♻️ Cleanup

API/src/main/java/tech/sbdevelopment/mapreflectionapi/MapReflectionAPI.java

@@ -24,7 +24,13 @@
 package tech.sbdevelopment.mapreflectionapi;
 
 import org.bukkit.Bukkit;
+import org.bukkit.map.MapView;
 import org.bukkit.plugin.java.JavaPlugin;
+import tech.sbdevelopment.mapreflectionapi.api.MapManager;
+import tech.sbdevelopment.mapreflectionapi.listeners.MapListener;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
+
+import java.util.logging.Level;
 
 public class MapReflectionAPI extends JavaPlugin {
     private static MapReflectionAPI instance;
@@ -45,15 +51,21 @@ public class MapReflectionAPI extends JavaPlugin {
     public void onEnable() {
         instance = this;
 
+        getLogger().info("----------------");
+        getLogger().info("MapReflectionAPI v" + getDescription().getVersion() + "");
+        getLogger().info("Made by © Copyright SBDevelopment 2022");
+
         if (!Bukkit.getPluginManager().isPluginEnabled("BKCommonLib")) {
             getLogger().severe("MapReflectionAPI requires BKCommonLib to function!");
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
 
+        getLogger().info("Initializing the packet handler...");
         packetListener = PacketListener.construct();
         packetListener.init(this);
 
+        getLogger().info("Initializing the map manager...");
         try {
             mapManager = new MapManager();
         } catch (IllegalStateException e) {
@@ -62,12 +74,32 @@ public class MapReflectionAPI extends JavaPlugin {
             return;
         }
 
+        getLogger().info("Registering the events...");
+        Bukkit.getPluginManager().registerEvents(new MapListener(), this);
+
+        getLogger().info("Discovering occupied Map IDs...");
+        for (int s = 0; s < Short.MAX_VALUE; s++) {
+            try {
+                MapView view = Bukkit.getMap(s);
+                if (view != null) mapManager.registerOccupiedID(s);
+            } catch (Exception e) {
+                if (e.getMessage().toLowerCase().contains("invalid map dimension")) {
+                    getLogger().log(Level.WARNING, e.getMessage(), e);
+                }
+            }
+        }
+
         getLogger().info("MapReflectionAPI is enabled!");
+        getLogger().info("----------------");
     }
 
     @Override
     public void onDisable() {
-        Bukkit.getOnlinePlayers().forEach(p -> packetListener.removePlayer(p));
+        getLogger().info("Disabling the packet handler...");
+        if (packetListener != null) Bukkit.getOnlinePlayers().forEach(p -> packetListener.removePlayer(p));
+
+        getLogger().info("MapReflectionAPI is disabled!");
+
         instance = null;
     }
 }

API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/ArrayImage.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi;
+package tech.sbdevelopment.mapreflectionapi.api;
 
 import com.bergerkiller.bukkit.common.map.MapColorPalette;
 

API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapController.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi;
+package tech.sbdevelopment.mapreflectionapi.api;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;

API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapManager.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi;
+package tech.sbdevelopment.mapreflectionapi.api;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;

API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapWrapper.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi;
+package tech.sbdevelopment.mapreflectionapi.api;
 
 public interface MapWrapper {
     MapController getController();

API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/events/CreateInventoryMapUpdateEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi.events;
+package tech.sbdevelopment.mapreflectionapi.api.events;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -30,7 +30,7 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 
 public class CreateInventoryMapUpdateEvent extends Event implements Cancellable {
     private static final HandlerList handlerList = new HandlerList();

API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/events/MapCancelEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi.events;
+package tech.sbdevelopment.mapreflectionapi.api.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;

API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/events/MapInteractEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi.events;
+package tech.sbdevelopment.mapreflectionapi.api.events;
 
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
@@ -30,7 +30,7 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 
 public class MapInteractEvent extends Event implements Cancellable {
     private static final HandlerList handlerList = new HandlerList();

API/src/main/java/tech/sbdevelopment/mapreflectionapi/listeners/MapListener.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of MapReflectionAPI.
+ * Copyright (c) 2022 inventivetalent / SBDevelopment - All Rights Reserved
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package tech.sbdevelopment.mapreflectionapi.listeners;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.MapInitializeEvent;
+import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+
+public class MapListener implements Listener {
+    @EventHandler
+    public void onQuit(PlayerQuitEvent e) {
+        MapReflectionAPI.getMapManager().clearAllMapsFor(e.getPlayer());
+    }
+
+    @EventHandler
+    public void onMapInitialize(MapInitializeEvent e) {
+        int id = e.getMap().getId();
+        if (id > 0) MapReflectionAPI.getMapManager().registerOccupiedID(id);
+    }
+}

API/src/main/java/tech/sbdevelopment/mapreflectionapi/listeners/PacketListener.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package tech.sbdevelopment.mapreflectionapi;
+package tech.sbdevelopment.mapreflectionapi.listeners;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -31,13 +31,14 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 
 import java.lang.reflect.Field;
 
 public abstract class PacketListener implements Listener {
     protected JavaPlugin plugin;
 
-    protected static PacketListener construct() {
+    public static PacketListener construct() {
         String packageName = Bukkit.getServer().getClass().getPackage().getName();
         String version = packageName.substring(packageName.lastIndexOf('.') + 1);
 
@@ -70,7 +71,7 @@ public abstract class PacketListener implements Listener {
 
     protected abstract void injectPlayer(Player p);
 
-    protected abstract void removePlayer(Player p);
+    public abstract void removePlayer(Player p);
 
     protected abstract Vector vec3DToVector(Object vec3d);
 

NMS-v1_12_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_12_R1.java

@@ -27,8 +27,8 @@ import net.minecraft.server.v1_12_R1.PacketPlayOutMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_12_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_12_R1.java

@@ -35,10 +35,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_12_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_12_R1.java

@@ -31,10 +31,10 @@ import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_12_R1 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().playerConnection.networkManager.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }

NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_13_R2.java

@@ -27,8 +27,8 @@ import net.minecraft.server.v1_13_R2.PacketPlayOutMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_13_R2.java

@@ -35,10 +35,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_13_R2.java

@@ -31,10 +31,10 @@ import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_13_R2 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().playerConnection.networkManager.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }

NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_14_R1.java

@@ -27,8 +27,8 @@ import net.minecraft.server.v1_14_R1.PacketPlayOutMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_14_R1.java

@@ -35,10 +35,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_14_R1.java

@@ -31,10 +31,10 @@ import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_14_R1 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().playerConnection.networkManager.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }

NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_15_R1.java

@@ -27,8 +27,8 @@ import net.minecraft.server.v1_15_R1.PacketPlayOutMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_15_R1.java

@@ -35,10 +35,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_15_R1.java

@@ -31,10 +31,10 @@ import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_15_R1 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().playerConnection.networkManager.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }

NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_16_R3.java

@@ -27,8 +27,8 @@ import net.minecraft.server.v1_16_R3.PacketPlayOutMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_16_R3.java

@@ -35,10 +35,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_16_R3.java

@@ -31,10 +31,10 @@ import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_16_R3 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().playerConnection.networkManager.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }

NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_17_R1.java

@@ -28,8 +28,8 @@ import net.minecraft.world.level.saveddata.maps.WorldMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_17_R1.java

@@ -39,10 +39,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_17_R1.java

@@ -36,10 +36,10 @@ import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_17_R1 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().connection.connection.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }

NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_18_R2.java

@@ -28,8 +28,8 @@ import net.minecraft.world.level.saveddata.maps.WorldMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_18_R2.java

@@ -39,10 +39,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_18_R2.java

@@ -36,10 +36,10 @@ import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_18_R2 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().connection.connection.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }

NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapSender_v1_19_R1.java

@@ -28,8 +28,8 @@ import net.minecraft.world.level.saveddata.maps.WorldMap;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
 
 import java.util.ArrayList;
 import java.util.List;

NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_19_R1.java

@@ -39,10 +39,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
-import tech.sbdevelopment.mapreflectionapi.ArrayImage;
-import tech.sbdevelopment.mapreflectionapi.MapController;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.MapWrapper;
+import tech.sbdevelopment.mapreflectionapi.api.ArrayImage;
+import tech.sbdevelopment.mapreflectionapi.api.MapController;
+import tech.sbdevelopment.mapreflectionapi.api.MapWrapper;
 import tech.sbdevelopment.mapreflectionapi.exceptions.MapLimitExceededException;
 
 import java.util.HashMap;

NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_19_R1.java

@@ -36,10 +36,10 @@ import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import tech.sbdevelopment.mapreflectionapi.MapReflectionAPI;
-import tech.sbdevelopment.mapreflectionapi.PacketListener;
+import tech.sbdevelopment.mapreflectionapi.api.events.CreateInventoryMapUpdateEvent;
-import tech.sbdevelopment.mapreflectionapi.events.CreateInventoryMapUpdateEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapCancelEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapCancelEvent;
+import tech.sbdevelopment.mapreflectionapi.api.events.MapInteractEvent;
-import tech.sbdevelopment.mapreflectionapi.events.MapInteractEvent;
+import tech.sbdevelopment.mapreflectionapi.listeners.PacketListener;
 
 import java.util.concurrent.TimeUnit;
 
@@ -110,7 +110,7 @@ public class PacketListener_v1_19_R1 extends PacketListener {
     }
 
     @Override
-    protected void removePlayer(Player p) {
+    public void removePlayer(Player p) {
         Channel channel = ((CraftPlayer) p).getHandle().connection.connection.channel;
         channel.eventLoop().submit(() -> channel.pipeline().remove(p.getName()));
     }