commit a2357a44628d48261597c908f67696df3d65c697 Author: MrLetsplay Date: Tue Aug 29 21:36:52 2023 +0200 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.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 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..0f0cf16 --- /dev/null +++ b/build.gradle @@ -0,0 +1,92 @@ +plugins { + id 'fabric-loom' version '1.3-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.mikeprimm.com/" + } +} + +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}" + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" + include modImplementation("me.mrletsplay:MrCore-Fabric:1.0.1") + implementation "me.mrletsplay:MrCore:4.3-SNAPSHOT" + include "me.mrletsplay:MrCore:4.3-SNAPSHOT" + + implementation "us.dynmap:DynmapCoreAPI:3.6" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +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_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + 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. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3eaf417 --- /dev/null +++ b/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.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.14.22 + +# Mod Properties +mod_version=1.0.0 +maven_group=me.mrletsplay.dynmapareas +archives_base_name=dynmapareas + +# Dependencies +fabric_version=0.87.0+1.20.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..033e24c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9f4197d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..fcb6fca --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/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. +# + +############################################################################## +# +# 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/subprojects/plugins/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##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || 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=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=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, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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 + +@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. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +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 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/me/mrletsplay/dynmapareas/DynmapAreasMod.java b/src/main/java/me/mrletsplay/dynmapareas/DynmapAreasMod.java new file mode 100644 index 0000000..492585a --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/DynmapAreasMod.java @@ -0,0 +1,37 @@ +package me.mrletsplay.dynmapareas; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import org.dynmap.markers.MarkerAPI; +import org.dynmap.markers.MarkerSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import me.mrletsplay.dynmapareas.command.Point; +import me.mrletsplay.dynmapareas.command.area.AreaCommand; +import me.mrletsplay.dynmapareas.command.marker.MarkerCommand; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; + +public class DynmapAreasMod implements ModInitializer { + + public static final Logger LOGGER = LoggerFactory.getLogger("dynmapareas"); + + public static Map> points = new HashMap<>(); + public static MarkerAPI markerAPI; + public static MarkerSet areaMarkerSet, markerMarkerSet; + + @Override + public void onInitialize() { + LOGGER.info("HELLO"); + + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> { + dispatcher.register(new AreaCommand().create()); + dispatcher.register(new MarkerCommand().create()); + }); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/Corner.java b/src/main/java/me/mrletsplay/dynmapareas/command/Corner.java new file mode 100644 index 0000000..5cf2bc5 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/Corner.java @@ -0,0 +1,40 @@ +package me.mrletsplay.dynmapareas.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); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/Point.java b/src/main/java/me/mrletsplay/dynmapareas/command/Point.java new file mode 100644 index 0000000..b59ca6e --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/Point.java @@ -0,0 +1,28 @@ +package me.mrletsplay.dynmapareas.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; + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaAddCornerCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaAddCornerCommand.java new file mode 100644 index 0000000..51be9c5 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaAddCornerCommand.java @@ -0,0 +1,66 @@ +package me.mrletsplay.dynmapareas.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.dynmapareas.DynmapAreasMod; +import me.mrletsplay.dynmapareas.command.Corner; +import me.mrletsplay.dynmapareas.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 points = DynmapAreasMod.points.getOrDefault(p.getUuid(), new ArrayList<>()); + points.add(new Point(p.getWorld(), x, z)); + DynmapAreasMod.points.put(p.getUuid(), points); +// p.sendMessage(String.format("§aAdded corner at (§7%s§a/§7%s§a)", x, z)); + p.sendMessage(Text.literal("OK")); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaCommand.java new file mode 100644 index 0000000..30c9ebb --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaCommand.java @@ -0,0 +1,27 @@ +package me.mrletsplay.dynmapareas.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()); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaCreateCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaCreateCommand.java new file mode 100644 index 0000000..ede1c82 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaCreateCommand.java @@ -0,0 +1,51 @@ +package me.mrletsplay.dynmapareas.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.HoverEvent; +import net.minecraft.text.HoverEvent.Action; +import net.minecraft.text.Text; + +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:")); + +// List message = new ArrayList<>(); +// message.addAll(Arrays.asList(new ComponentBuilder("1. ").color(ChatColor.GOLD).create())); +// message.addAll(Arrays.asList(new ComponentBuilder("[Add]").color(ChatColor.GREEN).event(CLICK_ME).event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/area addcorner")).create())); +// message.addAll(Arrays.asList(new ComponentBuilder(" all corners of your area (or use ").color(ChatColor.WHITE).append("/area addcorner [offset]").color(ChatColor.GRAY).append(")").color(ChatColor.WHITE).create())); +// p.spigot().sendMessage(message.toArray(BaseComponent[]::new)); +// +// // TODO: autofill command +// List message2 = new ArrayList<>(); +// message2.addAll(Arrays.asList(new ComponentBuilder("2. ").color(ChatColor.GOLD).create())); +// message2.addAll(Arrays.asList(new ComponentBuilder("Use ").color(ChatColor.WHITE).append("/area done \"\" [color (#000000)]").color(ChatColor.GRAY).append(" to create your area").color(ChatColor.WHITE).create())); +// p.spigot().sendMessage(message2.toArray(BaseComponent[]::new)); +// +// p.sendMessage(""); +// p.sendMessage("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"); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaDeleteCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaDeleteCommand.java new file mode 100644 index 0000000..4c02638 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaDeleteCommand.java @@ -0,0 +1,62 @@ +package me.mrletsplay.dynmapareas.command.area; + +import java.util.Collections; +import java.util.stream.Collectors; + +import org.dynmap.markers.AreaMarker; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +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 "); + + 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 DynmapAreasMod.areaMarkerSet.getAreaMarkers().stream() + .filter(a -> a.getMarkerID().startsWith(prefix)) + .map(a -> a.getMarkerID().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; + } + + AreaMarker am = DynmapAreasMod.areaMarkerSet.findAreaMarker(p.getUuid().toString() + "_" + event.getArguments()[0]); + if(am == null) { + p.sendMessage(Text.literal("§cThat area doesn't exist")); + return; + } + + am.deleteMarker(); + p.sendMessage(Text.literal("§aArea deleted successfully")); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaDoneCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaDoneCommand.java new file mode 100644 index 0000000..b2890cd --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaDoneCommand.java @@ -0,0 +1,81 @@ +package me.mrletsplay.dynmapareas.command.area; + +import java.awt.Color; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.dynmap.markers.AreaMarker; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +import me.mrletsplay.dynmapareas.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 \"\" [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 = Color.RED.getRGB(); + 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 points = DynmapAreasMod.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; + } + + + double[] x = new double[points.size()]; + double[] z = new double[points.size()]; + + for(int i = 0; i < points.size(); i++) { + x[i] = points.get(i).getX(); + z[i] = points.get(i).getZ(); + } + + AreaMarker a = DynmapAreasMod.areaMarkerSet.createAreaMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, false, points.get(0).getWorld().getServer().getName(), x, z, true); + a.setFillStyle(a.getFillOpacity(), colorInt); + a.setLineStyle(a.getLineWeight(), a.getLineOpacity(), colorInt); + DynmapAreasMod.points.remove(p.getUuid()); + p.sendMessage(Text.literal("§aArea created")); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaListCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaListCommand.java new file mode 100644 index 0000000..2af4a87 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaListCommand.java @@ -0,0 +1,51 @@ +package me.mrletsplay.dynmapareas.command.area; + +import java.util.List; +import java.util.stream.Collectors; + +import org.dynmap.markers.AreaMarker; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +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 markers = DynmapAreasMod.areaMarkerSet.getAreaMarkers().stream() + .filter(a -> a.getMarkerID().startsWith(prefix)) + .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(AreaMarker area : markers) { + p.sendMessage(Text.literal(String.format("§6%s: §7%s", area.getMarkerID().substring(prefix.length()), area.getLabel()))); + } + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaListCornersCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaListCornersCommand.java new file mode 100644 index 0000000..464b6ec --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaListCornersCommand.java @@ -0,0 +1,46 @@ +package me.mrletsplay.dynmapareas.command.area; + +import java.util.List; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +import me.mrletsplay.dynmapareas.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 points = DynmapAreasMod.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()))); + } + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaRemoveCornerCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaRemoveCornerCommand.java new file mode 100644 index 0000000..1f4aeb8 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaRemoveCornerCommand.java @@ -0,0 +1,100 @@ +package me.mrletsplay.dynmapareas.command.area; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +import me.mrletsplay.dynmapareas.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 "); + + setTabCompleter(event -> { + FabricCommandSender sender = (FabricCommandSender) event.getSender(); + ServerPlayerEntity p = sender.asPlayer(); + if(p == null) return Collections.emptyList(); + + if(event.getArgs().length == 0) { + List s = new ArrayList<>(); + List points = DynmapAreasMod.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 points = DynmapAreasMod.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")) { + DynmapAreasMod.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()) DynmapAreasMod.points.remove(p.getUuid()); + p.sendMessage(Text.literal("§aRemoved the last §7" + count + " §acorners")); + }catch(NumberFormatException e) { + sendCommandInfo(event.getSender()); + } + } + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaRenameCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaRenameCommand.java new file mode 100644 index 0000000..3aa77d5 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/area/AreaRenameCommand.java @@ -0,0 +1,67 @@ +package me.mrletsplay.dynmapareas.command.area; + +import java.util.Arrays; +import java.util.Collections; +import java.util.stream.Collectors; + +import org.dynmap.markers.AreaMarker; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +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 "); + + 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 DynmapAreasMod.areaMarkerSet.getAreaMarkers().stream() + .filter(a -> a.getMarkerID().startsWith(prefix)) + .map(a -> a.getMarkerID().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; + } + + AreaMarker am = DynmapAreasMod.areaMarkerSet.findAreaMarker(p.getUuid().toString() + "_" + event.getArguments()[0]); + if(am == null) { + p.sendMessage(Text.literal("§cThat area doesn't exist")); + return; + } + + String newName = event.getArguments()[1]; + am.setLabel(newName); + + p.sendMessage(Text.literal("§aArea renamed successfully")); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerAddCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerAddCommand.java new file mode 100644 index 0000000..610db64 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerAddCommand.java @@ -0,0 +1,63 @@ +package me.mrletsplay.dynmapareas.command.marker; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.dynmap.markers.MarkerIcon; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +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 "); + + setTabCompleter(event -> { + if(event.getArgs().length == 0) { + return Arrays.asList("My fancy marker"); + }else if(event.getArgs().length == 1) { + List icons = new ArrayList<>(); + for(MarkerIcon i : DynmapAreasMod.markerAPI.getMarkerIcons()) icons.add(i.getMarkerIconID()); + return icons; + } + + 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]; + MarkerIcon icon = DynmapAreasMod.markerAPI.getMarkerIcon(event.getArguments()[1]); + + if(icon == null) { + p.sendMessage(Text.literal("§cInvalid icon")); + return; + } + + BlockPos loc = p.getBlockPos(); + DynmapAreasMod.markerMarkerSet.createMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, p.getWorld().getServer().getName(), loc.getX() + 0.5, loc.getY(), loc.getZ() + 0.5, icon, true); + p.sendMessage(Text.literal("§aMarker created")); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerCommand.java new file mode 100644 index 0000000..954a0db --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerCommand.java @@ -0,0 +1,24 @@ +package me.mrletsplay.dynmapareas.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()); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerDeleteCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerDeleteCommand.java new file mode 100644 index 0000000..bebb5c7 --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerDeleteCommand.java @@ -0,0 +1,62 @@ +package me.mrletsplay.dynmapareas.command.marker; + +import java.util.Collections; +import java.util.stream.Collectors; + +import org.dynmap.markers.Marker; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +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 "); + + 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 DynmapAreasMod.markerMarkerSet.getMarkers().stream() + .filter(a -> a.getMarkerID().startsWith(prefix)) + .map(a -> a.getMarkerID().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; + } + + Marker m = DynmapAreasMod.markerMarkerSet.findMarker(p.getUuid().toString() + "_" + event.getArguments()[0]); + if(m == null) { + p.sendMessage(Text.literal("§cThat marker doesn't exist")); + return; + } + + m.deleteMarker(); + p.sendMessage(Text.literal("§aMarker deleted successfully")); + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerListCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerListCommand.java new file mode 100644 index 0000000..0d8a6cf --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerListCommand.java @@ -0,0 +1,51 @@ +package me.mrletsplay.dynmapareas.command.marker; + +import java.util.List; +import java.util.stream.Collectors; + +import org.dynmap.markers.Marker; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +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 markers = DynmapAreasMod.markerMarkerSet.getMarkers().stream() + .filter(a -> a.getMarkerID().startsWith(prefix)) + .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(Marker marker : markers) { + p.sendMessage(Text.literal(String.format("§6%s: §7%s", marker.getMarkerID().substring(prefix.length()), marker.getLabel()))); + } + } + +} diff --git a/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerRenameCommand.java b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerRenameCommand.java new file mode 100644 index 0000000..b280c5e --- /dev/null +++ b/src/main/java/me/mrletsplay/dynmapareas/command/marker/MarkerRenameCommand.java @@ -0,0 +1,67 @@ +package me.mrletsplay.dynmapareas.command.marker; + +import java.util.Arrays; +import java.util.Collections; +import java.util.stream.Collectors; + +import org.dynmap.markers.Marker; + +import me.mrletsplay.dynmapareas.DynmapAreasMod; +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 "); + + 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 DynmapAreasMod.markerMarkerSet.getMarkers().stream() + .filter(a -> a.getMarkerID().startsWith(prefix)) + .map(a -> a.getMarkerID().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; + } + + Marker m = DynmapAreasMod.markerMarkerSet.findMarker(p.getUuid().toString() + "_" + event.getArguments()[0]); + if(m == null) { + p.sendMessage(Text.literal("§cThat marker doesn't exist")); + return; + } + + String newName = event.getArguments()[1]; + m.setLabel(newName); + + p.sendMessage(Text.literal("§aMarker renamed successfully")); + } + +} diff --git a/src/main/resources/assets/dynmapareas/icon.png b/src/main/resources/assets/dynmapareas/icon.png new file mode 100644 index 0000000..047b91f Binary files /dev/null and b/src/main/resources/assets/dynmapareas/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..d9f01cc --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,33 @@ +{ + "schemaVersion": 1, + "id": "dynmapareas", + "version": "${version}", + "name": "DynmapAreas", + "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/dynmapareas/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "me.mrletsplay.dynmapareas.DynmapAreasMod" + ] + }, + "mixins": [], + "depends": { + "fabricloader": ">=0.14.22", + "minecraft": "~1.20.1", + "java": ">=17", + "fabric-api": "*", + "mrcore": "*" + }, + "suggests": { + "another-mod": "*" + } +} \ No newline at end of file