Merge branch 'development' into dev-feature-drop

data/Shop.json

+[
+  {
+    "shopId": 1004,
+    "items": [
+      {
+        "goodsId": 1004202,
+        "goodsItem": {
+          "Id": 202,
+          "Count": 1000000
+        },
+        "scoin": 1,
+        "buyLimit": 500,
+        "beginTime": 1575129600,
+        "endTime": 2051193600,
+        "minLevel": 1,
+        "maxLevel": 99,
+        "costItemList": [
+          {
+            "Id": 223,
+            "Count": 100
+          }
+        ]
+      },
+      {
+        "goodsId": 10048006,
+        "goodsItem": {
+          "Id": 108006,
+          "Count": 20
+        },
+        "scoin": 100,
+        "hcoin": 100,
+        "mcoin": 100,
+        "buyLimit": 50000,
+        "beginTime": 1575129600,
+        "endTime": 2051193600,
+        "minLevel": 1,
+        "maxLevel": 99
+      },
+      {
+        "goodsId": 10048033,
+        "goodsItem": {
+          "Id": 108033,
+          "Count": 20
+        },
+        "scoin": 1,
+        "buyLimit": 50000,
+        "beginTime": 1575129600,
+        "endTime": 2051193600,
+        "minLevel": 1,
+        "maxLevel": 99
+      }
+    ]
+  }
+]
\ No newline at end of file

src/main/java/emu/grasscutter/command/commands/ReloadCommand.java

@@ -17,6 +17,7 @@ public final class ReloadCommand implements CommandHandler {
         Grasscutter.loadConfig();
         Grasscutter.getGameServer().getGachaManager().load();
         Grasscutter.getGameServer().getDropManager().load();
+        Grasscutter.getGameServer().getShopManager().load();
         Grasscutter.getDispatchServer().loadQueries();
         CommandHandler.sendMessage(sender, "Reload complete.");
     }

src/main/java/emu/grasscutter/game/inventory/Inventory.java

@@ -110,6 +110,16 @@ public class Inventory implements Iterable<GameItem> {
 		return result;
 	}
 
+	public boolean addItem(GameItem item, ActionReason reason, boolean forceNotify) {
+		boolean result = addItem(item);
+
+		if (reason != null && (forceNotify || result)) {
+			getPlayer().sendPacket(new PacketItemAddHintNotify(item, reason));
+		}
+
+		return result;
+	}
+	
 	public void addItems(Collection<GameItem> items) {
 		this.addItems(items, null);
 	}

src/main/java/emu/grasscutter/game/player/Player.java

