initial commit

.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

.gitignore

@@ -0,0 +1,40 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
+# eclipse
+
+*.launch
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# macos
+
+*.DS_Store
+
+# fabric
+
+run/
+
+# java
+
+hs_err_*.log
+replay_*.log
+*.hprof
+*.jfr

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Julian Köglmeier/MrLetsplay2003
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

build.gradle

@@ -0,0 +1,89 @@
+plugins {
+	id 'fabric-loom' version '1.9-SNAPSHOT'
+	id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+base {
+	archivesName = project.archives_base_name
+}
+
+repositories {
+	// Add repositories to retrieve artifacts from in here.
+	// You should only use this when depending on other mods because
+	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+	// for more information about repositories.
+	maven {
+		name = "Graphite-Official"
+		url = 'https://maven.graphite-official.com/releases/'
+	}
+	
+	maven {
+		url = 'https://repo.bluecolored.de/releases'
+	}
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	
+	modImplementation "me.mrletsplay:MrCore-Fabric:1.2.0"
+
+	implementation "me.mrletsplay:MrCore:4.3"
+
+	compileOnly 'de.bluecolored:bluemap-api:2.7.3'
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

gradle.properties

@@ -0,0 +1,17 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
+loader_version=0.16.9
+
+# Mod Properties
+mod_version=1.0.0
+maven_group=me.mrletsplay.bmareas
+archives_base_name=bmareas
+
+# Dependencies
+fabric_version=0.112.0+1.21.3

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -0,0 +1,10 @@
+pluginManagement {
+	repositories {
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
+}

src/main/java/me/mrletsplay/bmareas/BMAreas.java

@@ -0,0 +1,177 @@
+package me.mrletsplay.bmareas;
+
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.imageio.ImageIO;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import de.bluecolored.bluemap.api.BlueMapAPI;
+import de.bluecolored.bluemap.api.gson.MarkerGson;
+import de.bluecolored.bluemap.api.markers.MarkerSet;
+import me.mrletsplay.bmareas.command.Icon;
+import me.mrletsplay.bmareas.command.Point;
+import me.mrletsplay.bmareas.command.area.AreaCommand;
+import me.mrletsplay.bmareas.command.bmareas.BMAreasCommand;
+import me.mrletsplay.bmareas.command.marker.MarkerCommand;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.world.World;
+
+public class BMAreas implements ModInitializer {
+	public static final String MOD_ID = "bmareas";
+
+	public static final Logger LOGGER = LoggerFactory.getLogger("dynmapareas");
+
+	private static final List<RegistryKey<World>> DIMENSIONS = List.of(
+		World.OVERWORLD,
+		World.NETHER,
+		World.END
+	);
+
+	public static final Path
+		DATA_PATH = Path.of("bmareas/data"),
+		BLUEMAP_WEB_PATH = Path.of("bluemap/web"),
+		ICONS_PATH = BLUEMAP_WEB_PATH.resolve("assets/icons");
+
+	public static Map<UUID, List<Point>> points = new HashMap<>();
+	public static BlueMapAPI markerAPI;
+//	public static MarkerSet areaMarkerSet, markerMarkerSet;
+	private static Map<RegistryKey<World>, MarkerSet>
+		areaMarkerSets,
+		markerMarkerSets;
+
+	public static List<Icon> icons;
+
+	@Override
+	public void onInitialize() {
+		LOGGER.info("HELLO");
+
+		areaMarkerSets = new HashMap<>();
+		markerMarkerSets = new HashMap<>();
+
+		loadIcons();
+
+		BlueMapAPI.onEnable(api -> {
+			markerAPI = api;
+			loadMarkers();
+		});
+
+		CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
+			dispatcher.register(new BMAreasCommand().create());
+			dispatcher.register(new AreaCommand().create());
+			dispatcher.register(new MarkerCommand().create());
+		});
+	}
+
+	public static MarkerSet getAreaMarkerSet(World world) {
+		return areaMarkerSets.get(world.getRegistryKey());
+	}
+
+	public static MarkerSet getMarkerMarkerSet(World world) {
+		return markerMarkerSets.get(world.getRegistryKey());
+	}
+
+	public static void loadIcons() {
+		try {
+			List<Path> iconFiles = Files.walk(ICONS_PATH)
+				.filter(Files::isRegularFile)
+				.filter(p -> p.getFileName().toString().endsWith(".png"))
+				.toList();
+
+			List<Icon> icons = new ArrayList<>();
+
+			for(Path p : iconFiles) {
+				try {
+					BufferedImage img = ImageIO.read(p.toFile());
+					String fileName = ICONS_PATH.relativize(p).toString();
+					fileName = fileName.substring(0, fileName.length() - ".png".length());
+					icons.add(new Icon(p, fileName, img.getWidth(), img.getHeight()));
+				}catch(IOException e) {
+					LOGGER.warn("Skipping invalid icon " + p.toString());
+				}
+			}
+
+			BMAreas.icons = icons;
+		} catch (IOException e) {
+			icons = Collections.emptyList();
+		}
+	}
+
+	private static MarkerSet loadMarkerSet(Path path, String defaultLabel) {
+		if(!Files.exists(path)) return new MarkerSet(defaultLabel);
+
+		try (BufferedReader reader = Files.newBufferedReader(path)) {
+			return MarkerGson.INSTANCE.fromJson(reader, MarkerSet.class);
+		} catch (IOException e) {
+			LOGGER.error("Failed to load marker set at " + path, e);
+			return null;
+		}
+	}
+
+	public static void loadMarkers() {
+		for(var key : DIMENSIONS) {
+			Path dimPath = DATA_PATH.resolve(key.getValue().getNamespace() + "-" + key.getValue().getPath());
+			try {
+				Files.createDirectories(dimPath);
+			} catch (IOException e) {
+				LOGGER.error("Failed to create directory for dimension " + key, e);
+				continue;
+			}
+
+			MarkerSet areaMarkerSet = loadMarkerSet(dimPath.resolve("areas.json"), "Player Areas");
+			MarkerSet markerMarkerSet = loadMarkerSet(dimPath.resolve("markers.json"), "Player Areas");
+			areaMarkerSets.put(key, areaMarkerSet);
+			markerMarkerSets.put(key, markerMarkerSet);
+
+			markerAPI.getWorld(key).get().getMaps().forEach(map -> {
+				map.getMarkerSets().put("bmareas_areas", areaMarkerSets.get(key));
+				map.getMarkerSets().put("bmareas_marker", markerMarkerSets.get(key));
+			});
+		}
+	}
+
+	private static void saveMarkerSet(Path path, MarkerSet markerSet) {
+		try(BufferedWriter writer = Files.newBufferedWriter(path)) {
+			MarkerGson.INSTANCE.toJson(markerSet, writer);
+		} catch (IOException e) {
+			LOGGER.error("Failed to save marker set at " + path, e);
+		}
+	}
+
+	public static void saveMarkers() {
+		for(var key : DIMENSIONS) {
+			Path dimPath = DATA_PATH.resolve(key.getValue().getNamespace() + "-" + key.getValue().getPath());
+
+			saveMarkerSet(dimPath.resolve("areas.json"), areaMarkerSets.get(key));
+			saveMarkerSet(dimPath.resolve("markers.json"), markerMarkerSets.get(key));
+		}
+	}
+
+//	// Taken from https://github.com/webbukkit/dynmap/blob/b8b1e8bd4e91f86e8017db8531c1e4faf37ce070/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricWorld.java#L39C5-L50C6
+//	public static String getWorldName(World w) {
+//		RegistryKey<World> rk = w.getRegistryKey();
+//		if (rk == World.OVERWORLD) { // Overworld?
+//			return w.getServer().getSaveProperties().getLevelName();
+//		} else if (rk == World.END) {
+//			return "DIM1";
+//		} else if (rk == World.NETHER) {
+//			return "DIM-1";
+//		} else {
+//			return rk.getValue().getNamespace() + "_" + rk.getValue().getPath();
+//		}
+//	}
+}

src/main/java/me/mrletsplay/bmareas/command/Corner.java

@@ -0,0 +1,40 @@
+package me.mrletsplay.bmareas.command;
+
+import java.util.Arrays;
+
+public enum Corner {
+	
+	NW("northwest", 0, 0),
+	NE("northeast", 1, 0),
+	SW("southwest", 0, 1),
+	SE("southeast", 1, 1),
+	CENTER("center", 0.5, 0.5);
+	
+	private final String name;
+	private final double dX, dZ;
+	
+	private Corner(String name, double dX, double dZ) {
+		this.name = name;
+		this.dX = dX;
+		this.dZ = dZ;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public double getDX() {
+		return dX;
+	}
+	
+	public double getDZ() {
+		return dZ;
+	}
+	
+	public static Corner getByName(String name) {
+		return Arrays.stream(values())
+				.filter(c -> c.getName().equalsIgnoreCase(name))
+				.findFirst().orElse(null);
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/Icon.java

@@ -0,0 +1,7 @@
+package me.mrletsplay.bmareas.command;
+
+import java.nio.file.Path;
+
+public record Icon(Path path, String name, int w, int h) {
+
+}

src/main/java/me/mrletsplay/bmareas/command/Point.java

@@ -0,0 +1,28 @@
+package me.mrletsplay.bmareas.command;
+
+import net.minecraft.world.World;
+
+public class Point {
+
+	private World world;
+	private double x, z;
+
+	public Point(World world, double x, double z) {
+		this.world = world;
+		this.x = x;
+		this.z = z;
+	}
+
+	public World getWorld() {
+		return world;
+	}
+
+	public double getX() {
+		return x;
+	}
+
+	public double getZ() {
+		return z;
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaAddCornerCommand.java

@@ -0,0 +1,65 @@
+package me.mrletsplay.bmareas.command.area;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.bmareas.command.Corner;
+import me.mrletsplay.bmareas.command.Point;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.math.BlockPos;
+
+public class AreaAddCornerCommand extends FabricCommand {
+
+	public AreaAddCornerCommand() {
+		super("addcorner");
+		setDescription("Add a corner to your area");
+		setUsage("/area addcorner [offset]");
+		setTabCompleter(event -> {
+			if(event.getArgs().length == 0) {
+				return Arrays.stream(Corner.values())
+						.map(c -> c.getName())
+						.collect(Collectors.toList());
+			}
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length > 1) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		Corner c = Corner.CENTER;
+		if(event.getArguments().length == 1) {
+			c = Corner.getByName(event.getArguments()[0]);
+			if(c == null) {
+				sendCommandInfo(event.getSender());
+				return;
+			}
+		}
+
+		BlockPos loc = p.getBlockPos();
+		double x = loc.getX() + c.getDX();
+		double z = loc.getZ() + c.getDZ();
+		List<Point> points = BMAreas.points.getOrDefault(p.getUuid(), new ArrayList<>());
+		points.add(new Point(p.getWorld(), x, z));
+		BMAreas.points.put(p.getUuid(), points);
+		p.sendMessage(Text.literal(String.format("§aAdded corner at (§7%s§a/§7%s§a)", x, z)));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaCommand.java

@@ -0,0 +1,27 @@
+package me.mrletsplay.bmareas.command.area;
+
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+
+public class AreaCommand extends FabricCommand {
+
+	public AreaCommand() {
+		super("area");
+		setDescription("Create your own area on the map");
+		setUsage(null);
+		addSubCommand(new AreaCreateCommand());
+		addSubCommand(new AreaAddCornerCommand());
+		addSubCommand(new AreaRemoveCornerCommand());
+		addSubCommand(new AreaListCornersCommand());
+		addSubCommand(new AreaDoneCommand());
+		addSubCommand(new AreaListCommand());
+		addSubCommand(new AreaRenameCommand());
+		addSubCommand(new AreaDeleteCommand());
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		sendCommandInfo(event.getSender());
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaCreateCommand.java

@@ -0,0 +1,52 @@
+package me.mrletsplay.bmareas.command.area;
+
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.ClickEvent;
+import net.minecraft.text.HoverEvent;
+import net.minecraft.text.HoverEvent.Action;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+public class AreaCreateCommand extends FabricCommand {
+
+	private static final HoverEvent CLICK_ME = new HoverEvent(Action.SHOW_TEXT, Text.literal("Click me!"));
+
+	public AreaCreateCommand() {
+		super("create");
+		setDescription("See how to create your own area");
+		setUsage("/area create");
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 0) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		p.sendMessage(Text.literal("To create an area:"));
+
+		p.sendMessage(Text.literal("1. ").formatted(Formatting.GOLD)
+			.append(Text.literal("[Add]").formatted(Formatting.GREEN).styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/area addcorner")).withHoverEvent(CLICK_ME)))
+			.append(Text.literal(" all corners of your area (or use ").formatted(Formatting.WHITE))
+			.append(Text.literal("/area addcorner [offset]").formatted(Formatting.GRAY))
+			.append(Text.literal(")").formatted(Formatting.WHITE)));
+
+		p.sendMessage(Text.literal("2. ").formatted(Formatting.GOLD)
+			.append(Text.literal("Use ").formatted(Formatting.WHITE))
+			.append(Text.literal("/area done \"<name>\" [color (#000000)]").formatted(Formatting.GRAY))
+			.append(Text.literal(" to create your area").formatted(Formatting.WHITE)));
+
+		p.sendMessage(Text.literal(""));
+		p.sendMessage(Text.literal("If you mess up, you can remove the last added corner using §7/area removecorner 1 §ror a specific corner using §7/area removecorner #index"));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaDeleteCommand.java

@@ -0,0 +1,64 @@
+package me.mrletsplay.bmareas.command.area;
+
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import de.bluecolored.bluemap.api.markers.Marker;
+import de.bluecolored.bluemap.api.markers.ShapeMarker;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import me.mrletsplay.mrcore.fabric.command.FabricCommandSender;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class AreaDeleteCommand extends FabricCommand {
+
+	public AreaDeleteCommand() {
+		super("delete");
+		setDescription("Delete an area from the map");
+		setUsage("/area delete <id>");
+
+		setTabCompleter(event -> {
+			FabricCommandSender sender = (FabricCommandSender) event.getSender();
+			ServerPlayerEntity p = sender.asPlayer();
+			if(p == null) return Collections.emptyList();
+
+			if(event.getArgs().length == 0) {
+				String prefix = p.getUuid().toString() + "_";
+				return BMAreas.getAreaMarkerSet(p.getWorld()).getMarkers().entrySet().stream()
+						.filter(en -> en.getKey().startsWith(prefix) && en.getValue() instanceof ShapeMarker)
+						.map(en -> en.getKey().substring(prefix.length()))
+						.collect(Collectors.toList());
+			}
+
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 1) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String markerID = p.getUuid().toString() + "_" + event.getArguments()[0];
+		Marker m = BMAreas.getAreaMarkerSet(p.getWorld()).get(markerID);
+		if(m == null || !(m instanceof ShapeMarker)) {
+			p.sendMessage(Text.literal("§cThat area doesn't exist"));
+			return;
+		}
+
+		BMAreas.getAreaMarkerSet(p.getWorld()).remove(markerID);
+		BMAreas.saveMarkers();
+		p.sendMessage(Text.literal("§aArea deleted successfully"));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaDoneCommand.java

@@ -0,0 +1,84 @@
+package me.mrletsplay.bmareas.command.area;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.flowpowered.math.vector.Vector2d;
+
+import de.bluecolored.bluemap.api.markers.ShapeMarker;
+import de.bluecolored.bluemap.api.math.Color;
+import de.bluecolored.bluemap.api.math.Shape;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.bmareas.command.Point;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class AreaDoneCommand extends FabricCommand {
+
+	public AreaDoneCommand() {
+		super("done");
+		setDescription("Create your own area and add it to the map");
+		setUsage("/area done \"<name>\" [color (#000000)]");
+
+		setTabCompleter(event -> {
+			if(event.getArgs().length == 0) {
+				return Arrays.asList("My fancy area");
+			}else if(event.getArgs().length == 1) {
+				return Arrays.asList("#FF00FF");
+			}
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length < 1 || event.getArguments().length > 2) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String name = event.getArguments()[0].replace("\"", "");
+		int colorInt = 0xFF0000;
+		if(event.getArguments().length == 2) {
+			try {
+				String colStr = event.getArguments()[1];
+				colorInt = Integer.parseInt(colStr.startsWith("#") ? colStr.substring(1) : colStr, 16);
+			}catch(NumberFormatException e) {
+				sendCommandInfo(event.getSender());
+				return;
+			}
+		}
+
+		List<Point> points = BMAreas.points.get(p.getUuid());
+		if(points == null || points.size() < 2) {
+			p.sendMessage(Text.literal("§cYou need to add at least 2 corners using §7/area addcorner"));
+			return;
+		}
+
+
+		List<Vector2d> vectors = points.stream()
+			.map(pt -> new Vector2d(pt.getX(), pt.getZ()))
+			.toList();
+
+		ShapeMarker shape = new ShapeMarker(name, new Shape(vectors), 64);
+		shape.setColors(new Color(colorInt, 1f), new Color(colorInt, 0.3f));
+		shape.setDepthTestEnabled(false);
+//		AreaMarker a = BMAreas.areaMarkerSet.createAreaMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, false, DynmapAreasMod.getWorldName(points.get(0).getWorld()), x, z, true);
+//		a.setFillStyle(a.getFillOpacity(), colorInt);
+//		a.setLineStyle(a.getLineWeight(), a.getLineOpacity(), colorInt);
+		BMAreas.getAreaMarkerSet(p.getWorld()).put(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), shape);
+		BMAreas.saveMarkers();
+		BMAreas.points.remove(p.getUuid());
+		p.sendMessage(Text.literal("§aArea created"));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaListCommand.java

@@ -0,0 +1,53 @@
+package me.mrletsplay.bmareas.command.area;
+
+import java.util.AbstractMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import de.bluecolored.bluemap.api.markers.ShapeMarker;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class AreaListCommand extends FabricCommand {
+
+	public AreaListCommand() {
+		super("list");
+		setDescription("List all of your areas");
+		setUsage("/area list");
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 0) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String prefix = p.getUuid().toString() + "_";
+		List<Map.Entry<String, ShapeMarker>> markers = BMAreas.getAreaMarkerSet(p.getWorld()).getMarkers().entrySet().stream()
+				.filter(en -> en.getKey().startsWith(prefix) && en.getValue() instanceof ShapeMarker)
+				.map(en -> new AbstractMap.SimpleEntry<>(en.getKey(), (ShapeMarker) en.getValue()))
+				.collect(Collectors.toList());
+
+		if(markers.isEmpty()) {
+			p.sendMessage(Text.literal("§cYou haven't created any areas yet"));
+			return;
+		}
+
+		p.sendMessage(Text.literal("§aYour areas:"));
+		for(Map.Entry<String, ShapeMarker> area : markers) {
+			p.sendMessage(Text.literal(String.format("§6%s: §7%s", area.getKey().substring(prefix.length()), area.getValue().getLabel())));
+		}
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaListCornersCommand.java

@@ -0,0 +1,46 @@
+package me.mrletsplay.bmareas.command.area;
+
+import java.util.List;
+
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.bmareas.command.Point;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class AreaListCornersCommand extends FabricCommand {
+
+	public AreaListCornersCommand() {
+		super("listcorners");
+		setDescription("List all currently added corners");
+		setUsage("/area listcorners");
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 0) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		List<Point> points = BMAreas.points.get(p.getUuid());
+		if(points == null) {
+			p.sendMessage(Text.literal("§cYou haven't added any corners"));
+			return;
+		}
+
+		p.sendMessage(Text.literal("§aCurrently added corners:"));
+		for(int i = 0; i < points.size(); i++) {
+			Point pt = points.get(i);
+			p.sendMessage(Text.literal(String.format("§6#%s: (§7%s§6/§7%s§6)", i+1, pt.getX(), pt.getZ())));
+		}
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaRemoveCornerCommand.java

@@ -0,0 +1,100 @@
+package me.mrletsplay.bmareas.command.area;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.bmareas.command.Point;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import me.mrletsplay.mrcore.fabric.command.FabricCommandSender;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class AreaRemoveCornerCommand extends FabricCommand {
+
+	public AreaRemoveCornerCommand() {
+		super("removecorner");
+		setDescription("Remove corners you've added");
+		setUsage("/area removecorner <all | #index | count>");
+
+		setTabCompleter(event -> {
+			FabricCommandSender sender = (FabricCommandSender) event.getSender();
+			ServerPlayerEntity p = sender.asPlayer();
+			if(p == null) return Collections.emptyList();
+
+			if(event.getArgs().length == 0) {
+				List<String> s = new ArrayList<>();
+				List<Point> points = BMAreas.points.get(p.getUuid());
+				if(points != null) {
+					for(int i = 0; i < points.size(); i++) {
+						s.add("#" + (i+1));
+					}
+				}
+				s.add("all");
+				s.add("1");
+				return s;
+			}
+
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 1) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		List<Point> points = BMAreas.points.get(p.getUuid());
+		if(points == null) {
+			p.sendMessage(Text.literal("§cNo corners to reset"));
+			return;
+		}
+
+		String what = event.getArguments()[0];
+		if(what.equals("all")) {
+			BMAreas.points.remove(p.getUuid());
+			p.sendMessage(Text.literal("§aReset all corners"));
+		}else if(what.startsWith("#")) {
+			try {
+				int idx = Integer.parseInt(what.substring(1)) - 1;
+				if(idx < 0 || idx >= points.size()) {
+					p.sendMessage(Text.literal("§aNot a valid corner index. Use §7/area listcorners §cto see valid indexes"));
+					return;
+				}
+
+				points.remove(idx);
+				p.sendMessage(Text.literal("§aRemoved corner at index §7" + (idx + 1)));
+			}catch(NumberFormatException e) {
+				sendCommandInfo(event.getSender());
+			}
+		}else {
+			try {
+				int count = Integer.parseInt(what);
+				if(count < 0 || count > points.size()) {
+					p.sendMessage(Text.literal("§aNot a valid amount of corners. Use §7/area listcorners §cto see how many corners you have added"));
+					return;
+				}
+
+				for(int i = 0; i < count; i++) {
+					points.remove(points.size() - 1);
+				}
+
+				if(points.isEmpty()) BMAreas.points.remove(p.getUuid());
+				p.sendMessage(Text.literal("§aRemoved the last §7" + count + " §acorners"));
+			}catch(NumberFormatException e) {
+				sendCommandInfo(event.getSender());
+			}
+		}
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/area/AreaRenameCommand.java

@@ -0,0 +1,70 @@
+package me.mrletsplay.bmareas.command.area;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import de.bluecolored.bluemap.api.markers.Marker;
+import de.bluecolored.bluemap.api.markers.ShapeMarker;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import me.mrletsplay.mrcore.fabric.command.FabricCommandSender;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class AreaRenameCommand extends FabricCommand {
+
+	public AreaRenameCommand() {
+		super("rename");
+		setDescription("Rename an area");
+		setUsage("/area rename <id> <new name>");
+
+		setTabCompleter(event -> {
+			FabricCommandSender sender = (FabricCommandSender) event.getSender();
+			ServerPlayerEntity p = sender.asPlayer();
+			if(p == null) return Collections.emptyList();
+
+			if(event.getArgs().length == 0) {
+				String prefix = p.getUuid().toString() + "_";
+				return BMAreas.getAreaMarkerSet(p.getWorld()).getMarkers().entrySet().stream()
+						.filter(en -> en.getKey().startsWith(prefix) && en.getValue() instanceof ShapeMarker)
+						.map(en -> en.getKey().substring(prefix.length()))
+						.collect(Collectors.toList());
+			}else if(event.getArgs().length == 1) {
+				return Arrays.asList("New name");
+			}
+
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 2) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String markerID = p.getUuid().toString() + "_" + event.getArguments()[0];
+		Marker am = BMAreas.getAreaMarkerSet(p.getWorld()).get(markerID);
+		if(am == null || !(am instanceof ShapeMarker)) {
+			p.sendMessage(Text.literal("§cThat area doesn't exist"));
+			return;
+		}
+
+		String newName = event.getArguments()[1];
+		am.setLabel(newName);
+		BMAreas.getAreaMarkerSet(p.getWorld()).put(markerID, am);
+		BMAreas.saveMarkers();
+
+		p.sendMessage(Text.literal("§aArea renamed successfully"));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/bmareas/BMAreasCommand.java

@@ -0,0 +1,22 @@
+package me.mrletsplay.bmareas.command.bmareas;
+
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+
+public class BMAreasCommand extends FabricCommand {
+
+	public BMAreasCommand() {
+		super("bmareas");
+		getProperties().setRequires(s -> s.hasPermissionLevel(4));
+		setDescription("BMAreas");
+		setUsage(null);
+
+		addSubCommand(new BMAreasReloadCommand());
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		sendCommandInfo(event.getSender());
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/bmareas/BMAreasReloadCommand.java

@@ -0,0 +1,35 @@
+package me.mrletsplay.bmareas.command.bmareas;
+
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class BMAreasReloadCommand extends FabricCommand {
+
+	public BMAreasReloadCommand() {
+		super("reload");
+		setDescription("Reload BMAreas");
+		setUsage("/bmareas reload");
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 0) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		BMAreas.loadIcons();
+		BMAreas.loadMarkers();
+		p.sendMessage(Text.literal("§aReloaded"));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/marker/MarkerAddCommand.java

@@ -0,0 +1,71 @@
+package me.mrletsplay.bmareas.command.marker;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import com.flowpowered.math.vector.Vector2i;
+import com.flowpowered.math.vector.Vector3d;
+
+import de.bluecolored.bluemap.api.markers.POIMarker;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.bmareas.command.Icon;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.math.BlockPos;
+
+public class MarkerAddCommand extends FabricCommand {
+
+	public MarkerAddCommand() {
+		super("add");
+		setDescription("Add a marker to the map");
+		setUsage("/area marker <name> <icon>");
+
+		setTabCompleter(event -> {
+			if(event.getArgs().length == 0) {
+				return Arrays.asList("My fancy marker");
+			}else if(event.getArgs().length == 1) {
+//				List<String> icons = new ArrayList<>();
+//				for(MarkerIcon i : BMAreas.markerAPI.getMarkerIcons()) icons.add(i.getMarkerIconID());
+				return BMAreas.icons.stream()
+					.map(i -> i.name())
+					.toList();
+			}
+
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 2) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String name = event.getArguments()[0];
+		Icon icon = BMAreas.icons.stream()
+			.filter(i -> i.name().equals(event.getArguments()[1]))
+			.findFirst().orElse(null);
+
+		if(icon == null) {
+			p.sendMessage(Text.literal("§cInvalid icon"));
+			return;
+		}
+
+		BlockPos loc = p.getBlockPos();
+		POIMarker poi = new POIMarker(name, new Vector3d(loc.getX(), loc.getY(), loc.getZ()), BMAreas.BLUEMAP_WEB_PATH.relativize(icon.path()).toString(), new Vector2i(icon.w() / 2, icon.h() / 2));
+		BMAreas.getMarkerMarkerSet(p.getWorld()).put(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), poi);
+		BMAreas.saveMarkers();
+//		DynmapAreasMod.markerMarkerSet.createMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, DynmapAreasMod.getWorldName(p.getWorld()), loc.getX() + 0.5, loc.getY(), loc.getZ() + 0.5, icon, true);
+		p.sendMessage(Text.literal("§aMarker created"));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/marker/MarkerCommand.java

@@ -0,0 +1,24 @@
+package me.mrletsplay.bmareas.command.marker;
+
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+
+public class MarkerCommand extends FabricCommand {
+
+	public MarkerCommand() {
+		super("marker");
+		setDescription("Add markers to the map");
+		setUsage(null);
+
+		addSubCommand(new MarkerAddCommand());
+		addSubCommand(new MarkerListCommand());
+		addSubCommand(new MarkerRenameCommand());
+		addSubCommand(new MarkerDeleteCommand());
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		sendCommandInfo(event.getSender());
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/marker/MarkerDeleteCommand.java

@@ -0,0 +1,66 @@
+package me.mrletsplay.bmareas.command.marker;
+
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import de.bluecolored.bluemap.api.markers.Marker;
+import de.bluecolored.bluemap.api.markers.POIMarker;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import me.mrletsplay.mrcore.fabric.command.FabricCommandSender;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class MarkerDeleteCommand extends FabricCommand {
+
+	public MarkerDeleteCommand() {
+		super("delete");
+		setDescription("Delete a marker from the map");
+		setUsage("/marker delete <id>");
+
+		setTabCompleter(event -> {
+			FabricCommandSender sender = (FabricCommandSender) event.getSender();
+			ServerPlayerEntity p = sender.asPlayer();
+			if(p == null) return Collections.emptyList();
+
+			if(event.getArgs().length == 0) {
+				String prefix = p.getUuid().toString() + "_";
+				return BMAreas.getMarkerMarkerSet(p.getWorld()).getMarkers().entrySet().stream()
+						.filter(en -> en.getKey().startsWith(prefix) && en.getValue() instanceof POIMarker)
+						.map(en -> en.getKey().substring(prefix.length()))
+						.collect(Collectors.toList());
+			}
+
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 1) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String markerID = p.getUuid().toString() + "_" + event.getArguments()[0];
+//		Marker m = DynmapAreasMod.markerMarkerSet.findMarker(p.getUuid().toString() + "_" + event.getArguments()[0]);
+		Marker m = BMAreas.getMarkerMarkerSet(p.getWorld()).get(markerID);
+		if(m == null || !(m instanceof POIMarker)) {
+			p.sendMessage(Text.literal("§cThat marker doesn't exist"));
+			return;
+		}
+
+//		m.deleteMarker();
+		BMAreas.getMarkerMarkerSet(p.getWorld()).remove(markerID);
+		BMAreas.saveMarkers();
+		p.sendMessage(Text.literal("§aMarker deleted successfully"));
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/marker/MarkerListCommand.java

@@ -0,0 +1,56 @@
+package me.mrletsplay.bmareas.command.marker;
+
+import java.util.AbstractMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import de.bluecolored.bluemap.api.markers.POIMarker;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class MarkerListCommand extends FabricCommand {
+
+	public MarkerListCommand() {
+		super("list");
+		setDescription("List all of your markers");
+		setUsage("/marker list");
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 0) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String prefix = p.getUuid().toString() + "_";
+//		List<Marker> markers = DynmapAreasMod.markerMarkerSet.getMarkers().stream()
+//				.filter(a -> a.getMarkerID().startsWith(prefix))
+//				.collect(Collectors.toList());
+		List<Map.Entry<String, POIMarker>> markers = BMAreas.getMarkerMarkerSet(p.getWorld()).getMarkers().entrySet().stream()
+			.filter(en -> en.getKey().startsWith(prefix) && en.getValue() instanceof POIMarker)
+			.map(en -> new AbstractMap.SimpleEntry<>(en.getKey(), (POIMarker) en.getValue()))
+			.collect(Collectors.toList());
+
+		if(markers.isEmpty()) {
+			p.sendMessage(Text.literal("§cYou haven't added any markers yet"));
+			return;
+		}
+
+		p.sendMessage(Text.literal("§aYour markers:"));
+		for(Map.Entry<String, POIMarker> area : markers) {
+			p.sendMessage(Text.literal(String.format("§6%s: §7%s", area.getKey().substring(prefix.length()), area.getValue().getLabel())));
+		}
+	}
+
+}

src/main/java/me/mrletsplay/bmareas/command/marker/MarkerRenameCommand.java

@@ -0,0 +1,70 @@
+package me.mrletsplay.bmareas.command.marker;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import de.bluecolored.bluemap.api.markers.Marker;
+import de.bluecolored.bluemap.api.markers.POIMarker;
+import me.mrletsplay.bmareas.BMAreas;
+import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
+import me.mrletsplay.mrcore.fabric.command.FabricCommand;
+import me.mrletsplay.mrcore.fabric.command.FabricCommandSender;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class MarkerRenameCommand extends FabricCommand {
+
+	public MarkerRenameCommand() {
+		super("rename");
+		setDescription("Rename a marker");
+		setUsage("/marker rename <id> <new name>");
+
+		setTabCompleter(event -> {
+			FabricCommandSender sender = (FabricCommandSender) event.getSender();
+			ServerPlayerEntity p = sender.asPlayer();
+			if(p == null) return Collections.emptyList();
+
+			if(event.getArgs().length == 0) {
+				String prefix = p.getUuid().toString() + "_";
+				return BMAreas.getMarkerMarkerSet(p.getWorld()).getMarkers().entrySet().stream()
+					.filter(en -> en.getKey().startsWith(prefix) && en.getValue() instanceof POIMarker)
+					.map(en -> en.getKey().substring(prefix.length()))
+					.collect(Collectors.toList());
+			}else if(event.getArgs().length == 1) {
+				return Arrays.asList("New name");
+			}
+
+			return Collections.emptyList();
+		});
+	}
+
+	@Override
+	public void action(CommandInvokedEvent event) {
+		ServerPlayerEntity p = getSenderPlayer(event);
+		if(p == null) {
+			event.getSender().sendMessage("Player only!");
+			return;
+		}
+
+		if(event.getArguments().length != 2) {
+			sendCommandInfo(event.getSender());
+			return;
+		}
+
+		String markerID = p.getUuid().toString() + "_" + event.getArguments()[0];
+		Marker m = BMAreas.getAreaMarkerSet(p.getWorld()).get(markerID);
+		if(m == null || !(m instanceof POIMarker)) {
+			p.sendMessage(Text.literal("§cThat marker doesn't exist"));
+			return;
+		}
+
+		String newName = event.getArguments()[1];
+		m.setLabel(newName);
+		BMAreas.getAreaMarkerSet(p.getWorld()).put(markerID, m);
+		BMAreas.saveMarkers();
+
+		p.sendMessage(Text.literal("§aMarker renamed successfully"));
+	}
+
+}

src/main/resources/fabric.mod.json

@@ -0,0 +1,32 @@
+{
+	"schemaVersion": 1,
+	"id": "bmareas",
+	"version": "${version}",
+	"name": "BMAreas",
+	"description": "This is an example description! Tell everyone what your mod is about!",
+	"authors": [
+		"Me!"
+	],
+	"contact": {
+		"homepage": "https://fabricmc.net/",
+		"sources": "https://github.com/FabricMC/fabric-example-mod"
+	},
+	"license": "CC0-1.0",
+	"icon": "assets/bmareas/icon.png",
+	"environment": "*",
+	"entrypoints": {
+		"main": [
+			"me.mrletsplay.bmareas.BMAreas"
+		]
+	},
+	"mixins": [],
+	"depends": {
+		"fabricloader": ">=0.16.9",
+		"minecraft": "~1.21.3",
+		"java": ">=21",
+		"fabric-api": "*"
+	},
+	"suggests": {
+		"another-mod": "*"
+	}
+}