commit d5fd82affd9d7f53979849eb52b187a16b0702d2 Author: Len <40720638+destro174@users.noreply.github.com> Date: Wed Sep 28 19:34:41 2022 +0200 GridLines addon diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e04b156 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ + +/.idea +/src/test/ +.gradle/ +build/ + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# IntelliJ +*.iml +*.ipr +*.iws +.idea/ +out/ + +# Maven +target/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +!gradle/wrapper/gradle-wrapper.jar +/.idea/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..5344a7d --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +
+Pl3xMap + +# GridLines + +Gridlines is an addon for Pl3xMap v2 that draws borders for mapart platforms on the map. + +
+ +## Installation + +1) Place the jar inside Pl3xMap's addon folder +2) Reload Pl3xMap plugin (or restart server) +3) Edit GridLines.yml to your liking +4) Reload Pl3xMap plugin (or restart server) again + +## Building from source + +TODO \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..0d27283 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + id("java") +} + +group = "com.alttd.gridlines" +version = "1.0-SNAPSHOT" + +repositories { + maven { + url = uri("https://repo.papermc.io/repository/maven-public/") + } + maven { + url = uri("https://api.modrinth.com/maven") + } +} + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT") + compileOnly("maven.modrinth:pl3xmap:1.19.2-306") +} \ 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..41d9927 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..41dfb87 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/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/master/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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# 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 \ + "$@" + +# 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..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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=. +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%" == "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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..eb442b2 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "GridLines" \ No newline at end of file diff --git a/src/main/java/com/alttd/gridlines/GridLines.java b/src/main/java/com/alttd/gridlines/GridLines.java new file mode 100644 index 0000000..3c331d7 --- /dev/null +++ b/src/main/java/com/alttd/gridlines/GridLines.java @@ -0,0 +1,15 @@ +package com.alttd.gridlines; + +import com.alttd.gridlines.configuration.Config; +import com.alttd.gridlines.listener.WorldListener; +import net.pl3x.map.Pl3xMap; +import net.pl3x.map.addon.Addon; + +public class GridLines extends Addon { + + @Override + public void onEnable() { + Config.reload(); + Pl3xMap.api().getEventRegistry().register(new WorldListener(this)); + } +} diff --git a/src/main/java/com/alttd/gridlines/configuration/Config.java b/src/main/java/com/alttd/gridlines/configuration/Config.java new file mode 100644 index 0000000..b561c61 --- /dev/null +++ b/src/main/java/com/alttd/gridlines/configuration/Config.java @@ -0,0 +1,29 @@ +package com.alttd.gridlines.configuration; + +import net.pl3x.map.addon.AddonRegistry; +import net.pl3x.map.configuration.AbstractConfig; + +public class Config extends AbstractConfig { + + @Key("settings.layer.label") + @Comment("Label for map layer") + public static String LAYER_LABEL = "Gridlines"; + @Key("settings.layer.show-controls") + @Comment("Show controls for map layer") + public static boolean LAYER_SHOW_CONTROLS = true; + @Key("settings.layer.default-hidden") + @Comment("Whether map layer is hidden by default") + public static boolean LAYER_DEFAULT_HIDDEN = true; + @Key("settings.layer.priority") + @Comment("Priority for map layer") + public static int LAYER_PRIORITY = 99; + @Key("settings.layer.z-index") + @Comment("zIndex for map layer") + public static int LAYER_ZINDEX = 99; + + private static final Config CONFIG = new Config(); + + public static void reload() { + CONFIG.reload(AddonRegistry.ADDONS_CONFIG_DIR.resolve("GridLines.yml"), Config.class); + } +} diff --git a/src/main/java/com/alttd/gridlines/layer/GridLinesLayer.java b/src/main/java/com/alttd/gridlines/layer/GridLinesLayer.java new file mode 100644 index 0000000..45023fa --- /dev/null +++ b/src/main/java/com/alttd/gridlines/layer/GridLinesLayer.java @@ -0,0 +1,83 @@ +package com.alttd.gridlines.layer; + +import com.alttd.gridlines.GridLines; +import com.alttd.gridlines.configuration.Config; +import net.pl3x.map.Key; +import net.pl3x.map.markers.Point; +import net.pl3x.map.markers.layer.SimpleLayer; +import net.pl3x.map.markers.marker.Marker; +import net.pl3x.map.markers.marker.Polyline; +import net.pl3x.map.markers.option.Fill; +import net.pl3x.map.markers.option.Options; +import net.pl3x.map.markers.option.Stroke; +import net.pl3x.map.world.World; +import org.bukkit.Bukkit; +import org.bukkit.WorldBorder; +import org.jetbrains.annotations.NotNull; + +import java.util.Collection; +import java.util.HashSet; + +public class GridLinesLayer extends SimpleLayer { + + public static final Key KEY = Key.of("gridlines"); + private final Collection> MARKERS = new HashSet<>(); + private final GridLines addon; + private final World mapWorld; + + public GridLinesLayer(GridLines addon, @NotNull World world) { + super(KEY, () -> Config.LAYER_LABEL); + this.addon = addon; + this.mapWorld = world; + setShowControls(Config.LAYER_SHOW_CONTROLS); + setDefaultHidden(Config.LAYER_DEFAULT_HIDDEN); + setPriority(Config.LAYER_PRIORITY); + setZIndex(Config.LAYER_ZINDEX); + updateLayer(); + } + + @Override + public @NotNull Collection> getMarkers() { + return MARKERS; + } + + public void updateLayer() { + MARKERS.clear(); + org.bukkit.World world = Bukkit.getWorld(mapWorld.getName()); + if (world == null) return; + WorldBorder worldBorder = world.getWorldBorder(); + double radius = worldBorder.getSize() / 2; + double radius2 = radius * -1; + + int t; + String key = "gridline"; + for(int i = -64; i < radius; i += 128) { + t = i * -1; + MARKERS.add(Marker.multiPolyline(Key.of(key + "-" + i), + Polyline.of(Key.of(key + i + "-1"), + Point.of(radius, i), + Point.of(radius2, i) + ), + Polyline.of(Key.of(key + i + "-2"), + Point.of(i, radius), + Point.of(i, radius2) + ), + Polyline.of(Key.of(key + i + "-3"), + Point.of(radius, t), + Point.of(radius2, t) + ), + Polyline.of(Key.of(key + i + "-4"), + Point.of(t, radius), + Point.of(t, radius2) + ) + )); + } + Options options = new Options() + .setStroke(new Stroke().setColor(0xFFFF0000).setWeight(1)) + .setFill(new Fill().setEnabled(false)); + for (Marker marker : MARKERS) { + marker.setOptions(options); + } + } + +} diff --git a/src/main/java/com/alttd/gridlines/listener/WorldListener.java b/src/main/java/com/alttd/gridlines/listener/WorldListener.java new file mode 100644 index 0000000..b16d87d --- /dev/null +++ b/src/main/java/com/alttd/gridlines/listener/WorldListener.java @@ -0,0 +1,35 @@ +package com.alttd.gridlines.listener; + +import com.alttd.gridlines.GridLines; +import com.alttd.gridlines.layer.GridLinesLayer; +import net.pl3x.map.Pl3xMap; +import net.pl3x.map.event.EventHandler; +import net.pl3x.map.event.EventListener; +import net.pl3x.map.event.server.ServerLoadedEvent; +import net.pl3x.map.event.world.WorldLoadedEvent; +import net.pl3x.map.event.world.WorldUnloadedEvent; + +public class WorldListener implements EventListener { + private final GridLines addon; + + public WorldListener(GridLines addon) { + this.addon = addon; + } + + @EventHandler + public void onServerLoaded(ServerLoadedEvent event) { + Pl3xMap.api().getWorldRegistry().entries().forEach((key, world) -> + world.getLayerRegistry().register(new GridLinesLayer(addon, world)) + ); + } + + @EventHandler + public void onWorldLoaded(WorldLoadedEvent event) { + event.getWorld().getLayerRegistry().register(new GridLinesLayer(addon, event.getWorld())); + } + + @EventHandler + public void onWorldUnloaded(WorldUnloadedEvent event) { + event.getWorld().getLayerRegistry().unregister(GridLinesLayer.KEY); + } +} diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml new file mode 100644 index 0000000..1fd0613 --- /dev/null +++ b/src/main/resources/addon.yml @@ -0,0 +1,4 @@ +name: "GridLines" +main: "com.alttd.gridlines.GridLines" +version: "1.0-SNAPSHOT" +author: "destro174"