Rename and clean up AbstractMapleMapObject

src/main/java/net/server/channel/handlers/UseCashItemHandler.java

@@ -396,7 +396,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
                 c.getWorldServer().addOwlItemSearch(itemid);
             }
             player.setOwlSearch(itemid);
-            List<Pair<MaplePlayerShopItem, AbstractMapleMapObject>> hmsAvailable = c.getWorldServer().getAvailableItemBundles(itemid);
+            List<Pair<MaplePlayerShopItem, AbstractMapObject>> hmsAvailable = c.getWorldServer().getAvailableItemBundles(itemid);
             if (!hmsAvailable.isEmpty()) {
                 remove(c, position, itemId);
             }

src/main/java/net/server/world/World.java

@@ -1813,8 +1813,8 @@ public class World {
         }
     }
 
-    public List<Pair<MaplePlayerShopItem, AbstractMapleMapObject>> getAvailableItemBundles(int itemid) {
-        List<Pair<MaplePlayerShopItem, AbstractMapleMapObject>> hmsAvailable = new ArrayList<>();
+    public List<Pair<MaplePlayerShopItem, AbstractMapObject>> getAvailableItemBundles(int itemid) {
+        List<Pair<MaplePlayerShopItem, AbstractMapObject>> hmsAvailable = new ArrayList<>();
 
         for (MapleHiredMerchant hm : getActiveMerchants()) {
             List<MaplePlayerShopItem> itemBundles = hm.sendAvailableBundles(itemid);

src/main/java/server/life/PlayerNPC.java

@@ -32,7 +32,7 @@ import net.server.channel.Channel;
 import net.server.world.World;
 import server.life.positioner.PlayerNPCPodium;
 import server.life.positioner.PlayerNPCPositioner;
-import server.maps.AbstractMapleMapObject;
+import server.maps.AbstractMapObject;
 import server.maps.MapleMap;
 import server.maps.MapleMapObject;
 import server.maps.MapleMapObjectType;
@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @author XoticStory
  * @author Ronan
  */
-public class PlayerNPC extends AbstractMapleMapObject {
+public class PlayerNPC extends AbstractMapObject {
     private static final Map<Byte, List<Integer>> availablePlayerNpcScriptIds = new HashMap<>();
     private static final AtomicInteger runningOverallRank = new AtomicInteger();
     private static final List<AtomicInteger> runningWorldRank = new ArrayList<>();

src/main/java/server/maps/AbstractAnimatedMapObject.java

@@ -26,7 +26,7 @@ import net.packet.*;
 
 import java.util.Arrays;
 
-public abstract class AbstractAnimatedMapObject extends AbstractMapleMapObject implements AnimatedMapleMapObject {
+public abstract class AbstractAnimatedMapObject extends AbstractMapObject implements AnimatedMapleMapObject {
     public static final int IDLE_MOVEMENT_PACKET_LENGTH = 15;
     private static final Packet IDLE_MOVEMENT_PACKET = createIdleMovementPacket();
 

src/main/java/server/maps/AbstractMapObject.java

@@ -21,9 +21,9 @@
 */
 package server.maps;
 
-import java.awt.Point;
+import java.awt.*;
 
-public abstract class AbstractMapleMapObject implements MapleMapObject {
+public abstract class AbstractMapObject implements MapleMapObject {
     private Point position = new Point();
     private int objectId;
 
@@ -49,9 +49,9 @@ public abstract class AbstractMapleMapObject implements MapleMapObject {
     public void setObjectId(int id) {
         this.objectId = id;
     }
-    
+
     @Override
     public void nullifyPosition() {
         this.position = null;
-    }    
+    }
 }

src/main/java/server/maps/MapleDoorObject.java

@@ -36,7 +36,7 @@ import java.awt.*;
  *
  * @author Ronan
  */
-public class MapleDoorObject extends AbstractMapleMapObject {
+public class MapleDoorObject extends AbstractMapObject {
     private final int ownerId;
     private int pairOid;
     

src/main/java/server/maps/MapleHiredMerchant.java

@@ -57,7 +57,7 @@ import java.util.concurrent.locks.Lock;
  * @author XoticStory
  * @author Ronan - concurrency protection
  */
-public class MapleHiredMerchant extends AbstractMapleMapObject {
+public class MapleHiredMerchant extends AbstractMapObject {
     private int ownerId, itemId, mesos = 0;
     private int channel, world;
     private long start;

src/main/java/server/maps/MapleKite.java

@@ -7,7 +7,7 @@ import tools.PacketCreator;
 
 import java.awt.*;
 
-public class MapleKite extends AbstractMapleMapObject {
+public class MapleKite extends AbstractMapObject {
     private final Point pos;
     private final Character owner;
     private final String text;

src/main/java/server/maps/MapleMapItem.java

@@ -30,7 +30,7 @@ import tools.PacketCreator;
 import java.awt.*;
 import java.util.concurrent.locks.Lock;
 
-public class MapleMapItem extends AbstractMapleMapObject {
+public class MapleMapItem extends AbstractMapObject {
     protected Client ownerClient;
     protected Item item;
     protected MapleMapObject dropper;

src/main/java/server/maps/MapleMiniGame.java

@@ -36,7 +36,7 @@ import java.util.List;
  * @author Matze
  * @author Ronan (HeavenMS)
  */
-public class MapleMiniGame extends AbstractMapleMapObject {
+public class MapleMiniGame extends AbstractMapObject {
     private Character owner;
     private Character visitor;
     private String password;

src/main/java/server/maps/MapleMist.java

@@ -38,7 +38,7 @@ import java.awt.*;
  *
  * @author LaiLaiNoob
  */
-public class MapleMist extends AbstractMapleMapObject {
+public class MapleMist extends AbstractMapObject {
     private Rectangle mistPosition;
     private Character owner = null;
     private Monster mob = null;

src/main/java/server/maps/MaplePlayerShop.java

@@ -44,7 +44,7 @@ import java.util.concurrent.locks.Lock;
  * @author Matze
  * @author Ronan - concurrency protection
  */
-public class MaplePlayerShop extends AbstractMapleMapObject {
+public class MaplePlayerShop extends AbstractMapObject {
     private AtomicBoolean open = new AtomicBoolean(false);
     private Character owner;
     private int itemid;

src/main/java/server/maps/MapleReactor.java

@@ -44,7 +44,7 @@ import java.util.concurrent.locks.Lock;
  * @author Lerk
  * @author Ronan
  */
-public class MapleReactor extends AbstractMapleMapObject {
+public class MapleReactor extends AbstractMapObject {
 
     private int rid;
     private MapleReactorStats stats;

src/main/java/tools/PacketCreator.java

@@ -5004,7 +5004,7 @@ public class PacketCreator {
         return p;
     }
 
-    public static Packet owlOfMinerva(Client c, int itemId, List<Pair<MaplePlayerShopItem, AbstractMapleMapObject>> hmsAvailable) {
+    public static Packet owlOfMinerva(Client c, int itemId, List<Pair<MaplePlayerShopItem, AbstractMapObject>> hmsAvailable) {
         byte itemType = ItemConstants.getInventoryType(itemId).getType();
 
         OutPacket p = OutPacket.create(SendOpcode.SHOP_SCANNER_RESULT);
@@ -5012,9 +5012,9 @@ public class PacketCreator {
         p.writeInt(0);
         p.writeInt(itemId);
         p.writeInt(hmsAvailable.size());
-        for (Pair<MaplePlayerShopItem, AbstractMapleMapObject> hme : hmsAvailable) {
+        for (Pair<MaplePlayerShopItem, AbstractMapObject> hme : hmsAvailable) {
             MaplePlayerShopItem item = hme.getLeft();
-            AbstractMapleMapObject mo = hme.getRight();
+            AbstractMapObject mo = hme.getRight();
 
             if (mo instanceof MaplePlayerShop ps) {
                 Character owner = ps.getOwner();