Direct selection command usable also in the console /if select world x1 y1 z1 x2 y2 z2

Closes #23

src/main/java/com/loohp/imageframe/Commands.java

@@ -23,6 +23,7 @@ package com.loohp.imageframe;
 import com.loohp.imageframe.api.events.ImageMapUpdatedEvent;
 import com.loohp.imageframe.migration.ExternalPluginMigration;
 import com.loohp.imageframe.migration.PluginMigrationRegistry;
+import com.loohp.imageframe.objectholders.BlockPosition;
 import com.loohp.imageframe.objectholders.ImageMap;
 import com.loohp.imageframe.objectholders.ImageMapAccessPermissionType;
 import com.loohp.imageframe.objectholders.ItemFrameSelectionManager;
@@ -43,6 +44,7 @@ import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -130,7 +132,7 @@ public class Commands implements CommandExecutor, TabCompleter {
                                         sender.sendMessage(ImageFrame.messageNoConsole);
                                         return true;
                                     }
-                                    selection = ImageFrame.itemFrameSelectionManager.getPlayerSelection(player);
+                                    selection = ImageFrame.itemFrameSelectionManager.getConfirmedSelections(player);
                                     if (selection == null) {
                                         sender.sendMessage(ImageFrame.messageSelectionNoSelection);
                                         return true;
@@ -275,7 +277,7 @@ public class Commands implements CommandExecutor, TabCompleter {
                                     int width;
                                     int height;
                                     if (args.length == 4 && args[3].equalsIgnoreCase("selection")) {
-                                        ItemFrameSelectionManager.SelectedItemFrameResult selection = ImageFrame.itemFrameSelectionManager.getPlayerSelection(player);
+                                        ItemFrameSelectionManager.SelectedItemFrameResult selection = ImageFrame.itemFrameSelectionManager.getConfirmedSelections(player);
                                         if (selection == null) {
                                             player.sendMessage(ImageFrame.messageSelectionNoSelection);
                                             return true;
@@ -366,7 +368,7 @@ public class Commands implements CommandExecutor, TabCompleter {
                                 boolean combined = args.length > 3 && args[3].equalsIgnoreCase("combined");
                                 ItemFrameSelectionManager.SelectedItemFrameResult selection;
                                 if (args.length > 3 && args[3].equalsIgnoreCase("selection")) {
-                                    selection = ImageFrame.itemFrameSelectionManager.getPlayerSelection(player);
+                                    selection = ImageFrame.itemFrameSelectionManager.getConfirmedSelections(player);
                                     if (selection == null) {
                                         sender.sendMessage(ImageFrame.messageSelectionNoSelection);
                                         return true;
@@ -524,17 +526,52 @@ public class Commands implements CommandExecutor, TabCompleter {
             return true;
         } else if (args[0].equalsIgnoreCase("select")) {
             if (sender.hasPermission("imageframe.select")) {
-                if (sender instanceof Player) {
-                    Player player = (Player) sender;
-                    if (ImageFrame.itemFrameSelectionManager.isInSelection(player)) {
-                        ImageFrame.itemFrameSelectionManager.setInSelection(player, false);
-                        sender.sendMessage(ImageFrame.messageSelectionClear);
+                if (args.length == 1) {
+                    if (sender instanceof Player) {
+                        Player player = (Player) sender;
+                        if (ImageFrame.itemFrameSelectionManager.isInSelection(player)) {
+                            ImageFrame.itemFrameSelectionManager.setInSelection(player, false);
+                            sender.sendMessage(ImageFrame.messageSelectionClear);
+                        } else {
+                            ImageFrame.itemFrameSelectionManager.setInSelection(player, true);
+                            sender.sendMessage(ImageFrame.messageSelectionBegin);
+                        }
                     } else {
-                        ImageFrame.itemFrameSelectionManager.setInSelection(player, true);
-                        sender.sendMessage(ImageFrame.messageSelectionBegin);
+                        sender.sendMessage(ImageFrame.messageNoConsole);
+                    }
+                } else if (args.length == 8 || args.length == 9) {
+                    try {
+                        World world = Bukkit.getWorld(args[1]);
+                        if (world != null) {
+                            int x1 = Integer.parseInt(args[2]);
+                            int y1 = Integer.parseInt(args[3]);
+                            int z1 = Integer.parseInt(args[4]);
+                            int x2 = Integer.parseInt(args[5]);
+                            int y2 = Integer.parseInt(args[6]);
+                            int z2 = Integer.parseInt(args[7]);
+
+                            BlockPosition pos1 = new BlockPosition(world, x1, y1, z1);
+                            BlockPosition pos2 = new BlockPosition(world, x2, y2, z2);
+
+                            float yaw;
+                            if (args.length == 9) {
+                                yaw = Float.parseFloat(args[8]);
+                            } else {
+                                yaw = sender instanceof Player ? ((Player) sender).getLocation().getYaw() : 0F;
+                            }
+
+                            if (ImageFrame.itemFrameSelectionManager.isInSelection(sender)) {
+                                ImageFrame.itemFrameSelectionManager.setInSelection(sender, false);
+                            }
+                            ImageFrame.itemFrameSelectionManager.applyDirectItemFrameSelection(sender, yaw, pos1, pos2);
+                        } else {
+                            sender.sendMessage(ImageFrame.messageInvalidUsage);
+                        }
+                    } catch (NumberFormatException e) {
+                        sender.sendMessage(ImageFrame.messageInvalidUsage);
                     }
                 } else {
-                    sender.sendMessage(ImageFrame.messageNoConsole);
+                    sender.sendMessage(ImageFrame.messageInvalidUsage);
                 }
             } else {
                 sender.sendMessage(ImageFrame.messageNoPermission);
@@ -913,7 +950,7 @@ public class Commands implements CommandExecutor, TabCompleter {
                         boolean combined = args.length > 2 && args[2].equalsIgnoreCase("combined");
                         ItemFrameSelectionManager.SelectedItemFrameResult selection;
                         if (args.length > 2 && args[2].equalsIgnoreCase("selection") && senderPlayer != null) {
-                            selection = ImageFrame.itemFrameSelectionManager.getPlayerSelection(senderPlayer);
+                            selection = ImageFrame.itemFrameSelectionManager.getConfirmedSelections(senderPlayer);
                             if (selection == null) {
                                 sender.sendMessage(ImageFrame.messageSelectionNoSelection);
                                 return true;

src/main/java/com/loohp/imageframe/objectholders/BlockPosition.java

@@ -0,0 +1,83 @@
+/*
+ * This file is part of ImageFrame.
+ *
+ * Copyright (C) 2023. LoohpJames <jamesloohp@gmail.com>
+ * Copyright (C) 2023. Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.loohp.imageframe.objectholders;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.util.BoundingBox;
+import org.bukkit.util.Vector;
+
+import java.lang.ref.WeakReference;
+
+public class BlockPosition {
+
+    private final WeakReference<World> world;
+    private final int x;
+    private final int y;
+    private final int z;
+
+    public BlockPosition(World world, int x, int y, int z) {
+        this.world = new WeakReference<>(world);
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    public boolean isWorldLoaded() {
+        World world = this.world.get();
+        return world != null && Bukkit.getWorld(world.getUID()) != null;
+    }
+
+    public World getWorld() {
+        return world.get();
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public int getZ() {
+        return z;
+    }
+
+    public Block getBlock() {
+        return getWorld().getBlockAt(x, y, z);
+    }
+
+    public Location toLocation() {
+        return new Location(getWorld(), x, y, z);
+    }
+
+    public Vector toVector() {
+        return new Vector(x, y, z);
+    }
+
+    public BoundingBox toBoundingBox() {
+        return new BoundingBox(x, y, z, x + 1, y + 1, z + 1);
+    }
+
+}

src/main/java/com/loohp/imageframe/objectholders/ItemFrameSelectionManager.java

@@ -28,6 +28,7 @@ import org.bukkit.Rotation;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
@@ -42,6 +43,7 @@ import org.bukkit.map.MapView;
 import org.bukkit.util.BoundingBox;
 import org.bukkit.util.Vector;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.IntSummaryStatistics;
@@ -55,13 +57,13 @@ import java.util.stream.Collectors;
 public class ItemFrameSelectionManager implements Listener, AutoCloseable {
 
     private final Set<Player> inSelectionMode;
-    private final Map<Player, ItemFrame> playerFirstCorner;
-    private final Map<Player, SelectedItemFrameResult> playerSelection;
+    private final Map<Player, ItemFrame> activeFirstCorners;
+    private final Map<CommandSender, SelectedItemFrameResult> confirmedSelection;
 
     public ItemFrameSelectionManager() {
         this.inSelectionMode = ConcurrentHashMap.newKeySet();
-        this.playerFirstCorner = new ConcurrentHashMap<>();
-        this.playerSelection = new ConcurrentHashMap<>();
+        this.activeFirstCorners = new ConcurrentHashMap<>();
+        this.confirmedSelection = new ConcurrentHashMap<>();
         Bukkit.getPluginManager().registerEvents(this, ImageFrame.plugin);
     }
 
@@ -70,41 +72,47 @@ public class ItemFrameSelectionManager implements Listener, AutoCloseable {
         HandlerList.unregisterAll(this);
     }
 
-    public void setInSelection(Player player, boolean value) {
-        if (value) {
-            playerSelection.remove(player);
-            playerFirstCorner.remove(player);
-            inSelectionMode.add(player);
-        } else {
-            playerFirstCorner.remove(player);
-            inSelectionMode.remove(player);
+    public void setInSelection(CommandSender sender, boolean value) {
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            if (value) {
+                confirmedSelection.remove(player);
+                activeFirstCorners.remove(player);
+                inSelectionMode.add(player);
+            } else {
+                activeFirstCorners.remove(player);
+                inSelectionMode.remove(player);
+            }
         }
     }
 
-    public boolean isInSelection(Player player) {
-        return inSelectionMode.contains(player);
+    public boolean isInSelection(CommandSender sender) {
+        if (!(sender instanceof Player)) {
+            return false;
+        }
+        return inSelectionMode.contains((Player) sender);
     }
 
-    public SelectedItemFrameResult getPlayerSelection(Player player) {
-        return playerSelection.get(player);
+    public SelectedItemFrameResult getConfirmedSelections(CommandSender sender) {
+        return confirmedSelection.get(sender);
     }
 
-    public SelectedItemFrameResult clearPlayerSelection(Player player) {
-        playerFirstCorner.remove(player);
-        inSelectionMode.remove(player);
-        return playerSelection.remove(player);
+    public SelectedItemFrameResult clearConfirmedSelections(CommandSender sender) {
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            activeFirstCorners.remove(player);
+            inSelectionMode.remove(player);
+        }
+        return confirmedSelection.remove(sender);
     }
 
     @EventHandler
     public void onQuit(PlayerQuitEvent event) {
-        clearPlayerSelection(event.getPlayer());
+        clearConfirmedSelections(event.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInteractEntity(PlayerInteractEntityEvent event) {
-        if (event.getHand().equals(EquipmentSlot.OFF_HAND)) {
-            return;
-        }
         Player player = event.getPlayer();
         if (!inSelectionMode.contains(player)) {
             return;
@@ -114,9 +122,12 @@ public class ItemFrameSelectionManager implements Listener, AutoCloseable {
             return;
         }
         event.setCancelled(true);
-        ItemFrame selection = playerFirstCorner.remove(player);
+        if (event.getHand().equals(EquipmentSlot.OFF_HAND)) {
+            return;
+        }
+        ItemFrame selection = activeFirstCorners.remove(player);
         if (selection == null) {
-            playerFirstCorner.put(player, (ItemFrame) entity);
+            activeFirstCorners.put(player, (ItemFrame) entity);
             player.sendMessage(ImageFrame.messageSelectionCorner1);
         } else {
             player.sendMessage(ImageFrame.messageSelectionCorner2);
@@ -127,12 +138,41 @@ public class ItemFrameSelectionManager implements Listener, AutoCloseable {
             } else if (result.isOverSize()) {
                 player.sendMessage(ImageFrame.messageSelectionOversize.replace("{MaxSize}", ImageFrame.mapMaxSize + ""));
             } else {
-                playerSelection.put(player, result);
+                confirmedSelection.put(player, result);
                 player.sendMessage(ImageFrame.messageSelectionSuccess.replace("{Width}", result.getWidth() + "").replace("{Height}", result.getHeight() + ""));
             }
         }
     }
 
+    public boolean applyDirectItemFrameSelection(CommandSender sender, float yaw, BlockPosition pos1, BlockPosition pos2) {
+        Collection<Entity> pos1Entity = pos1.getWorld().getNearbyEntities(pos1.toBoundingBox());
+        Collection<Entity> pos2Entity = pos2.getWorld().getNearbyEntities(pos2.toBoundingBox());
+        MutablePair<ItemFrame, ItemFrame> pair = pos1Entity.stream().filter(e -> e instanceof ItemFrame).map(e -> {
+            ItemFrame i = (ItemFrame) e;
+            BlockFace facing = i.getAttachedFace();
+            return pos2Entity.stream()
+                    .filter(e2 -> e2 instanceof ItemFrame && ((ItemFrame) e2).getAttachedFace().equals(facing))
+                    .findFirst()
+                    .map(e2 -> new MutablePair<>(i, (ItemFrame) e2))
+                    .orElse(null);
+        }).filter(p -> p != null).findFirst().orElse(null);
+        if (pair == null) {
+            sender.sendMessage(ImageFrame.messageSelectionInvalid);
+            return false;
+        }
+        SelectedItemFrameResult result = getSelectedItemFrames(yaw, pair.getFirst(), pair.getSecond());
+        if (result == null) {
+            sender.sendMessage(ImageFrame.messageSelectionInvalid);
+        } else if (result.isOverSize()) {
+            sender.sendMessage(ImageFrame.messageSelectionOversize.replace("{MaxSize}", ImageFrame.mapMaxSize + ""));
+        } else {
+            confirmedSelection.put(sender, result);
+            sender.sendMessage(ImageFrame.messageSelectionSuccess.replace("{Width}", result.getWidth() + "").replace("{Height}", result.getHeight() + ""));
+            return true;
+        }
+        return false;
+    }
+
     public SelectedItemFrameResult getSelectedItemFrames(float yaw, ItemFrame left, ItemFrame right) {
         if (left == null || right == null) {
             return null;

src/main/java/com/loohp/imageframe/utils/GifReader.java

@@ -20,7 +20,6 @@
 
 package com.loohp.imageframe.utils;
 
-import com.loohp.imageframe.objectholders.MutablePair;
 import com.loohp.imageframe.objectholders.Scheduler;
 import com.madgag.gif.fmsware.GifDecoder;
 import org.w3c.dom.NamedNodeMap;