Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get shop as Optional

Browse Source
This commit is contained in:
P0nk
2023-03-30 06:40:16 +02:00
parent fe9dd75a23
commit 39d759595d
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/client/command/commands/gm2/GmShopCommand.java
View File

@@ -36,6 +36,6 @@ public class GmShopCommand extends Command {
@Override @Override
public void execute(Client c, String[] params, CommandContext ctx) { public void execute(Client c, String[] params, CommandContext ctx) {
ctx.shopFactory().getShop(GM_SHOP_ID).sendShop(c); ctx.shopFactory().getShop(GM_SHOP_ID).ifPresent(shop -> shop.sendShop(c));
} }
} }

9
src/main/java/net/server/channel/handlers/NPCTalkHandler.java
View File

@@ -30,7 +30,6 @@ import net.packet.InPacket;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import scripting.npc.NPCScriptManager; import scripting.npc.NPCScriptManager;
import server.Shop;
import server.ShopFactory; import server.ShopFactory;
import server.life.NPC; import server.life.NPC;
import server.life.PlayerNPC; import server.life.PlayerNPC;
@@ -106,14 +105,10 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
} }
private boolean hasShop(NPC npc) { private boolean hasShop(NPC npc) {
return shopFactory.getShop(npc.getId()) != null; return shopFactory.getShop(npc.getId()).isPresent();
} }
private void sendShop(NPC npc, Client c) { private void sendShop(NPC npc, Client c) {
Shop shop = shopFactory.getShop(npc.getId()); shopFactory.getShop(npc.getId()).ifPresent(shop -> shop.sendShop(c));
if (shop == null) {
return;
}
shop.sendShop(c);
} }
} }

7
src/main/java/net/server/channel/handlers/UseCashItemHandler.java
View File

@@ -54,6 +54,7 @@ import tools.Pair;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Optional;
import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
@@ -511,9 +512,9 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
} }
} else if (itemType == 545) { // MiuMiu's travel store } else if (itemType == 545) { // MiuMiu's travel store
if (player.getShop() == null) { if (player.getShop() == null) {
Shop shop = shopFactory.getShop(MIU_MIU_SHOP_ID); Optional<Shop> shop = shopFactory.getShop(MIU_MIU_SHOP_ID);
if (shop != null) { if (shop.isPresent()) {
shop.sendShop(c); shop.get().sendShop(c);
remove(c, position, itemId); remove(c, position, itemId);
} }
} else { } else {

11
src/main/java/server/ShopFactory.java
View File

@@ -37,11 +37,12 @@ import java.util.stream.Stream;
/** /**
* @author Matze * @author Matze
* @author Ponk
*/ */
public class ShopFactory { public class ShopFactory {
private static final short MAX_QUANTITY_PER_PURCHASE = 1000; // Should really use max stack size for the given item private static final short MAX_QUANTITY_PER_PURCHASE = 1000; // Should really use max stack size for the given item
private static final Set<Integer> rechargeableItemIds = rechargeableItemIds(); private static final Set<Integer> rechargeableItemIds = rechargeableItemIds();
private final Cache<Integer, Shop> shops = Caffeine.newBuilder().build(); private final Cache<Integer, Optional<Shop>> shops = Caffeine.newBuilder().build();
private final ShopDao shopDao; private final ShopDao shopDao;
public ShopFactory(ShopDao shopDao) { public ShopFactory(ShopDao shopDao) {
@@ -56,17 +57,17 @@ public class ShopFactory {
.collect(Collectors.toUnmodifiableSet()); .collect(Collectors.toUnmodifiableSet());
} }
public Shop getShop(int shopId) { public Optional<Shop> getShop(int shopId) {
return shops.get(shopId, this::loadShop); return shops.get(shopId, this::loadShop);
} }
private Shop loadShop(int shopId) { private Optional<Shop> loadShop(int shopId) {
Optional<database.shop.Shop> dbShop = shopDao.getShop(shopId); Optional<database.shop.Shop> dbShop = shopDao.getShop(shopId);
if (dbShop.isEmpty()) { if (dbShop.isEmpty()) {
throw new IllegalArgumentException("Shop with id %d does not exist".formatted(shopId)); return Optional.empty();
} }
List<ShopItem> items = shopDao.getShopItems(shopId); List<ShopItem> items = shopDao.getShopItems(shopId);
return new Shop(dbShop.get().id(), dbShop.get().npcId(), fromDbShopItems(items)); return Optional.of(new Shop(dbShop.get().id(), dbShop.get().npcId(), fromDbShopItems(items)));
} }
private List<server.ShopItem> fromDbShopItems(List<ShopItem> dbItems) { private List<server.ShopItem> fromDbShopItems(List<ShopItem> dbItems) {