@@ -21,6 +21,7 @@ import emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.shop.ShopLimit;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.packet.BasePacket;
@@ -80,6 +81,7 @@ public class Player {
 	private ArrayList<AvatarProfileData> shownAvatars;
 	private Set<Integer> rewardedLevels;
 	private ArrayList<Mail> mail;
+	private ArrayList<ShopLimit> shopLimit;
 
 	private int sceneId;
 	private int regionId;
@@ -137,6 +139,8 @@ public class Player {
 		this.birthday = new PlayerBirthday();
 		this.rewardedLevels = new HashSet<>();
 		this.moonCardGetTimes = new HashSet<>();
+
+		this.shopLimit = new ArrayList<>();
 	}
 
 	// On player creation
@@ -588,6 +592,35 @@ public class Player {
 		session.send(new PacketCardProductRewardNotify(getMoonCardRemainDays()));
 	}
 
+	public List<ShopLimit> getShopLimit() {
+		return shopLimit;
+	}
+
+	public int getGoodsLimitNum(int goodsId) {
+		for (ShopLimit sl : getShopLimit()) {
+			if (sl.getShopGoodId() == goodsId)
+				return sl.getHasBought();
+		}
+		return 0;
+	}
+
+	public void addShopLimit(int goodsId, int boughtCount) {
+		boolean found = false;
+		for (ShopLimit sl : getShopLimit()) {
+			if (sl.getShopGoodId() == goodsId){
+				sl.setHasBought(sl.getHasBought() + boughtCount);
+				found = true;
+			}
+		}
+		if (!found) {
+			ShopLimit sl = new ShopLimit();
+			sl.setShopGoodId(goodsId);
+			sl.setHasBought(boughtCount);
+			shopLimit.add(sl);
+		}
+		this.save();
+	}
+
 	public boolean inGodmode() {
 		return godmode;
 	}

src/main/java/emu/grasscutter/game/shop/ShopInfo.java

 package emu.grasscutter.game.shop;
 
+import emu.grasscutter.data.common.ItemParamData;
+
+import java.util.ArrayList;
+import java.util.List;
+
 public class ShopInfo {
+    private int goodsId = 0;
+    private ItemParamData goodsItem;
+    private int scoin = 0;
+    private List<ItemParamData> costItemList;
+    private int boughtNum = 0;
+    private int buyLimit = 0;
+    private int beginTime = 0;
+    private int endTime = 1924992000;
+    private int nextRefreshTime = 1924992000;
+    private int minLevel = 0;
+    private int maxLevel = 61;
+    private List<Integer> preGoodsIdList = new ArrayList<>();
+    private int mcoin = 0;
+    private int hcoin = 0;
+    private int disableType = 0;
+    private int secondarySheetId = 0;
+
+    public int getHcoin() {
+        return hcoin;
+    }
+
+    public void setHcoin(int hcoin) {
+        this.hcoin = hcoin;
+    }
+
+    public List<Integer> getPreGoodsIdList() {
+        return preGoodsIdList;
+    }
+
+    public void setPreGoodsIdList(List<Integer> preGoodsIdList) {
+        this.preGoodsIdList = preGoodsIdList;
+    }
+
+    public int getMcoin() {
+        return mcoin;
+    }
+
+    public void setMcoin(int mcoin) {
+        this.mcoin = mcoin;
+    }
+
+    public int getDisableType() {
+        return disableType;
+    }
+
+    public void setDisableType(int disableType) {
+        this.disableType = disableType;
+    }
+
+    public int getSecondarySheetId() {
+        return secondarySheetId;
+    }
+
+    public void setSecondarySheetId(int secondarySheetId) {
+        this.secondarySheetId = secondarySheetId;
+    }
+
+    public int getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(int goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public ItemParamData getGoodsItem() {
+        return goodsItem;
+    }
+
+    public void setGoodsItem(ItemParamData goodsItem) {
+        this.goodsItem = goodsItem;
+    }
+
+    public int getScoin() {
+        return scoin;
+    }
+
+    public void setScoin(int scoin) {
+        this.scoin = scoin;
+    }
+
+    public List<ItemParamData> getCostItemList() {
+        return costItemList;
+    }
+
+    public void setCostItemList(List<ItemParamData> costItemList) {
+        this.costItemList = costItemList;
+    }
+
+    public int getBoughtNum() {
+        return boughtNum;
+    }
+
+    public void setBoughtNum(int boughtNum) {
+        this.boughtNum = boughtNum;
+    }
+
+    public int getBuyLimit() {
+        return buyLimit;
+    }
+
+    public void setBuyLimit(int buyLimit) {
+        this.buyLimit = buyLimit;
+    }
+
+    public int getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(int beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public int getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(int endTime) {
+        this.endTime = endTime;
+    }
+
+    public int getNextRefreshTime() {
+        return nextRefreshTime;
+    }
+
+    public void setNextRefreshTime(int nextRefreshTime) {
+        this.nextRefreshTime = nextRefreshTime;
+    }
+
+    public int getMinLevel() {
+        return minLevel;
+    }
+
+    public void setMinLevel(int minLevel) {
+        this.minLevel = minLevel;
+    }
+
+    public int getMaxLevel() {
+        return maxLevel;
+    }
 
+    public void setMaxLevel(int maxLevel) {
+        this.maxLevel = maxLevel;
+    }
 }

src/main/java/emu/grasscutter/game/shop/ShopLimit.java

+package emu.grasscutter.game.shop;
+
+import dev.morphia.annotations.Entity;
+
+@Entity
+public class ShopLimit {
+    public int getShopGoodId() {
+        return shopGoodId;
+    }
+
+    public void setShopGoodId(int shopGoodId) {
+        this.shopGoodId = shopGoodId;
+    }
+
+    public int getHasBought() {
+        return hasBought;
+    }
+
+    public void setHasBought(int hasBought) {
+        this.hasBought = hasBought;
+    }
+
+    private int shopGoodId;
+    private int hasBought;
+}

src/main/java/emu/grasscutter/game/shop/ShopManager.java

 package emu.grasscutter.game.shop;
 
+import com.google.gson.reflect.TypeToken;
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.server.game.GameServer;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+import java.io.FileReader;
+import java.util.Collection;
+import java.util.List;
 
 public class ShopManager {
 	private final GameServer server;
 
+	public Int2ObjectMap<List<ShopInfo>> getShopData() {
+		return shopData;
+	}
+
+	private final Int2ObjectMap<List<ShopInfo>> shopData;
+
 	public ShopManager(GameServer server) {
 		this.server = server;
+		this.shopData = new Int2ObjectOpenHashMap<>();
+		this.load();
+	}
+
+	public synchronized void load() {
+		try (FileReader fileReader = new FileReader(Grasscutter.getConfig().DATA_FOLDER + "Shop.json")) {
+			getShopData().clear();
+			List<ShopTable> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ShopTable.class).getType());
+			if(banners.size() > 0) {
+				for (ShopTable shopTable : banners) {
+					getShopData().put(shopTable.getShopId(), shopTable.getItems());
+				}
+				Grasscutter.getLogger().info("Shop data successfully loaded.");
+			} else {
+				Grasscutter.getLogger().error("Unable to load shop data. Shop data size is 0.");
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	public GameServer getServer() {

src/main/java/emu/grasscutter/game/shop/ShopTable.java

+package emu.grasscutter.game.shop;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShopTable {
+    private int shopId;
+    private List<ShopInfo> items = new ArrayList<>();
+
+    public int getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(int shopId) {
+        this.shopId = shopId;
+    }
+
+    public List<ShopInfo> getItems() {
+        return items;
+    }
+
+    public void setItems(List<ShopInfo> items) {
+        this.items = items;
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.BuyGoodsReqOuterClass;
+import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.net.proto.ShopGoodsOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketBuyGoodsRsp;
+import emu.grasscutter.server.packet.send.PacketStoreItemChangeNotify;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Optional;
+
+@Opcodes(PacketOpcodes.BuyGoodsReq)
+public class HandlerBuyGoodsReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        BuyGoodsReqOuterClass.BuyGoodsReq buyGoodsReq = BuyGoodsReqOuterClass.BuyGoodsReq.parseFrom(payload);
+
+        for (ShopGoodsOuterClass.ShopGoods sg : buyGoodsReq.getGoodsListList()) {
+            if (sg.getScoin() > 0 && session.getPlayer().getMora() < buyGoodsReq.getBoughtNum() * sg.getScoin()) {
+                return;
+            }
+            if (sg.getHcoin() > 0 && session.getPlayer().getPrimogems() < buyGoodsReq.getBoughtNum() * sg.getHcoin()) {
+                return;
+            }
+            if (sg.getMcoin() > 0 && session.getPlayer().getProperty(PlayerProperty.PROP_PLAYER_MCOIN) < buyGoodsReq.getBoughtNum() * sg.getMcoin()) {
+                return;
+            }
+
+            HashMap<GameItem, Integer> itemsCache = new HashMap<>();
+            for (ItemParamOuterClass.ItemParam p : sg.getCostItemListList()) {
+                Optional<GameItem> invItem = session.getPlayer().getInventory().getItems().values().stream().filter(x -> x.getItemId() == p.getItemId()).findFirst();
+                if (invItem.isEmpty() || invItem.get().getCount() < p.getCount())
+                    return;
+                itemsCache.put(invItem.get(), p.getCount() * buyGoodsReq.getBoughtNum());
+            }
+
+            session.getPlayer().setMora(session.getPlayer().getMora() - buyGoodsReq.getBoughtNum() * sg.getScoin());
+            session.getPlayer().setPrimogems(session.getPlayer().getPrimogems() - buyGoodsReq.getBoughtNum() * sg.getHcoin());
+            session.getPlayer().setProperty(PlayerProperty.PROP_PLAYER_MCOIN, session.getPlayer().getProperty(PlayerProperty.PROP_PLAYER_MCOIN) - buyGoodsReq.getBoughtNum() * sg.getMcoin());
+
+            if (!itemsCache.isEmpty()) {
+                for (GameItem gi : itemsCache.keySet()) {
+                    session.getPlayer().getInventory().removeItem(gi, itemsCache.get(gi));
+                }
+                itemsCache.clear();
+            }
+
+            session.getPlayer().addShopLimit(sg.getGoodsId(), buyGoodsReq.getBoughtNum());
+            GameItem item = new GameItem(GameData.getItemDataMap().get(sg.getGoodsItem().getItemId()));
+            item.setCount(buyGoodsReq.getBoughtNum() * sg.getGoodsItem().getCount());
+            session.getPlayer().getInventory().addItem(item, ActionReason.Shop, true); // fix: not notify when got virtual item from shop
+            session.send(new PacketBuyGoodsRsp(buyGoodsReq.getShopType(), session.getPlayer().getGoodsLimitNum(sg.getGoodsId()), sg));
+        }
+
+        session.getPlayer().save();
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.GetShopReqOuterClass.GetShopReq;
-import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetShopRsp;
 
@@ -13,7 +13,6 @@ public class HandlerGetShopReq extends PacketHandler {
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		GetShopReq req = GetShopReq.parseFrom(payload);
 
-		// TODO
-		session.send(new PacketGetShopRsp(req.getShopType()));
+		session.send(new PacketGetShopRsp(session.getPlayer(), req.getShopType()));
 	}
 }

src/main/java/emu/grasscutter/server/packet/send/PacketBuyGoodsRsp.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.BuyGoodsRspOuterClass;
+import emu.grasscutter.net.proto.ShopGoodsOuterClass;
+
+public class PacketBuyGoodsRsp extends BasePacket {
+    public PacketBuyGoodsRsp(int shopType, int boughtNum, ShopGoodsOuterClass.ShopGoods sg) {
+        super(PacketOpcodes.BuyGoodsRsp);
+
+        BuyGoodsRspOuterClass.BuyGoodsRsp buyGoodsRsp = BuyGoodsRspOuterClass.BuyGoodsRsp.newBuilder()
+                .setShopType(shopType)
+                .setBoughtNum(boughtNum)
+                .addGoodsList(ShopGoodsOuterClass.ShopGoods.newBuilder()
+                        .mergeFrom(sg)
+                        .setBoughtNum(boughtNum)
+                ).build();
+
+        this.setData(buyGoodsRsp);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java

@@ -14,32 +14,23 @@ import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;
 
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
 
 public class PacketGetAllMailRsp extends BasePacket {
 
     public PacketGetAllMailRsp(Player player, boolean isGiftMail) {
         super(PacketOpcodes.GetAllMailRsp);
+        GetAllMailRsp.Builder proto = GetAllMailRsp.newBuilder();
 
         if (isGiftMail) {
-            // TODO: Gift Mail
-            // Make sure to send the stupid empty packet
-            Base64.Decoder decoder = Base64.getDecoder();
-            byte[] rsp = decoder.decode("IAE=");
-            try {
-                GetAllMailRsp var = GetAllMailRsp.parseFrom(rsp);
-                this.setData(var.toBuilder().build());
-            } catch (Exception e) {
-            }
-
+            proto.setIsGiftMail(true);
         } else {
+            proto.setIsGiftMail(false);
+
             if (player.getAllMail().size() != 0) { // Make sure the player has mail
-                GetAllMailRsp.Builder proto = GetAllMailRsp.newBuilder();
                 List<MailData> mailDataList = new ArrayList<MailData>();
 
                 for (Mail message : player.getAllMail()) {
-
                     if(message.stateValue == 1) { // Make sure it isn't a gift
                         if (message.expireTime > (int) Instant.now().getEpochSecond()) { // Make sure the message isn't expired (The game won't show expired mail, but I don't want to send unnecessary information).
                             if(mailDataList.size() <= 1000) { // Make sure that there isn't over 1000 messages in the mailbox. (idk what will happen if there is but the game probably won't like it.)
@@ -79,17 +70,8 @@ public class PacketGetAllMailRsp extends BasePacket {
 
                 proto.addAllMailList(mailDataList);
                 proto.setIsTruncated(mailDataList.size() <= 1000 ? false : true); // When enabled this will send a notification to the user telling them their inbox is full and they should delete old messages when opening the mailbox.
-
-                this.setData(proto.build());
-            } else {
-                // Make sure to send the stupid empty packet
-                Base64.Decoder decoder = Base64.getDecoder();
-                byte[] rsp = decoder.decode("IAE=");
-                try {
-                    GetAllMailRsp var = GetAllMailRsp.parseFrom(rsp);
-                    this.setData(var.toBuilder().build());
-                } catch (Exception e) {}
             }
         }
+        this.setData(proto.build());
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java

 package emu.grasscutter.server.packet.send;
 
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.shop.ShopInfo;
+import emu.grasscutter.game.shop.ShopManager;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp;
+import emu.grasscutter.net.proto.GetShopRspOuterClass;
+import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods;
 import emu.grasscutter.net.proto.ShopOuterClass.Shop;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class PacketGetShopRsp extends BasePacket {
 
-	public PacketGetShopRsp(int shopType) {
+	public PacketGetShopRsp(Player inv, int shopType) {
 		super(PacketOpcodes.GetShopRsp);
 
-		GetShopRsp proto = GetShopRsp.newBuilder()
-				.setShop(Shop.newBuilder().setShopType(shopType))
-				.build();
+		// TODO: CityReputationLevel
+		Shop.Builder shop = Shop.newBuilder()
+				.setShopType(shopType)
+				.setCityId(1) //mock
+				.setCityReputationLevel(10); //mock
+
+		ShopManager manager = Grasscutter.getGameServer().getShopManager();
+		if (manager.getShopData().get(shopType) != null) {
+			List<ShopInfo> list = manager.getShopData().get(shopType);
+			List<ShopGoods> goodsList = new ArrayList<>();
+			for (ShopInfo info : list) {
+				ShopGoods.Builder goods = ShopGoods.newBuilder()
+						.setGoodsId(info.getGoodsId())
+						.setGoodsItem(ItemParamOuterClass.ItemParam.newBuilder().setItemId(info.getGoodsItem().getId()).setCount(info.getGoodsItem().getCount()).build())
+						.setScoin(info.getScoin())
+						.setHcoin(info.getHcoin())
+						.setBoughtNum(inv.getGoodsLimitNum(info.getGoodsId()))
+						.setBuyLimit(info.getBuyLimit())
+						.setBeginTime(info.getBeginTime())
+						.setEndTime(info.getEndTime())
+						.setNextRefreshTime(info.getNextRefreshTime())
+						.setMinLevel(info.getMinLevel())
+						.setMaxLevel(info.getMaxLevel())
+						.addAllPreGoodsIdList(info.getPreGoodsIdList())
+						.setMcoin(info.getMcoin())
+						.setDisableType(info.getDisableType())
+						.setSecondarySheetId(info.getSecondarySheetId());
+				if (info.getCostItemList() != null) {
+					goods.addAllCostItemList(info.getCostItemList().stream().map(x -> ItemParamOuterClass.ItemParam.newBuilder().setItemId(x.getId()).setCount(x.getCount()).build()).collect(Collectors.toList()));
+				}
+				goodsList.add(goods.build());
+			}
+			shop.addAllGoodsList(goodsList);
+		}
 
-		this.setData(proto);
+		this.setData(GetShopRspOuterClass.GetShopRsp.newBuilder().setShop(shop).build());
 	}
 }