XaeroLevelMapSender

Author: turikhay

spigot/src/main/java/com/turikhay/mc/mapmodcompanion/spigot/XaeroHandler.java

@@ -1,8 +1,6 @@
 package com.turikhay.mc.mapmodcompanion.spigot;
 
 import com.turikhay.mc.mapmodcompanion.*;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.HandlerList;
@@ -11,30 +9,26 @@
 import org.bukkit.event.player.PlayerEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 public class XaeroHandler implements Handler, Listener {
     private final Logger logger;
-    private final String configPath;
     private final String channelName;
     private final MapModCompanion plugin;
     private final ScheduledExecutorService scheduler;
+    private final XaeroLevelMapSender sender;
 
     public XaeroHandler(Logger logger, String configPath, String channelName, MapModCompanion plugin) {
         this.logger = logger;
-        this.configPath = configPath;
         this.channelName = channelName;
         this.plugin = plugin;
 
         this.scheduler = Executors.newSingleThreadScheduledExecutor(
                 new DaemonThreadFactory(ILogger.ofJava(logger), XaeroHandler.class)
         );
+        this.sender = new XaeroLevelMapSender(logger, plugin, channelName, configPath, scheduler);
     }
 
     public void init() throws InitializationException {
@@ -53,36 +47,16 @@ public void cleanUp() {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoined(PlayerJoinEvent event) {
-        sendPacket(event, Type.JOIN);
+        sendPacket(event, XaeroLevelMapSender.EventSource.JOIN);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onWorldChanged(PlayerChangedWorldEvent event) {
-        sendPacket(event, Type.WORLD_CHANGE);
+        sendPacket(event, XaeroLevelMapSender.EventSource.WORLD_CHANGE);
     }
 
-    private void sendPacket(PlayerEvent event, Type type) {
-        Player p = event.getPlayer();
-        World world = p.getWorld();
-        int id = plugin.getRegistry().getId(world);
-        byte[] payload = LevelMapProperties.Serializer.instance().serialize(id);
-        SendPayloadTask task = new SendPayloadTask(logger, plugin, p.getUniqueId(), channelName, payload, world.getUID());
-        int repeatTimes = plugin.getConfig().getInt(
-                configPath + ".events." + type.name().toLowerCase(Locale.ROOT) + ".repeat_times",
-                1
-        );
-        if (repeatTimes > 1) {
-            for (int i = 0; i < repeatTimes; i++) {
-                scheduler.schedule(task, i, TimeUnit.SECONDS);
-            }
-        } else {
-            task.run();
-        }
-    }
-
-    private enum Type {
-        JOIN,
-        WORLD_CHANGE,
+    private void sendPacket(PlayerEvent event, XaeroLevelMapSender.EventSource source) {
+        sender.sendPacket(event.getPlayer(), source);
     }
 
     public static class Factory implements Handler.Factory<MapModCompanion> {
@@ -111,37 +85,5 @@ public XaeroHandler create(MapModCompanion plugin) throws InitializationExceptio
         }
     }
 
-    private static class SendPayloadTask implements Runnable {
-        private final Logger logger;
-        private final MapModCompanion plugin;
-        private final UUID playerId;
-        private final String channelName;
-        private final byte[] payload;
-        private final UUID expectedWorld;
-
-        public SendPayloadTask(Logger logger, MapModCompanion plugin, UUID playerId, String channelName, byte[] payload,
-                               UUID expectedWorld) {
-            this.logger = logger;
-            this.plugin = plugin;
-            this.playerId = playerId;
-            this.channelName = channelName;
-            this.payload = payload;
-            this.expectedWorld = expectedWorld;
-        }
 
-        @Override
-        public void run() {
-            Player player = plugin.getServer().getPlayer(playerId);
-            if (player == null) {
-                return;
-            }
-            UUID world = player.getWorld().getUID();
-            if (!world.equals(expectedWorld)) {
-                logger.fine("Skipping sending Xaero's LevelMapProperties to " + player.getName() + ": unexpected world");
-                return;
-            }
-            logger.fine(() -> "Sending Xaero's LevelMapProperties to " + player.getName() + ": " + Arrays.toString(payload));
-            player.sendPluginMessage(plugin, channelName, payload);
-        }
-    }
 }

spigot/src/main/java/com/turikhay/mc/mapmodcompanion/spigot/XaeroLevelMapSender.java

@@ -0,0 +1,85 @@
+package com.turikhay.mc.mapmodcompanion.spigot;
+
+import com.turikhay.mc.mapmodcompanion.LevelMapProperties;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+class XaeroLevelMapSender {
+    private final Logger logger;
+    private final MapModCompanion plugin;
+    private final String channelName;
+    private final String configPath;
+    private final ScheduledExecutorService scheduler;
+
+    XaeroLevelMapSender(Logger logger, MapModCompanion plugin, String channelName, String configPath, ScheduledExecutorService scheduler) {
+        this.logger = logger;
+        this.plugin = plugin;
+        this.channelName = channelName;
+        this.configPath = configPath;
+        this.scheduler = scheduler;
+    }
+
+    void sendPacket(Player p, EventSource source) {
+        World world = p.getWorld();
+        int id = plugin.getRegistry().getId(world);
+        byte[] payload = LevelMapProperties.Serializer.instance().serialize(id);
+        SendPayloadTask task = new SendPayloadTask(logger, plugin, p.getUniqueId(), channelName, payload, world.getUID());
+        int repeatTimes = plugin.getConfig().getInt(
+                configPath + ".events." + source.name().toLowerCase(Locale.ROOT) + ".repeat_times",
+                1
+        );
+        if (repeatTimes > 1) {
+            for (int i = 0; i < repeatTimes; i++) {
+                scheduler.schedule(task, i, TimeUnit.SECONDS);
+            }
+        } else {
+            task.run();
+        }
+    }
+
+    enum EventSource {
+        JOIN,
+        WORLD_CHANGE,
+    }
+
+    private static class SendPayloadTask implements Runnable {
+        private final Logger logger;
+        private final MapModCompanion plugin;
+        private final UUID playerId;
+        private final String channelName;
+        private final byte[] payload;
+        private final UUID expectedWorld;
+
+        public SendPayloadTask(Logger logger, MapModCompanion plugin, UUID playerId, String channelName, byte[] payload,
+                               UUID expectedWorld) {
+            this.logger = logger;
+            this.plugin = plugin;
+            this.playerId = playerId;
+            this.channelName = channelName;
+            this.payload = payload;
+            this.expectedWorld = expectedWorld;
+        }
+
+        @Override
+        public void run() {
+            Player player = plugin.getServer().getPlayer(playerId);
+            if (player == null) {
+                return;
+            }
+            UUID world = player.getWorld().getUID();
+            if (!world.equals(expectedWorld)) {
+                logger.fine("Skipping sending Xaero's LevelMapProperties to " + player.getName() + ": unexpected world");
+                return;
+            }
+            logger.fine(() -> "Sending Xaero's LevelMapProperties to " + player.getName() + ": " + Arrays.toString(payload));
+            player.sendPluginMessage(plugin, channelName, payload);
+        }
+    }
+}