fix: better proxy support and allows disabling worldId (fixes #22)

Author: funniray

common/src/main/java/com/funniray/minimap/common/JavaMinimapPlugin.java

@@ -3,7 +3,9 @@
 import com.funniray.minimap.common.api.MinimapPlayer;
 import com.funniray.minimap.common.api.MinimapWorld;
 import com.funniray.minimap.common.jm.JMHandler;
+import com.funniray.minimap.common.jm.data.JMConfig;
 import com.funniray.minimap.common.jm.data.JMVersion;
+import com.funniray.minimap.common.jm.data.JMWorldConfig;
 import com.funniray.minimap.common.voxel.VoxelHandler;
 import com.funniray.minimap.common.worldinfo.WorldInfoHandler;
 import com.funniray.minimap.common.xaeros.XaerosHandler;
@@ -78,12 +80,16 @@ public void handlePlayerJoined(MinimapPlayer player) {
         xaerosHandler.sendXaerosHandshake(player);
         xaerosHandler.sendXaerosConfig(player);
         voxelHandler.sendSettings(player);
+        worldInfoHandler.sendPacket(player);
+        if (jmHandler.isLegacy(player)) {
+            jmHandler.handlePerm(player, new byte[0], "journeymap:common", 2);
+        } else {
+            jmHandler.handlePerm(player, new byte[0], "journeymap:perm_req", 0);
+        }
     }
 
     @Override
-    public void handlePlayerLeft(MinimapPlayer player) {
-        jmHandler.playerLeft(player);
-    }
+    public void handlePlayerLeft(MinimapPlayer player) {}
 
     public void saveConfig() {
         try {
@@ -95,6 +101,15 @@ public void saveConfig() {
         }
     }
 
+    public JMConfig getEffectiveJMConfig(MinimapPlayer player) {
+        JMWorldConfig worldConfig = this.getConfig().getWorldConfig(player.getLocation().getWorld().getName()).journeymapConfig;
+        JMConfig config = this.getConfig().globalJourneymapConfig;
+        if (worldConfig != null) {
+            return worldConfig.applyToConfig(config);
+        }
+        return config;
+    }
+
     public MinimapConfig getConfig() {
         return config;
     }

common/src/main/java/com/funniray/minimap/common/jm/JMHandler.java

@@ -10,20 +10,17 @@
 import com.funniray.minimap.common.jm.data.JMWorldConfig;
 import com.funniray.minimap.common.jm.data.ServerPropType;
 import com.funniray.minimap.common.network.NetworkUtils;
+import com.funniray.minimap.common.version.Version;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import com.google.gson.Gson;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
-import java.awt.print.Pageable;
 import java.util.*;
 
 public class JMHandler implements MessageHandler {
     private final JavaMinimapPlugin plugin;
-    // JM for 1.21 and above no longer has a leading 0 byte at the start of packets.
-    // We need to note who is on a modern version and not send them (or parse) leading 0 bytes
-    private final Map<UUID, Boolean> modernList = new HashMap<>();
 
     public JMHandler(JavaMinimapPlugin plugin) {
         this.plugin = plugin;
@@ -42,7 +39,7 @@ public void handleTeleport(MinimapPlayer player, byte[] message, String replyCha
             player.sendMessage(MiniMessage.miniMessage().deserialize("<red>You don't have permission to teleport."));
             return;
         }
-        String teleport = getEffectiveConfig(player).teleportEnabled;
+        String teleport = plugin.getEffectiveJMConfig(player).teleportEnabled;
         if (teleport.equalsIgnoreCase("none") || (teleport.equalsIgnoreCase("ops") && !player.hasPermission("minimap.jm.admin"))) {
             player.sendMessage(MiniMessage.miniMessage().deserialize("<red>Teleport packet was sent, but teleporting isn't enabled."));
             return;
@@ -144,7 +141,6 @@ public void handleAdminSave(MinimapPlayer player, byte[] message, String replyCh
     }
 
     public void handleVersion(MinimapPlayer player, byte[] message, String replyChannel) {
-        modernList.put(player.getUniqueId(), message.length > 0 && message[0] != 0);
         Gson gson = new Gson();
         JMVersion serverVersion = new JMVersion();
         ByteArrayDataInput in = ByteStreams.newDataInput(message);
@@ -163,18 +159,8 @@ public void handleVersion(MinimapPlayer player, byte[] message, String replyChan
         player.sendPluginMessage(out.toByteArray(), replyChannel);
     }
 
-    public JMConfig getEffectiveConfig(MinimapPlayer player) {
-        JMWorldConfig worldConfig = plugin.getConfig().getWorldConfig(player.getLocation().getWorld().getName()).journeymapConfig;
-        JMConfig config = plugin.getConfig().globalJourneymapConfig;
-        if (worldConfig != null) {
-            return worldConfig.applyToConfig(config);
-        }
-        return config;
-    }
-
     public void handlePerm(MinimapPlayer player, byte[] message, String replyChannel, int replyByte) {
-        modernList.putIfAbsent(player.getUniqueId(), message.length > 0 && message[0] == 42);
-        JMConfig config = getEffectiveConfig(player);
+        JMConfig config = plugin.getEffectiveJMConfig(player);
 
         Gson gson = new Gson();
         String payload = gson.toJson(config);
@@ -187,14 +173,12 @@ public void handlePerm(MinimapPlayer player, byte[] message, String replyChannel
         player.sendPluginMessage(out.toByteArray(), replyChannel);
     }
 
-    private boolean modern(MinimapPlayer player) {
-        Boolean modern = modernList.get(player.getUniqueId());
-        if (modern == null) return false;
-        return modern;
+    public boolean modern(MinimapPlayer player) {
+        return player.getVersion().greaterThanEqual(new Version(1,21,0));
     }
 
-    public void playerLeft(MinimapPlayer player) {
-        modernList.remove(player.getUniqueId());
+    public boolean isLegacy(MinimapPlayer player) {
+        return !player.getVersion().greaterThanEqual(new Version(1, 18, 0));
     }
 
     @Override

common/src/main/java/com/funniray/minimap/common/worldinfo/WorldInfoHandler.java

@@ -3,12 +3,12 @@
 import com.funniray.minimap.common.JavaMinimapPlugin;
 import com.funniray.minimap.common.api.MessageHandler;
 import com.funniray.minimap.common.api.MinimapPlayer;
+import com.funniray.minimap.common.jm.data.JMConfig;
 import com.funniray.minimap.common.network.NetworkUtils;
 import com.funniray.minimap.common.version.Version;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 
-import java.util.UUID;
 
 public class WorldInfoHandler implements MessageHandler {
     private final JavaMinimapPlugin plugin;
@@ -23,11 +23,17 @@ public void sendPacket(MinimapPlayer player) {
         String worldId;
         // The entire server gets it's own worldId on 1.13
         // worldId on 1.12 and before is per-dimension, as bukkit reuses dimension IDs
+        JMConfig config = plugin.getEffectiveJMConfig(player);
         if (player.getVersion().greaterThanEqual(new Version(1,13,0))) {
             worldId = plugin.getConfig().worldId;
         } else {
             worldId = plugin.getConfig().getWorldConfig(player.getLocation().getWorld().getName()).worldId;
         }
+
+        if (worldId == null || !config.useWorldId.equalsIgnoreCase("true")) {
+            return;
+        }
+
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeByte(0);
         out.writeByte(42);