From 43a80f0491c2d08244a61b12fb02334b91863a43 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:48:25 +0200 Subject: [PATCH] Rename and clean up MapleShopFactory --- scripts/npc/11000.js | 4 ++-- .../command/commands/gm2/GmShopCommand.java | 4 ++-- .../commands/gm3/ReloadShopsCommand.java | 4 ++-- .../channel/handlers/UseCashItemHandler.java | 4 ++-- .../scripting/npc/NPCConversationManager.java | 4 ++-- ...{MapleShopFactory.java => ShopFactory.java} | 18 ++++++++---------- src/main/java/server/life/NPC.java | 6 +++--- 7 files changed, 21 insertions(+), 23 deletions(-) rename src/main/java/server/{MapleShopFactory.java => ShopFactory.java} (86%) diff --git a/scripts/npc/11000.js b/scripts/npc/11000.js index a787830c55..4c2bad1fab 100644 --- a/scripts/npc/11000.js +++ b/scripts/npc/11000.js @@ -19,7 +19,7 @@ */ function start() { - const MapleShopFactory = Java.type('server.MapleShopFactory'); - MapleShopFactory.getInstance().getShop(11000).sendShop(cm.getClient()); + const ShopFactory = Java.type('server.ShopFactory'); + ShopFactory.getInstance().getShop(11000).sendShop(cm.getClient()); cm.dispose(); } diff --git a/src/main/java/client/command/commands/gm2/GmShopCommand.java b/src/main/java/client/command/commands/gm2/GmShopCommand.java index 6e44be08ea..ea286f3261 100644 --- a/src/main/java/client/command/commands/gm2/GmShopCommand.java +++ b/src/main/java/client/command/commands/gm2/GmShopCommand.java @@ -25,7 +25,7 @@ package client.command.commands.gm2; import client.Client; import client.command.Command; -import server.MapleShopFactory; +import server.ShopFactory; public class GmShopCommand extends Command { { @@ -34,6 +34,6 @@ public class GmShopCommand extends Command { @Override public void execute(Client c, String[] params) { - MapleShopFactory.getInstance().getShop(1337).sendShop(c); + ShopFactory.getInstance().getShop(1337).sendShop(c); } } diff --git a/src/main/java/client/command/commands/gm3/ReloadShopsCommand.java b/src/main/java/client/command/commands/gm3/ReloadShopsCommand.java index 8b759e7845..f98daf3e20 100644 --- a/src/main/java/client/command/commands/gm3/ReloadShopsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadShopsCommand.java @@ -25,7 +25,7 @@ package client.command.commands.gm3; import client.Client; import client.command.Command; -import server.MapleShopFactory; +import server.ShopFactory; public class ReloadShopsCommand extends Command { @@ -35,6 +35,6 @@ public class ReloadShopsCommand extends Command { @Override public void execute(Client c, String[] params) { - MapleShopFactory.getInstance().reloadShops(); + ShopFactory.getInstance().reloadShops(); } } diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index c8379ebf61..593af88a4c 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -38,8 +38,8 @@ import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import server.ItemInformationProvider; -import server.MapleShopFactory; import server.Shop; +import server.ShopFactory; import server.TimerManager; import server.maps.*; import tools.PacketCreator; @@ -494,7 +494,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } } else if (itemType == 545) { // MiuMiu's travel store if (player.getShop() == null) { - Shop shop = MapleShopFactory.getInstance().getShop(1338); + Shop shop = ShopFactory.getInstance().getShop(1338); if (shop != null) { shop.sendShop(c); remove(c, position, itemId); diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index a3e825f16d..8b6690c055 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -373,13 +373,13 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void openShopNPC(int id) { - Shop shop = MapleShopFactory.getInstance().getShop(id); + Shop shop = ShopFactory.getInstance().getShop(id); if (shop != null) { shop.sendShop(c); } else { // check for missing shopids thanks to resinate FilePrinter.printError(FilePrinter.NPC_UNCODED, "Shop ID: " + id + " is missing from database."); - MapleShopFactory.getInstance().getShop(11000).sendShop(c); + ShopFactory.getInstance().getShop(11000).sendShop(c); } } diff --git a/src/main/java/server/MapleShopFactory.java b/src/main/java/server/ShopFactory.java similarity index 86% rename from src/main/java/server/MapleShopFactory.java rename to src/main/java/server/ShopFactory.java index 4203592d46..ebecf59bfb 100644 --- a/src/main/java/server/MapleShopFactory.java +++ b/src/main/java/server/ShopFactory.java @@ -25,19 +25,17 @@ import java.util.HashMap; import java.util.Map; /** - * * @author Matze */ -public class MapleShopFactory { - - private static MapleShopFactory instance = new MapleShopFactory(); - - public static MapleShopFactory getInstance() { +public class ShopFactory { + private static final ShopFactory instance = new ShopFactory(); + + public static ShopFactory getInstance() { return instance; } - - private Map shops = new HashMap<>(); - private Map npcShops = new HashMap<>(); + + private final Map shops = new HashMap<>(); + private final Map npcShops = new HashMap<>(); private Shop loadShop(int id, boolean isShopId) { Shop ret = Shop.createFromDB(id, isShopId); @@ -65,7 +63,7 @@ public class MapleShopFactory { } return loadShop(npcId, false); } - + public void reloadShops() { shops.clear(); npcShops.clear(); diff --git a/src/main/java/server/life/NPC.java b/src/main/java/server/life/NPC.java index 06572ff2ca..355aa97c12 100644 --- a/src/main/java/server/life/NPC.java +++ b/src/main/java/server/life/NPC.java @@ -22,7 +22,7 @@ package server.life; import client.Client; -import server.MapleShopFactory; +import server.ShopFactory; import server.maps.MapObjectType; import tools.PacketCreator; @@ -35,11 +35,11 @@ public class NPC extends AbstractLoadedLife { } public boolean hasShop() { - return MapleShopFactory.getInstance().getShopForNPC(getId()) != null; + return ShopFactory.getInstance().getShopForNPC(getId()) != null; } public void sendShop(Client c) { - MapleShopFactory.getInstance().getShopForNPC(getId()).sendShop(c); + ShopFactory.getInstance().getShopForNPC(getId()).sendShop(c); } @Override