chore: remove MapManager + dependent features (#3246)

dordsor21 · web-flow · commit ffc59efe1246 · 2025-07-25T17:52:59.000+02:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,6 @@ snakeyaml = "2.0"
 # Plugins
 dummypermscompat = "1.10"
 worldguard-bukkit = "7.0.14"
-mapmanager = "1.8.0-SNAPSHOT"
 griefprevention = "17.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "4.5._13.1"
@@ -66,7 +65,6 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml"
 # Plugins
 dummypermscompat = { group = "com.sk89q", name = "dummypermscompat", version.ref = "dummypermscompat" }
 worldguard = { group = "com.sk89q.worldguard", name = "worldguard-bukkit", version.ref = "worldguard-bukkit" }
-mapmanager = { group = "com.github.InventivetalentDev", name = "MapManager", version.ref = "mapmanager" }
 griefprevention = { group = "com.github.TechFortress", name = "GriefPrevention", version.ref = "griefprevention" }
 griefdefender = { group = "com.griefdefender", name = "api", version.ref = "griefdefender" }
 residence = { group = "com.bekvon.bukkit.residence", name = "Residence", version.ref = "residence" }
diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
@@ -103,7 +103,6 @@ dependencies {
         exclude("com.sk89q.worldedit.worldedit-libs", "bukkit")
         exclude("com.sk89q.worldedit.worldedit-libs", "core")
     }
-    compileOnly(libs.mapmanager) { isTransitive = false }
     compileOnly(libs.griefprevention) { isTransitive = false }
     compileOnly(libs.griefdefender) { isTransitive = false }
     compileOnly(libs.residence) { isTransitive = false }
diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java
@@ -111,21 +111,7 @@ public QueueHandler getQueueHandler() {
 
     @Override
     public synchronized ImageViewer getImageViewer(com.sk89q.worldedit.entity.Player player) {
-        try {
-            PluginManager manager = Bukkit.getPluginManager();
-
-            if (manager.getPlugin("PacketListenerApi") == null) {
-                LOGGER.error("PacketListener not found! Please install PacketListenerAPI v3.7.6 or above before attempting to " +
-                        "complete image-related edits");
-            }
-            if (manager.getPlugin("MapManager") == null) {
-                LOGGER.error("MapManager not found! Please install PacketListenerAPI v1.7.8 or above before attempting to " +
-                        "complete image-related edits");
-            }
-            return new BukkitImageViewer(BukkitAdapter.adapt(player));
-        } catch (Throwable ignored) {
-        }
-        return null;
+        throw new UnsupportedOperationException("No longer supported.");
     }
 
     @Override
diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/image/BukkitImageViewer.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/image/BukkitImageViewer.java
@@ -1,220 +1,42 @@
 package com.fastasyncworldedit.bukkit.util.image;
 
-import com.fastasyncworldedit.core.util.TaskManager;
 import com.fastasyncworldedit.core.util.image.Drawable;
-import com.fastasyncworldedit.core.util.image.ImageUtil;
 import com.fastasyncworldedit.core.util.image.ImageViewer;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Rotation;
-import org.bukkit.World;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.inventivetalent.mapmanager.MapManagerPlugin;
-import org.inventivetalent.mapmanager.controller.MapController;
-import org.inventivetalent.mapmanager.controller.MultiMapController;
-import org.inventivetalent.mapmanager.manager.MapManager;
-import org.inventivetalent.mapmanager.wrapper.MapWrapper;
 
-import javax.annotation.Nullable;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.util.Collection;
 
+/**
+ * @deprecated for removal with no replacement. Out of scope for FAWE.
+ */
+@Deprecated(forRemoval = true, since = "TODO")
 public class BukkitImageViewer implements ImageViewer {
 
-    private final MapManager mapManager;
-    private final Player player;
-    private BufferedImage last;
-    private ItemFrame[][] frames;
-    private boolean reverse;
-
     public BukkitImageViewer(Player player) {
-        mapManager = ((MapManagerPlugin) Bukkit.getPluginManager().getPlugin("MapManager")).getMapManager();
-        this.player = player;
+        throw new UnsupportedOperationException("No longer supported.");
     }
 
     public void selectFrame(ItemFrame start) {
-        Location pos1 = start.getLocation().clone();
-        Location pos2 = start.getLocation().clone();
-
-        BlockFace facing = start.getFacing();
-        int planeX = facing.getModX() == 0 ? 1 : 0;
-        int planeY = facing.getModY() == 0 ? 1 : 0;
-        int planeZ = facing.getModZ() == 0 ? 1 : 0;
-
-        ItemFrame[][] res = find(pos1, pos2, facing);
-        Location tmp;
-        while (true) {
-            if (res != null) {
-                frames = res;
-            }
-            tmp = pos1.clone().subtract(planeX, planeY, planeZ);
-            if ((res = find(tmp, pos2, facing)) != null) {
-                pos1 = tmp;
-                continue;
-            }
-            tmp = pos2.clone().add(planeX, planeY, planeZ);
-            if ((res = find(pos1, tmp, facing)) != null) {
-                pos2 = tmp;
-                continue;
-            }
-            tmp = pos1.clone().subtract(planeX, 0, planeZ);
-            if ((res = find(tmp, pos2, facing)) != null) {
-                pos1 = tmp;
-                continue;
-            }
-            tmp = pos2.clone().add(planeX, 0, planeZ);
-            if ((res = find(pos1, tmp, facing)) != null) {
-                pos2 = tmp;
-                continue;
-            }
-            tmp = pos1.clone().subtract(0, 1, 0);
-            if ((res = find(tmp, pos2, facing)) != null) {
-                pos1 = tmp;
-                continue;
-            }
-            tmp = pos2.clone().add(0, 1, 0);
-            if ((res = find(pos1, tmp, facing)) != null) {
-                pos2 = tmp;
-                continue;
-            }
-            break;
-        }
+        throw new UnsupportedOperationException("No longer supported.");
     }
 
     public ItemFrame[][] getItemFrames() {
-        return frames;
-    }
-
-    private ItemFrame[][] find(Location pos1, Location pos2, BlockFace facing) {
-        try {
-            Location distance = pos2.clone().subtract(pos1).add(1, 1, 1);
-            int width = Math.max(distance.getBlockX(), distance.getBlockZ());
-            ItemFrame[][] frames = new ItemFrame[width][distance.getBlockY()];
-
-            World world = pos1.getWorld();
-
-            this.reverse = facing == BlockFace.NORTH || facing == BlockFace.EAST;
-            int v = 0;
-            for (double y = pos1.getY(); y <= pos2.getY(); y++, v++) {
-                int h = 0;
-                for (double z = pos1.getZ(); z <= pos2.getZ(); z++) {
-                    for (double x = pos1.getX(); x <= pos2.getX(); x++, h++) {
-                        Location pos = new Location(world, x, y, z);
-                        Collection<Entity> entities = world.getNearbyEntities(pos, 0.1, 0.1, 0.1);
-                        boolean contains = false;
-                        for (Entity ent : entities) {
-                            if (ent instanceof ItemFrame && ent.getFacing() == facing) {
-                                ItemFrame itemFrame = (ItemFrame) ent;
-                                itemFrame.setRotation(Rotation.NONE);
-                                contains = true;
-                                frames[reverse ? width - 1 - h : h][v] = (ItemFrame) ent;
-                                break;
-                            }
-                        }
-                        if (!contains) {
-                            return null;
-                        }
-                    }
-                }
-            }
-            return frames;
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
+        throw new UnsupportedOperationException("No longer supported.");
     }
 
     @Override
     public void view(Drawable drawable) {
-        view(null, drawable);
-    }
-
-    private void view(@Nullable BufferedImage image, @Nullable Drawable drawable) {
-        if (image == null && drawable == null) {
-            throw new IllegalArgumentException("An image or drawable must be provided. Both cannot be null");
-        }
-        boolean initializing = last == null;
-
-        if (this.frames != null) {
-            if (image == null && drawable != null) {
-                image = drawable.draw();
-            }
-            last = image;
-            int width = frames.length;
-            int height = frames[0].length;
-            BufferedImage scaled = ImageUtil.getScaledInstance(
-                    image,
-                    128 * width,
-                    128 * height,
-                    RenderingHints.VALUE_INTERPOLATION_BILINEAR,
-                    false
-            );
-            MapWrapper mapWrapper = mapManager.wrapMultiImage(scaled, width, height);
-            MultiMapController controller = (MultiMapController) mapWrapper.getController();
-            controller.addViewer(player);
-            controller.sendContent(player);
-            controller.showInFrames(player, frames, true);
-        } else {
-            int slot = getMapSlot(player);
-            TaskManager.taskManager().sync(() -> {
-                if (slot == -1) {
-                    if (initializing) {
-                        player.getInventory().setItemInMainHand(new ItemStack(Material.MAP));
-                    } else {
-                        return null;
-                    }
-                } else if (player.getInventory().getHeldItemSlot() != slot) {
-                    player.getInventory().setHeldItemSlot(slot);
-                }
-                return null;
-            });
-            if (image == null && drawable != null) {
-                image = drawable.draw();
-            }
-            last = image;
-            BufferedImage scaled = ImageUtil.getScaledInstance(
-                    image,
-                    128,
-                    128,
-                    RenderingHints.VALUE_INTERPOLATION_BILINEAR,
-                    false
-            );
-            MapWrapper mapWrapper = mapManager.wrapImage(scaled);
-            MapController controller = mapWrapper.getController();
-            controller.addViewer(player);
-            controller.sendContent(player);
-            controller.showInHand(player, true);
-        }
-    }
-
-    private int getMapSlot(Player player) {
-        PlayerInventory inventory = player.getInventory();
-        for (int i = 0; i < 9; i++) {
-            ItemStack item = inventory.getItem(i);
-            if (item != null && item.getType() == Material.MAP) {
-                return i;
-            }
-        }
-        return -1;
+        throw new UnsupportedOperationException("No longer supported.");
     }
 
     public void refresh() {
-        if (last != null) {
-            view(last, null);
-        }
+        throw new UnsupportedOperationException("No longer supported.");
     }
 
     @Override
     public void close() throws IOException {
-        last = null;
+        throw new UnsupportedOperationException("No longer supported.");
     }
 
 }
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java
@@ -19,6 +19,10 @@ public interface IFawe {
 
     Collection<FaweMaskManager> getMaskManagers();
 
+    /**
+     * @deprecated for removal with no replacement. Out of scope for FAWE.
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     default ImageViewer getImageViewer(Player player) {
         return null;
     }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ dependencies {`
`103`	`103`	`exclude("com.sk89q.worldedit.worldedit-libs", "bukkit")`
`104`	`104`	`exclude("com.sk89q.worldedit.worldedit-libs", "core")`
`105`	`105`	`}`
`106`		`- compileOnly(libs.mapmanager) { isTransitive = false }`
`107`	`106`	`compileOnly(libs.griefprevention) { isTransitive = false }`
`108`	`107`	`compileOnly(libs.griefdefender) { isTransitive = false }`
`109`	`108`	`compileOnly(libs.residence) { isTransitive = false }`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ public interface IFawe {`
`19`	`19`
`20`	`20`	`Collection<FaweMaskManager> getMaskManagers();`
`21`	`21`
	`22`	`+ /**`
	`23`	`+ * @deprecated for removal with no replacement. Out of scope for FAWE.`
	`24`	`+ */`
	`25`	`+ @Deprecated(forRemoval = true, since = "TODO")`
`22`	`26`	`default ImageViewer getImageViewer(Player player) {`
`23`	`27`	`return null;`
`24`	`28`	`}`