From 12a36f96cec0ff3bc1c3a7494856199239b75ae9 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Thu, 20 Mar 2025 20:11:43 +0100 Subject: [PATCH 01/13] rewrite in python: recreate all points and structure --- .gitignore | 9 ++ README.md | 125 ++++++++++++++++++ icons/.gitkeep | 0 map-markers/vanillaSurvival/verden/byer.nix | 120 ++++++++--------- pyproject.toml | 17 +++ src/minecraft_kartverket/__init__.py | 1 + .../bluemap_hocon_generator/__init__.py | 0 src/minecraft_kartverket/cli/__init__.py | 0 src/minecraft_kartverket/cli/main.py | 49 +++++++ src/minecraft_kartverket/cli/print.py | 55 ++++++++ src/minecraft_kartverket/cli/validate.py | 8 ++ .../lib_marker/__init__.py | 15 +++ src/minecraft_kartverket/lib_marker/area.py | 9 ++ src/minecraft_kartverket/lib_marker/color.py | 8 ++ src/minecraft_kartverket/lib_marker/marker.py | 8 ++ .../lib_marker/marker_set.py | 26 ++++ src/minecraft_kartverket/lib_marker/point.py | 11 ++ src/minecraft_kartverket/lib_marker/track.py | 9 ++ .../mapcrafter_json_generator/__init__.py | 0 .../marker_sets/__init__.py | 11 ++ .../marker_sets/nether/__init__.py | 14 ++ .../marker_sets/nether/area_names/__init__.py | 10 ++ .../nether/area_names/grisebukta.py | 11 ++ .../marker_sets/nether/ice_tracks/__init__.py | 7 + .../marker_sets/nether/other/__init__.py | 7 + .../marker_sets/nether/portals/__init__.py | 7 + .../marker_sets/nether/railways/__init__.py | 7 + .../marker_sets/overworld/__init__.py | 27 ++++ .../overworld/area_names/__init__.py | 22 +++ .../overworld/area_names/andoya.py | 11 ++ .../overworld/area_names/england.py | 11 ++ .../overworld/area_names/hemmelig_mesabiom.py | 11 ++ .../overworld/area_names/summefjord.py | 11 ++ .../overworld/area_names/trangdalen.py | 11 ++ .../overworld/area_names/vestisodet.py | 11 ++ .../overworld/area_names/vestsumpland.py | 11 ++ .../overworld/buildings/__init__.py | 28 ++++ .../overworld/buildings/der_kolner_dom.py | 11 ++ .../marker_sets/overworld/buildings/fyret.py | 11 ++ .../overworld/buildings/hodeskallegrotten.py | 11 ++ .../overworld/buildings/isjungelkatedralen.py | 11 ++ .../buildings/jesus_christ_superstore.py | 11 ++ .../overworld/buildings/kystbasen.py | 11 ++ .../overworld/buildings/taarnodden.py | 11 ++ .../overworld/buildings/tegltaarnet.py | 11 ++ .../vinterstranda_hotel_og_resort.py | 11 ++ .../marker_sets/overworld/cities/__init__.py | 18 +++ .../marker_sets/overworld/cities/heimfjell.py | 11 ++ .../marker_sets/overworld/cities/holmgard.py | 11 ++ .../marker_sets/overworld/cities/tangen.py | 11 ++ .../overworld/cities/tosjodalen.py | 11 ++ .../overworld/cities/vikingelandsbyen.py | 11 ++ .../marker_sets/overworld/homes/__init__.py | 30 +++++ .../overworld/homes/akasienborg.py | 11 ++ .../marker_sets/overworld/homes/bikkjeby.py | 11 ++ .../marker_sets/overworld/homes/biosfaeren.py | 11 ++ .../overworld/homes/bjorkeholmen.py | 11 ++ .../overworld/homes/bjornebukten.py | 11 ++ .../marker_sets/overworld/homes/huloyeid.py | 11 ++ .../marker_sets/overworld/homes/singapore.py | 11 ++ .../marker_sets/overworld/homes/summevatn.py | 11 ++ .../overworld/homes/supertheodors_fiskehus.py | 11 ++ .../overworld/homes/svartskoghavn.py | 11 ++ .../marker_sets/overworld/homes/vestlandet.py | 11 ++ .../marker_sets/overworld/huts/__init__.py | 14 ++ .../overworld/huts/dypskiferhytta.py | 11 ++ .../overworld/huts/grensebuelvbu.py | 11 ++ .../overworld/huts/nyverdenhytta.py | 11 ++ .../overworld/infrastructure/__init__.py | 12 ++ .../overworld/infrastructure/grantrebukta.py | 11 ++ .../overworld/infrastructure/smalelvbro.py | 11 ++ .../marker_sets/overworld/mines/__init__.py | 12 ++ .../overworld/mines/sandsteingruva.py | 11 ++ .../marker_sets/overworld/mines/slimegruva.py | 11 ++ .../marker_sets/overworld/nature/__init__.py | 47 +++++++ .../overworld/nature/blindodden.py | 11 ++ .../marker_sets/overworld/nature/hulevatna.py | 11 ++ .../marker_sets/overworld/nature/kirkemyr.py | 11 ++ .../overworld/nature/lamafjellet.py | 11 ++ .../overworld/nature/langstrand.py | 11 ++ .../overworld/nature/lille_isbjornelv.py | 11 ++ .../overworld/nature/naturreservat.py | 11 ++ .../overworld/nature/piratbukta.py | 11 ++ .../overworld/nature/snoklippan.py | 11 ++ .../overworld/nature/store_isbjornelv.py | 11 ++ .../overworld/nature/storhavet_i_ost.py | 11 ++ .../overworld/nature/storhavs_kanalen.py | 11 ++ .../overworld/nature/storsnofjella.py | 11 ++ .../overworld/nature/storvatnet.py | 11 ++ .../overworld/nature/supertheodors_strand.py | 11 ++ .../overworld/nature/trangdalen.py | 11 ++ .../overworld/nature/turrikkelmyra.py | 11 ++ .../marker_sets/overworld/nature/ulveelva.py | 11 ++ .../overworld/nature/vestsumpland.py | 11 ++ .../marker_sets/overworld/other/__init__.py | 12 ++ .../marker_sets/overworld/other/leirhavn.py | 11 ++ .../marker_sets/overworld/other/nullpunkt.py | 11 ++ .../overworld/railways/__init__.py | 7 + .../marker_sets/overworld/roads/__init__.py | 7 + .../overworld/villages/__init__.py | 27 ++++ .../marker_sets/overworld/villages/bondeby.py | 11 ++ .../overworld/villages/gammelleirnes.py | 11 ++ .../overworld/villages/hestelandsby.py | 11 ++ .../overworld/villages/isbjornby.py | 11 ++ .../overworld/villages/ittoqqortoormiit.py | 11 ++ .../overworld/villages/klofteby.py | 11 ++ .../overworld/villages/npc_landsby.py | 11 ++ .../overworld/villages/npc_landsby_nord.py | 11 ++ .../marker_sets/overworld/villages/smedby.py | 11 ++ .../marker_sets/the_end/__init__.py | 7 + .../marker_sets/the_end/other/__init__.py | 7 + .../marker_sets/the_end/portals/__init__.py | 7 + uv.lock | 7 + 113 files changed, 1534 insertions(+), 60 deletions(-) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 icons/.gitkeep create mode 100644 pyproject.toml create mode 100644 src/minecraft_kartverket/__init__.py create mode 100644 src/minecraft_kartverket/bluemap_hocon_generator/__init__.py create mode 100644 src/minecraft_kartverket/cli/__init__.py create mode 100644 src/minecraft_kartverket/cli/main.py create mode 100644 src/minecraft_kartverket/cli/print.py create mode 100644 src/minecraft_kartverket/cli/validate.py create mode 100644 src/minecraft_kartverket/lib_marker/__init__.py create mode 100644 src/minecraft_kartverket/lib_marker/area.py create mode 100644 src/minecraft_kartverket/lib_marker/color.py create mode 100644 src/minecraft_kartverket/lib_marker/marker.py create mode 100644 src/minecraft_kartverket/lib_marker/marker_set.py create mode 100644 src/minecraft_kartverket/lib_marker/point.py create mode 100644 src/minecraft_kartverket/lib_marker/track.py create mode 100644 src/minecraft_kartverket/mapcrafter_json_generator/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/nether/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/nether/area_names/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/nether/area_names/grisebukta.py create mode 100644 src/minecraft_kartverket/marker_sets/nether/ice_tracks/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/nether/other/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/nether/portals/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/nether/railways/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/andoya.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/england.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/hemmelig_mesabiom.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/summefjord.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/vestisodet.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/der_kolner_dom.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/fyret.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/hodeskallegrotten.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/isjungelkatedralen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/jesus_christ_superstore.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/kystbasen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/taarnodden.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/tegltaarnet.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/cities/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/cities/heimfjell.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/cities/holmgard.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/cities/tangen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/cities/tosjodalen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/cities/vikingelandsbyen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/bikkjeby.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/biosfaeren.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/bjorkeholmen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/bjornebukten.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/huloyeid.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/singapore.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/summevatn.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/supertheodors_fiskehus.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/svartskoghavn.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/homes/vestlandet.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/huts/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/huts/dypskiferhytta.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/huts/grensebuelvbu.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/huts/nyverdenhytta.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/infrastructure/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/infrastructure/grantrebukta.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/infrastructure/smalelvbro.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/mines/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/mines/sandsteingruva.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/mines/slimegruva.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/blindodden.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/hulevatna.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/kirkemyr.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/lamafjellet.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/lille_isbjornelv.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/naturreservat.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/piratbukta.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/snoklippan.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/store_isbjornelv.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/storhavet_i_ost.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/storhavs_kanalen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/storsnofjella.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/storvatnet.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/supertheodors_strand.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/trangdalen.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/turrikkelmyra.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/ulveelva.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/nature/vestsumpland.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/other/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/other/leirhavn.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/other/nullpunkt.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/railways/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/bondeby.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/gammelleirnes.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/hestelandsby.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/isbjornby.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/ittoqqortoormiit.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/klofteby.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby_nord.py create mode 100644 src/minecraft_kartverket/marker_sets/overworld/villages/smedby.py create mode 100644 src/minecraft_kartverket/marker_sets/the_end/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/the_end/other/__init__.py create mode 100644 src/minecraft_kartverket/marker_sets/the_end/portals/__init__.py create mode 100644 uv.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..78d52e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.pyc +*.pyo +build/ +dist/ +.venv +__pycache__ + +result +result-* diff --git a/README.md b/README.md new file mode 100644 index 0000000..e8d4df4 --- /dev/null +++ b/README.md @@ -0,0 +1,125 @@ +# minecraft-kartverket + +Map markers for PVV's minecraft server + +## What is this? + +This project is meant to let PVV members contribute map data for PVV's minecraft server, like coordinates for bases, cities, and other points of interest. +These markers are written in python so that we easily can do things like generating points in a loop, or other types of automation. + +There is also a cli tool that we use to export these points into the formats of several minecraft map implementations. + +## Marker sets + +Here is an overview of the different marker sets, and what they are meant for. + +- **Overworld** + - Area Names: larger areas with names + - Buildings: important buildings and world wonders. + - Cities: an area that consist of several bases and/or public infrastructure. + - Homes: single bases consisting of 1-3 people. + - Huts: small huts, meant for visitors and travelers. + - Infrastructure: public infrastructure, like bridges, ports, tunnels, etc. + - Mines: public mines + - Nature: similar to "Area Names", but specifically for mostly untouched nature-named areas. + - Other: anything that doesn't fit into the other categories + - Railways: railways + - Roads: roads + - Villages: villages generated by minecraft (as opposed to player made cities) + +- **Nether** + - Ice Tracks: ice tracks meant for boats. + - Other: anything that doesn't fit into the other categories + - Portals: named portals that lead back to the overworld. + - Railways: railways + +- **The End** + - Other: anything that doesn't fit into the other categories + - Portals: end portals that send you back to the center of the map + +## How to add a point marker + +1. Find the correct marker set directory in `src/marker_sets`. +2. Create a new file in this directory with the name of the marker and the extension `.py`. + Note that this needs to be underscored (no spaces or hyphens), and valid ascii. + e.g. `Min svære base` -> `min_svaere_base.py` +3. Add the marker to the file. You can use the following template or look at other markers for inspiration. + +```python +from lib_marker import Point + +MARKERS = [ + Point( + name="Nyverdenhytta", + icon = None, + x = 848, + y = 70, + z = 1583, + ), +] +``` + +4. Register the marker(s) to the marker set by editing the marker set's `__init__.py` file. + Add the following line to the file, replacing `` with the name of the marker file. + Notice that there needs to be a `*` before the marker name inside the `markers` list. + +```python + ... + + from . import MARKERS as _markers + + ... + + markers = [ + ... + *_markers, + ] +``` + +5. Run the cli tool to verify that the marker has been added correctly. + +```bash +uv run mckart verify +uv run mckart print +``` + +6. Open a PR + +## How to add a railway / road + +This is very similar to adding a point marker, but the content of the marker is different. + +You can follow the previous guide, but for step 3, use this template or look at other markers for inspiration. + +```python +from lib_marker import Track + +MARKERS = [ + Track( + name="Nordbanen", + points = [ + (848, 70, 1583), + (920, 70, 1583), + (920, 70, 1200), + ... + ], + ), +] +``` + +## How to add a new marker set + +TODO: Write this section + +## How to add icons + +TODO: Write this section + +## Building with nix + +TODO: Write this section + +## See also + +- [BlueMap documentation for markers](https://bluemap.bluecolored.de/wiki/customization/Markers.html) +- [Mapcrafter documentation for markers](https://mapcrafter.readthedocs.io/en/latest/markers.html) diff --git a/icons/.gitkeep b/icons/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/map-markers/vanillaSurvival/verden/byer.nix b/map-markers/vanillaSurvival/verden/byer.nix index ca5c0ec..2045f2c 100644 --- a/map-markers/vanillaSurvival/verden/byer.nix +++ b/map-markers/vanillaSurvival/verden/byer.nix @@ -6,71 +6,71 @@ default-hidden = false; sorting = 0; markers = { - "Vestlandet" = lib.mkPoi "Vestlandet" [(-2204) (447) (64)] { }; - "Vestsumpland" = lib.mkPoi "Vestsumpland" [(-1818) (98) (64)] { }; - "Smedby" = lib.mkPoi "Smedby" [(-1760) (-2440) (64)] { }; - "Snøklippan" = lib.mkPoi "Snøklippan" [(-1654) (-654) (64)] { }; - "Dypskiferhytta" = lib.mkPoi "Dypskiferhytta" [(-1563) (-1966) (64)] { }; - "England" = lib.mkPoi "England" [(-1189) (1556) (75)] { }; - "Hemmelig mesabiom" = lib.mkPoi "Hemmelig mesabiom" [(-980) (4090) (64)] { }; - "Vestisødet" = lib.mkPoi "Vestisødet" [(-800) (0) (64)] { }; - "Isjungelkatedralen" = lib.mkPoi "Isjungelkatedralen" [(-378) (153) (64)] { }; - "Svartskoghavn" = lib.mkPoi "Svartskoghavn" [(-370) (2390) (64)] { }; - "Kystbasen" = lib.mkPoi "Kystbasen" [(-334) (473) (116)] { }; - "Langstrand" = lib.mkPoi "Langstrand" [(-305) (535) (64)] { }; - "Summefjord" = lib.mkPoi "Summefjord" [(-220) (2890) (64)] { }; - "Slimegruva" = lib.mkPoi "Slimegruva" [(-206) (-35) (64)] { }; - "Turrikkelmyra" = lib.mkPoi "Turrikkelmyra" [(-160) (1480) (64)] { }; - "Akasienborg" = lib.mkPoi "Akasienborg" [(-128) (-1460) (64)] { }; - "Summevatn" = lib.mkPoi "Summevatn" [(-110) (3465) (64)] { }; - "Tegltårnet" = lib.mkPoi "Tegltårnet" [(-99) (1025) (99)] { }; - "Huløyeid" = lib.mkPoi "Huløyeid" [(-54) (234) (64)] { }; - "Trangdalen" = lib.mkPoi "Trangdalen" [(-47) (146) (64)] { }; - "Tårnodden" = lib.mkPoi "Tårnodden" [(-22) (67) (76)] { }; - "Nordørkenen" = lib.mkPoi "Nordørkenen" [(0) (-485) (67)] { }; - "Naturreservat" = lib.mkPoi "Naturreservat" [(4) (800) (64)] { }; + # "Vestlandet" = lib.mkPoi "Vestlandet" [(-2204) (447) (64)] { }; + # "Vestsumpland" = lib.mkPoi "Vestsumpland" [(-1818) (98) (64)] { }; + # "Smedby" = lib.mkPoi "Smedby" [(-1760) (-2440) (64)] { }; + # "Snøklippan" = lib.mkPoi "Snøklippan" [(-1654) (-654) (64)] { }; + # "Dypskiferhytta" = lib.mkPoi "Dypskiferhytta" [(-1563) (-1966) (64)] { }; + # "England" = lib.mkPoi "England" [(-1189) (1556) (75)] { }; + # "Hemmelig mesabiom" = lib.mkPoi "Hemmelig mesabiom" [(-980) (4090) (64)] { }; + # "Vestisødet" = lib.mkPoi "Vestisødet" [(-800) (0) (64)] { }; + # "Isjungelkatedralen" = lib.mkPoi "Isjungelkatedralen" [(-378) (153) (64)] { }; + # "Svartskoghavn" = lib.mkPoi "Svartskoghavn" [(-370) (2390) (64)] { }; + # "Kystbasen" = lib.mkPoi "Kystbasen" [(-334) (473) (116)] { }; + # "Langstrand" = lib.mkPoi "Langstrand" [(-305) (535) (64)] { }; + # "Summefjord" = lib.mkPoi "Summefjord" [(-220) (2890) (64)] { }; + # "Slimegruva" = lib.mkPoi "Slimegruva" [(-206) (-35) (64)] { }; + # "Turrikkelmyra" = lib.mkPoi "Turrikkelmyra" [(-160) (1480) (64)] { }; + # "Akasienborg" = lib.mkPoi "Akasienborg" [(-128) (-1460) (64)] { }; + # "Summevatn" = lib.mkPoi "Summevatn" [(-110) (3465) (64)] { }; + # "Tegltårnet" = lib.mkPoi "Tegltårnet" [(-99) (1025) (99)] { }; + # "Huløyeid" = lib.mkPoi "Huløyeid" [(-54) (234) (64)] { }; + # "Trangdalen" = lib.mkPoi "Trangdalen" [(-47) (146) (64)] { }; + # "Tårnodden" = lib.mkPoi "Tårnodden" [(-22) (67) (76)] { }; + # "Nordørkenen" = lib.mkPoi "Nordørkenen" [(0) (-485) (67)] { }; + # "Naturreservat" = lib.mkPoi "Naturreservat" [(4) (800) (64)] { }; "Sandsteingruva" = lib.mkPoi "Sandsteingruva" [(56) (-266) (67)] { }; - "Tangen" = lib.mkPoi "Tangen" [(58) (-2860) (63)] { }; + # "Tangen" = lib.mkPoi "Tangen" [(58) (-2860) (63)] { }; "Smalelvbro" = lib.mkPoi "Smalelvbro" [(77) (-348) (69)] { }; - "Ittoqqortoormiit" = lib.mkPoi "Ittoqqortoormiit" [(100) (-3830) (64)] { }; + # "Ittoqqortoormiit" = lib.mkPoi "Ittoqqortoormiit" [(100) (-3830) (64)] { }; "Bjerkepalasset" = lib.mkPoi "Bjerkepalasset" [(102) (37) (77)] { }; - "Piratbukta" = lib.mkPoi "Piratbukta" [(150) (80) (64)] { }; - "Heimfjell" = lib.mkPoi "Heimfjell" [(177) (177) (64)] { }; - "Hulevatna" = lib.mkPoi "Hulevatna" [(240) (3070) (64)] { }; + # "Piratbukta" = lib.mkPoi "Piratbukta" [(150) (80) (64)] { }; + # "Heimfjell" = lib.mkPoi "Heimfjell" [(177) (177) (64)] { }; + # "Hulevatna" = lib.mkPoi "Hulevatna" [(240) (3070) (64)] { }; "Hodeskallegrotten" = lib.mkPoi "Hodeskallegrotten" [(267) (-496) (89)] { }; - "Jesus Christ Superstore" = lib.mkPoi "Jesus Christ Superstore" [(280) (-2800) (64)] { }; - "NPC-landsby nord" = lib.mkPoi "NPC-landsby nord" [(337) (-853) (64)] { }; + # "Jesus Christ Superstore" = lib.mkPoi "Jesus Christ Superstore" [(280) (-2800) (64)] { }; + # "NPC-landsby nord" = lib.mkPoi "NPC-landsby nord" [(337) (-853) (64)] { }; "Vikingelandsbyen" = lib.mkPoi "Vikingelandsbyen" [(360) (-460) (64)] { }; - "Bjørnebukten" = lib.mkPoi "Bjørnebukten" [(473) (-3043) (78)] { }; - "Leirhavn" = lib.mkPoi "Leirhavn" [(512) (-3320) (64)] { }; - "Grensebuelvbu" = lib.mkPoi "Grensebuelvbu" [(550) (-1480) (64)] { }; - "Storvatnet" = lib.mkPoi "Storvatnet" [(675) (362) (64)] { }; - "Kløfteby" = lib.mkPoi "Kløfteby" [(695) (2812) (64)] { }; - "Isbjørnby" = lib.mkPoi "Isbjørnby" [(723) (-2380) (64)] { }; - "Lille isbjørnelv" = lib.mkPoi "Lille isbjørnelv" [(730) (-1900) (64)] { }; - "Gammelleirnes" = lib.mkPoi "Gammelleirnes" [(800) (-3300) (64)] { }; - "Biosfæren" = lib.mkPoi "Biosfæren" [(834) (-3089) (65)] { }; - "Nyverdenhytta" = lib.mkPoi "Nyverdenhytta" [(848) (1583) (70)] { }; - "Store isbjørnelv" = lib.mkPoi "Store isbjørnelv" [(850) (-2130) (64)] { }; - "Blindodden" = lib.mkPoi "Blindodden" [(874) (160) (65)] { }; - "Ulveelva" = lib.mkPoi "Ulveelva" [(910) (3050) (64)] { }; - "Tosjødalen" = lib.mkPoi "Tosjødalen" [(960) (460) (64)] { }; - "Storhavskanalen" = lib.mkPoi "Storhavskanalen" [(1005) (1335) (64)] { }; - "NPC-landsby" = lib.mkPoi "NPC-landsby" [(1278) (-397) (64)] { }; - "SuperTheodors fiskehus" = lib.mkPoi "SuperTheodors fiskehus" [(1570) (3285) (64)] { }; - "Lamafjellet" = lib.mkPoi "Lamafjellet" [(1810) (-1630) (64)] { }; - "SuperTheodors strand" = lib.mkPoi "SuperTheodors strand" [(2111) (3777) (64)] { }; - "Andøya" = lib.mkPoi "Andøya" [(2300) (250) (64)] { }; + # "Bjørnebukten" = lib.mkPoi "Bjørnebukten" [(473) (-3043) (78)] { }; + # "Leirhavn" = lib.mkPoi "Leirhavn" [(512) (-3320) (64)] { }; + # "Grensebuelvbu" = lib.mkPoi "Grensebuelvbu" [(550) (-1480) (64)] { }; + # "Storvatnet" = lib.mkPoi "Storvatnet" [(675) (362) (64)] { }; + # "Kløfteby" = lib.mkPoi "Kløfteby" [(695) (2812) (64)] { }; + # "Isbjørnby" = lib.mkPoi "Isbjørnby" [(723) (-2380) (64)] { }; + # "Lille isbjørnelv" = lib.mkPoi "Lille isbjørnelv" [(730) (-1900) (64)] { }; + # "Gammelleirnes" = lib.mkPoi "Gammelleirnes" [(800) (-3300) (64)] { }; + # "Biosfæren" = lib.mkPoi "Biosfæren" [(834) (-3089) (65)] { }; + # "Nyverdenhytta" = lib.mkPoi "Nyverdenhytta" [(848) (1583) (70)] { }; + # "Store isbjørnelv" = lib.mkPoi "Store isbjørnelv" [(850) (-2130) (64)] { }; + # "Blindodden" = lib.mkPoi "Blindodden" [(874) (160) (65)] { }; + # "Ulveelva" = lib.mkPoi "Ulveelva" [(910) (3050) (64)] { }; + # "Tosjødalen" = lib.mkPoi "Tosjødalen" [(960) (460) (64)] { }; + # "Storhavskanalen" = lib.mkPoi "Storhavskanalen" [(1005) (1335) (64)] { }; + # "NPC-landsby" = lib.mkPoi "NPC-landsby" [(1278) (-397) (64)] { }; + # "SuperTheodors fiskehus" = lib.mkPoi "SuperTheodors fiskehus" [(1570) (3285) (64)] { }; + # "Lamafjellet" = lib.mkPoi "Lamafjellet" [(1810) (-1630) (64)] { }; + # "SuperTheodors strand" = lib.mkPoi "SuperTheodors strand" [(2111) (3777) (64)] { }; + # "Andøya" = lib.mkPoi "Andøya" [(2300) (250) (64)] { }; "Grantrebukta" = lib.mkPoi "Grantrebukta" [(2350) (-136) (64)] { }; - "Hestelandsby" = lib.mkPoi "Hestelandsby" [(2734) (-984) (64)] { }; - "Bikkjeby" = lib.mkPoi "Bikkjeby" [(2950) (270) (64)] { }; - "Storhavet i øst" = lib.mkPoi "Storhavet i øst" [(3000) (1000) (64)] { }; - "Fyret" = lib.mkPoi "Fyret" [(3085) (424) (64)] { }; - "Vinterstranda hotel & resort" = lib.mkPoi "Vinterstranda hotel & resort" [(3481) (210) (75)] { }; - "Holmgard" = lib.mkPoi "Holmgard" [(4468) (1337) (64)] { }; - "Der Kölner Dom" = lib.mkPoi "Der Kölner Dom" [(4630) (270) (64)] { }; - "Storsnøfjella" = lib.mkPoi "Storsnøfjella" [(5470) (-270) (64)] { }; - "Bondeby" = lib.mkPoi "Bondeby" [(6200) (-300) (64)] { }; - "Kirkemyr" = lib.mkPoi "Kirkemyr" [(6880) (-465) (64)] { }; + # "Hestelandsby" = lib.mkPoi "Hestelandsby" [(2734) (-984) (64)] { }; + # "Bikkjeby" = lib.mkPoi "Bikkjeby" [(2950) (270) (64)] { }; + # "Storhavet i øst" = lib.mkPoi "Storhavet i øst" [(3000) (1000) (64)] { }; + # "Fyret" = lib.mkPoi "Fyret" [(3085) (424) (64)] { }; + # "Vinterstranda hotel & resort" = lib.mkPoi "Vinterstranda hotel & resort" [(3481) (210) (75)] { }; + # "Holmgard" = lib.mkPoi "Holmgard" [(4468) (1337) (64)] { }; + # "Der Kölner Dom" = lib.mkPoi "Der Kölner Dom" [(4630) (270) (64)] { }; + # "Storsnøfjella" = lib.mkPoi "Storsnøfjella" [(5470) (-270) (64)] { }; + # "Bondeby" = lib.mkPoi "Bondeby" [(6200) (-300) (64)] { }; + # "Kirkemyr" = lib.mkPoi "Kirkemyr" [(6880) (-465) (64)] { }; }; } diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..8a86021 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,17 @@ +[project] +name = "minecraft-kartverket" +version = "0.1.0" +description = "Map data for our favourite minecraft server" +readme = "README.md" +authors = [ + { name = "pvv", email = "pvv@pvv.ntnu.no" } +] +requires-python = ">=3.12" +dependencies = [] + +[project.scripts] +mckart = "minecraft_kartverket.cli.main:main" + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" diff --git a/src/minecraft_kartverket/__init__.py b/src/minecraft_kartverket/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/minecraft_kartverket/__init__.py @@ -0,0 +1 @@ + diff --git a/src/minecraft_kartverket/bluemap_hocon_generator/__init__.py b/src/minecraft_kartverket/bluemap_hocon_generator/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/minecraft_kartverket/cli/__init__.py b/src/minecraft_kartverket/cli/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/minecraft_kartverket/cli/main.py b/src/minecraft_kartverket/cli/main.py new file mode 100644 index 0000000..9b3c420 --- /dev/null +++ b/src/minecraft_kartverket/cli/main.py @@ -0,0 +1,49 @@ +import argparse + +from .print import print_worlds + + +def parse_args(): + parser = argparse.ArgumentParser(description="Minecraft map data exporter cli") + + subparsers = parser.add_subparsers(dest="command") + + ebh_parser = subparsers.add_parser( + "export-bluemap-hocon", help="Export map data to Bluemap hocon format" + ) + # TODO: dir? + ebh_parser.add_argument("output", help="Output file", default="map.hocon") + + emj_parser = subparsers.add_parser( + "export-mapcrafter-json", help="Export map data to Mapcrafter json format" + ) + emj_parser.add_argument("output", help="Output file", default="map.json") + + subparsers.add_parser("validate", help="Validate the map data") + subparsers.add_parser("print", help="Print the map data") + + return parser.parse_args() + + +def main(): + args = parse_args() + + match args.command: + case "export-bluemap-hocon": + print("Exporting map data to Bluemap hocon format...") + raise NotImplementedError() + case "export-mapcrafter-json": + print("Exporting map data to Mapcrafter json format...") + raise NotImplementedError() + case "validate": + print("Validating the map data...") + raise NotImplementedError() + case "print": + print("Printing the map data...") + print_worlds() + case _: + print("Unknown command") + + +if __name__ == "__main__": + main() diff --git a/src/minecraft_kartverket/cli/print.py b/src/minecraft_kartverket/cli/print.py new file mode 100644 index 0000000..a0e4862 --- /dev/null +++ b/src/minecraft_kartverket/cli/print.py @@ -0,0 +1,55 @@ +from minecraft_kartverket.lib_marker import MarkerSet, Marker, Point, Track, Area +from minecraft_kartverket.marker_sets import WORLDS + + +def print_worlds() -> None: + tree = format_tree( + "Worlds", [format_world(name, world) for name, world in WORLDS.items()] + ) + print(tree) + + +def format_world(name: str, world: list[MarkerSet]) -> str: + tree = format_tree(name, [format_marker_set(marker_set) for marker_set in world]) + return tree + + +def format_marker_set(marker_set: MarkerSet) -> str: + tree = format_tree( + marker_set.name, [format_marker(marker) for marker in marker_set.markers] + ) + return tree + + +def format_marker(marker: Marker) -> str: + if isinstance(marker, Point): + return format_point_marker(marker) + elif isinstance(marker, Track): + raise NotImplementedError("Track markers are not supported") + elif isinstance(marker, Area): + raise NotImplementedError("Area markers are not supported") + else: + raise ValueError(f"Unknown marker type: {marker}") + + +def format_point_marker(marker: Point) -> str: + return f"{marker.name} ({marker.x}, {marker.y}, {marker.z})" + + +def format_tree(name: str, items: list[str]) -> str: + result = [name] + for i, item in enumerate(items): + if i == len(items) - 1: + for k, line in enumerate(item.splitlines()): + if k == 0: + result.append(f"└─ {line}") + else: + result.append(f" {line}") + else: + for k, line in enumerate(item.splitlines()): + if k == 0: + result.append(f"├─ {line}") + else: + result.append(f"│ {line}") + + return "\n".join(result) diff --git a/src/minecraft_kartverket/cli/validate.py b/src/minecraft_kartverket/cli/validate.py new file mode 100644 index 0000000..17d262d --- /dev/null +++ b/src/minecraft_kartverket/cli/validate.py @@ -0,0 +1,8 @@ +# Check for non-included files +# read all python files, edit-distance out common mistakes. +# Check for invalid y values +# Check for duplicate points in tracks +# Check for duplicate names in markers +# Check for duplicate names in marker sets +# Check for unused icons +# Check for duplicate points diff --git a/src/minecraft_kartverket/lib_marker/__init__.py b/src/minecraft_kartverket/lib_marker/__init__.py new file mode 100644 index 0000000..6d8b91a --- /dev/null +++ b/src/minecraft_kartverket/lib_marker/__init__.py @@ -0,0 +1,15 @@ +from .area import Area +from .color import Color +from .marker import Marker +from .marker_set import MarkerSet +from .point import Point +from .track import Track + +__all__ = [ + "Area", + "Color", + "Marker", + "MarkerSet", + "Point", + "Track", +] diff --git a/src/minecraft_kartverket/lib_marker/area.py b/src/minecraft_kartverket/lib_marker/area.py new file mode 100644 index 0000000..74fc682 --- /dev/null +++ b/src/minecraft_kartverket/lib_marker/area.py @@ -0,0 +1,9 @@ +from dataclasses import dataclass + +from .marker import Marker + + +@dataclass +class Area(Marker): + points: list[tuple[int, int, int]] + icon: str | None = None diff --git a/src/minecraft_kartverket/lib_marker/color.py b/src/minecraft_kartverket/lib_marker/color.py new file mode 100644 index 0000000..a2cac04 --- /dev/null +++ b/src/minecraft_kartverket/lib_marker/color.py @@ -0,0 +1,8 @@ +from dataclasses import dataclass + + +@dataclass +class Color: + r: int + g: int + b: int diff --git a/src/minecraft_kartverket/lib_marker/marker.py b/src/minecraft_kartverket/lib_marker/marker.py new file mode 100644 index 0000000..32902bd --- /dev/null +++ b/src/minecraft_kartverket/lib_marker/marker.py @@ -0,0 +1,8 @@ +from abc import ABC +from dataclasses import dataclass + + +@dataclass +class Marker(ABC): + name: str + # icon: str | None = None diff --git a/src/minecraft_kartverket/lib_marker/marker_set.py b/src/minecraft_kartverket/lib_marker/marker_set.py new file mode 100644 index 0000000..cb47bc5 --- /dev/null +++ b/src/minecraft_kartverket/lib_marker/marker_set.py @@ -0,0 +1,26 @@ +from dataclasses import dataclass + +from .color import Color +from .marker import Marker + + +@dataclass +class MarkerSet: + name: str + + markers: list[Marker] + + # Icon to use for the marker group. If None, the default icon will be used. + icon: str | None = None + + # Default icon to use for the markers in the group. If None, the default icon will be used. + default_icon: str | None = None + + # Default icon size to use for the markers in the group. If None, the default icon size will be used. + default_icon_size: tuple[int, int] | None = None + + # Default color to use for the markers in the group. If None, the default color will be used. + default_color: Color | None = None + + # Whether to show this marker group by default. + show_by_default: bool = True diff --git a/src/minecraft_kartverket/lib_marker/point.py b/src/minecraft_kartverket/lib_marker/point.py new file mode 100644 index 0000000..6289da2 --- /dev/null +++ b/src/minecraft_kartverket/lib_marker/point.py @@ -0,0 +1,11 @@ +from dataclasses import dataclass + +from .marker import Marker + + +@dataclass +class Point(Marker): + x: int + y: int + z: int + icon: str | None = None diff --git a/src/minecraft_kartverket/lib_marker/track.py b/src/minecraft_kartverket/lib_marker/track.py new file mode 100644 index 0000000..9fd965d --- /dev/null +++ b/src/minecraft_kartverket/lib_marker/track.py @@ -0,0 +1,9 @@ +from dataclasses import dataclass + +from .marker import Marker + + +@dataclass +class Track(Marker): + points: list[tuple[int, int, int]] + icon: str | None = None diff --git a/src/minecraft_kartverket/mapcrafter_json_generator/__init__.py b/src/minecraft_kartverket/mapcrafter_json_generator/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/minecraft_kartverket/marker_sets/__init__.py b/src/minecraft_kartverket/marker_sets/__init__.py new file mode 100644 index 0000000..f2a249e --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/__init__.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import MarkerSet + +from .nether import MARKER_SETS as nether_marker_sets +from .overworld import MARKER_SETS as overworld_marker_sets +from .the_end import MARKER_SETS as the_end_marker_sets + +WORLDS: dict[str, list[MarkerSet]] = { + "Nether": nether_marker_sets, + "Overworld": overworld_marker_sets, + "The End": the_end_marker_sets, +} diff --git a/src/minecraft_kartverket/marker_sets/nether/__init__.py b/src/minecraft_kartverket/marker_sets/nether/__init__.py new file mode 100644 index 0000000..ab88ae3 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/nether/__init__.py @@ -0,0 +1,14 @@ +from .area_names import MARKER_SET as area_names_marker_set +from .ice_tracks import MARKER_SET as ice_tracks_marker_set +from .other import MARKER_SET as other_marker_set +from .portals import MARKER_SET as portals_marker_set +from .railways import MARKER_SET as railways_marker_set + + +MARKER_SETS = [ + area_names_marker_set, + ice_tracks_marker_set, + other_marker_set, + portals_marker_set, + railways_marker_set, +] diff --git a/src/minecraft_kartverket/marker_sets/nether/area_names/__init__.py b/src/minecraft_kartverket/marker_sets/nether/area_names/__init__.py new file mode 100644 index 0000000..bbe17fd --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/nether/area_names/__init__.py @@ -0,0 +1,10 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .grisebukta import MARKERS as grisebukta_markers + +MARKER_SET = MarkerSet( + name="Area Names", + markers=[ + *grisebukta_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/nether/area_names/grisebukta.py b/src/minecraft_kartverket/marker_sets/nether/area_names/grisebukta.py new file mode 100644 index 0000000..64baba0 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/nether/area_names/grisebukta.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Grisebukta", + icon=None, + x=-900, + y=64, + z=27, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/nether/ice_tracks/__init__.py b/src/minecraft_kartverket/marker_sets/nether/ice_tracks/__init__.py new file mode 100644 index 0000000..16bff2f --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/nether/ice_tracks/__init__.py @@ -0,0 +1,7 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Ice tracks", + markers=[], +) diff --git a/src/minecraft_kartverket/marker_sets/nether/other/__init__.py b/src/minecraft_kartverket/marker_sets/nether/other/__init__.py new file mode 100644 index 0000000..d29400c --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/nether/other/__init__.py @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..a97fc23 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/nether/portals/__init__.py @@ -0,0 +1,7 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Portals", + markers=[], +) diff --git a/src/minecraft_kartverket/marker_sets/nether/railways/__init__.py b/src/minecraft_kartverket/marker_sets/nether/railways/__init__.py new file mode 100644 index 0000000..244f1f8 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/nether/railways/__init__.py @@ -0,0 +1,7 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Railways", + markers=[], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/__init__.py new file mode 100644 index 0000000..908089f --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/__init__.py @@ -0,0 +1,27 @@ +from .area_names import MARKER_SET as area_names_marker_set +from .buildings import MARKER_SET as buildings_marker_set +from .cities import MARKER_SET as cities_marker_set +from .homes import MARKER_SET as homes_marker_set +from .huts import MARKER_SET as huts_marker_set +from .infrastructure import MARKER_SET as infrastructure_marker_set +from .mines import MARKER_SET as mines_marker_set +from .nature import MARKER_SET as nature_marker_set +from .other import MARKER_SET as other_marker_set +from .railways import MARKER_SET as railways_marker_set +from .roads import MARKER_SET as roads_marker_set +from .villages import MARKER_SET as villages_marker_set + +MARKER_SETS = [ + area_names_marker_set, + buildings_marker_set, + cities_marker_set, + homes_marker_set, + huts_marker_set, + infrastructure_marker_set, + mines_marker_set, + nature_marker_set, + other_marker_set, + railways_marker_set, + roads_marker_set, + villages_marker_set, +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py new file mode 100644 index 0000000..b6bb062 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py @@ -0,0 +1,22 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .andoya import MARKERS as andoya_markers +from .england import MARKERS as england_markers +from .hemmelig_mesabiom import MARKERS as hemmelig_mesabiom_markers +from .summefjord import MARKERS as summefjord_markers +from .trangdalen import MARKERS as trangdalen_markers +from .vestisodet import MARKERS as vestisodet_markers +from .vestsumpland import MARKERS as vestsumpland_markers + +MARKER_SET = MarkerSet( + name="Area Names", + markers=[ + *andoya_markers, + *england_markers, + *hemmelig_mesabiom_markers, + *summefjord_markers, + *trangdalen_markers, + *vestisodet_markers, + *vestsumpland_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/andoya.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/andoya.py new file mode 100644 index 0000000..6005d04 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/andoya.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Andøya", + icon=None, + x=2300, + y=64, + z=250, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/england.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/england.py new file mode 100644 index 0000000..8bab149 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/england.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="England", + icon=None, + x=-1189, + y=64, + z=1556, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/hemmelig_mesabiom.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/hemmelig_mesabiom.py new file mode 100644 index 0000000..4e0185a --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/hemmelig_mesabiom.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Hemmelig mesabiom", + icon=None, + x=-980, + y=64, + z=4090, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/summefjord.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/summefjord.py new file mode 100644 index 0000000..a501d91 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/summefjord.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Summefjord", + icon=None, + x=-220, + y=64, + z=2890, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py new file mode 100644 index 0000000..19d8b0d --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Trangdalen", + icon=None, + x=-47, + y=64, + z=146, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/vestisodet.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/vestisodet.py new file mode 100644 index 0000000..bbab8e9 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/vestisodet.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Vestisødet", + icon=None, + x=-800, + y=64, + z=0, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py new file mode 100644 index 0000000..26fe374 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Vestsumpland", + icon=None, + x=-1818, + y=64, + z=98, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/__init__.py new file mode 100644 index 0000000..38a2785 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/__init__.py @@ -0,0 +1,28 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .der_kolner_dom import MARKERS as der_kolner_dom_markers +from .fyret import MARKERS as fyret_markers +from .hodeskallegrotten import MARKERS as hodeskallegrotten_markers +from .isjungelkatedralen import MARKERS as isjungelkatedralen_markers +from .jesus_christ_superstore import MARKERS as jesus_christ_superstore_markers +from .kystbasen import MARKERS as kystbasen_markers +from .taarnodden import MARKERS as taarnodden_markers +from .tegltaarnet import MARKERS as tegltaarnet_markers +from .vinterstranda_hotel_og_resort import ( + MARKERS as vinterstranda_hotel_og_resort_markers, +) + +MARKER_SET = MarkerSet( + name="Buildings", + markers=[ + *der_kolner_dom_markers, + *fyret_markers, + *hodeskallegrotten_markers, + *isjungelkatedralen_markers, + *jesus_christ_superstore_markers, + *kystbasen_markers, + *taarnodden_markers, + *tegltaarnet_markers, + *vinterstranda_hotel_og_resort_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/der_kolner_dom.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/der_kolner_dom.py new file mode 100644 index 0000000..404e0da --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/der_kolner_dom.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Der Kölner Dom", + icon=None, + x=4630, + y=64, + z=270, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/fyret.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/fyret.py new file mode 100644 index 0000000..23ee539 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/fyret.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Fyret", + icon=None, + x=3085, + y=64, + z=424, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/hodeskallegrotten.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/hodeskallegrotten.py new file mode 100644 index 0000000..5523a19 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/hodeskallegrotten.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Hodeskallegrotten", + icon=None, + x=267, + y=89, + z=-496, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/isjungelkatedralen.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/isjungelkatedralen.py new file mode 100644 index 0000000..ffa38c7 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/isjungelkatedralen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Isjungelkatedralen", + icon=None, + x=-378, + y=64, + z=153, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/jesus_christ_superstore.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/jesus_christ_superstore.py new file mode 100644 index 0000000..4af80dd --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/jesus_christ_superstore.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Jesus Christ Superstore", + icon=None, + x=280, + y=64, + z=-2800, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/kystbasen.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/kystbasen.py new file mode 100644 index 0000000..2d1f5db --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/kystbasen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Kystbasen", + icon=None, + x=-334, + y=116, + z=473, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/taarnodden.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/taarnodden.py new file mode 100644 index 0000000..bd2f068 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/taarnodden.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Tårnodden", + icon=None, + x=-22, + y=76, + z=67, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/tegltaarnet.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/tegltaarnet.py new file mode 100644 index 0000000..239a5e4 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/tegltaarnet.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Tegltårnet", + icon=None, + x=-99, + y=99, + z=1025, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py b/src/minecraft_kartverket/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py new file mode 100644 index 0000000..d8d0887 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Vinterstranda hotel & resort", + icon=None, + x=3481, + y=75, + z=210, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/cities/__init__.py new file mode 100644 index 0000000..da52afe --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/cities/__init__.py @@ -0,0 +1,18 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .heimfjell import MARKERS as heimfjell_markers +from .holmgard import MARKERS as holmgard_markers +from .tangen import MARKERS as tangen_markers +from .tosjodalen import MARKERS as tosjodalen_markers +from .vikingelandsbyen import MARKERS as vikingelandsbyen_markers + +MARKER_SET = MarkerSet( + name="Cities", + markers=[ + *heimfjell_markers, + *holmgard_markers, + *tangen_markers, + *tosjodalen_markers, + *vikingelandsbyen_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/heimfjell.py b/src/minecraft_kartverket/marker_sets/overworld/cities/heimfjell.py new file mode 100644 index 0000000..f561bd3 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/cities/heimfjell.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Heimfjell", + icon=None, + x=177, + y=64, + z=177, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/holmgard.py b/src/minecraft_kartverket/marker_sets/overworld/cities/holmgard.py new file mode 100644 index 0000000..c53bac0 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/cities/holmgard.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Holmgard", + icon=None, + x=4468, + y=64, + z=1337, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/tangen.py b/src/minecraft_kartverket/marker_sets/overworld/cities/tangen.py new file mode 100644 index 0000000..2255dc2 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/cities/tangen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Tangen", + icon=None, + x=58, + y=63, + z=-2860, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/tosjodalen.py b/src/minecraft_kartverket/marker_sets/overworld/cities/tosjodalen.py new file mode 100644 index 0000000..74019ad --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/cities/tosjodalen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Tosjødalen", + icon=None, + x=960, + y=64, + z=460, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/vikingelandsbyen.py b/src/minecraft_kartverket/marker_sets/overworld/cities/vikingelandsbyen.py new file mode 100644 index 0000000..f91230a --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/cities/vikingelandsbyen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Vikingelandsbyen", + icon=None, + x=360, + y=64, + z=-460, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/homes/__init__.py new file mode 100644 index 0000000..7799e16 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/__init__.py @@ -0,0 +1,30 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .biosfaeren import MARKERS as biosfaeren_markers +from .akasienborg import MARKERS as akasienborg_markers +from .bikkjeby import MARKERS as bikkjeby_markers +from .bjorkeholmen import MARKERS as bjorkeholmen_markers +from .bjornebukten import MARKERS as bjornebukten_markers +from .huloyeid import MARKERS as huloyeid_markers +from .singapore import MARKERS as singapore_markers +from .summevatn import MARKERS as summevatn_markers +from .supertheodors_fiskehus import MARKERS as supertheodors_fiskehus_markers +from .svartskoghavn import MARKERS as svartskoghavn_markers +from .vestlandet import MARKERS as vestlandet_markers + +MARKER_SET = MarkerSet( + name="Homes", + markers=[ + *akasienborg_markers, + *bikkjeby_markers, + *biosfaeren_markers, + *bjorkeholmen_markers, + *bjornebukten_markers, + *huloyeid_markers, + *singapore_markers, + *summevatn_markers, + *supertheodors_fiskehus_markers, + *svartskoghavn_markers, + *vestlandet_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py b/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py new file mode 100644 index 0000000..d6d9bd6 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Akasienborg", + icon=None, + x=-160, + y=64, + z=1480, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/bikkjeby.py b/src/minecraft_kartverket/marker_sets/overworld/homes/bikkjeby.py new file mode 100644 index 0000000..09c13d4 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/bikkjeby.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Bikkjeby", + icon=None, + x=2950, + y=64, + z=270, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/biosfaeren.py b/src/minecraft_kartverket/marker_sets/overworld/homes/biosfaeren.py new file mode 100644 index 0000000..4dea7ba --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/biosfaeren.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Biosfæren", + icon=None, + x=834, + y=65, + z=-3089, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/bjorkeholmen.py b/src/minecraft_kartverket/marker_sets/overworld/homes/bjorkeholmen.py new file mode 100644 index 0000000..0decdd2 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/bjorkeholmen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Bjørkeholmen", + icon=None, + x=102, + y=77, + z=37, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/bjornebukten.py b/src/minecraft_kartverket/marker_sets/overworld/homes/bjornebukten.py new file mode 100644 index 0000000..4e7b546 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/bjornebukten.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Bjørnebukten", + icon=None, + x=473, + y=78, + z=-3043, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/huloyeid.py b/src/minecraft_kartverket/marker_sets/overworld/homes/huloyeid.py new file mode 100644 index 0000000..d8c79c0 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/huloyeid.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Huløyeid", + icon=None, + x=-54, + y=64, + z=234, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/singapore.py b/src/minecraft_kartverket/marker_sets/overworld/homes/singapore.py new file mode 100644 index 0000000..709e561 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/singapore.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Singapore", + icon=None, + x=-600, + y=64, + z=1130, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/summevatn.py b/src/minecraft_kartverket/marker_sets/overworld/homes/summevatn.py new file mode 100644 index 0000000..30bf31d --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/summevatn.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Summevatn", + icon=None, + x=-110, + y=64, + z=3465, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/supertheodors_fiskehus.py b/src/minecraft_kartverket/marker_sets/overworld/homes/supertheodors_fiskehus.py new file mode 100644 index 0000000..7bb8035 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/supertheodors_fiskehus.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="SuperTheodors fiskehus", + icon=None, + x=1570, + y=64, + z=3285, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/svartskoghavn.py b/src/minecraft_kartverket/marker_sets/overworld/homes/svartskoghavn.py new file mode 100644 index 0000000..7f2434a --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/svartskoghavn.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Svartskoghavn", + icon=None, + x=-370, + y=64, + z=2390, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/vestlandet.py b/src/minecraft_kartverket/marker_sets/overworld/homes/vestlandet.py new file mode 100644 index 0000000..8084f48 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/vestlandet.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Vestlandet", + icon=None, + x=-2204, + y=64, + z=447, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/huts/__init__.py new file mode 100644 index 0000000..15066b2 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/huts/__init__.py @@ -0,0 +1,14 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .dypskiferhytta import MARKERS as dypskiferhytta_markers +from .grensebuelvbu import MARKERS as grensebuelvbu_markers +from .nyverdenhytta import MARKERS as nyverdenhytta_markers + +MARKER_SET = MarkerSet( + name="Huts", + markers=[ + *dypskiferhytta_markers, + *grensebuelvbu_markers, + *nyverdenhytta_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/dypskiferhytta.py b/src/minecraft_kartverket/marker_sets/overworld/huts/dypskiferhytta.py new file mode 100644 index 0000000..7cc9c76 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/huts/dypskiferhytta.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Dypskiferhytta", + icon=None, + x=-1563, + y=64, + z=-1966, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/grensebuelvbu.py b/src/minecraft_kartverket/marker_sets/overworld/huts/grensebuelvbu.py new file mode 100644 index 0000000..42d4ac7 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/huts/grensebuelvbu.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Grensebuelvbu", + icon=None, + x=550, + y=64, + z=-1480, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/nyverdenhytta.py b/src/minecraft_kartverket/marker_sets/overworld/huts/nyverdenhytta.py new file mode 100644 index 0000000..c3a13fa --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/huts/nyverdenhytta.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Nyverdenhytta", + icon=None, + x=848, + y=70, + z=1583, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/infrastructure/__init__.py new file mode 100644 index 0000000..6aa3101 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/infrastructure/__init__.py @@ -0,0 +1,12 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .grantrebukta import MARKERS as grantrebukta_markers +from .smalelvbro import MARKERS as smalelvbro_markers + +MARKER_SET = MarkerSet( + name="Infrastructure", + markers=[ + *grantrebukta_markers, + *smalelvbro_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/grantrebukta.py b/src/minecraft_kartverket/marker_sets/overworld/infrastructure/grantrebukta.py new file mode 100644 index 0000000..b36f4a9 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/infrastructure/grantrebukta.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Grantrebukta", + icon=None, + x=2350, + y=64, + z=-136, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/smalelvbro.py b/src/minecraft_kartverket/marker_sets/overworld/infrastructure/smalelvbro.py new file mode 100644 index 0000000..84bd86e --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/infrastructure/smalelvbro.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Smalelvbro", + icon=None, + x=77, + y=69, + z=-348, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/mines/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/mines/__init__.py new file mode 100644 index 0000000..66ec9ef --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/mines/__init__.py @@ -0,0 +1,12 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .sandsteingruva import MARKERS as sandsteingruva_markers +from .slimegruva import MARKERS as slimegruva_markers + +MARKER_SET = MarkerSet( + name="Mines", + markers=[ + *sandsteingruva_markers, + *slimegruva_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/mines/sandsteingruva.py b/src/minecraft_kartverket/marker_sets/overworld/mines/sandsteingruva.py new file mode 100644 index 0000000..16bfb95 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/mines/sandsteingruva.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Sandsteingruva", + icon=None, + x=56, + y=67, + z=-266, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/mines/slimegruva.py b/src/minecraft_kartverket/marker_sets/overworld/mines/slimegruva.py new file mode 100644 index 0000000..0e6b4a8 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/mines/slimegruva.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Slimegruva", + icon=None, + x=-206, + y=64, + z=-35, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/nature/__init__.py new file mode 100644 index 0000000..86f2ed1 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/__init__.py @@ -0,0 +1,47 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .blindodden import MARKERS as blindodden_markers +from .hulevatna import MARKERS as hulevatna_markers +from .kirkemyr import MARKERS as kirkemyr_markers +from .lamafjellet import MARKERS as lamafjellet_markers +from .langstrand import MARKERS as langstrand_markers +from .lille_isbjornelv import MARKERS as lille_isbjornelv_markers +from .naturreservat import MARKERS as naturreservat_markers +from .piratbukta import MARKERS as piratbukta_markers +from .snoklippan import MARKERS as snoklippan_markers +from .store_isbjornelv import MARKERS as store_isbjornelv_markers +from .storhavet_i_ost import MARKERS as storhavet_i_ost_markers +from .storhavs_kanalen import MARKERS as storhavs_kanalen_markers +from .storsnofjella import MARKERS as storsnofjella_markers +from .storvatnet import MARKERS as storvatnet_markers +from .supertheodors_strand import MARKERS as supertheodors_strand_markers +from .trangdalen import MARKERS as trangdalen_markers +from .turrikkelmyra import MARKERS as turrikkelmyra_markers +from .ulveelva import MARKERS as ulveelva_markers +from .vestsumpland import MARKERS as vestsumpland_markers + + +MARKER_SET = MarkerSet( + name="Nature", + markers=[ + *blindodden_markers, + *hulevatna_markers, + *kirkemyr_markers, + *lamafjellet_markers, + *langstrand_markers, + *lille_isbjornelv_markers, + *naturreservat_markers, + *piratbukta_markers, + *snoklippan_markers, + *store_isbjornelv_markers, + *storhavet_i_ost_markers, + *storhavs_kanalen_markers, + *storsnofjella_markers, + *storvatnet_markers, + *supertheodors_strand_markers, + *trangdalen_markers, + *turrikkelmyra_markers, + *ulveelva_markers, + *vestsumpland_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/blindodden.py b/src/minecraft_kartverket/marker_sets/overworld/nature/blindodden.py new file mode 100644 index 0000000..f02ff56 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/blindodden.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Blindodden", + icon=None, + x=874, + y=65, + z=160, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/hulevatna.py b/src/minecraft_kartverket/marker_sets/overworld/nature/hulevatna.py new file mode 100644 index 0000000..b168bc0 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/hulevatna.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Hulevatna", + icon=None, + x=240, + y=64, + z=3070, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/kirkemyr.py b/src/minecraft_kartverket/marker_sets/overworld/nature/kirkemyr.py new file mode 100644 index 0000000..bd6a013 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/kirkemyr.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Kirkemyr", + icon=None, + x=6880, + y=64, + z=-465, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/lamafjellet.py b/src/minecraft_kartverket/marker_sets/overworld/nature/lamafjellet.py new file mode 100644 index 0000000..27d24fa --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/lamafjellet.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Lamafjellet", + icon=None, + x=1810, + y=64, + z=-1630, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py b/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py new file mode 100644 index 0000000..1be3115 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Lamafjellet", + icon=None, + x=-305, + y=64, + z=535, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/lille_isbjornelv.py b/src/minecraft_kartverket/marker_sets/overworld/nature/lille_isbjornelv.py new file mode 100644 index 0000000..74cf6e4 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/lille_isbjornelv.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Lille isbjørnelv", + icon=None, + x=730, + y=64, + z=-1900, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/naturreservat.py b/src/minecraft_kartverket/marker_sets/overworld/nature/naturreservat.py new file mode 100644 index 0000000..e29224a --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/naturreservat.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Naturreservat", + icon=None, + x=4, + y=64, + z=800, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/piratbukta.py b/src/minecraft_kartverket/marker_sets/overworld/nature/piratbukta.py new file mode 100644 index 0000000..f281002 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/piratbukta.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Piratbukta", + icon=None, + x=150, + y=64, + z=80, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/snoklippan.py b/src/minecraft_kartverket/marker_sets/overworld/nature/snoklippan.py new file mode 100644 index 0000000..02279ba --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/snoklippan.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Snøklippan", + icon=None, + x=-1654, + y=64, + z=-654, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/store_isbjornelv.py b/src/minecraft_kartverket/marker_sets/overworld/nature/store_isbjornelv.py new file mode 100644 index 0000000..6406daa --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/store_isbjornelv.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Store isbjørnelv", + icon=None, + x=850, + y=64, + z=-2130, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storhavet_i_ost.py b/src/minecraft_kartverket/marker_sets/overworld/nature/storhavet_i_ost.py new file mode 100644 index 0000000..a58592c --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/storhavet_i_ost.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Storhavet i øst", + icon=None, + x=3000, + y=64, + z=1000, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storhavs_kanalen.py b/src/minecraft_kartverket/marker_sets/overworld/nature/storhavs_kanalen.py new file mode 100644 index 0000000..a3920ca --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/storhavs_kanalen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Storhavskanalen", + icon=None, + x=1005, + y=64, + z=1335, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storsnofjella.py b/src/minecraft_kartverket/marker_sets/overworld/nature/storsnofjella.py new file mode 100644 index 0000000..ee4111b --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/storsnofjella.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Storsnøfjella", + icon=None, + x=5470, + y=64, + z=-270, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storvatnet.py b/src/minecraft_kartverket/marker_sets/overworld/nature/storvatnet.py new file mode 100644 index 0000000..6204a1f --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/storvatnet.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Storvatnet", + icon=None, + x=675, + y=64, + z=362, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/supertheodors_strand.py b/src/minecraft_kartverket/marker_sets/overworld/nature/supertheodors_strand.py new file mode 100644 index 0000000..404d00e --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/supertheodors_strand.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="SuperTheodors strand", + icon=None, + x=2111, + y=64, + z=3777, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/trangdalen.py b/src/minecraft_kartverket/marker_sets/overworld/nature/trangdalen.py new file mode 100644 index 0000000..19d8b0d --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/trangdalen.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Trangdalen", + icon=None, + x=-47, + y=64, + z=146, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/turrikkelmyra.py b/src/minecraft_kartverket/marker_sets/overworld/nature/turrikkelmyra.py new file mode 100644 index 0000000..d4bfa28 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/turrikkelmyra.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Turrikkelmyra", + icon=None, + x=-160, + y=64, + z=1480, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/ulveelva.py b/src/minecraft_kartverket/marker_sets/overworld/nature/ulveelva.py new file mode 100644 index 0000000..eae44ab --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/ulveelva.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Ulveelva", + icon=None, + x=910, + y=64, + z=3050, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/vestsumpland.py b/src/minecraft_kartverket/marker_sets/overworld/nature/vestsumpland.py new file mode 100644 index 0000000..26fe374 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/vestsumpland.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Vestsumpland", + icon=None, + x=-1818, + y=64, + z=98, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/other/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/other/__init__.py new file mode 100644 index 0000000..79d7110 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/other/__init__.py @@ -0,0 +1,12 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .leirhavn import MARKERS as leirhavn_markers +from .nullpunkt import MARKERS as nullpunkt_markers + +MARKER_SET = MarkerSet( + name="Other", + markers=[ + *leirhavn_markers, + *nullpunkt_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/other/leirhavn.py b/src/minecraft_kartverket/marker_sets/overworld/other/leirhavn.py new file mode 100644 index 0000000..015040c --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/other/leirhavn.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Leirhavn", + icon=None, + x=512, + y=64, + z=-3320, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/other/nullpunkt.py b/src/minecraft_kartverket/marker_sets/overworld/other/nullpunkt.py new file mode 100644 index 0000000..e77d9f1 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/other/nullpunkt.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Nullpunkt", + icon=None, + x=0, + y=64, + z=0, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/railways/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/railways/__init__.py new file mode 100644 index 0000000..244f1f8 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/railways/__init__.py @@ -0,0 +1,7 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Railways", + markers=[], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py new file mode 100644 index 0000000..059c94e --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py @@ -0,0 +1,7 @@ +from minecraft_kartverket.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/minecraft_kartverket/marker_sets/overworld/villages/__init__.py new file mode 100644 index 0000000..6f07cd5 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/__init__.py @@ -0,0 +1,27 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + +from .bondeby import MARKERS as bondeby_markers +from .gammelleirnes import MARKERS as gammelleirnes_markers +from .hestelandsby import MARKERS as hestelandsby_markers +from .isbjornby import MARKERS as isbjornby_markers +from .ittoqqortoormiit import MARKERS as ittoqqortoormiit_markers +from .klofteby import MARKERS as kloftebye_markers +from .npc_landsby import MARKERS as npc_landsby_markers +from .npc_landsby_nord import MARKERS as npc_landsby_nord_markers +from .smedby import MARKERS as smedby_markers + + +MARKER_SET = MarkerSet( + name="Villages", + markers=[ + *bondeby_markers, + *gammelleirnes_markers, + *hestelandsby_markers, + *isbjornby_markers, + *ittoqqortoormiit_markers, + *kloftebye_markers, + *npc_landsby_markers, + *npc_landsby_nord_markers, + *smedby_markers, + ], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/bondeby.py b/src/minecraft_kartverket/marker_sets/overworld/villages/bondeby.py new file mode 100644 index 0000000..6d03f2d --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/bondeby.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Bondeby", + icon=None, + x=6200, + y=64, + z=-300, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/gammelleirnes.py b/src/minecraft_kartverket/marker_sets/overworld/villages/gammelleirnes.py new file mode 100644 index 0000000..00abae0 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/gammelleirnes.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Gammelleirnes", + icon=None, + x=800, + y=64, + z=-3300, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/hestelandsby.py b/src/minecraft_kartverket/marker_sets/overworld/villages/hestelandsby.py new file mode 100644 index 0000000..a51482c --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/hestelandsby.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Hestelandsby", + icon=None, + x=2734, + y=64, + z=-984, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/isbjornby.py b/src/minecraft_kartverket/marker_sets/overworld/villages/isbjornby.py new file mode 100644 index 0000000..47a30b5 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/isbjornby.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Isbjørnby", + icon=None, + x=723, + y=64, + z=-2380, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/ittoqqortoormiit.py b/src/minecraft_kartverket/marker_sets/overworld/villages/ittoqqortoormiit.py new file mode 100644 index 0000000..55bb20e --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/ittoqqortoormiit.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Ittoqqortoormiit", + icon=None, + x=100, + y=64, + z=-3830, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/klofteby.py b/src/minecraft_kartverket/marker_sets/overworld/villages/klofteby.py new file mode 100644 index 0000000..995112a --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/klofteby.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Kløfteby", + icon=None, + x=695, + y=64, + z=2812, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby.py b/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby.py new file mode 100644 index 0000000..3aef475 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="NPC-landsby", + icon=None, + x=1278, + y=64, + z=-397, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby_nord.py b/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby_nord.py new file mode 100644 index 0000000..3c0a0fd --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby_nord.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="NPC-landsby nord", + icon=None, + x=337, + y=64, + z=-853, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/smedby.py b/src/minecraft_kartverket/marker_sets/overworld/villages/smedby.py new file mode 100644 index 0000000..d79e278 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/overworld/villages/smedby.py @@ -0,0 +1,11 @@ +from minecraft_kartverket.lib_marker import Point + +MARKERS = [ + Point( + name="Smedby", + icon=None, + x=-1760, + y=64, + z=-2440, + ), +] diff --git a/src/minecraft_kartverket/marker_sets/the_end/__init__.py b/src/minecraft_kartverket/marker_sets/the_end/__init__.py new file mode 100644 index 0000000..ee65ee7 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/the_end/__init__.py @@ -0,0 +1,7 @@ +from .other import MARKER_SET as other_marker_set +from .portals import MARKER_SET as portals_marker_set + +MARKER_SETS = [ + other_marker_set, + portals_marker_set, +] diff --git a/src/minecraft_kartverket/marker_sets/the_end/other/__init__.py b/src/minecraft_kartverket/marker_sets/the_end/other/__init__.py new file mode 100644 index 0000000..d29400c --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/the_end/other/__init__.py @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..a97fc23 --- /dev/null +++ b/src/minecraft_kartverket/marker_sets/the_end/portals/__init__.py @@ -0,0 +1,7 @@ +from minecraft_kartverket.lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Portals", + markers=[], +) diff --git a/uv.lock b/uv.lock new file mode 100644 index 0000000..fa9f551 --- /dev/null +++ b/uv.lock @@ -0,0 +1,7 @@ +version = 1 +requires-python = ">=3.12" + +[[package]] +name = "minecraft-kartverket" +version = "0.1.0" +source = { editable = "." } -- 2.51.2 From 2b0a1716635aead2d15d75a077eb9468935cb12b Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 21 Mar 2025 22:46:13 +0100 Subject: [PATCH 02/13] rewrite in python: export to mapcrafter --- .../bluemap_exporter/__init__.py | 3 + .../bluemap_exporter/exporter.py | 15 +++++ .../bluemap_hocon_generator/__init__.py | 0 src/minecraft_kartverket/cli/main.py | 48 ++++++++++----- src/minecraft_kartverket/cli/print.py | 2 +- src/minecraft_kartverket/cli/validate.py | 35 ++++++++--- .../mapcrafter_exporter/__init__.py | 3 + .../mapcrafter_exporter/exporter.py | 57 ++++++++++++++++++ .../mapcrafter_exporter/markers-template.js | 60 +++++++++++++++++++ .../mapcrafter_json_generator/__init__.py | 0 10 files changed, 198 insertions(+), 25 deletions(-) create mode 100644 src/minecraft_kartverket/bluemap_exporter/__init__.py create mode 100644 src/minecraft_kartverket/bluemap_exporter/exporter.py delete mode 100644 src/minecraft_kartverket/bluemap_hocon_generator/__init__.py create mode 100644 src/minecraft_kartverket/mapcrafter_exporter/__init__.py create mode 100644 src/minecraft_kartverket/mapcrafter_exporter/exporter.py create mode 100644 src/minecraft_kartverket/mapcrafter_exporter/markers-template.js delete mode 100644 src/minecraft_kartverket/mapcrafter_json_generator/__init__.py diff --git a/src/minecraft_kartverket/bluemap_exporter/__init__.py b/src/minecraft_kartverket/bluemap_exporter/__init__.py new file mode 100644 index 0000000..c64c5ad --- /dev/null +++ b/src/minecraft_kartverket/bluemap_exporter/__init__.py @@ -0,0 +1,3 @@ +from .exporter import generate_bluemap_output + +__all__ = ["generate_bluemap_output"] diff --git a/src/minecraft_kartverket/bluemap_exporter/exporter.py b/src/minecraft_kartverket/bluemap_exporter/exporter.py new file mode 100644 index 0000000..744dbc2 --- /dev/null +++ b/src/minecraft_kartverket/bluemap_exporter/exporter.py @@ -0,0 +1,15 @@ +from pathlib import Path + +# from minecraft_kartverket.marker_sets import WORLDS +# from minecraft_kartverket.lib_marker import Point + + +def generate_bluemap_output(output_dir: Path): + raise NotImplementedError("Bluemap export is not implemented yet") + ... + +def convert_data_to_bluemap_structure() -> dict: + ... + +def to_hocon(): + ... diff --git a/src/minecraft_kartverket/bluemap_hocon_generator/__init__.py b/src/minecraft_kartverket/bluemap_hocon_generator/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/minecraft_kartverket/cli/main.py b/src/minecraft_kartverket/cli/main.py index 9b3c420..249f742 100644 --- a/src/minecraft_kartverket/cli/main.py +++ b/src/minecraft_kartverket/cli/main.py @@ -1,6 +1,11 @@ import argparse +from pathlib import Path -from .print import print_worlds +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 def parse_args(): @@ -9,15 +14,26 @@ def parse_args(): subparsers = parser.add_subparsers(dest="command") ebh_parser = subparsers.add_parser( - "export-bluemap-hocon", help="Export map data to Bluemap hocon format" + "export-bluemap", help="Export map data to Bluemap format" + ) + ebh_parser.add_argument( + "--output-dir", + help="Output dir", + type=Path, + metavar="DIR", + default=Path("bluemap"), ) - # TODO: dir? - ebh_parser.add_argument("output", help="Output file", default="map.hocon") emj_parser = subparsers.add_parser( - "export-mapcrafter-json", help="Export map data to Mapcrafter json format" + "export-mapcrafter", help="Export map data to Mapcrafter format" + ) + emj_parser.add_argument( + "--output-dir", + help="Output dir", + type=Path, + metavar="DIR", + default=Path("mapcrafter"), ) - emj_parser.add_argument("output", help="Output file", default="map.json") subparsers.add_parser("validate", help="Validate the map data") subparsers.add_parser("print", help="Print the map data") @@ -29,18 +45,18 @@ def main(): args = parse_args() match args.command: - case "export-bluemap-hocon": - print("Exporting map data to Bluemap hocon format...") - raise NotImplementedError() - case "export-mapcrafter-json": - print("Exporting map data to Mapcrafter json format...") - raise NotImplementedError() + case "export-bluemap": + generate_bluemap_output(args.output_dir) + + case "export-mapcrafter": + generate_mapcrafter_output(args.output_dir) + case "validate": - print("Validating the map data...") - raise NotImplementedError() + validate_marker_data() + case "print": - print("Printing the map data...") - print_worlds() + pretty_print_marker_data() + case _: print("Unknown command") diff --git a/src/minecraft_kartverket/cli/print.py b/src/minecraft_kartverket/cli/print.py index a0e4862..ca3a1a9 100644 --- a/src/minecraft_kartverket/cli/print.py +++ b/src/minecraft_kartverket/cli/print.py @@ -2,7 +2,7 @@ from minecraft_kartverket.lib_marker import MarkerSet, Marker, Point, Track, Are from minecraft_kartverket.marker_sets import WORLDS -def print_worlds() -> None: +def pretty_print_marker_data() -> None: tree = format_tree( "Worlds", [format_world(name, world) for name, world in WORLDS.items()] ) diff --git a/src/minecraft_kartverket/cli/validate.py b/src/minecraft_kartverket/cli/validate.py index 17d262d..ce17cf7 100644 --- a/src/minecraft_kartverket/cli/validate.py +++ b/src/minecraft_kartverket/cli/validate.py @@ -1,8 +1,27 @@ -# Check for non-included files -# read all python files, edit-distance out common mistakes. -# Check for invalid y values -# Check for duplicate points in tracks -# Check for duplicate names in markers -# Check for duplicate names in marker sets -# Check for unused icons -# Check for duplicate points +def validate_marker_data() -> None: + # TODO: print [V] checkmarks for each test + ... + + +def validate_no_non_included_files() -> None: ... + + +def validate_no_invalid_y_values() -> None: ... + + +def validate_no_duplicate_points_in_tracks() -> None: ... + + +def validate_no_duplicate_names_in_markers() -> None: ... + + +def validate_no_duplicate_names_in_marker_sets() -> None: ... + + +def validate_no_unused_icons() -> None: ... + + +def validate_no_duplicate_points() -> None: ... + + +def validate_all_tracks_have_at_least_two_points() -> None: ... diff --git a/src/minecraft_kartverket/mapcrafter_exporter/__init__.py b/src/minecraft_kartverket/mapcrafter_exporter/__init__.py new file mode 100644 index 0000000..5438395 --- /dev/null +++ b/src/minecraft_kartverket/mapcrafter_exporter/__init__.py @@ -0,0 +1,3 @@ +from .exporter import generate_mapcrafter_output + +__all__ = ["generate_mapcrafter_output"] diff --git a/src/minecraft_kartverket/mapcrafter_exporter/exporter.py b/src/minecraft_kartverket/mapcrafter_exporter/exporter.py new file mode 100644 index 0000000..6d68492 --- /dev/null +++ b/src/minecraft_kartverket/mapcrafter_exporter/exporter.py @@ -0,0 +1,57 @@ +import json +from pathlib import Path + +from minecraft_kartverket.marker_sets import WORLDS +from minecraft_kartverket.lib_marker import Point, Track, Area + + +def generate_mapcrafter_output(output_dir: Path): + output_dir.mkdir(parents=True, exist_ok=True) + + with (Path(__file__).parent / "markers-template.js").open( + "r", encoding="utf-8" + ) as f: + template = f.read() + + exported_markers_json = json.dumps( + convert_data_to_mapcrafter_structure(), + indent=2, + ensure_ascii=False, + ) + + template = template.replace('"@EXPORTED_MARKERS@"', exported_markers_json) + + with (output_dir / "markers.js").open("w", encoding="utf-8") as f: + f.write(template) + + +def convert_data_to_mapcrafter_structure() -> dict: + result = {} + + for world_name, world_marker_sets in WORLDS.items(): + for marker_set in world_marker_sets: + if marker_set.name not in result: + result[marker_set.name] = { + "id": marker_set.name.lower().replace(" ", "-"), + "name": marker_set.name, + "showDefault": marker_set.show_by_default, + "markers": {}, + } + + result[marker_set.name]["markers"][world_name] = [] + for marker in marker_set.markers: + if isinstance(marker, Point): + result[marker_set.name]["markers"][world_name].append( + {"pos": [marker.x, marker.y, marker.z], "title": marker.name} + ) + + elif isinstance(marker, Track): + raise NotImplementedError("Track markers are not supported") + + elif isinstance(marker, Area): + raise NotImplementedError("Area markers are not supported") + + else: + raise ValueError(f"Unknown marker type: {marker}") + + return result diff --git a/src/minecraft_kartverket/mapcrafter_exporter/markers-template.js b/src/minecraft_kartverket/mapcrafter_exporter/markers-template.js new file mode 100644 index 0000000..24d6930 --- /dev/null +++ b/src/minecraft_kartverket/mapcrafter_exporter/markers-template.js @@ -0,0 +1,60 @@ +const MAPCRAFTER_MARKERS = [ + "@EXPORTED_MARKERS@", + { + // + // Tegner et rutenett som viser regiongrensene, og + // koordinatene for hver region. + // + "id" : "regioner", + "name" : "Regioner", + "showDefault" : false, + "createMarker" : function(ui, groupInfo, markerInfo) { + var rmax = 15; + var objekter = []; + + var multilatlngs = []; + + for (var rx = -rmax; rx < rmax; rx++) { + var latlngs = []; + var miny = -rmax*512; + var maxy = rmax*512; + var x = rx*512; + // use the ui.mcToLatLng-function to convert Minecraft coords to LatLngs + latlngs.push(ui.mcToLatLng(x, miny, 64)); + latlngs.push(ui.mcToLatLng(x, maxy, 64)); + multilatlngs.push(latlngs); + } + + for (var ry = -rmax; ry < rmax; ry++) { + var latlngs = []; + var minx = -rmax*512; + var maxx = rmax*512; + var y = ry*512; + // use the ui.mcToLatLng-function to convert Minecraft coords to LatLngs + latlngs.push(ui.mcToLatLng(minx, y, 64)); + latlngs.push(ui.mcToLatLng(maxx, y, 64)); + multilatlngs.push(latlngs); + } + + for (var rx = -rmax; rx < rmax; rx++) { + for (var ry = -rmax; ry < rmax; ry++) { + var x = rx*512 + 256; + var y = ry*512 + 256; + + var myIcon = L.divIcon({iconSize: L.point(55, 20), html: "
r." + String(rx) + "." + String(ry) + "
"}); + var myMarker = L.marker(ui.mcToLatLng(x, y, 64), {icon: myIcon}); + objekter.push(myMarker); + } + } + + var linjer = []; + if (L.version.startsWith("0.7.")) { + linjer = L.multiPolyline(multilatlngs, {"color" : markerInfo.color}); + } else { + linjer = L.polyline(multilatlngs, {"color" : markerInfo.color}); + } + objekter.push(linjer); + return L.layerGroup(objekter); + }, + }, +]; diff --git a/src/minecraft_kartverket/mapcrafter_json_generator/__init__.py b/src/minecraft_kartverket/mapcrafter_json_generator/__init__.py deleted file mode 100644 index e69de29..0000000 -- 2.51.2 From aada4fc8975e689bf485d905865b7df030eb3e0a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 21 Mar 2025 23:14:55 +0100 Subject: [PATCH 03/13] rewrite to python: implement validator --- src/minecraft_kartverket/cli/validate.py | 193 +++++++++++++++++++++-- 1 file changed, 183 insertions(+), 10 deletions(-) diff --git a/src/minecraft_kartverket/cli/validate.py b/src/minecraft_kartverket/cli/validate.py index ce17cf7..82df3b5 100644 --- a/src/minecraft_kartverket/cli/validate.py +++ b/src/minecraft_kartverket/cli/validate.py @@ -1,27 +1,200 @@ +from minecraft_kartverket.marker_sets import WORLDS +from minecraft_kartverket.lib_marker import Point, Track + + def validate_marker_data() -> None: - # TODO: print [V] checkmarks for each test - ... + for test_name, test_f in _tests.items(): + results = test_f() + if len(results) > 0: + print(f"[X] {test_name}") + for result in results: + print(f" {result}") + else: + print(f"[✓] {test_name}") -def validate_no_non_included_files() -> None: ... +def validate_no_non_included_files() -> list: + # TODO: Implement this function + return [] -def validate_no_invalid_y_values() -> None: ... +def validate_no_invalid_y_values() -> list: + result = [] + + for world_name, marker_sets in WORLDS.items(): + for marker_set in marker_sets: + for marker in marker_set.markers: + if isinstance(marker, Point): + if marker.y < 0 or marker.y > 255: + result.append( + { + "error_type": "invalid_y_value", + "full_marker_name": ( + world_name, + marker_set.name, + marker.name, + ), + "y_value": marker.y, + } + ) + elif isinstance(marker, Track): + for i, point in enumerate(marker.points): + _, y, _ = point + if y < 0 or y > 255: + result.append( + { + "error_type": "invalid_y_value", + "full_marker_name": ( + world_name, + marker_set.name, + marker.name, + ), + "index": i, + "y_value": y, + } + ) + + return result -def validate_no_duplicate_points_in_tracks() -> None: ... +def validate_no_duplicate_points_in_tracks() -> list: + result = [] + + for world_name, marker_sets in WORLDS.items(): + for marker_set in marker_sets: + for marker in marker_set.markers: + if isinstance(marker, Track): + points = {} + for point in marker.points: + if point in points: + result.append( + { + "error_type": "duplicate_point", + "point_a": points[point], + "point_b": ( + world_name, + marker_set.name, + marker.name, + ), + "coordinates": point, + } + ) + points[point] = (world_name, marker_set.name, marker.name) + + return result -def validate_no_duplicate_names_in_markers() -> None: ... +def validate_no_duplicate_marker_names() -> list: + result = [] + + marker_names = set() + for world_name, marker_sets in WORLDS.items(): + for marker_set in marker_sets: + for marker in marker_set.markers: + full_name = (world_name, marker_set.name, marker.name) + if full_name in marker_names: + result.append( + { + "error_type": "duplicate_marker_name", + "full_marker_name": full_name, + } + ) + marker_names.add(full_name) + + return result -def validate_no_duplicate_names_in_marker_sets() -> None: ... +def validate_no_duplicate_marker_set_names() -> list: + result = [] + + marker_set_names = set() + for world_name, marker_sets in WORLDS.items(): + for marker_set in marker_sets: + if (world_name, marker_set.name) in marker_set_names: + result.append( + { + "error_type": "duplicate_marker_set_name", + "full_marker_set_name": (world_name, marker_set.name), + } + ) + marker_set_names.add((world_name, marker_set.name)) + + return result -def validate_no_unused_icons() -> None: ... +def validate_no_unused_icons() -> list: + # TODO: Implement this function + return [] -def validate_no_duplicate_points() -> None: ... +def validate_no_duplicate_points() -> list: + result = [] + + for world_name, marker_sets in WORLDS.items(): + points = {} + for marker_set in marker_sets: + for marker in marker_set.markers: + if isinstance(marker, Point): + point = (marker.x, marker.y, marker.z) + if point in points: + result.append( + { + "error_type": "duplicate_point", + "point_a": points[point], + "point_b": (world_name, marker_set.name, marker.name), + "coordinates": point, + } + ) + points[point] = (world_name, marker_set.name, marker.name) + elif isinstance(marker, Track): + for i, point in enumerate(marker.points): + if point in points: + result.append( + { + "error_type": "duplicate_point", + "point_a": points[point], + "point_b": ( + world_name, + marker_set.name, + marker.name, + ), + "index": i, + "coordinates": point, + } + ) + points[point] = (world_name, marker_set.name, marker.name) + + return result -def validate_all_tracks_have_at_least_two_points() -> None: ... +def validate_all_tracks_have_at_least_two_points() -> list: + result = [] + + for world_name, marker_sets in WORLDS.items(): + for marker_set in marker_sets: + for marker in marker_set.markers: + if isinstance(marker, Track) and len(marker.points) < 2: + result.append( + { + "error_type": "track_too_short", + "full_marker_name": ( + world_name, + marker_set.name, + marker.name, + ), + } + ) + + return result + + +_tests = { + "No non-included files": validate_no_non_included_files, + "No invalid y coordinates": validate_no_invalid_y_values, + "No duplicate points in tracks": validate_no_duplicate_points_in_tracks, + "No duplicate marker names": validate_no_duplicate_marker_names, + "No duplicate marker-set names": validate_no_duplicate_marker_set_names, + "No unused icons": validate_no_unused_icons, + "No duplicate points": validate_no_duplicate_points, + "All tracks have at least two points": validate_all_tracks_have_at_least_two_points, +} -- 2.51.2 From 025475f55412ccec3d7dde7ce58ac730d0ad418a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 21 Mar 2025 23:18:43 +0100 Subject: [PATCH 04/13] rewrite to python: fix oopsies reported by validator --- .../marker_sets/overworld/area_names/__init__.py | 4 ---- .../marker_sets/overworld/area_names/trangdalen.py | 11 ----------- .../marker_sets/overworld/area_names/vestsumpland.py | 11 ----------- .../marker_sets/overworld/homes/akasienborg.py | 4 ++-- .../marker_sets/overworld/nature/langstrand.py | 2 +- 5 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py delete mode 100644 src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py index b6bb062..b70435f 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py +++ b/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py @@ -4,9 +4,7 @@ from .andoya import MARKERS as andoya_markers from .england import MARKERS as england_markers from .hemmelig_mesabiom import MARKERS as hemmelig_mesabiom_markers from .summefjord import MARKERS as summefjord_markers -from .trangdalen import MARKERS as trangdalen_markers from .vestisodet import MARKERS as vestisodet_markers -from .vestsumpland import MARKERS as vestsumpland_markers MARKER_SET = MarkerSet( name="Area Names", @@ -15,8 +13,6 @@ MARKER_SET = MarkerSet( *england_markers, *hemmelig_mesabiom_markers, *summefjord_markers, - *trangdalen_markers, *vestisodet_markers, - *vestsumpland_markers, ], ) diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py deleted file mode 100644 index 19d8b0d..0000000 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/trangdalen.py +++ /dev/null @@ -1,11 +0,0 @@ -from minecraft_kartverket.lib_marker import Point - -MARKERS = [ - Point( - name="Trangdalen", - icon=None, - x=-47, - y=64, - z=146, - ), -] diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py b/src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py deleted file mode 100644 index 26fe374..0000000 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/vestsumpland.py +++ /dev/null @@ -1,11 +0,0 @@ -from minecraft_kartverket.lib_marker import Point - -MARKERS = [ - Point( - name="Vestsumpland", - icon=None, - x=-1818, - y=64, - z=98, - ), -] diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py b/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py index d6d9bd6..2e7e95a 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py +++ b/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py @@ -4,8 +4,8 @@ MARKERS = [ Point( name="Akasienborg", icon=None, - x=-160, + x=-128, y=64, - z=1480, + z=1460, ), ] diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py b/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py index 1be3115..7289c1c 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py +++ b/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py @@ -2,7 +2,7 @@ from minecraft_kartverket.lib_marker import Point MARKERS = [ Point( - name="Lamafjellet", + name="Langstrand", icon=None, x=-305, y=64, -- 2.51.2 From 65c7fe2371024923662e33ce9475ff679fe7ee0d Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 22 Mar 2025 00:01:12 +0100 Subject: [PATCH 05/13] rewrite to python: add section about adding marker sets --- README.md | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e8d4df4..defde7e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Map markers for PVV's minecraft server ## What is this? This project is meant to let PVV members contribute map data for PVV's minecraft server, like coordinates for bases, cities, and other points of interest. -These markers are written in python so that we easily can do things like generating points in a loop, or other types of automation. +These markers are written in python so that we can do things like generating points in a loop, calculating distances, and other types of automation. There is also a cli tool that we use to export these points into the formats of several minecraft map implementations. @@ -109,7 +109,34 @@ MARKERS = [ ## How to add a new marker set -TODO: Write this section +To add a new marker set, you need to: + +1. Create a new directory alongside the other marker sets in `src/marker_sets/`. +2. Create an `__init__.py` file in this directory with the following content: + +```python +from lib_marker.marker_set import MarkerSet + +MARKER_SET = MarkerSet( + name="My Marker Set", + markers=[ + ], +) +``` + +3. Add the marker set to the `MARKER_SETS` list in `src/marker_sets//__init__.py`. +4. Add the marker set with a description to this README file. + +```python +from . import MARKER_SET as _marker_set + +MARKER_SETS = [ + ... + portals_marker_set, +] +``` + +See the other marker sets for inspiration. ## How to add icons -- 2.51.2 From 86c98a6d2f6fffb2aadd269d416f1616bfb640f7 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 22 Mar 2025 00:34:59 +0100 Subject: [PATCH 06/13] rewrite to python: export to bluemap --- .../bluemap_exporter/exporter.py | 79 +++++++++++++++++-- 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/src/minecraft_kartverket/bluemap_exporter/exporter.py b/src/minecraft_kartverket/bluemap_exporter/exporter.py index 744dbc2..0ab15fc 100644 --- a/src/minecraft_kartverket/bluemap_exporter/exporter.py +++ b/src/minecraft_kartverket/bluemap_exporter/exporter.py @@ -1,15 +1,80 @@ +import json +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 minecraft_kartverket.marker_sets import WORLDS +from minecraft_kartverket.lib_marker import Point def generate_bluemap_output(output_dir: Path): - raise NotImplementedError("Bluemap export is not implemented yet") - ... + output_dir.mkdir(parents=True, exist_ok=True) + + data = convert_data_to_bluemap_structure() + + for world_name, marker_sets in data.items(): + with open(output_dir / f"{slug(world_name)}.hocon", "w") as f: + f.write(to_hocon(marker_sets)) + + +def slug(s: str) -> str: + return ( + s.lower() + .replace(" ", "-") + .replace("ø", "o") + .replace("æ", "ae") + .replace("å", "a") + ) + def convert_data_to_bluemap_structure() -> dict: - ... + result = {} -def to_hocon(): - ... + for world_name, marker_sets in WORLDS.items(): + result[world_name] = {} + + for marker_set in marker_sets: + result[world_name][slug(marker_set.name)] = { + "label": marker_set.name, + "toggleable": True, + "default-hidden": not marker_set.show_by_default, + "markers": {}, + } + + for marker in marker_set.markers: + if isinstance(marker, Point): + result[world_name][slug(marker_set.name)][slug(marker.name)] = { + "type": "poi", + "label": marker.name, + "position": { + "x": marker.x, + "y": marker.y, + "z": marker.z, + }, + } + else: + raise NotImplementedError(f"Unknown marker type: {marker}") + + return result + + +def to_hocon(x: Any) -> str: + if isinstance(x, str): + return json.dumps(x, ensure_ascii=False) + elif isinstance(x, int): + return str(x) + elif isinstance(x, float): + return str(x) + elif isinstance(x, bool): + return str(x).lower() + elif isinstance(x, list): + items = [indent(to_hocon(y), " ") for y in x] + return f"[\n{'\n'.join(items)}\n]" + elif isinstance(x, dict): + items = [ + f' {k}: {indent(to_hocon(v), ' ').removeprefix(' ')}' + for k, v in x.items() + ] + return f"{{\n{'\n'.join(items)}\n}}" + else: + raise ValueError(f"Unknown type: {x}") -- 2.51.2 From 974bd1e7f8f4237d3ddc38739600ab3b059ecaf9 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 22 Mar 2025 00:36:31 +0100 Subject: [PATCH 07/13] rewrite to python: remove old map markers --- map-markers/default.nix | 6 - map-markers/lib.nix | 11 - map-markers/mapcrafter/markers.js | 380 ------------------ map-markers/vanillaSurvival/default.nix | 7 - .../vanillaSurvival/underverden/byer.nix | 8 - .../vanillaSurvival/underverden/default.nix | 6 - .../vanillaSurvival/underverden/spesial.nix | 12 - map-markers/vanillaSurvival/verden/byer.nix | 76 ---- .../vanillaSurvival/verden/default.nix | 6 - .../vanillaSurvival/verden/spesial.nix | 12 - 10 files changed, 524 deletions(-) delete mode 100644 map-markers/default.nix delete mode 100644 map-markers/lib.nix delete mode 100644 map-markers/mapcrafter/markers.js delete mode 100644 map-markers/vanillaSurvival/default.nix delete mode 100644 map-markers/vanillaSurvival/underverden/byer.nix delete mode 100644 map-markers/vanillaSurvival/underverden/default.nix delete mode 100644 map-markers/vanillaSurvival/underverden/spesial.nix delete mode 100644 map-markers/vanillaSurvival/verden/byer.nix delete mode 100644 map-markers/vanillaSurvival/verden/default.nix delete mode 100644 map-markers/vanillaSurvival/verden/spesial.nix diff --git a/map-markers/default.nix b/map-markers/default.nix deleted file mode 100644 index 180d065..0000000 --- a/map-markers/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - lib = import ./lib.nix; - icons = import ./icons; -in { - vanillaSurvival = import ./vanillaSurvival { inherit lib icons; }; -} diff --git a/map-markers/lib.nix b/map-markers/lib.nix deleted file mode 100644 index c6dd773..0000000 --- a/map-markers/lib.nix +++ /dev/null @@ -1,11 +0,0 @@ -rec { - mkPoi = label: pos: attr: { - type = "poi"; - position = { - x = builtins.elemAt pos 0; - y = builtins.elemAt pos 2; - z = builtins.elemAt pos 1; - }; - label = label; - } // attr; -} diff --git a/map-markers/mapcrafter/markers.js b/map-markers/mapcrafter/markers.js deleted file mode 100644 index a5d4e39..0000000 --- a/map-markers/mapcrafter/markers.js +++ /dev/null @@ -1,380 +0,0 @@ -var MAPCRAFTER_MARKERS = [ - { - "id" : "byer", - "name" : "Byer og steder", - "showDefault" : true, - "markers" : { - "verden" : [ - // Sorter markoerene etter lengdegrad. - { - "pos" : [-2204, 447, 64], - "title" : "Vestlandet", - }, - { - "pos" : [-1818, 98, 64], - "title" : "Vestsumpland", - }, - { - "pos" : [-1760, -2440, 64], - "title" : "Smedby", - }, - { - "pos" : [-1654, -654, 64], - "title" : "Snøklippan", - }, - { - "pos" : [-1563, -1966, 64], - "title" : "Dypskiferhytta", - }, - { - "pos" : [-1189, 1556, 75], - "title" : "England", - }, - { - "pos" : [-980, 4090, 64], - "title" : "Hemmelig mesabiom", - }, - { - "pos" : [-800, 0, 64], - "title" : "Vestisødet", - }, - { - "pos" : [-378, 153, 64], - "title" : "Isjungelkatedralen", - }, - { - "pos" : [-370, 2390, 64], - "title" : "Svartskoghavn", - }, - { - "pos" : [-334, 473, 116], - "title" : "Kystbasen", - }, - { - "pos" : [-305, 535, 64], - "title" : "Langstrand", - }, - { - "pos" : [-220, 2890, 64], - "title" : "Summefjord", - }, - { - "pos" : [-206, -35, 64], - "title" : "Slimegruva", - }, - { - "pos" : [-160, 1480, 64], - "title" : "Turrikkelmyra", - }, - { - "pos" : [-128, -1460, 64], - "title" : "Akasienborg", - }, - { - "pos" : [-110, 3465, 64], - "title" : "Summevatn", - }, - { - "pos" : [-99, 1025, 99], - "title" : "Tegltårnet", - }, - { - "pos" : [-54, 234, 64], - "title" : "Huløyeid", - }, - { - "pos" : [-47, 146, 64], - "title" : "Trangdalen", - }, - { - "pos" : [-22, 67, 76], - "title" : "Tårnodden", - }, - { - "pos" : [0, -485, 67], - "title" : "Nordørkenen", - }, - { - "pos" : [4, 800, 64], - "title" : "Naturreservat", - }, - { - "pos" : [56, -266, 67], - "title" : "Sandsteingruva", - }, - { - "pos" : [58, -2860, 63], - "title" : "Tangen", - }, - { - "pos" : [77, -348, 69], - "title" : "Smalelvbro", - }, - { - "pos" : [100, -3830, 64], - "title" : "Ittoqqortoormiit", - }, - { - "pos" : [102, 37, 77], - "title" : "Bjerkepalasset", - }, - { - "pos" : [150, 80, 64], - "title" : "Piratbukta", - }, - { - "pos" : [177, 177, 64], - "title" : "Heimfjell", - }, - { - "pos" : [240, 3070, 64], - "title" : "Hulevatna", - }, - { - "pos" : [267, -496, 89], - "title" : "Hodeskallegrotten", - }, - { - "pos" : [280, -2800, 64], - "title" : "Jesus Christ Superstore", - }, - { - "pos" : [337, -853, 64], - "title" : "NPC-landsby nord", - }, - { - "pos" : [360, -460, 64], - "title" : "Vikingelandsbyen", - }, - { - "pos" : [473, -3043, 78], - "title" : "Bjørnebukten", - }, - { - "pos" : [512, -3320, 64], - "title" : "Leirhavn", - }, - { - "pos" : [550, -1480, 64], - "title" : "Grensebuelvbu", - }, - { - "pos" : [675, 362, 64], - "title" : "Storvatnet", - }, - { - "pos" : [695, 2812, 64], - "title" : "Kløfteby", - }, - { - "pos" : [723, -2380, 64], - "title" : "Isbjørnby", - }, - { - "pos" : [730, -1900, 64], - "title" : "Lille isbjørnelv", - }, - { - "pos" : [800, -3300, 64], - "title" : "Gammelleirnes", - }, - { - "pos" : [834, -3089, 65], - "title" : "Biosfæren", - }, - { - "pos" : [848, 1583, 70], - "title" : "Nyverdenhytta", - }, - { - "pos" : [850, -2130, 64], - "title" : "Store isbjørnelv", - }, - { - "pos" : [874, 160, 65], - "title" : "Blindodden", - }, - { - "pos" : [910, 3050, 64], - "title" : "Ulveelva", - }, - { - "pos" : [960, 460, 64], - "title" : "Tosjødalen", - }, - { - "pos" : [1005, 1335, 64], - "title" : "Storhavskanalen", - }, - { - "pos" : [1278, -397, 64], - "title" : "NPC-landsby", - }, - { - "pos" : [1570, 3285, 64], - "title" : "SuperTheodors fiskehus", - }, - { - "pos" : [1810, -1630, 64], - "title" : "Lamafjellet", - }, - { - "pos" : [2111, 3777, 64], - "title" : "SuperTheodors strand", - }, - { - "pos" : [2300, 250, 64], - "title" : "Andøya", - }, - { - "pos" : [2350, -136, 64], - "title" : "Grantrebukta", - }, - { - "pos" : [2734, -984, 64], - "title" : "Hestelandsby", - }, - { - "pos" : [2950, 270, 64], - "title" : "Bikkjeby", - }, - { - "pos" : [3000, 1000, 64], - "title" : "Storhavet i øst", - }, - { - "pos" : [3085, 424, 64], - "title" : "Fyret", - }, - { - "pos" : [3481, 210, 75], - "title" : "Vinterstranda hotel & resort", - }, - { - "pos" : [4468, 1337, 64], - "title" : "Holmgard", - }, - { - "pos" : [4630, 270, 64], - "title" : "Der Kölner Dom", - }, - { - "pos" : [5470, -270, 64], - "title" : "Storsnøfjella", - }, - { - "pos" : [6200, -300, 64], - "title" : "Bondeby", - }, - { - "pos" : [6880, -465, 64], - "title" : "Kirkemyr", - }, - ], - "underverden" : [ - // Sorter markoerene etter lengdegrad. - { - "pos" : [-900, 27, 64], - "title" : "Grisebukta", - }, - { - "pos" : [-120, 510, 64], - "title" : "Hemmelig mesabiom, ca.", - }, - { - "pos" : [120, -420, 64], - "title" : "Biosfæren, ca.", - }, - { - "pos" : [520, 220, 64], - "title" : "Holmgard, ca.", - }, - ], - }, - }, - { - "id" : "spesial", - "name" : "Spesielle steder", - "showDefault" : true, - "icon" : "marker-icon-green.png", - "iconSize" : [25, 41], - "markers" : { - "verden" : [ - { - "pos" : [0, 0, 64], - "title" : "Nullpunkt", - }, - ], - "underverden" : [ - { - "pos" : [0, 0, 64], - "title" : "Nullpunkt", - }, - ], - }, - }, - { - // - // Tegner et rutenett som viser regiongrensene, og - // koordinatene for hver region. - // - "id" : "regioner", - "name" : "Regioner", - "showDefault" : false, - "createMarker" : function(ui, groupInfo, markerInfo) { - var rmax = 15; - var objekter = []; - - var multilatlngs = []; - - for (var rx = -rmax; rx < rmax; rx++) { - var latlngs = []; - var miny = -rmax*512; - var maxy = rmax*512; - var x = rx*512; - // use the ui.mcToLatLng-function to convert Minecraft coords to LatLngs - latlngs.push(ui.mcToLatLng(x, miny, 64)); - latlngs.push(ui.mcToLatLng(x, maxy, 64)); - multilatlngs.push(latlngs); - } - - for (var ry = -rmax; ry < rmax; ry++) { - var latlngs = []; - var minx = -rmax*512; - var maxx = rmax*512; - var y = ry*512; - // use the ui.mcToLatLng-function to convert Minecraft coords to LatLngs - latlngs.push(ui.mcToLatLng(minx, y, 64)); - latlngs.push(ui.mcToLatLng(maxx, y, 64)); - multilatlngs.push(latlngs); - } - - for (var rx = -rmax; rx < rmax; rx++) { - for (var ry = -rmax; ry < rmax; ry++) { - var x = rx*512 + 256; - var y = ry*512 + 256; - - var myIcon = L.divIcon({iconSize: L.point(55, 20), html: "
r." + String(rx) + "." + String(ry) + "
"}); - var myMarker = L.marker(ui.mcToLatLng(x, y, 64), {icon: myIcon}); - objekter.push(myMarker); - } - } - - var linjer = []; - if (L.version.startsWith("0.7.")) { - linjer = L.multiPolyline(multilatlngs, {"color" : markerInfo.color}); - } else { - linjer = L.polyline(multilatlngs, {"color" : markerInfo.color}); - } - objekter.push(linjer); - return L.layerGroup(objekter); - }, - "markers" : { - "verden" : [ - { - "color" : "yellow", - }, - ], - }, - }, -]; diff --git a/map-markers/vanillaSurvival/default.nix b/map-markers/vanillaSurvival/default.nix deleted file mode 100644 index 78836f0..0000000 --- a/map-markers/vanillaSurvival/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, icons, ... }: - -{ - verden = import ./verden { inherit lib icons; }; - underverden = import ./underverden { inherit lib icons; }; - # enden = import ./enden { inherit lib icons; }; -} diff --git a/map-markers/vanillaSurvival/underverden/byer.nix b/map-markers/vanillaSurvival/underverden/byer.nix deleted file mode 100644 index d8239b0..0000000 --- a/map-markers/vanillaSurvival/underverden/byer.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, icons }: - -{ - "Grisebukta" = lib.mkPoi "Grisebukta" [(-900) (27) (64)] { }; - "Hemmelig mesabiom, ca." = lib.mkPoi "Hemmelig mesabiom, ca." [(-120) (510) (64)] { }; - "Biosfæren, ca." = lib.mkPoi "Biosfæren, ca." [(120) (-420) (64)] { }; - "Holmgard, ca." = lib.mkPoi "Holmgard, ca." [(520) (220) (64)] { }; -} diff --git a/map-markers/vanillaSurvival/underverden/default.nix b/map-markers/vanillaSurvival/underverden/default.nix deleted file mode 100644 index 78a934f..0000000 --- a/map-markers/vanillaSurvival/underverden/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, icons }: - -{ - byer = import ./byer.nix { inherit lib icons; }; - spesial = import ./spesial.nix { inherit lib icons; }; -} diff --git a/map-markers/vanillaSurvival/underverden/spesial.nix b/map-markers/vanillaSurvival/underverden/spesial.nix deleted file mode 100644 index 78d086c..0000000 --- a/map-markers/vanillaSurvival/underverden/spesial.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, icons }: - -{ - label = "Spesielle steder"; - toggleable = true; - default-hidden = false; - sorting = 100; - - markers = { - nullpunkt = lib.mkPoi "Nullpunkt" [0 0 64] { /*icon = icons.green*/ }; - }; -} diff --git a/map-markers/vanillaSurvival/verden/byer.nix b/map-markers/vanillaSurvival/verden/byer.nix deleted file mode 100644 index 2045f2c..0000000 --- a/map-markers/vanillaSurvival/verden/byer.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, ... }: - -{ - label = "Byer og steder"; - toggleable = true; - default-hidden = false; - sorting = 0; - markers = { - # "Vestlandet" = lib.mkPoi "Vestlandet" [(-2204) (447) (64)] { }; - # "Vestsumpland" = lib.mkPoi "Vestsumpland" [(-1818) (98) (64)] { }; - # "Smedby" = lib.mkPoi "Smedby" [(-1760) (-2440) (64)] { }; - # "Snøklippan" = lib.mkPoi "Snøklippan" [(-1654) (-654) (64)] { }; - # "Dypskiferhytta" = lib.mkPoi "Dypskiferhytta" [(-1563) (-1966) (64)] { }; - # "England" = lib.mkPoi "England" [(-1189) (1556) (75)] { }; - # "Hemmelig mesabiom" = lib.mkPoi "Hemmelig mesabiom" [(-980) (4090) (64)] { }; - # "Vestisødet" = lib.mkPoi "Vestisødet" [(-800) (0) (64)] { }; - # "Isjungelkatedralen" = lib.mkPoi "Isjungelkatedralen" [(-378) (153) (64)] { }; - # "Svartskoghavn" = lib.mkPoi "Svartskoghavn" [(-370) (2390) (64)] { }; - # "Kystbasen" = lib.mkPoi "Kystbasen" [(-334) (473) (116)] { }; - # "Langstrand" = lib.mkPoi "Langstrand" [(-305) (535) (64)] { }; - # "Summefjord" = lib.mkPoi "Summefjord" [(-220) (2890) (64)] { }; - # "Slimegruva" = lib.mkPoi "Slimegruva" [(-206) (-35) (64)] { }; - # "Turrikkelmyra" = lib.mkPoi "Turrikkelmyra" [(-160) (1480) (64)] { }; - # "Akasienborg" = lib.mkPoi "Akasienborg" [(-128) (-1460) (64)] { }; - # "Summevatn" = lib.mkPoi "Summevatn" [(-110) (3465) (64)] { }; - # "Tegltårnet" = lib.mkPoi "Tegltårnet" [(-99) (1025) (99)] { }; - # "Huløyeid" = lib.mkPoi "Huløyeid" [(-54) (234) (64)] { }; - # "Trangdalen" = lib.mkPoi "Trangdalen" [(-47) (146) (64)] { }; - # "Tårnodden" = lib.mkPoi "Tårnodden" [(-22) (67) (76)] { }; - # "Nordørkenen" = lib.mkPoi "Nordørkenen" [(0) (-485) (67)] { }; - # "Naturreservat" = lib.mkPoi "Naturreservat" [(4) (800) (64)] { }; - "Sandsteingruva" = lib.mkPoi "Sandsteingruva" [(56) (-266) (67)] { }; - # "Tangen" = lib.mkPoi "Tangen" [(58) (-2860) (63)] { }; - "Smalelvbro" = lib.mkPoi "Smalelvbro" [(77) (-348) (69)] { }; - # "Ittoqqortoormiit" = lib.mkPoi "Ittoqqortoormiit" [(100) (-3830) (64)] { }; - "Bjerkepalasset" = lib.mkPoi "Bjerkepalasset" [(102) (37) (77)] { }; - # "Piratbukta" = lib.mkPoi "Piratbukta" [(150) (80) (64)] { }; - # "Heimfjell" = lib.mkPoi "Heimfjell" [(177) (177) (64)] { }; - # "Hulevatna" = lib.mkPoi "Hulevatna" [(240) (3070) (64)] { }; - "Hodeskallegrotten" = lib.mkPoi "Hodeskallegrotten" [(267) (-496) (89)] { }; - # "Jesus Christ Superstore" = lib.mkPoi "Jesus Christ Superstore" [(280) (-2800) (64)] { }; - # "NPC-landsby nord" = lib.mkPoi "NPC-landsby nord" [(337) (-853) (64)] { }; - "Vikingelandsbyen" = lib.mkPoi "Vikingelandsbyen" [(360) (-460) (64)] { }; - # "Bjørnebukten" = lib.mkPoi "Bjørnebukten" [(473) (-3043) (78)] { }; - # "Leirhavn" = lib.mkPoi "Leirhavn" [(512) (-3320) (64)] { }; - # "Grensebuelvbu" = lib.mkPoi "Grensebuelvbu" [(550) (-1480) (64)] { }; - # "Storvatnet" = lib.mkPoi "Storvatnet" [(675) (362) (64)] { }; - # "Kløfteby" = lib.mkPoi "Kløfteby" [(695) (2812) (64)] { }; - # "Isbjørnby" = lib.mkPoi "Isbjørnby" [(723) (-2380) (64)] { }; - # "Lille isbjørnelv" = lib.mkPoi "Lille isbjørnelv" [(730) (-1900) (64)] { }; - # "Gammelleirnes" = lib.mkPoi "Gammelleirnes" [(800) (-3300) (64)] { }; - # "Biosfæren" = lib.mkPoi "Biosfæren" [(834) (-3089) (65)] { }; - # "Nyverdenhytta" = lib.mkPoi "Nyverdenhytta" [(848) (1583) (70)] { }; - # "Store isbjørnelv" = lib.mkPoi "Store isbjørnelv" [(850) (-2130) (64)] { }; - # "Blindodden" = lib.mkPoi "Blindodden" [(874) (160) (65)] { }; - # "Ulveelva" = lib.mkPoi "Ulveelva" [(910) (3050) (64)] { }; - # "Tosjødalen" = lib.mkPoi "Tosjødalen" [(960) (460) (64)] { }; - # "Storhavskanalen" = lib.mkPoi "Storhavskanalen" [(1005) (1335) (64)] { }; - # "NPC-landsby" = lib.mkPoi "NPC-landsby" [(1278) (-397) (64)] { }; - # "SuperTheodors fiskehus" = lib.mkPoi "SuperTheodors fiskehus" [(1570) (3285) (64)] { }; - # "Lamafjellet" = lib.mkPoi "Lamafjellet" [(1810) (-1630) (64)] { }; - # "SuperTheodors strand" = lib.mkPoi "SuperTheodors strand" [(2111) (3777) (64)] { }; - # "Andøya" = lib.mkPoi "Andøya" [(2300) (250) (64)] { }; - "Grantrebukta" = lib.mkPoi "Grantrebukta" [(2350) (-136) (64)] { }; - # "Hestelandsby" = lib.mkPoi "Hestelandsby" [(2734) (-984) (64)] { }; - # "Bikkjeby" = lib.mkPoi "Bikkjeby" [(2950) (270) (64)] { }; - # "Storhavet i øst" = lib.mkPoi "Storhavet i øst" [(3000) (1000) (64)] { }; - # "Fyret" = lib.mkPoi "Fyret" [(3085) (424) (64)] { }; - # "Vinterstranda hotel & resort" = lib.mkPoi "Vinterstranda hotel & resort" [(3481) (210) (75)] { }; - # "Holmgard" = lib.mkPoi "Holmgard" [(4468) (1337) (64)] { }; - # "Der Kölner Dom" = lib.mkPoi "Der Kölner Dom" [(4630) (270) (64)] { }; - # "Storsnøfjella" = lib.mkPoi "Storsnøfjella" [(5470) (-270) (64)] { }; - # "Bondeby" = lib.mkPoi "Bondeby" [(6200) (-300) (64)] { }; - # "Kirkemyr" = lib.mkPoi "Kirkemyr" [(6880) (-465) (64)] { }; - }; -} diff --git a/map-markers/vanillaSurvival/verden/default.nix b/map-markers/vanillaSurvival/verden/default.nix deleted file mode 100644 index 78a934f..0000000 --- a/map-markers/vanillaSurvival/verden/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, icons }: - -{ - byer = import ./byer.nix { inherit lib icons; }; - spesial = import ./spesial.nix { inherit lib icons; }; -} diff --git a/map-markers/vanillaSurvival/verden/spesial.nix b/map-markers/vanillaSurvival/verden/spesial.nix deleted file mode 100644 index 78d086c..0000000 --- a/map-markers/vanillaSurvival/verden/spesial.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, icons }: - -{ - label = "Spesielle steder"; - toggleable = true; - default-hidden = false; - sorting = 100; - - markers = { - nullpunkt = lib.mkPoi "Nullpunkt" [0 0 64] { /*icon = icons.green*/ }; - }; -} -- 2.51.2 From 587d7272202a34435531f8be8cbdf5dfa9f82849 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 22 Mar 2025 00:42:59 +0100 Subject: [PATCH 08/13] rewrite to python: redo nix packaging --- .envrc | 1 + flake.lock | 27 +++++++++++++++++ flake.nix | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 .envrc create mode 100644 flake.lock diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..4e45c8a --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1762482733, + "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index e7784aa..2f11191 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,86 @@ { - inputs = { }; - outputs = inputs@{ self, ...}: { - map-markers = import ./map-markers; - map-lib = import ./map-markers/lib.nix; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + + outputs = { self, nixpkgs }: let + systems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + + forAllSystems = f: nixpkgs.lib.genAttrs systems (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in f system pkgs); + + inherit (nixpkgs) lib; + + in { + apps = forAllSystems (system: pkgs: let + mkApp = package: { + type = "app"; + program = lib.getExe package; + }; + in { + default = mkApp self.packages.${system}.default; + }); + + devShells = forAllSystems (_: pkgs: { + default = pkgs.mkShell { + packages = with pkgs; [ + uv + ruff + python3 + # (python3.withPackages (ps: with ps; [])) + biome + ]; + }; + }); + + overlays.default = final: prev: self.packages.${final.system}; + + packages = forAllSystems (system: pkgs: { + default = self.packages.${system}.mckart; + + mckart = let + pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml); + in with pkgs.python3Packages; buildPythonPackage { + pname = pyproject.project.name; + version = pyproject.project.version; + src = lib.cleanSource ./.; + + format = "pyproject"; + + build-system = [ hatchling ]; + dependencies = []; + + meta.mainProgram = "mckart"; + }; + + bluemap-export = pkgs.runCommand "bluemap-export" { + buildInputs = [ (self.packages.${system}.mckart) ]; + } '' + mckart export-bluemap --output-dir "$out" + ''; + + mapcrafter-export = pkgs.runCommand "mapcrafter-export" { + buildInputs = [ + (self.packages.${system}.mckart) + pkgs.biome + ]; + + biomeConf = builtins.toJSON { + formatter = { + indentStyle = "space"; + lineWidth = 100; + }; + }; + passAsFile = [ "biomeConf" ]; + } '' + mckart export-mapcrafter --output-dir "$out" + cp "$biomeConfPath" ./biome.json + biome format --config-path=./biome.json "$out"/* --write + ''; + }); }; } -- 2.51.2 From f585d8fe670cb7bb7b0333fc7f0bb515127c93c7 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 11 Nov 2025 18:59:09 +0900 Subject: [PATCH 09/13] rewrite-to-python: flatten structure --- pyproject.toml | 13 +++++++++++-- .../bluemap_exporter/__init__.py | 0 .../bluemap_exporter/exporter.py | 4 ++-- src/{minecraft_kartverket => }/cli/__init__.py | 0 src/{minecraft_kartverket => }/cli/main.py | 4 ++-- src/{minecraft_kartverket => }/cli/print.py | 4 ++-- src/{minecraft_kartverket => }/cli/validate.py | 4 ++-- .../lib_marker/__init__.py | 0 src/{minecraft_kartverket => }/lib_marker/area.py | 0 src/{minecraft_kartverket => }/lib_marker/color.py | 0 src/{minecraft_kartverket => }/lib_marker/marker.py | 0 .../lib_marker/marker_set.py | 0 src/{minecraft_kartverket => }/lib_marker/point.py | 0 src/{minecraft_kartverket => }/lib_marker/track.py | 0 .../mapcrafter_exporter/__init__.py | 0 .../mapcrafter_exporter/exporter.py | 4 ++-- .../mapcrafter_exporter/markers-template.js | 0 .../marker_sets/__init__.py | 2 +- .../marker_sets/nether/__init__.py | 0 .../marker_sets/nether/area_names/__init__.py | 2 +- .../marker_sets/nether/area_names/grisebukta.py | 2 +- .../marker_sets/nether/ice_tracks/__init__.py | 2 +- src/marker_sets/nether/other/__init__.py | 7 +++++++ src/marker_sets/nether/portals/__init__.py | 7 +++++++ .../nether}/railways/__init__.py | 2 +- .../marker_sets/overworld/__init__.py | 0 .../marker_sets/overworld/area_names/__init__.py | 2 +- .../marker_sets/overworld/area_names/andoya.py | 2 +- .../marker_sets/overworld/area_names/england.py | 2 +- .../overworld/area_names/hemmelig_mesabiom.py | 2 +- .../marker_sets/overworld/area_names/summefjord.py | 2 +- .../marker_sets/overworld/area_names/vestisodet.py | 2 +- .../marker_sets/overworld/buildings/__init__.py | 2 +- .../overworld/buildings/der_kolner_dom.py | 2 +- .../marker_sets/overworld/buildings/fyret.py | 2 +- .../overworld/buildings/hodeskallegrotten.py | 2 +- .../overworld/buildings/isjungelkatedralen.py | 2 +- .../overworld/buildings/jesus_christ_superstore.py | 2 +- .../marker_sets/overworld/buildings/kystbasen.py | 2 +- .../marker_sets/overworld/buildings/taarnodden.py | 2 +- .../marker_sets/overworld/buildings/tegltaarnet.py | 2 +- .../buildings/vinterstranda_hotel_og_resort.py | 2 +- .../marker_sets/overworld/cities/__init__.py | 2 +- .../marker_sets/overworld/cities/heimfjell.py | 2 +- .../marker_sets/overworld/cities/holmgard.py | 2 +- .../marker_sets/overworld/cities/tangen.py | 2 +- .../marker_sets/overworld/cities/tosjodalen.py | 2 +- .../overworld/cities/vikingelandsbyen.py | 2 +- .../marker_sets/overworld/homes/__init__.py | 2 +- .../marker_sets/overworld/homes/akasienborg.py | 2 +- .../marker_sets/overworld/homes/bikkjeby.py | 2 +- .../marker_sets/overworld/homes/biosfaeren.py | 2 +- .../marker_sets/overworld/homes/bjorkeholmen.py | 2 +- .../marker_sets/overworld/homes/bjornebukten.py | 2 +- .../marker_sets/overworld/homes/huloyeid.py | 2 +- .../marker_sets/overworld/homes/singapore.py | 2 +- .../marker_sets/overworld/homes/summevatn.py | 2 +- .../overworld/homes/supertheodors_fiskehus.py | 2 +- .../marker_sets/overworld/homes/svartskoghavn.py | 2 +- .../marker_sets/overworld/homes/vestlandet.py | 2 +- .../marker_sets/overworld/huts/__init__.py | 2 +- .../marker_sets/overworld/huts/dypskiferhytta.py | 2 +- .../marker_sets/overworld/huts/grensebuelvbu.py | 2 +- .../marker_sets/overworld/huts/nyverdenhytta.py | 2 +- .../overworld/infrastructure/__init__.py | 2 +- .../overworld/infrastructure/grantrebukta.py | 2 +- .../overworld/infrastructure/smalelvbro.py | 2 +- .../marker_sets/overworld/mines/__init__.py | 2 +- .../marker_sets/overworld/mines/sandsteingruva.py | 2 +- .../marker_sets/overworld/mines/slimegruva.py | 2 +- .../marker_sets/overworld/nature/__init__.py | 2 +- .../marker_sets/overworld/nature/blindodden.py | 2 +- .../marker_sets/overworld/nature/hulevatna.py | 2 +- .../marker_sets/overworld/nature/kirkemyr.py | 2 +- .../marker_sets/overworld/nature/lamafjellet.py | 2 +- .../marker_sets/overworld/nature/langstrand.py | 2 +- .../overworld/nature/lille_isbjornelv.py | 2 +- .../marker_sets/overworld/nature/naturreservat.py | 2 +- .../marker_sets/overworld/nature/piratbukta.py | 2 +- .../marker_sets/overworld/nature/snoklippan.py | 2 +- .../overworld/nature/store_isbjornelv.py | 2 +- .../marker_sets/overworld/nature/storhavet_i_ost.py | 2 +- .../overworld/nature/storhavs_kanalen.py | 2 +- .../marker_sets/overworld/nature/storsnofjella.py | 2 +- .../marker_sets/overworld/nature/storvatnet.py | 2 +- .../overworld/nature/supertheodors_strand.py | 2 +- .../marker_sets/overworld/nature/trangdalen.py | 2 +- .../marker_sets/overworld/nature/turrikkelmyra.py | 2 +- .../marker_sets/overworld/nature/ulveelva.py | 2 +- .../marker_sets/overworld/nature/vestsumpland.py | 2 +- .../marker_sets/overworld/other/__init__.py | 2 +- .../marker_sets/overworld/other/leirhavn.py | 2 +- .../marker_sets/overworld/other/nullpunkt.py | 2 +- .../overworld}/railways/__init__.py | 2 +- src/marker_sets/overworld/roads/__init__.py | 7 +++++++ .../marker_sets/overworld/villages/__init__.py | 2 +- .../marker_sets/overworld/villages/bondeby.py | 2 +- .../marker_sets/overworld/villages/gammelleirnes.py | 2 +- .../marker_sets/overworld/villages/hestelandsby.py | 2 +- .../marker_sets/overworld/villages/isbjornby.py | 2 +- .../overworld/villages/ittoqqortoormiit.py | 2 +- .../marker_sets/overworld/villages/klofteby.py | 2 +- .../marker_sets/overworld/villages/npc_landsby.py | 2 +- .../overworld/villages/npc_landsby_nord.py | 2 +- .../marker_sets/overworld/villages/smedby.py | 2 +- .../marker_sets/the_end/__init__.py | 0 src/marker_sets/the_end/other/__init__.py | 7 +++++++ src/marker_sets/the_end/portals/__init__.py | 7 +++++++ src/minecraft_kartverket/__init__.py | 1 - .../marker_sets/nether/other/__init__.py | 7 ------- .../marker_sets/nether/portals/__init__.py | 7 ------- .../marker_sets/overworld/roads/__init__.py | 7 ------- .../marker_sets/the_end/other/__init__.py | 7 ------- .../marker_sets/the_end/portals/__init__.py | 7 ------- 114 files changed, 139 insertions(+), 131 deletions(-) rename src/{minecraft_kartverket => }/bluemap_exporter/__init__.py (100%) rename src/{minecraft_kartverket => }/bluemap_exporter/exporter.py (95%) rename src/{minecraft_kartverket => }/cli/__init__.py (100%) rename src/{minecraft_kartverket => }/cli/main.py (90%) rename src/{minecraft_kartverket => }/cli/print.py (92%) rename src/{minecraft_kartverket => }/cli/validate.py (98%) rename src/{minecraft_kartverket => }/lib_marker/__init__.py (100%) rename src/{minecraft_kartverket => }/lib_marker/area.py (100%) rename src/{minecraft_kartverket => }/lib_marker/color.py (100%) rename src/{minecraft_kartverket => }/lib_marker/marker.py (100%) rename src/{minecraft_kartverket => }/lib_marker/marker_set.py (100%) rename src/{minecraft_kartverket => }/lib_marker/point.py (100%) rename src/{minecraft_kartverket => }/lib_marker/track.py (100%) rename src/{minecraft_kartverket => }/mapcrafter_exporter/__init__.py (100%) rename src/{minecraft_kartverket => }/mapcrafter_exporter/exporter.py (93%) rename src/{minecraft_kartverket => }/mapcrafter_exporter/markers-template.js (100%) rename src/{minecraft_kartverket => }/marker_sets/__init__.py (85%) rename src/{minecraft_kartverket => }/marker_sets/nether/__init__.py (100%) rename src/{minecraft_kartverket => }/marker_sets/nether/area_names/__init__.py (70%) rename src/{minecraft_kartverket => }/marker_sets/nether/area_names/grisebukta.py (71%) rename src/{minecraft_kartverket => }/marker_sets/nether/ice_tracks/__init__.py (50%) create mode 100644 src/marker_sets/nether/other/__init__.py create mode 100644 src/marker_sets/nether/portals/__init__.py rename src/{minecraft_kartverket/marker_sets/overworld => marker_sets/nether}/railways/__init__.py (50%) rename src/{minecraft_kartverket => }/marker_sets/overworld/__init__.py (100%) rename src/{minecraft_kartverket => }/marker_sets/overworld/area_names/__init__.py (88%) rename src/{minecraft_kartverket => }/marker_sets/overworld/area_names/andoya.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/area_names/england.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/area_names/hemmelig_mesabiom.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/area_names/summefjord.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/area_names/vestisodet.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/__init__.py (93%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/der_kolner_dom.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/fyret.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/hodeskallegrotten.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/isjungelkatedralen.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/jesus_christ_superstore.py (73%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/kystbasen.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/taarnodden.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/tegltaarnet.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py (73%) rename src/{minecraft_kartverket => }/marker_sets/overworld/cities/__init__.py (88%) rename src/{minecraft_kartverket => }/marker_sets/overworld/cities/heimfjell.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/cities/holmgard.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/cities/tangen.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/cities/tosjodalen.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/cities/vikingelandsbyen.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/__init__.py (94%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/akasienborg.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/bikkjeby.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/biosfaeren.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/bjorkeholmen.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/bjornebukten.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/huloyeid.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/singapore.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/summevatn.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/supertheodors_fiskehus.py (73%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/svartskoghavn.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/homes/vestlandet.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/huts/__init__.py (84%) rename src/{minecraft_kartverket => }/marker_sets/overworld/huts/dypskiferhytta.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/huts/grensebuelvbu.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/huts/nyverdenhytta.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/infrastructure/__init__.py (79%) rename src/{minecraft_kartverket => }/marker_sets/overworld/infrastructure/grantrebukta.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/infrastructure/smalelvbro.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/mines/__init__.py (79%) rename src/{minecraft_kartverket => }/marker_sets/overworld/mines/sandsteingruva.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/mines/slimegruva.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/__init__.py (96%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/blindodden.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/hulevatna.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/kirkemyr.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/lamafjellet.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/langstrand.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/lille_isbjornelv.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/naturreservat.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/piratbukta.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/snoklippan.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/store_isbjornelv.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/storhavet_i_ost.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/storhavs_kanalen.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/storsnofjella.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/storvatnet.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/supertheodors_strand.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/trangdalen.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/turrikkelmyra.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/ulveelva.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/nature/vestsumpland.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/other/__init__.py (77%) rename src/{minecraft_kartverket => }/marker_sets/overworld/other/leirhavn.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/other/nullpunkt.py (70%) rename src/{minecraft_kartverket/marker_sets/nether => marker_sets/overworld}/railways/__init__.py (50%) create mode 100644 src/marker_sets/overworld/roads/__init__.py rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/__init__.py (92%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/bondeby.py (70%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/gammelleirnes.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/hestelandsby.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/isbjornby.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/ittoqqortoormiit.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/klofteby.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/npc_landsby.py (71%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/npc_landsby_nord.py (72%) rename src/{minecraft_kartverket => }/marker_sets/overworld/villages/smedby.py (71%) rename src/{minecraft_kartverket => }/marker_sets/the_end/__init__.py (100%) create mode 100644 src/marker_sets/the_end/other/__init__.py create mode 100644 src/marker_sets/the_end/portals/__init__.py delete mode 100644 src/minecraft_kartverket/__init__.py delete mode 100644 src/minecraft_kartverket/marker_sets/nether/other/__init__.py delete mode 100644 src/minecraft_kartverket/marker_sets/nether/portals/__init__.py delete mode 100644 src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py delete mode 100644 src/minecraft_kartverket/marker_sets/the_end/other/__init__.py delete mode 100644 src/minecraft_kartverket/marker_sets/the_end/portals/__init__.py 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=[], -) -- 2.51.2 From 0a22ae5bfa952776bb681fb5b1499f2d4f7624dc Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 11 Nov 2025 19:00:28 +0900 Subject: [PATCH 10/13] rewrite-to-python: fix gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 78d52e6..4e74cb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +# Python *.pyc *.pyo build/ @@ -5,5 +6,10 @@ dist/ .venv __pycache__ +# Nix result result-* + +# Ignore generated files by default +/mapcrafter +/bluemap -- 2.51.2 From bf012ea24f5c8045f466c9d124b88e69290f43e0 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 11 Nov 2025 19:22:28 +0900 Subject: [PATCH 11/13] rewrite-to-python: add test for hocon includes, fix generator bug --- flake.nix | 12 ++++++++++++ src/bluemap_exporter/exporter.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2f11191..6f51f75 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,18 @@ overlays.default = final: prev: self.packages.${final.system}; + checks = forAllSystems (system: pkgs: { + hocon-include = let + format = pkgs.formats.hocon { }; + in format.generate "minecraft-kartverket-test-hocon-include" { + _includes = [ + (format.lib.mkInclude "${self.packages.${system}.bluemap-export}/overworld.hocon") + (format.lib.mkInclude "${self.packages.${system}.bluemap-export}/nether.hocon") + (format.lib.mkInclude "${self.packages.${system}.bluemap-export}/the-end.hocon") + ]; + }; + }); + packages = forAllSystems (system: pkgs: { default = self.packages.${system}.mckart; diff --git a/src/bluemap_exporter/exporter.py b/src/bluemap_exporter/exporter.py index f849b91..e4dca80 100644 --- a/src/bluemap_exporter/exporter.py +++ b/src/bluemap_exporter/exporter.py @@ -72,7 +72,7 @@ def to_hocon(x: Any) -> str: return f"[\n{'\n'.join(items)}\n]" elif isinstance(x, dict): items = [ - f' {k}: {indent(to_hocon(v), ' ').removeprefix(' ')}' + f' "{k}": {indent(to_hocon(v), ' ').removeprefix(' ')}' for k, v in x.items() ] return f"{{\n{'\n'.join(items)}\n}}" -- 2.51.2 From 3d5f5ea9d89443871400c1706b2242b3fd356ed3 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 11 Nov 2025 21:39:26 +0900 Subject: [PATCH 12/13] rewrite-in-python: flatten marker sets --- README.md | 58 ++------ src/marker_sets/nether/area_names.py | 14 ++ src/marker_sets/nether/area_names/__init__.py | 10 -- .../nether/area_names/grisebukta.py | 11 -- .../{ice_tracks/__init__.py => ice_tracks.py} | 2 +- .../other/__init__.py => nether/other.py} | 2 +- .../{portals/__init__.py => portals.py} | 2 +- .../{railways/__init__.py => railways.py} | 2 +- src/marker_sets/overworld/area_names.py | 42 ++++++ .../overworld/area_names/__init__.py | 18 --- .../overworld/area_names/andoya.py | 11 -- .../overworld/area_names/england.py | 11 -- .../overworld/area_names/hemmelig_mesabiom.py | 11 -- .../overworld/area_names/summefjord.py | 11 -- .../overworld/area_names/vestisodet.py | 11 -- src/marker_sets/overworld/buildings.py | 70 +++++++++ .../overworld/buildings/__init__.py | 28 ---- .../overworld/buildings/der_kolner_dom.py | 11 -- src/marker_sets/overworld/buildings/fyret.py | 11 -- .../overworld/buildings/hodeskallegrotten.py | 11 -- .../overworld/buildings/isjungelkatedralen.py | 11 -- .../buildings/jesus_christ_superstore.py | 11 -- .../overworld/buildings/kystbasen.py | 11 -- .../overworld/buildings/taarnodden.py | 11 -- .../overworld/buildings/tegltaarnet.py | 11 -- .../vinterstranda_hotel_og_resort.py | 11 -- src/marker_sets/overworld/cities.py | 42 ++++++ src/marker_sets/overworld/cities/__init__.py | 18 --- src/marker_sets/overworld/cities/heimfjell.py | 11 -- src/marker_sets/overworld/cities/holmgard.py | 11 -- src/marker_sets/overworld/cities/tangen.py | 11 -- .../overworld/cities/tosjodalen.py | 11 -- .../overworld/cities/vikingelandsbyen.py | 11 -- src/marker_sets/overworld/homes.py | 84 +++++++++++ src/marker_sets/overworld/homes/__init__.py | 30 ---- .../overworld/homes/akasienborg.py | 11 -- src/marker_sets/overworld/homes/bikkjeby.py | 11 -- src/marker_sets/overworld/homes/biosfaeren.py | 11 -- .../overworld/homes/bjorkeholmen.py | 11 -- .../overworld/homes/bjornebukten.py | 11 -- src/marker_sets/overworld/homes/huloyeid.py | 11 -- src/marker_sets/overworld/homes/singapore.py | 11 -- src/marker_sets/overworld/homes/summevatn.py | 11 -- .../overworld/homes/supertheodors_fiskehus.py | 11 -- .../overworld/homes/svartskoghavn.py | 11 -- src/marker_sets/overworld/homes/vestlandet.py | 11 -- src/marker_sets/overworld/huts.py | 28 ++++ src/marker_sets/overworld/huts/__init__.py | 14 -- .../overworld/huts/dypskiferhytta.py | 11 -- .../overworld/huts/grensebuelvbu.py | 11 -- .../overworld/huts/nyverdenhytta.py | 11 -- src/marker_sets/overworld/infrastructure.py | 21 +++ .../overworld/infrastructure/__init__.py | 12 -- .../overworld/infrastructure/grantrebukta.py | 11 -- .../overworld/infrastructure/smalelvbro.py | 11 -- src/marker_sets/overworld/mines.py | 21 +++ src/marker_sets/overworld/mines/__init__.py | 12 -- .../overworld/mines/sandsteingruva.py | 11 -- src/marker_sets/overworld/mines/slimegruva.py | 11 -- src/marker_sets/overworld/nature.py | 140 ++++++++++++++++++ src/marker_sets/overworld/nature/__init__.py | 47 ------ .../overworld/nature/blindodden.py | 11 -- src/marker_sets/overworld/nature/hulevatna.py | 11 -- src/marker_sets/overworld/nature/kirkemyr.py | 11 -- .../overworld/nature/lamafjellet.py | 11 -- .../overworld/nature/langstrand.py | 11 -- .../overworld/nature/lille_isbjornelv.py | 11 -- .../overworld/nature/naturreservat.py | 11 -- .../overworld/nature/piratbukta.py | 11 -- .../overworld/nature/snoklippan.py | 11 -- .../overworld/nature/store_isbjornelv.py | 11 -- .../overworld/nature/storhavet_i_ost.py | 11 -- .../overworld/nature/storhavs_kanalen.py | 11 -- .../overworld/nature/storsnofjella.py | 11 -- .../overworld/nature/storvatnet.py | 11 -- .../overworld/nature/supertheodors_strand.py | 11 -- .../overworld/nature/trangdalen.py | 11 -- .../overworld/nature/turrikkelmyra.py | 11 -- src/marker_sets/overworld/nature/ulveelva.py | 11 -- .../overworld/nature/vestsumpland.py | 11 -- src/marker_sets/overworld/other.py | 21 +++ src/marker_sets/overworld/other/__init__.py | 12 -- src/marker_sets/overworld/other/leirhavn.py | 11 -- src/marker_sets/overworld/other/nullpunkt.py | 11 -- .../{railways/__init__.py => railways.py} | 2 +- .../overworld/{roads/__init__.py => roads.py} | 2 +- src/marker_sets/overworld/villages.py | 70 +++++++++ .../overworld/villages/__init__.py | 27 ---- src/marker_sets/overworld/villages/bondeby.py | 11 -- .../overworld/villages/gammelleirnes.py | 11 -- .../overworld/villages/hestelandsby.py | 11 -- .../overworld/villages/isbjornby.py | 11 -- .../overworld/villages/ittoqqortoormiit.py | 11 -- .../overworld/villages/klofteby.py | 11 -- .../overworld/villages/npc_landsby.py | 11 -- .../overworld/villages/npc_landsby_nord.py | 11 -- src/marker_sets/overworld/villages/smedby.py | 11 -- .../other/__init__.py => the_end/other.py} | 2 +- .../{portals/__init__.py => portals.py} | 2 +- 99 files changed, 570 insertions(+), 1033 deletions(-) create mode 100644 src/marker_sets/nether/area_names.py delete mode 100644 src/marker_sets/nether/area_names/__init__.py delete mode 100644 src/marker_sets/nether/area_names/grisebukta.py rename src/marker_sets/nether/{ice_tracks/__init__.py => ice_tracks.py} (60%) rename src/marker_sets/{the_end/other/__init__.py => nether/other.py} (58%) rename src/marker_sets/nether/{portals/__init__.py => portals.py} (59%) rename src/marker_sets/nether/{railways/__init__.py => railways.py} (59%) create mode 100644 src/marker_sets/overworld/area_names.py delete mode 100644 src/marker_sets/overworld/area_names/__init__.py delete mode 100644 src/marker_sets/overworld/area_names/andoya.py delete mode 100644 src/marker_sets/overworld/area_names/england.py delete mode 100644 src/marker_sets/overworld/area_names/hemmelig_mesabiom.py delete mode 100644 src/marker_sets/overworld/area_names/summefjord.py delete mode 100644 src/marker_sets/overworld/area_names/vestisodet.py create mode 100644 src/marker_sets/overworld/buildings.py delete mode 100644 src/marker_sets/overworld/buildings/__init__.py delete mode 100644 src/marker_sets/overworld/buildings/der_kolner_dom.py delete mode 100644 src/marker_sets/overworld/buildings/fyret.py delete mode 100644 src/marker_sets/overworld/buildings/hodeskallegrotten.py delete mode 100644 src/marker_sets/overworld/buildings/isjungelkatedralen.py delete mode 100644 src/marker_sets/overworld/buildings/jesus_christ_superstore.py delete mode 100644 src/marker_sets/overworld/buildings/kystbasen.py delete mode 100644 src/marker_sets/overworld/buildings/taarnodden.py delete mode 100644 src/marker_sets/overworld/buildings/tegltaarnet.py delete mode 100644 src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py create mode 100644 src/marker_sets/overworld/cities.py delete mode 100644 src/marker_sets/overworld/cities/__init__.py delete mode 100644 src/marker_sets/overworld/cities/heimfjell.py delete mode 100644 src/marker_sets/overworld/cities/holmgard.py delete mode 100644 src/marker_sets/overworld/cities/tangen.py delete mode 100644 src/marker_sets/overworld/cities/tosjodalen.py delete mode 100644 src/marker_sets/overworld/cities/vikingelandsbyen.py create mode 100644 src/marker_sets/overworld/homes.py delete mode 100644 src/marker_sets/overworld/homes/__init__.py delete mode 100644 src/marker_sets/overworld/homes/akasienborg.py delete mode 100644 src/marker_sets/overworld/homes/bikkjeby.py delete mode 100644 src/marker_sets/overworld/homes/biosfaeren.py delete mode 100644 src/marker_sets/overworld/homes/bjorkeholmen.py delete mode 100644 src/marker_sets/overworld/homes/bjornebukten.py delete mode 100644 src/marker_sets/overworld/homes/huloyeid.py delete mode 100644 src/marker_sets/overworld/homes/singapore.py delete mode 100644 src/marker_sets/overworld/homes/summevatn.py delete mode 100644 src/marker_sets/overworld/homes/supertheodors_fiskehus.py delete mode 100644 src/marker_sets/overworld/homes/svartskoghavn.py delete mode 100644 src/marker_sets/overworld/homes/vestlandet.py create mode 100644 src/marker_sets/overworld/huts.py delete mode 100644 src/marker_sets/overworld/huts/__init__.py delete mode 100644 src/marker_sets/overworld/huts/dypskiferhytta.py delete mode 100644 src/marker_sets/overworld/huts/grensebuelvbu.py delete mode 100644 src/marker_sets/overworld/huts/nyverdenhytta.py create mode 100644 src/marker_sets/overworld/infrastructure.py delete mode 100644 src/marker_sets/overworld/infrastructure/__init__.py delete mode 100644 src/marker_sets/overworld/infrastructure/grantrebukta.py delete mode 100644 src/marker_sets/overworld/infrastructure/smalelvbro.py create mode 100644 src/marker_sets/overworld/mines.py delete mode 100644 src/marker_sets/overworld/mines/__init__.py delete mode 100644 src/marker_sets/overworld/mines/sandsteingruva.py delete mode 100644 src/marker_sets/overworld/mines/slimegruva.py create mode 100644 src/marker_sets/overworld/nature.py delete mode 100644 src/marker_sets/overworld/nature/__init__.py delete mode 100644 src/marker_sets/overworld/nature/blindodden.py delete mode 100644 src/marker_sets/overworld/nature/hulevatna.py delete mode 100644 src/marker_sets/overworld/nature/kirkemyr.py delete mode 100644 src/marker_sets/overworld/nature/lamafjellet.py delete mode 100644 src/marker_sets/overworld/nature/langstrand.py delete mode 100644 src/marker_sets/overworld/nature/lille_isbjornelv.py delete mode 100644 src/marker_sets/overworld/nature/naturreservat.py delete mode 100644 src/marker_sets/overworld/nature/piratbukta.py delete mode 100644 src/marker_sets/overworld/nature/snoklippan.py delete mode 100644 src/marker_sets/overworld/nature/store_isbjornelv.py delete mode 100644 src/marker_sets/overworld/nature/storhavet_i_ost.py delete mode 100644 src/marker_sets/overworld/nature/storhavs_kanalen.py delete mode 100644 src/marker_sets/overworld/nature/storsnofjella.py delete mode 100644 src/marker_sets/overworld/nature/storvatnet.py delete mode 100644 src/marker_sets/overworld/nature/supertheodors_strand.py delete mode 100644 src/marker_sets/overworld/nature/trangdalen.py delete mode 100644 src/marker_sets/overworld/nature/turrikkelmyra.py delete mode 100644 src/marker_sets/overworld/nature/ulveelva.py delete mode 100644 src/marker_sets/overworld/nature/vestsumpland.py create mode 100644 src/marker_sets/overworld/other.py delete mode 100644 src/marker_sets/overworld/other/__init__.py delete mode 100644 src/marker_sets/overworld/other/leirhavn.py delete mode 100644 src/marker_sets/overworld/other/nullpunkt.py rename src/marker_sets/overworld/{railways/__init__.py => railways.py} (59%) rename src/marker_sets/overworld/{roads/__init__.py => roads.py} (58%) create mode 100644 src/marker_sets/overworld/villages.py delete mode 100644 src/marker_sets/overworld/villages/__init__.py delete mode 100644 src/marker_sets/overworld/villages/bondeby.py delete mode 100644 src/marker_sets/overworld/villages/gammelleirnes.py delete mode 100644 src/marker_sets/overworld/villages/hestelandsby.py delete mode 100644 src/marker_sets/overworld/villages/isbjornby.py delete mode 100644 src/marker_sets/overworld/villages/ittoqqortoormiit.py delete mode 100644 src/marker_sets/overworld/villages/klofteby.py delete mode 100644 src/marker_sets/overworld/villages/npc_landsby.py delete mode 100644 src/marker_sets/overworld/villages/npc_landsby_nord.py delete mode 100644 src/marker_sets/overworld/villages/smedby.py rename src/marker_sets/{nether/other/__init__.py => the_end/other.py} (58%) rename src/marker_sets/the_end/{portals/__init__.py => portals.py} (59%) diff --git a/README.md b/README.md index defde7e..8a9fbb6 100644 --- a/README.md +++ b/README.md @@ -39,51 +39,16 @@ Here is an overview of the different marker sets, and what they are meant for. ## How to add a point marker -1. Find the correct marker set directory in `src/marker_sets`. -2. Create a new file in this directory with the name of the marker and the extension `.py`. - Note that this needs to be underscored (no spaces or hyphens), and valid ascii. - e.g. `Min svære base` -> `min_svaere_base.py` -3. Add the marker to the file. You can use the following template or look at other markers for inspiration. - -```python -from lib_marker import Point - -MARKERS = [ - Point( - name="Nyverdenhytta", - icon = None, - x = 848, - y = 70, - z = 1583, - ), -] -``` - -4. Register the marker(s) to the marker set by editing the marker set's `__init__.py` file. - Add the following line to the file, replacing `` with the name of the marker file. - Notice that there needs to be a `*` before the marker name inside the `markers` list. - -```python - ... - - from . import MARKERS as _markers - - ... - - markers = [ - ... - *_markers, - ] -``` - -5. Run the cli tool to verify that the marker has been added correctly. +1. Find the correct marker set file in `src/marker_sets/`. +2. Add the marker to the list in the file. You can look at neighbouring markers for inspiration. +3. Run the cli tool to verify that the marker has been added correctly. ```bash uv run mckart verify uv run mckart print ``` -6. Open a PR +4. Open a PR ## How to add a railway / road @@ -95,6 +60,7 @@ You can follow the previous guide, but for step 3, use this template or look at from lib_marker import Track MARKERS = [ + ..., Track( name="Nordbanen", points = [ @@ -104,6 +70,7 @@ MARKERS = [ ... ], ), + ..., ] ``` @@ -111,8 +78,8 @@ MARKERS = [ To add a new marker set, you need to: -1. Create a new directory alongside the other marker sets in `src/marker_sets/`. -2. Create an `__init__.py` file in this directory with the following content: +1. Create a new file the other marker sets in `src/marker_sets/`. +2. Create a marker set in this file, using this template: ```python from lib_marker.marker_set import MarkerSet @@ -125,7 +92,6 @@ MARKER_SET = MarkerSet( ``` 3. Add the marker set to the `MARKER_SETS` list in `src/marker_sets//__init__.py`. -4. Add the marker set with a description to this README file. ```python from . import MARKER_SET as _marker_set @@ -138,13 +104,7 @@ MARKER_SETS = [ See the other marker sets for inspiration. -## How to add icons - -TODO: Write this section - -## Building with nix - -TODO: Write this section +4. Add the marker set with a description to this README file. ## See also diff --git a/src/marker_sets/nether/area_names.py b/src/marker_sets/nether/area_names.py new file mode 100644 index 0000000..ad5cf7f --- /dev/null +++ b/src/marker_sets/nether/area_names.py @@ -0,0 +1,14 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Area Names", + markers=[ + Point( + name="Grisebukta", + icon=None, + x=-900, + y=64, + z=27, + ), + ], +) diff --git a/src/marker_sets/nether/area_names/__init__.py b/src/marker_sets/nether/area_names/__init__.py deleted file mode 100644 index d1ae5f1..0000000 --- a/src/marker_sets/nether/area_names/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .grisebukta import MARKERS as grisebukta_markers - -MARKER_SET = MarkerSet( - name="Area Names", - markers=[ - *grisebukta_markers, - ], -) diff --git a/src/marker_sets/nether/area_names/grisebukta.py b/src/marker_sets/nether/area_names/grisebukta.py deleted file mode 100644 index a672719..0000000 --- a/src/marker_sets/nether/area_names/grisebukta.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Grisebukta", - icon=None, - x=-900, - y=64, - z=27, - ), -] diff --git a/src/marker_sets/nether/ice_tracks/__init__.py b/src/marker_sets/nether/ice_tracks.py similarity index 60% rename from src/marker_sets/nether/ice_tracks/__init__.py rename to src/marker_sets/nether/ice_tracks.py index 5699220..86a2446 100644 --- a/src/marker_sets/nether/ice_tracks/__init__.py +++ b/src/marker_sets/nether/ice_tracks.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( diff --git a/src/marker_sets/the_end/other/__init__.py b/src/marker_sets/nether/other.py similarity index 58% rename from src/marker_sets/the_end/other/__init__.py rename to src/marker_sets/nether/other.py index a1e1630..6d160b7 100644 --- a/src/marker_sets/the_end/other/__init__.py +++ b/src/marker_sets/nether/other.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( diff --git a/src/marker_sets/nether/portals/__init__.py b/src/marker_sets/nether/portals.py similarity index 59% rename from src/marker_sets/nether/portals/__init__.py rename to src/marker_sets/nether/portals.py index 3e036bc..07f8e47 100644 --- a/src/marker_sets/nether/portals/__init__.py +++ b/src/marker_sets/nether/portals.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( diff --git a/src/marker_sets/nether/railways/__init__.py b/src/marker_sets/nether/railways.py similarity index 59% rename from src/marker_sets/nether/railways/__init__.py rename to src/marker_sets/nether/railways.py index a93292a..5cbe19e 100644 --- a/src/marker_sets/nether/railways/__init__.py +++ b/src/marker_sets/nether/railways.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( diff --git a/src/marker_sets/overworld/area_names.py b/src/marker_sets/overworld/area_names.py new file mode 100644 index 0000000..0b65aad --- /dev/null +++ b/src/marker_sets/overworld/area_names.py @@ -0,0 +1,42 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Area Names", + markers=[ + Point( + name="Andøya", + icon=None, + x=2300, + y=64, + z=250, + ), + Point( + name="England", + icon=None, + x=-1189, + y=64, + z=1556, + ), + Point( + name="Hemmelig mesabiom", + icon=None, + x=-980, + y=64, + z=4090, + ), + Point( + name="Summefjord", + icon=None, + x=-220, + y=64, + z=2890, + ), + Point( + name="Vestisødet", + icon=None, + x=-800, + y=64, + z=0, + ), + ], +) diff --git a/src/marker_sets/overworld/area_names/__init__.py b/src/marker_sets/overworld/area_names/__init__.py deleted file mode 100644 index 5a06f2c..0000000 --- a/src/marker_sets/overworld/area_names/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .andoya import MARKERS as andoya_markers -from .england import MARKERS as england_markers -from .hemmelig_mesabiom import MARKERS as hemmelig_mesabiom_markers -from .summefjord import MARKERS as summefjord_markers -from .vestisodet import MARKERS as vestisodet_markers - -MARKER_SET = MarkerSet( - name="Area Names", - markers=[ - *andoya_markers, - *england_markers, - *hemmelig_mesabiom_markers, - *summefjord_markers, - *vestisodet_markers, - ], -) diff --git a/src/marker_sets/overworld/area_names/andoya.py b/src/marker_sets/overworld/area_names/andoya.py deleted file mode 100644 index 915b6a7..0000000 --- a/src/marker_sets/overworld/area_names/andoya.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Andøya", - icon=None, - x=2300, - y=64, - z=250, - ), -] diff --git a/src/marker_sets/overworld/area_names/england.py b/src/marker_sets/overworld/area_names/england.py deleted file mode 100644 index 976b6b9..0000000 --- a/src/marker_sets/overworld/area_names/england.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="England", - icon=None, - x=-1189, - y=64, - z=1556, - ), -] diff --git a/src/marker_sets/overworld/area_names/hemmelig_mesabiom.py b/src/marker_sets/overworld/area_names/hemmelig_mesabiom.py deleted file mode 100644 index dec48d3..0000000 --- a/src/marker_sets/overworld/area_names/hemmelig_mesabiom.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Hemmelig mesabiom", - icon=None, - x=-980, - y=64, - z=4090, - ), -] diff --git a/src/marker_sets/overworld/area_names/summefjord.py b/src/marker_sets/overworld/area_names/summefjord.py deleted file mode 100644 index 3df83e3..0000000 --- a/src/marker_sets/overworld/area_names/summefjord.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Summefjord", - icon=None, - x=-220, - y=64, - z=2890, - ), -] diff --git a/src/marker_sets/overworld/area_names/vestisodet.py b/src/marker_sets/overworld/area_names/vestisodet.py deleted file mode 100644 index a36511d..0000000 --- a/src/marker_sets/overworld/area_names/vestisodet.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Vestisødet", - icon=None, - x=-800, - y=64, - z=0, - ), -] diff --git a/src/marker_sets/overworld/buildings.py b/src/marker_sets/overworld/buildings.py new file mode 100644 index 0000000..4c141bb --- /dev/null +++ b/src/marker_sets/overworld/buildings.py @@ -0,0 +1,70 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Buildings", + markers=[ + Point( + name="Der Kölner Dom", + icon=None, + x=4630, + y=64, + z=270, + ), + Point( + name="Fyret", + icon=None, + x=3085, + y=64, + z=424, + ), + Point( + name="Hodeskallegrotten", + icon=None, + x=267, + y=89, + z=-496, + ), + Point( + name="Isjungelkatedralen", + icon=None, + x=-378, + y=64, + z=153, + ), + Point( + name="Jesus Christ Superstore", + icon=None, + x=280, + y=64, + z=-2800, + ), + Point( + name="Kystbasen", + icon=None, + x=-334, + y=116, + z=473, + ), + Point( + name="Tårnodden", + icon=None, + x=-22, + y=76, + z=67, + ), + Point( + name="Tegltårnet", + icon=None, + x=-99, + y=99, + z=1025, + ), + Point( + name="Vinterstranda hotel & resort", + icon=None, + x=3481, + y=75, + z=210, + ), + ], +) diff --git a/src/marker_sets/overworld/buildings/__init__.py b/src/marker_sets/overworld/buildings/__init__.py deleted file mode 100644 index 42a3614..0000000 --- a/src/marker_sets/overworld/buildings/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -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 -from .hodeskallegrotten import MARKERS as hodeskallegrotten_markers -from .isjungelkatedralen import MARKERS as isjungelkatedralen_markers -from .jesus_christ_superstore import MARKERS as jesus_christ_superstore_markers -from .kystbasen import MARKERS as kystbasen_markers -from .taarnodden import MARKERS as taarnodden_markers -from .tegltaarnet import MARKERS as tegltaarnet_markers -from .vinterstranda_hotel_og_resort import ( - MARKERS as vinterstranda_hotel_og_resort_markers, -) - -MARKER_SET = MarkerSet( - name="Buildings", - markers=[ - *der_kolner_dom_markers, - *fyret_markers, - *hodeskallegrotten_markers, - *isjungelkatedralen_markers, - *jesus_christ_superstore_markers, - *kystbasen_markers, - *taarnodden_markers, - *tegltaarnet_markers, - *vinterstranda_hotel_og_resort_markers, - ], -) diff --git a/src/marker_sets/overworld/buildings/der_kolner_dom.py b/src/marker_sets/overworld/buildings/der_kolner_dom.py deleted file mode 100644 index 97affcf..0000000 --- a/src/marker_sets/overworld/buildings/der_kolner_dom.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Der Kölner Dom", - icon=None, - x=4630, - y=64, - z=270, - ), -] diff --git a/src/marker_sets/overworld/buildings/fyret.py b/src/marker_sets/overworld/buildings/fyret.py deleted file mode 100644 index 4bd563b..0000000 --- a/src/marker_sets/overworld/buildings/fyret.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Fyret", - icon=None, - x=3085, - y=64, - z=424, - ), -] diff --git a/src/marker_sets/overworld/buildings/hodeskallegrotten.py b/src/marker_sets/overworld/buildings/hodeskallegrotten.py deleted file mode 100644 index 1575943..0000000 --- a/src/marker_sets/overworld/buildings/hodeskallegrotten.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Hodeskallegrotten", - icon=None, - x=267, - y=89, - z=-496, - ), -] diff --git a/src/marker_sets/overworld/buildings/isjungelkatedralen.py b/src/marker_sets/overworld/buildings/isjungelkatedralen.py deleted file mode 100644 index 2d7ffd4..0000000 --- a/src/marker_sets/overworld/buildings/isjungelkatedralen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Isjungelkatedralen", - icon=None, - x=-378, - y=64, - z=153, - ), -] diff --git a/src/marker_sets/overworld/buildings/jesus_christ_superstore.py b/src/marker_sets/overworld/buildings/jesus_christ_superstore.py deleted file mode 100644 index 4c99d8c..0000000 --- a/src/marker_sets/overworld/buildings/jesus_christ_superstore.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Jesus Christ Superstore", - icon=None, - x=280, - y=64, - z=-2800, - ), -] diff --git a/src/marker_sets/overworld/buildings/kystbasen.py b/src/marker_sets/overworld/buildings/kystbasen.py deleted file mode 100644 index e63f2fd..0000000 --- a/src/marker_sets/overworld/buildings/kystbasen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Kystbasen", - icon=None, - x=-334, - y=116, - z=473, - ), -] diff --git a/src/marker_sets/overworld/buildings/taarnodden.py b/src/marker_sets/overworld/buildings/taarnodden.py deleted file mode 100644 index 0e897ba..0000000 --- a/src/marker_sets/overworld/buildings/taarnodden.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Tårnodden", - icon=None, - x=-22, - y=76, - z=67, - ), -] diff --git a/src/marker_sets/overworld/buildings/tegltaarnet.py b/src/marker_sets/overworld/buildings/tegltaarnet.py deleted file mode 100644 index bae379c..0000000 --- a/src/marker_sets/overworld/buildings/tegltaarnet.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Tegltårnet", - icon=None, - x=-99, - y=99, - z=1025, - ), -] diff --git a/src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py b/src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py deleted file mode 100644 index a4dd1d4..0000000 --- a/src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Vinterstranda hotel & resort", - icon=None, - x=3481, - y=75, - z=210, - ), -] diff --git a/src/marker_sets/overworld/cities.py b/src/marker_sets/overworld/cities.py new file mode 100644 index 0000000..9e0f698 --- /dev/null +++ b/src/marker_sets/overworld/cities.py @@ -0,0 +1,42 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Cities", + markers=[ + Point( + name="Heimfjell", + icon=None, + x=177, + y=64, + z=177, + ), + Point( + name="Holmgard", + icon=None, + x=4468, + y=64, + z=1337, + ), + Point( + name="Tangen", + icon=None, + x=58, + y=63, + z=-2860, + ), + Point( + name="Tosjødalen", + icon=None, + x=960, + y=64, + z=460, + ), + Point( + name="Vikingelandsbyen", + icon=None, + x=360, + y=64, + z=-460, + ), + ], +) diff --git a/src/marker_sets/overworld/cities/__init__.py b/src/marker_sets/overworld/cities/__init__.py deleted file mode 100644 index 46c4824..0000000 --- a/src/marker_sets/overworld/cities/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .heimfjell import MARKERS as heimfjell_markers -from .holmgard import MARKERS as holmgard_markers -from .tangen import MARKERS as tangen_markers -from .tosjodalen import MARKERS as tosjodalen_markers -from .vikingelandsbyen import MARKERS as vikingelandsbyen_markers - -MARKER_SET = MarkerSet( - name="Cities", - markers=[ - *heimfjell_markers, - *holmgard_markers, - *tangen_markers, - *tosjodalen_markers, - *vikingelandsbyen_markers, - ], -) diff --git a/src/marker_sets/overworld/cities/heimfjell.py b/src/marker_sets/overworld/cities/heimfjell.py deleted file mode 100644 index 27f8e34..0000000 --- a/src/marker_sets/overworld/cities/heimfjell.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Heimfjell", - icon=None, - x=177, - y=64, - z=177, - ), -] diff --git a/src/marker_sets/overworld/cities/holmgard.py b/src/marker_sets/overworld/cities/holmgard.py deleted file mode 100644 index 9b831b4..0000000 --- a/src/marker_sets/overworld/cities/holmgard.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Holmgard", - icon=None, - x=4468, - y=64, - z=1337, - ), -] diff --git a/src/marker_sets/overworld/cities/tangen.py b/src/marker_sets/overworld/cities/tangen.py deleted file mode 100644 index 4a7ff59..0000000 --- a/src/marker_sets/overworld/cities/tangen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Tangen", - icon=None, - x=58, - y=63, - z=-2860, - ), -] diff --git a/src/marker_sets/overworld/cities/tosjodalen.py b/src/marker_sets/overworld/cities/tosjodalen.py deleted file mode 100644 index b55c397..0000000 --- a/src/marker_sets/overworld/cities/tosjodalen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Tosjødalen", - icon=None, - x=960, - y=64, - z=460, - ), -] diff --git a/src/marker_sets/overworld/cities/vikingelandsbyen.py b/src/marker_sets/overworld/cities/vikingelandsbyen.py deleted file mode 100644 index 244fd70..0000000 --- a/src/marker_sets/overworld/cities/vikingelandsbyen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Vikingelandsbyen", - icon=None, - x=360, - y=64, - z=-460, - ), -] diff --git a/src/marker_sets/overworld/homes.py b/src/marker_sets/overworld/homes.py new file mode 100644 index 0000000..0121b4f --- /dev/null +++ b/src/marker_sets/overworld/homes.py @@ -0,0 +1,84 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Homes", + markers=[ + Point( + name="Akasienborg", + icon=None, + x=-128, + y=64, + z=1460, + ), + Point( + name="Bikkjeby", + icon=None, + x=2950, + y=64, + z=270, + ), + Point( + name="Biosfæren", + icon=None, + x=834, + y=65, + z=-3089, + ), + Point( + name="Bjørkeholmen", + icon=None, + x=102, + y=77, + z=37, + ), + Point( + name="Bjørnebukten", + icon=None, + x=473, + y=78, + z=-3043, + ), + Point( + name="Huløyeid", + icon=None, + x=-54, + y=64, + z=234, + ), + Point( + name="Singapore", + icon=None, + x=-600, + y=64, + z=1130, + ), + Point( + name="Summevatn", + icon=None, + x=-110, + y=64, + z=3465, + ), + Point( + name="SuperTheodors fiskehus", + icon=None, + x=1570, + y=64, + z=3285, + ), + Point( + name="Svartskoghavn", + icon=None, + x=-370, + y=64, + z=2390, + ), + Point( + name="Vestlandet", + icon=None, + x=-2204, + y=64, + z=447, + ), + ], +) diff --git a/src/marker_sets/overworld/homes/__init__.py b/src/marker_sets/overworld/homes/__init__.py deleted file mode 100644 index a0234a1..0000000 --- a/src/marker_sets/overworld/homes/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .biosfaeren import MARKERS as biosfaeren_markers -from .akasienborg import MARKERS as akasienborg_markers -from .bikkjeby import MARKERS as bikkjeby_markers -from .bjorkeholmen import MARKERS as bjorkeholmen_markers -from .bjornebukten import MARKERS as bjornebukten_markers -from .huloyeid import MARKERS as huloyeid_markers -from .singapore import MARKERS as singapore_markers -from .summevatn import MARKERS as summevatn_markers -from .supertheodors_fiskehus import MARKERS as supertheodors_fiskehus_markers -from .svartskoghavn import MARKERS as svartskoghavn_markers -from .vestlandet import MARKERS as vestlandet_markers - -MARKER_SET = MarkerSet( - name="Homes", - markers=[ - *akasienborg_markers, - *bikkjeby_markers, - *biosfaeren_markers, - *bjorkeholmen_markers, - *bjornebukten_markers, - *huloyeid_markers, - *singapore_markers, - *summevatn_markers, - *supertheodors_fiskehus_markers, - *svartskoghavn_markers, - *vestlandet_markers, - ], -) diff --git a/src/marker_sets/overworld/homes/akasienborg.py b/src/marker_sets/overworld/homes/akasienborg.py deleted file mode 100644 index 800611f..0000000 --- a/src/marker_sets/overworld/homes/akasienborg.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Akasienborg", - icon=None, - x=-128, - y=64, - z=1460, - ), -] diff --git a/src/marker_sets/overworld/homes/bikkjeby.py b/src/marker_sets/overworld/homes/bikkjeby.py deleted file mode 100644 index 1f0e56c..0000000 --- a/src/marker_sets/overworld/homes/bikkjeby.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Bikkjeby", - icon=None, - x=2950, - y=64, - z=270, - ), -] diff --git a/src/marker_sets/overworld/homes/biosfaeren.py b/src/marker_sets/overworld/homes/biosfaeren.py deleted file mode 100644 index 40a7299..0000000 --- a/src/marker_sets/overworld/homes/biosfaeren.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Biosfæren", - icon=None, - x=834, - y=65, - z=-3089, - ), -] diff --git a/src/marker_sets/overworld/homes/bjorkeholmen.py b/src/marker_sets/overworld/homes/bjorkeholmen.py deleted file mode 100644 index ee0b970..0000000 --- a/src/marker_sets/overworld/homes/bjorkeholmen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Bjørkeholmen", - icon=None, - x=102, - y=77, - z=37, - ), -] diff --git a/src/marker_sets/overworld/homes/bjornebukten.py b/src/marker_sets/overworld/homes/bjornebukten.py deleted file mode 100644 index eeb0d92..0000000 --- a/src/marker_sets/overworld/homes/bjornebukten.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Bjørnebukten", - icon=None, - x=473, - y=78, - z=-3043, - ), -] diff --git a/src/marker_sets/overworld/homes/huloyeid.py b/src/marker_sets/overworld/homes/huloyeid.py deleted file mode 100644 index c92a6b5..0000000 --- a/src/marker_sets/overworld/homes/huloyeid.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Huløyeid", - icon=None, - x=-54, - y=64, - z=234, - ), -] diff --git a/src/marker_sets/overworld/homes/singapore.py b/src/marker_sets/overworld/homes/singapore.py deleted file mode 100644 index 7f784c0..0000000 --- a/src/marker_sets/overworld/homes/singapore.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Singapore", - icon=None, - x=-600, - y=64, - z=1130, - ), -] diff --git a/src/marker_sets/overworld/homes/summevatn.py b/src/marker_sets/overworld/homes/summevatn.py deleted file mode 100644 index 381f0db..0000000 --- a/src/marker_sets/overworld/homes/summevatn.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Summevatn", - icon=None, - x=-110, - y=64, - z=3465, - ), -] diff --git a/src/marker_sets/overworld/homes/supertheodors_fiskehus.py b/src/marker_sets/overworld/homes/supertheodors_fiskehus.py deleted file mode 100644 index ccc6434..0000000 --- a/src/marker_sets/overworld/homes/supertheodors_fiskehus.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="SuperTheodors fiskehus", - icon=None, - x=1570, - y=64, - z=3285, - ), -] diff --git a/src/marker_sets/overworld/homes/svartskoghavn.py b/src/marker_sets/overworld/homes/svartskoghavn.py deleted file mode 100644 index d198dec..0000000 --- a/src/marker_sets/overworld/homes/svartskoghavn.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Svartskoghavn", - icon=None, - x=-370, - y=64, - z=2390, - ), -] diff --git a/src/marker_sets/overworld/homes/vestlandet.py b/src/marker_sets/overworld/homes/vestlandet.py deleted file mode 100644 index 25d9520..0000000 --- a/src/marker_sets/overworld/homes/vestlandet.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Vestlandet", - icon=None, - x=-2204, - y=64, - z=447, - ), -] diff --git a/src/marker_sets/overworld/huts.py b/src/marker_sets/overworld/huts.py new file mode 100644 index 0000000..f051f20 --- /dev/null +++ b/src/marker_sets/overworld/huts.py @@ -0,0 +1,28 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Huts", + markers=[ + Point( + name="Dypskiferhytta", + icon=None, + x=-1563, + y=64, + z=-1966, + ), + Point( + name="Grensebuelvbu", + icon=None, + x=550, + y=64, + z=-1480, + ), + Point( + name="Nyverdenhytta", + icon=None, + x=848, + y=70, + z=1583, + ), + ], +) diff --git a/src/marker_sets/overworld/huts/__init__.py b/src/marker_sets/overworld/huts/__init__.py deleted file mode 100644 index a7030ff..0000000 --- a/src/marker_sets/overworld/huts/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .dypskiferhytta import MARKERS as dypskiferhytta_markers -from .grensebuelvbu import MARKERS as grensebuelvbu_markers -from .nyverdenhytta import MARKERS as nyverdenhytta_markers - -MARKER_SET = MarkerSet( - name="Huts", - markers=[ - *dypskiferhytta_markers, - *grensebuelvbu_markers, - *nyverdenhytta_markers, - ], -) diff --git a/src/marker_sets/overworld/huts/dypskiferhytta.py b/src/marker_sets/overworld/huts/dypskiferhytta.py deleted file mode 100644 index d9c31c5..0000000 --- a/src/marker_sets/overworld/huts/dypskiferhytta.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Dypskiferhytta", - icon=None, - x=-1563, - y=64, - z=-1966, - ), -] diff --git a/src/marker_sets/overworld/huts/grensebuelvbu.py b/src/marker_sets/overworld/huts/grensebuelvbu.py deleted file mode 100644 index bc1a2f3..0000000 --- a/src/marker_sets/overworld/huts/grensebuelvbu.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Grensebuelvbu", - icon=None, - x=550, - y=64, - z=-1480, - ), -] diff --git a/src/marker_sets/overworld/huts/nyverdenhytta.py b/src/marker_sets/overworld/huts/nyverdenhytta.py deleted file mode 100644 index 46bd005..0000000 --- a/src/marker_sets/overworld/huts/nyverdenhytta.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Nyverdenhytta", - icon=None, - x=848, - y=70, - z=1583, - ), -] diff --git a/src/marker_sets/overworld/infrastructure.py b/src/marker_sets/overworld/infrastructure.py new file mode 100644 index 0000000..dae0b59 --- /dev/null +++ b/src/marker_sets/overworld/infrastructure.py @@ -0,0 +1,21 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Infrastructure", + markers=[ + Point( + name="Grantrebukta", + icon=None, + x=2350, + y=64, + z=-136, + ), + Point( + name="Smalelvbro", + icon=None, + x=77, + y=69, + z=-348, + ), + ], +) diff --git a/src/marker_sets/overworld/infrastructure/__init__.py b/src/marker_sets/overworld/infrastructure/__init__.py deleted file mode 100644 index 3fbe05e..0000000 --- a/src/marker_sets/overworld/infrastructure/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .grantrebukta import MARKERS as grantrebukta_markers -from .smalelvbro import MARKERS as smalelvbro_markers - -MARKER_SET = MarkerSet( - name="Infrastructure", - markers=[ - *grantrebukta_markers, - *smalelvbro_markers, - ], -) diff --git a/src/marker_sets/overworld/infrastructure/grantrebukta.py b/src/marker_sets/overworld/infrastructure/grantrebukta.py deleted file mode 100644 index 7a45b96..0000000 --- a/src/marker_sets/overworld/infrastructure/grantrebukta.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Grantrebukta", - icon=None, - x=2350, - y=64, - z=-136, - ), -] diff --git a/src/marker_sets/overworld/infrastructure/smalelvbro.py b/src/marker_sets/overworld/infrastructure/smalelvbro.py deleted file mode 100644 index c7cd317..0000000 --- a/src/marker_sets/overworld/infrastructure/smalelvbro.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Smalelvbro", - icon=None, - x=77, - y=69, - z=-348, - ), -] diff --git a/src/marker_sets/overworld/mines.py b/src/marker_sets/overworld/mines.py new file mode 100644 index 0000000..902aeef --- /dev/null +++ b/src/marker_sets/overworld/mines.py @@ -0,0 +1,21 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Mines", + markers=[ + Point( + name="Sandsteingruva", + icon=None, + x=56, + y=67, + z=-266, + ), + Point( + name="Slimegruva", + icon=None, + x=-206, + y=64, + z=-35, + ), + ], +) diff --git a/src/marker_sets/overworld/mines/__init__.py b/src/marker_sets/overworld/mines/__init__.py deleted file mode 100644 index 8e40630..0000000 --- a/src/marker_sets/overworld/mines/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .sandsteingruva import MARKERS as sandsteingruva_markers -from .slimegruva import MARKERS as slimegruva_markers - -MARKER_SET = MarkerSet( - name="Mines", - markers=[ - *sandsteingruva_markers, - *slimegruva_markers, - ], -) diff --git a/src/marker_sets/overworld/mines/sandsteingruva.py b/src/marker_sets/overworld/mines/sandsteingruva.py deleted file mode 100644 index 3714841..0000000 --- a/src/marker_sets/overworld/mines/sandsteingruva.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Sandsteingruva", - icon=None, - x=56, - y=67, - z=-266, - ), -] diff --git a/src/marker_sets/overworld/mines/slimegruva.py b/src/marker_sets/overworld/mines/slimegruva.py deleted file mode 100644 index 45e780b..0000000 --- a/src/marker_sets/overworld/mines/slimegruva.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Slimegruva", - icon=None, - x=-206, - y=64, - z=-35, - ), -] diff --git a/src/marker_sets/overworld/nature.py b/src/marker_sets/overworld/nature.py new file mode 100644 index 0000000..8faf7f5 --- /dev/null +++ b/src/marker_sets/overworld/nature.py @@ -0,0 +1,140 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Nature", + markers=[ + Point( + name="Blindodden", + icon=None, + x=874, + y=65, + z=160, + ), + Point( + name="Hulevatna", + icon=None, + x=240, + y=64, + z=3070, + ), + Point( + name="Kirkemyr", + icon=None, + x=6880, + y=64, + z=-465, + ), + Point( + name="Lamafjellet", + icon=None, + x=1810, + y=64, + z=-1630, + ), + Point( + name="Langstrand", + icon=None, + x=-305, + y=64, + z=535, + ), + Point( + name="Lille isbjørnelv", + icon=None, + x=730, + y=64, + z=-1900, + ), + Point( + name="Naturreservat", + icon=None, + x=4, + y=64, + z=800, + ), + Point( + name="Piratbukta", + icon=None, + x=150, + y=64, + z=80, + ), + Point( + name="Snøklippan", + icon=None, + x=-1654, + y=64, + z=-654, + ), + Point( + name="Store isbjørnelv", + icon=None, + x=850, + y=64, + z=-2130, + ), + Point( + name="Storhavet i øst", + icon=None, + x=3000, + y=64, + z=1000, + ), + Point( + name="Storhavskanalen", + icon=None, + x=1005, + y=64, + z=1335, + ), + Point( + name="Storsnøfjella", + icon=None, + x=5470, + y=64, + z=-270, + ), + Point( + name="Storvatnet", + icon=None, + x=675, + y=64, + z=362, + ), + Point( + name="SuperTheodors strand", + icon=None, + x=2111, + y=64, + z=3777, + ), + Point( + name="Trangdalen", + icon=None, + x=-47, + y=64, + z=146, + ), + Point( + name="Turrikkelmyra", + icon=None, + x=-160, + y=64, + z=1480, + ), + Point( + name="Ulveelva", + icon=None, + x=910, + y=64, + z=3050, + ), + Point( + name="Vestsumpland", + icon=None, + x=-1818, + y=64, + z=98, + ), + ], +) diff --git a/src/marker_sets/overworld/nature/__init__.py b/src/marker_sets/overworld/nature/__init__.py deleted file mode 100644 index 85ea7cb..0000000 --- a/src/marker_sets/overworld/nature/__init__.py +++ /dev/null @@ -1,47 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .blindodden import MARKERS as blindodden_markers -from .hulevatna import MARKERS as hulevatna_markers -from .kirkemyr import MARKERS as kirkemyr_markers -from .lamafjellet import MARKERS as lamafjellet_markers -from .langstrand import MARKERS as langstrand_markers -from .lille_isbjornelv import MARKERS as lille_isbjornelv_markers -from .naturreservat import MARKERS as naturreservat_markers -from .piratbukta import MARKERS as piratbukta_markers -from .snoklippan import MARKERS as snoklippan_markers -from .store_isbjornelv import MARKERS as store_isbjornelv_markers -from .storhavet_i_ost import MARKERS as storhavet_i_ost_markers -from .storhavs_kanalen import MARKERS as storhavs_kanalen_markers -from .storsnofjella import MARKERS as storsnofjella_markers -from .storvatnet import MARKERS as storvatnet_markers -from .supertheodors_strand import MARKERS as supertheodors_strand_markers -from .trangdalen import MARKERS as trangdalen_markers -from .turrikkelmyra import MARKERS as turrikkelmyra_markers -from .ulveelva import MARKERS as ulveelva_markers -from .vestsumpland import MARKERS as vestsumpland_markers - - -MARKER_SET = MarkerSet( - name="Nature", - markers=[ - *blindodden_markers, - *hulevatna_markers, - *kirkemyr_markers, - *lamafjellet_markers, - *langstrand_markers, - *lille_isbjornelv_markers, - *naturreservat_markers, - *piratbukta_markers, - *snoklippan_markers, - *store_isbjornelv_markers, - *storhavet_i_ost_markers, - *storhavs_kanalen_markers, - *storsnofjella_markers, - *storvatnet_markers, - *supertheodors_strand_markers, - *trangdalen_markers, - *turrikkelmyra_markers, - *ulveelva_markers, - *vestsumpland_markers, - ], -) diff --git a/src/marker_sets/overworld/nature/blindodden.py b/src/marker_sets/overworld/nature/blindodden.py deleted file mode 100644 index fb1bd9a..0000000 --- a/src/marker_sets/overworld/nature/blindodden.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Blindodden", - icon=None, - x=874, - y=65, - z=160, - ), -] diff --git a/src/marker_sets/overworld/nature/hulevatna.py b/src/marker_sets/overworld/nature/hulevatna.py deleted file mode 100644 index 2619f8c..0000000 --- a/src/marker_sets/overworld/nature/hulevatna.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Hulevatna", - icon=None, - x=240, - y=64, - z=3070, - ), -] diff --git a/src/marker_sets/overworld/nature/kirkemyr.py b/src/marker_sets/overworld/nature/kirkemyr.py deleted file mode 100644 index 88c2d5e..0000000 --- a/src/marker_sets/overworld/nature/kirkemyr.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Kirkemyr", - icon=None, - x=6880, - y=64, - z=-465, - ), -] diff --git a/src/marker_sets/overworld/nature/lamafjellet.py b/src/marker_sets/overworld/nature/lamafjellet.py deleted file mode 100644 index 1ab6755..0000000 --- a/src/marker_sets/overworld/nature/lamafjellet.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Lamafjellet", - icon=None, - x=1810, - y=64, - z=-1630, - ), -] diff --git a/src/marker_sets/overworld/nature/langstrand.py b/src/marker_sets/overworld/nature/langstrand.py deleted file mode 100644 index b501261..0000000 --- a/src/marker_sets/overworld/nature/langstrand.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Langstrand", - icon=None, - x=-305, - y=64, - z=535, - ), -] diff --git a/src/marker_sets/overworld/nature/lille_isbjornelv.py b/src/marker_sets/overworld/nature/lille_isbjornelv.py deleted file mode 100644 index 545f881..0000000 --- a/src/marker_sets/overworld/nature/lille_isbjornelv.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Lille isbjørnelv", - icon=None, - x=730, - y=64, - z=-1900, - ), -] diff --git a/src/marker_sets/overworld/nature/naturreservat.py b/src/marker_sets/overworld/nature/naturreservat.py deleted file mode 100644 index 164157d..0000000 --- a/src/marker_sets/overworld/nature/naturreservat.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Naturreservat", - icon=None, - x=4, - y=64, - z=800, - ), -] diff --git a/src/marker_sets/overworld/nature/piratbukta.py b/src/marker_sets/overworld/nature/piratbukta.py deleted file mode 100644 index b3a9d7f..0000000 --- a/src/marker_sets/overworld/nature/piratbukta.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Piratbukta", - icon=None, - x=150, - y=64, - z=80, - ), -] diff --git a/src/marker_sets/overworld/nature/snoklippan.py b/src/marker_sets/overworld/nature/snoklippan.py deleted file mode 100644 index c63b469..0000000 --- a/src/marker_sets/overworld/nature/snoklippan.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Snøklippan", - icon=None, - x=-1654, - y=64, - z=-654, - ), -] diff --git a/src/marker_sets/overworld/nature/store_isbjornelv.py b/src/marker_sets/overworld/nature/store_isbjornelv.py deleted file mode 100644 index 60a59fe..0000000 --- a/src/marker_sets/overworld/nature/store_isbjornelv.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Store isbjørnelv", - icon=None, - x=850, - y=64, - z=-2130, - ), -] diff --git a/src/marker_sets/overworld/nature/storhavet_i_ost.py b/src/marker_sets/overworld/nature/storhavet_i_ost.py deleted file mode 100644 index 1657368..0000000 --- a/src/marker_sets/overworld/nature/storhavet_i_ost.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Storhavet i øst", - icon=None, - x=3000, - y=64, - z=1000, - ), -] diff --git a/src/marker_sets/overworld/nature/storhavs_kanalen.py b/src/marker_sets/overworld/nature/storhavs_kanalen.py deleted file mode 100644 index 0297786..0000000 --- a/src/marker_sets/overworld/nature/storhavs_kanalen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Storhavskanalen", - icon=None, - x=1005, - y=64, - z=1335, - ), -] diff --git a/src/marker_sets/overworld/nature/storsnofjella.py b/src/marker_sets/overworld/nature/storsnofjella.py deleted file mode 100644 index 9c3c561..0000000 --- a/src/marker_sets/overworld/nature/storsnofjella.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Storsnøfjella", - icon=None, - x=5470, - y=64, - z=-270, - ), -] diff --git a/src/marker_sets/overworld/nature/storvatnet.py b/src/marker_sets/overworld/nature/storvatnet.py deleted file mode 100644 index c64715e..0000000 --- a/src/marker_sets/overworld/nature/storvatnet.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Storvatnet", - icon=None, - x=675, - y=64, - z=362, - ), -] diff --git a/src/marker_sets/overworld/nature/supertheodors_strand.py b/src/marker_sets/overworld/nature/supertheodors_strand.py deleted file mode 100644 index 7610115..0000000 --- a/src/marker_sets/overworld/nature/supertheodors_strand.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="SuperTheodors strand", - icon=None, - x=2111, - y=64, - z=3777, - ), -] diff --git a/src/marker_sets/overworld/nature/trangdalen.py b/src/marker_sets/overworld/nature/trangdalen.py deleted file mode 100644 index 46da77c..0000000 --- a/src/marker_sets/overworld/nature/trangdalen.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Trangdalen", - icon=None, - x=-47, - y=64, - z=146, - ), -] diff --git a/src/marker_sets/overworld/nature/turrikkelmyra.py b/src/marker_sets/overworld/nature/turrikkelmyra.py deleted file mode 100644 index b07beae..0000000 --- a/src/marker_sets/overworld/nature/turrikkelmyra.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Turrikkelmyra", - icon=None, - x=-160, - y=64, - z=1480, - ), -] diff --git a/src/marker_sets/overworld/nature/ulveelva.py b/src/marker_sets/overworld/nature/ulveelva.py deleted file mode 100644 index 6e6e887..0000000 --- a/src/marker_sets/overworld/nature/ulveelva.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Ulveelva", - icon=None, - x=910, - y=64, - z=3050, - ), -] diff --git a/src/marker_sets/overworld/nature/vestsumpland.py b/src/marker_sets/overworld/nature/vestsumpland.py deleted file mode 100644 index fba8d01..0000000 --- a/src/marker_sets/overworld/nature/vestsumpland.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Vestsumpland", - icon=None, - x=-1818, - y=64, - z=98, - ), -] diff --git a/src/marker_sets/overworld/other.py b/src/marker_sets/overworld/other.py new file mode 100644 index 0000000..0b1f64b --- /dev/null +++ b/src/marker_sets/overworld/other.py @@ -0,0 +1,21 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Other", + markers=[ + Point( + name="Leirhavn", + icon=None, + x=512, + y=64, + z=-3320, + ), + Point( + name="Nullpunkt", + icon=None, + x=0, + y=64, + z=0, + ), + ], +) diff --git a/src/marker_sets/overworld/other/__init__.py b/src/marker_sets/overworld/other/__init__.py deleted file mode 100644 index 3cf8867..0000000 --- a/src/marker_sets/overworld/other/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .leirhavn import MARKERS as leirhavn_markers -from .nullpunkt import MARKERS as nullpunkt_markers - -MARKER_SET = MarkerSet( - name="Other", - markers=[ - *leirhavn_markers, - *nullpunkt_markers, - ], -) diff --git a/src/marker_sets/overworld/other/leirhavn.py b/src/marker_sets/overworld/other/leirhavn.py deleted file mode 100644 index 3cc4c84..0000000 --- a/src/marker_sets/overworld/other/leirhavn.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Leirhavn", - icon=None, - x=512, - y=64, - z=-3320, - ), -] diff --git a/src/marker_sets/overworld/other/nullpunkt.py b/src/marker_sets/overworld/other/nullpunkt.py deleted file mode 100644 index 6fcb6c6..0000000 --- a/src/marker_sets/overworld/other/nullpunkt.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Nullpunkt", - icon=None, - x=0, - y=64, - z=0, - ), -] diff --git a/src/marker_sets/overworld/railways/__init__.py b/src/marker_sets/overworld/railways.py similarity index 59% rename from src/marker_sets/overworld/railways/__init__.py rename to src/marker_sets/overworld/railways.py index a93292a..5cbe19e 100644 --- a/src/marker_sets/overworld/railways/__init__.py +++ b/src/marker_sets/overworld/railways.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( diff --git a/src/marker_sets/overworld/roads/__init__.py b/src/marker_sets/overworld/roads.py similarity index 58% rename from src/marker_sets/overworld/roads/__init__.py rename to src/marker_sets/overworld/roads.py index 322d231..3db4f78 100644 --- a/src/marker_sets/overworld/roads/__init__.py +++ b/src/marker_sets/overworld/roads.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( diff --git a/src/marker_sets/overworld/villages.py b/src/marker_sets/overworld/villages.py new file mode 100644 index 0000000..6a91b9f --- /dev/null +++ b/src/marker_sets/overworld/villages.py @@ -0,0 +1,70 @@ +from lib_marker import MarkerSet, Point + +MARKER_SET = MarkerSet( + name="Villages", + markers=[ + Point( + name="Bondeby", + icon=None, + x=6200, + y=64, + z=-300, + ), + Point( + name="Gammelleirnes", + icon=None, + x=800, + y=64, + z=-3300, + ), + Point( + name="Hestelandsby", + icon=None, + x=2734, + y=64, + z=-984, + ), + Point( + name="Isbjørnby", + icon=None, + x=723, + y=64, + z=-2380, + ), + Point( + name="Ittoqqortoormiit", + icon=None, + x=100, + y=64, + z=-3830, + ), + Point( + name="Kløfteby", + icon=None, + x=695, + y=64, + z=2812, + ), + Point( + name="NPC-landsby nord", + icon=None, + x=337, + y=64, + z=-853, + ), + Point( + name="NPC-landsby", + icon=None, + x=1278, + y=64, + z=-397, + ), + Point( + name="Smedby", + icon=None, + x=-1760, + y=64, + z=-2440, + ), + ], +) diff --git a/src/marker_sets/overworld/villages/__init__.py b/src/marker_sets/overworld/villages/__init__.py deleted file mode 100644 index ffb9334..0000000 --- a/src/marker_sets/overworld/villages/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -from lib_marker.marker_set import MarkerSet - -from .bondeby import MARKERS as bondeby_markers -from .gammelleirnes import MARKERS as gammelleirnes_markers -from .hestelandsby import MARKERS as hestelandsby_markers -from .isbjornby import MARKERS as isbjornby_markers -from .ittoqqortoormiit import MARKERS as ittoqqortoormiit_markers -from .klofteby import MARKERS as kloftebye_markers -from .npc_landsby import MARKERS as npc_landsby_markers -from .npc_landsby_nord import MARKERS as npc_landsby_nord_markers -from .smedby import MARKERS as smedby_markers - - -MARKER_SET = MarkerSet( - name="Villages", - markers=[ - *bondeby_markers, - *gammelleirnes_markers, - *hestelandsby_markers, - *isbjornby_markers, - *ittoqqortoormiit_markers, - *kloftebye_markers, - *npc_landsby_markers, - *npc_landsby_nord_markers, - *smedby_markers, - ], -) diff --git a/src/marker_sets/overworld/villages/bondeby.py b/src/marker_sets/overworld/villages/bondeby.py deleted file mode 100644 index 65348d7..0000000 --- a/src/marker_sets/overworld/villages/bondeby.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Bondeby", - icon=None, - x=6200, - y=64, - z=-300, - ), -] diff --git a/src/marker_sets/overworld/villages/gammelleirnes.py b/src/marker_sets/overworld/villages/gammelleirnes.py deleted file mode 100644 index 72681b1..0000000 --- a/src/marker_sets/overworld/villages/gammelleirnes.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Gammelleirnes", - icon=None, - x=800, - y=64, - z=-3300, - ), -] diff --git a/src/marker_sets/overworld/villages/hestelandsby.py b/src/marker_sets/overworld/villages/hestelandsby.py deleted file mode 100644 index e289d77..0000000 --- a/src/marker_sets/overworld/villages/hestelandsby.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Hestelandsby", - icon=None, - x=2734, - y=64, - z=-984, - ), -] diff --git a/src/marker_sets/overworld/villages/isbjornby.py b/src/marker_sets/overworld/villages/isbjornby.py deleted file mode 100644 index 1d363a4..0000000 --- a/src/marker_sets/overworld/villages/isbjornby.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Isbjørnby", - icon=None, - x=723, - y=64, - z=-2380, - ), -] diff --git a/src/marker_sets/overworld/villages/ittoqqortoormiit.py b/src/marker_sets/overworld/villages/ittoqqortoormiit.py deleted file mode 100644 index 27f1891..0000000 --- a/src/marker_sets/overworld/villages/ittoqqortoormiit.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Ittoqqortoormiit", - icon=None, - x=100, - y=64, - z=-3830, - ), -] diff --git a/src/marker_sets/overworld/villages/klofteby.py b/src/marker_sets/overworld/villages/klofteby.py deleted file mode 100644 index 531616b..0000000 --- a/src/marker_sets/overworld/villages/klofteby.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Kløfteby", - icon=None, - x=695, - y=64, - z=2812, - ), -] diff --git a/src/marker_sets/overworld/villages/npc_landsby.py b/src/marker_sets/overworld/villages/npc_landsby.py deleted file mode 100644 index a041c75..0000000 --- a/src/marker_sets/overworld/villages/npc_landsby.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="NPC-landsby", - icon=None, - x=1278, - y=64, - z=-397, - ), -] diff --git a/src/marker_sets/overworld/villages/npc_landsby_nord.py b/src/marker_sets/overworld/villages/npc_landsby_nord.py deleted file mode 100644 index c04507d..0000000 --- a/src/marker_sets/overworld/villages/npc_landsby_nord.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="NPC-landsby nord", - icon=None, - x=337, - y=64, - z=-853, - ), -] diff --git a/src/marker_sets/overworld/villages/smedby.py b/src/marker_sets/overworld/villages/smedby.py deleted file mode 100644 index 472afdb..0000000 --- a/src/marker_sets/overworld/villages/smedby.py +++ /dev/null @@ -1,11 +0,0 @@ -from lib_marker import Point - -MARKERS = [ - Point( - name="Smedby", - icon=None, - x=-1760, - y=64, - z=-2440, - ), -] diff --git a/src/marker_sets/nether/other/__init__.py b/src/marker_sets/the_end/other.py similarity index 58% rename from src/marker_sets/nether/other/__init__.py rename to src/marker_sets/the_end/other.py index a1e1630..6d160b7 100644 --- a/src/marker_sets/nether/other/__init__.py +++ b/src/marker_sets/the_end/other.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( diff --git a/src/marker_sets/the_end/portals/__init__.py b/src/marker_sets/the_end/portals.py similarity index 59% rename from src/marker_sets/the_end/portals/__init__.py rename to src/marker_sets/the_end/portals.py index 3e036bc..07f8e47 100644 --- a/src/marker_sets/the_end/portals/__init__.py +++ b/src/marker_sets/the_end/portals.py @@ -1,4 +1,4 @@ -from lib_marker.marker_set import MarkerSet +from lib_marker import MarkerSet MARKER_SET = MarkerSet( -- 2.51.2 From 6a6a3b6c686e7a656295ce4677d122332599e19a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 11 Nov 2025 22:28:55 +0900 Subject: [PATCH 13/13] rewrite-in-python: more nix validation, fix eval warning --- flake.nix | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 6f51f75..ca8ee8b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,13 +16,12 @@ inherit (nixpkgs) lib; in { - apps = forAllSystems (system: pkgs: let - mkApp = package: { + apps = forAllSystems (system: pkgs: { + default = { type = "app"; - program = lib.getExe package; + program = lib.getExe self.packages.${system}.default; + meta.description = "The 'mckart' cli tool with all map data embedded"; }; - in { - default = mkApp self.packages.${system}.default; }); devShells = forAllSystems (_: pkgs: { @@ -40,6 +39,8 @@ overlays.default = final: prev: self.packages.${final.system}; checks = forAllSystems (system: pkgs: { + inherit (self.packages.${system}) bluemap-export mapcrafter-export; + hocon-include = let format = pkgs.formats.hocon { }; in format.generate "minecraft-kartverket-test-hocon-include" { @@ -69,10 +70,33 @@ meta.mainProgram = "mckart"; }; - bluemap-export = pkgs.runCommand "bluemap-export" { - buildInputs = [ (self.packages.${system}.mckart) ]; + bluemap-export = let + # from pkgs/pkgs-lib/formats/hocon/default.nix + hocon-validator = + pkgs.writers.writePython3Bin "hocon-validator" + { + libraries = [ pkgs.python3Packages.pyhocon ]; + } + '' + from sys import argv + from pyhocon import ConfigFactory + + if not len(argv) == 2: + print("USAGE: hocon-validator ") + + ConfigFactory.parse_file(argv[1]) + ''; + in pkgs.runCommand "bluemap-export" { + nativeBuildInputs = [ + (self.packages.${system}.mckart) + hocon-validator + ]; } '' mckart export-bluemap --output-dir "$out" + + for file in "$out"/*.hocon; do + hocon-validator "$file" + done ''; mapcrafter-export = pkgs.runCommand "mapcrafter-export" { -- 2.51.2