v1.1

Author: letsgoawaydev

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'dev.letsgoaway'
-version = '1.0'
+version = '1.1'
 
 repositories {
     mavenCentral()
@@ -39,6 +39,12 @@ tasks.withType(JavaCompile).configureEach {
     }
 }
 
+tasks {
+    jar {
+        archiveFileName = "MapXYZ.jar"
+    }
+}
+
 processResources {
     def props = [version: version]
     inputs.properties props

src/main/java/dev/letsgoaway/mapxyz/Config.java

@@ -7,18 +7,26 @@
 
 public class Config {
     //region DEFAULTS
+    public static boolean enableXYZDisplay = true;
+
     public static boolean enableStartingMap = true;
 
     public static boolean useLegacyConsoleDefaultZoom = true;
 
     public static boolean enableReducedDebugInfo = true;
 
+    public static boolean enableLocatorMaps = true;
+
     public static boolean useEyeLevelPosition = false;
     //endregion
 
     private static FileConfiguration config;
 
     private static void updateValues() {
+        if (config.contains("enable-xyz-display", true)) {
+            enableXYZDisplay = config.getBoolean("enable-xyz-display");
+        }
+
         if (config.contains("enable-starting-map", true)) {
             enableStartingMap = config.getBoolean("enable-starting-map");
         }
@@ -31,6 +39,10 @@ private static void updateValues() {
             enableReducedDebugInfo = config.getBoolean("enable-reduced-debug-info");
         }
 
+        if (config.contains("enable-locator-maps", true)) {
+            enableLocatorMaps = config.getBoolean("enable-locator-maps");
+        }
+
         if (config.contains("use-eye-level-position", true)) {
             useEyeLevelPosition = config.getBoolean("use-eye-level-position");
         }
@@ -39,9 +51,11 @@ private static void updateValues() {
     }
 
     private static void saveValues() {
+        config.set("enable-xyz-display", enableXYZDisplay);
         config.set("enable-starting-map", enableStartingMap);
         config.set("use-legacy-console-default-zoom", useLegacyConsoleDefaultZoom);
         config.set("enable-reduced-debug-info", enableReducedDebugInfo);
+        config.set("enable-locator-maps", enableLocatorMaps);
         config.set("use-eye-level-position", useEyeLevelPosition);
         try {
             config.save(MapXYZ.instance.getDataFolder().toPath().resolve("config.yml").toFile());

src/main/java/dev/letsgoaway/mapxyz/MapXYZ.java

@@ -1,9 +1,6 @@
 package dev.letsgoaway.mapxyz;
 
-import org.bukkit.Bukkit;
-import org.bukkit.GameRule;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPickupItemEvent;
@@ -13,9 +10,11 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.server.MapInitializeEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.MapMeta;
 import org.bukkit.map.MapRenderer;
 import org.bukkit.map.MapView;
+import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;

src/main/java/dev/letsgoaway/mapxyz/MapXYZCommand.java

@@ -8,7 +8,7 @@
 public class MapXYZCommand implements CommandExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (sender.isOp()) {
+        if (sender.hasPermission("mapxyz.command")) {
             Config.reload();
             sender.sendMessage("MapXYZ successfully reloaded!");
         }

src/main/java/dev/letsgoaway/mapxyz/MathUtils.java

@@ -0,0 +1,37 @@
+package dev.letsgoaway.mapxyz;
+
+public class MathUtils {
+    public static boolean between(float x, float min, float max) {
+        return x >= min && x <= max;
+    }
+
+    public static boolean between(double x, double min, double max) {
+        return x >= min && x <= max;
+    }
+
+    public static boolean between(int x, int min, int max) {
+        return x >= min && x <= max;
+    }
+
+    /**
+     * If number is greater than the max, set it to max, and if number is lower than low, set it to low.
+     *
+     * @param num number to calculate
+     * @param min the lowest value the number can be
+     * @param max the greatest value the number can be
+     * @return - min if num is lower than min <br>
+     * - max if num is greater than max <br>
+     * - num otherwise
+     */
+    public static float constrain(float num, float min, float max) {
+        if (num > max) {
+            num = max;
+        }
+
+        if (num < min) {
+            num = min;
+        }
+
+        return num;
+    }
+}

src/main/java/dev/letsgoaway/mapxyz/PlayerCursorRenderer.java

@@ -0,0 +1,89 @@
+package dev.letsgoaway.mapxyz;
+
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.map.*;
+
+import java.util.ArrayList;
+import java.util.logging.Level;
+
+@SuppressWarnings("deprecation")
+public class PlayerCursorRenderer {
+
+    private static final MapCursor.Type MARKER_TYPE = MapCursor.Type.BLUE_MARKER;
+    private static final MapCursor.Type NETHER_MARKER_TYPE = MapCursor.Type.RED_MARKER;
+
+    public static void render(Player viewer, Player player, MapCanvas canvas, MapView map) {
+        if (viewer.equals(player)) {
+            return;
+        }
+
+        int scaleFactor = 1 << map.getScale().getValue();
+        float x = (float)(player.getLocation().getX() - (double)map.getCenterX()) / (float)scaleFactor;
+        float z = (float)(player.getLocation().getZ() - (double)map.getCenterZ()) / (float)scaleFactor;
+
+        byte d = calculateRotation(player);
+
+        // Nether marker type matches Bedrock Edition locator maps
+        canvas.getCursors().addCursor(new MapCursor(clampMapCoordinate(x), clampMapCoordinate(z), d, map.getWorld().getEnvironment().equals(World.Environment.NETHER) ? NETHER_MARKER_TYPE : MARKER_TYPE, true, player.getName()));
+    }
+
+    private static byte clampMapCoordinate(float coordinate) {
+        if (coordinate <= -63.0F) {
+            return -128;
+        } else {
+            return coordinate >= 63.0F ? 127 : (byte)((int)((double)(coordinate * 2.0F) + 0.5));
+        }
+    }
+
+    private static byte calculateRotation(Player player) {
+        double yaw = player.getLocation().getYaw();
+        boolean shouldFlip = 0.0 > yaw;
+        World world = player.getLocation().getWorld();
+        if (world != null && world.getEnvironment().equals(World.Environment.NETHER)) {
+            // use world.getFullTime() if its the same player
+            // but im going to use player.getTicksLived()
+            // to make sure it looks different from your marker
+            int i = (int) (player.getTicksLived() / 10L);
+            return (byte) (i * i * 34187121 + i * 121 >> 15 & 15);
+        } else {
+            double adjusted = yaw < 0.0 ? yaw - 8.0 : yaw + 8.0;
+            if (shouldFlip) {
+                int i = 16 + ((int) (adjusted * 16.0 / 360.0));
+                // todo figure out better way to fix
+                if (i == 16) {
+                    return (byte) 0;
+                }
+                return (byte) (i);
+            } else {
+                return (byte) ((int) (adjusted * 16.0 / 360.0));
+            }
+        }
+    }
+
+    public static void renderAll(Player viewer, MapCanvas canvas, MapView map) {
+        for (int i = 0; i < canvas.getCursors().size(); i++) {
+            MapCursor c = canvas.getCursors().getCursor(i);
+            MapCursor.Type t = c.getType();
+
+            if (t.equals(MARKER_TYPE) || t.equals(NETHER_MARKER_TYPE)) {
+                canvas.getCursors().removeCursor(c);
+            }
+
+            if (Config.enableLocatorMaps && (t.equals(MapCursor.Type.PLAYER) || t.equals(MapCursor.Type.PLAYER_OFF_MAP) || t.equals(MapCursor.Type.PLAYER_OFF_LIMITS))){
+                canvas.getCursors().removeCursor(c);
+            }
+        }
+
+        if (!Config.enableLocatorMaps) {
+            return;
+        }
+
+        World world = map.getWorld();
+        if (world != null) {
+            for (Player player : world.getPlayers()) {
+                render(viewer, player, canvas, map);
+            }
+        }
+    }
+}

src/main/java/dev/letsgoaway/mapxyz/PosRenderer.java

@@ -5,10 +5,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.MapMeta;
-import org.bukkit.map.MapCanvas;
-import org.bukkit.map.MapPalette;
-import org.bukkit.map.MapRenderer;
-import org.bukkit.map.MapView;
+import org.bukkit.map.*;
 import org.jetbrains.annotations.NotNull;
 
 public class PosRenderer extends MapRenderer {
@@ -46,6 +43,13 @@ public void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Pla
                 canvas.setPixelColor(x, y, canvas.getBasePixelColor(x, y));
             }
         }
+
+        if (!Config.enableXYZDisplay) {
+            return;
+        }
+
+        PlayerCursorRenderer.renderAll(player, canvas, map);
+
         /*
          this is for item frames, unfortunately the position is still visible
          if you are holding the same map of id in your hand but that's the best we can do atm
@@ -87,8 +91,7 @@ public void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Pla
         Location pos;
         if (Config.useEyeLevelPosition) {
             pos = player.getEyeLocation();
-        }
-        else {
+        } else {
             pos = player.getLocation();
         }
         canvas.drawText(0, 0, MapXYZ.asciiFont, "§" + color + ";X: " + pos.getBlockX() + ", Y: " + pos.getBlockY() + ", Z: " + pos.getBlockZ());

src/main/resources/config.yml

@@ -1,10 +1,15 @@
+# If true, show XYZ on map
+enable-xyz-display: true
 # If true, players will get an empty map when they first join the server.
 enable-starting-map: true
 # If true, maps will scale at 1:8 (Level 3/4) by default when a map is created.
 use-legacy-console-default-zoom: true
 # Enables the reducedDebugInfo game rule on all worlds
 # This option hides position info in the Debug menu (F3)
 enable-reduced-debug-info: true
+# Enable locator maps, similar idea to the one on Bedrock Edition
+# Shows other player's markers on maps
+enable-locator-maps: true
 # Make the XYZ display position show the eye level position instead of
 # the players feet level. This matches Legacy Console Edition but may cause confusion
 use-eye-level-position: false

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: MapXYZ
-version: '1.0'
+version: '1.1'
 main: dev.letsgoaway.mapxyz.MapXYZ
 api-version: '1.21'
 author: LetsGoAway