mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-19 02:15:45 +01:00
Merge branch 'fixmail' into unstable
# Conflicts: # src/main/java/emu/grasscutter/game/mail/Mail.java # src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java # src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java # src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java # src/main/java/emu/grasscutter/utils/Utils.java
This commit is contained in:
KingRainbow44
@@ -1,133 +1,163 @@
|
||||
package emu.grasscutter.game.mail;
|
||||
|
||||
import dev.morphia.annotations.Entity;
|
||||
import dev.morphia.annotations.Id;
|
||||
import dev.morphia.annotations.Indexed;
|
||||
import dev.morphia.annotations.Transient;
|
||||
import emu.grasscutter.database.DatabaseHelper;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.bson.types.ObjectId;
|
||||
|
||||
@Entity(value = "mail", useDiscriminator = false)
|
||||
public class Mail {
|
||||
public MailContent mailContent;
|
||||
public List<MailItem> itemList;
|
||||
public long sendTime;
|
||||
public long expireTime;
|
||||
public int importance;
|
||||
public boolean isRead;
|
||||
public boolean isAttachmentGot;
|
||||
public int stateValue;
|
||||
@Id private ObjectId id;
|
||||
@Indexed private int ownerUid;
|
||||
@Transient private boolean shouldDelete;
|
||||
|
||||
public Mail() {
|
||||
this(
|
||||
new MailContent(),
|
||||
new ArrayList<MailItem>(),
|
||||
(int) Instant.now().getEpochSecond()
|
||||
+ 604800); // TODO: add expire time to send mail command
|
||||
}
|
||||
|
||||
public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime) {
|
||||
this(mailContent, itemList, expireTime, 0);
|
||||
}
|
||||
|
||||
public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime, int importance) {
|
||||
this(mailContent, itemList, expireTime, importance, 1);
|
||||
}
|
||||
|
||||
public Mail(
|
||||
MailContent mailContent,
|
||||
List<MailItem> itemList,
|
||||
long expireTime,
|
||||
int importance,
|
||||
int state) {
|
||||
this.mailContent = mailContent;
|
||||
this.itemList = itemList;
|
||||
this.sendTime = (int) Instant.now().getEpochSecond();
|
||||
this.expireTime = expireTime;
|
||||
this.importance = importance; // Starred mail, 0 = No star, 1 = Star.
|
||||
this.isRead = false;
|
||||
this.isAttachmentGot = false;
|
||||
this.stateValue = state; // Different mailboxes, 1 = Default, 3 = Gift-box.
|
||||
}
|
||||
|
||||
public ObjectId getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public int getOwnerUid() {
|
||||
return ownerUid;
|
||||
}
|
||||
|
||||
public void setOwnerUid(int ownerUid) {
|
||||
this.ownerUid = ownerUid;
|
||||
}
|
||||
|
||||
public void save() {
|
||||
if (this.expireTime * 1000 < System.currentTimeMillis()) {
|
||||
DatabaseHelper.deleteMail(this);
|
||||
} else {
|
||||
DatabaseHelper.saveMail(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Entity
|
||||
public static class MailContent {
|
||||
public String title;
|
||||
public String content;
|
||||
public String sender;
|
||||
|
||||
public MailContent() {
|
||||
this.title = "";
|
||||
this.content = "loading...";
|
||||
this.sender = "loading";
|
||||
}
|
||||
|
||||
public MailContent(String title, String content) {
|
||||
this(title, content, "Server");
|
||||
}
|
||||
|
||||
public MailContent(String title, String content, Player sender) {
|
||||
this(title, content, sender.getNickname());
|
||||
}
|
||||
|
||||
public MailContent(String title, String content, String sender) {
|
||||
this.title = title;
|
||||
this.content = content;
|
||||
this.sender = sender;
|
||||
}
|
||||
}
|
||||
|
||||
@Entity
|
||||
public static class MailItem {
|
||||
public int itemId;
|
||||
public int itemCount;
|
||||
public int itemLevel;
|
||||
|
||||
public MailItem() {
|
||||
this.itemId = 11101;
|
||||
this.itemCount = 1;
|
||||
this.itemLevel = 1;
|
||||
}
|
||||
|
||||
public MailItem(int itemId) {
|
||||
this(itemId, 1);
|
||||
}
|
||||
|
||||
public MailItem(int itemId, int itemCount) {
|
||||
this(itemId, itemCount, 1);
|
||||
}
|
||||
|
||||
public MailItem(int itemId, int itemCount, int itemLevel) {
|
||||
this.itemId = itemId;
|
||||
this.itemCount = itemCount;
|
||||
this.itemLevel = itemLevel;
|
||||
}
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.mail;
|
||||
|
||||
import dev.morphia.annotations.Entity;
|
||||
import dev.morphia.annotations.Id;
|
||||
import dev.morphia.annotations.Indexed;
|
||||
import dev.morphia.annotations.Transient;
|
||||
import emu.grasscutter.database.DatabaseHelper;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.net.proto.*;
|
||||
import emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam;
|
||||
import emu.grasscutter.net.proto.MailCollectStateOuterClass.MailCollectState;
|
||||
import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;
|
||||
import org.bson.types.ObjectId;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static emu.grasscutter.net.proto.MailItemOuterClass.MailItem.*;
|
||||
|
||||
@Entity(value = "mail", useDiscriminator = false)
|
||||
public final class Mail {
|
||||
@Id private ObjectId id;
|
||||
@Indexed private int ownerUid;
|
||||
public MailContent mailContent;
|
||||
public List<MailItem> itemList;
|
||||
public long sendTime;
|
||||
public long expireTime;
|
||||
public int importance;
|
||||
public boolean isRead;
|
||||
public boolean isAttachmentGot;
|
||||
public int stateValue;
|
||||
@Transient private boolean shouldDelete;
|
||||
|
||||
public Mail() {
|
||||
this(new MailContent(), new ArrayList<MailItem>(), (int) Instant.now().getEpochSecond() + 604800); // TODO: add expire time to send mail command
|
||||
}
|
||||
|
||||
public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime) {
|
||||
this(mailContent, itemList, expireTime, 0);
|
||||
}
|
||||
|
||||
public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime, int importance) {
|
||||
this(mailContent, itemList, expireTime, importance, 1);
|
||||
}
|
||||
|
||||
public Mail(MailContent mailContent, List<MailItem> itemList, long expireTime, int importance, int state) {
|
||||
this.mailContent = mailContent;
|
||||
this.itemList = itemList;
|
||||
this.sendTime = (int) Instant.now().getEpochSecond();
|
||||
this.expireTime = expireTime;
|
||||
this.importance = importance; // Starred mail, 0 = No star, 1 = Star.
|
||||
this.isRead = false;
|
||||
this.isAttachmentGot = false;
|
||||
this.stateValue = state; // Different mailboxes, 1 = Default, 3 = Gift-box.
|
||||
}
|
||||
|
||||
public ObjectId getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public int getOwnerUid() {
|
||||
return ownerUid;
|
||||
}
|
||||
|
||||
public void setOwnerUid(int ownerUid) {
|
||||
this.ownerUid = ownerUid;
|
||||
}
|
||||
|
||||
public MailDataOuterClass.MailData toProto(Player player) {
|
||||
return MailDataOuterClass.MailData.newBuilder()
|
||||
.setMailId(player.getMailId(this))
|
||||
.setMailTextContent(this.mailContent.toProto())
|
||||
.addAllItemList(this.itemList.stream().map(MailItem::toProto).toList())
|
||||
.setSendTime((int) this.sendTime)
|
||||
.setExpireTime((int) this.expireTime)
|
||||
.setImportance(this.importance)
|
||||
.setIsRead(this.isRead)
|
||||
.setIsAttachmentGot(this.isAttachmentGot)
|
||||
.setCollectState(MailCollectState.MAIL_COLLECT_STATE_NOT_COLLECTIBLE)
|
||||
.build();
|
||||
}
|
||||
|
||||
@Entity
|
||||
public static class MailContent {
|
||||
public String title;
|
||||
public String content;
|
||||
public String sender;
|
||||
|
||||
public MailContent() {
|
||||
this.title = "";
|
||||
this.content = "loading...";
|
||||
this.sender = "loading";
|
||||
}
|
||||
|
||||
public MailContent(String title, String content) {
|
||||
this(title, content, "Server");
|
||||
}
|
||||
|
||||
public MailContent(String title, String content, Player sender) {
|
||||
this(title, content, sender.getNickname());
|
||||
}
|
||||
|
||||
public MailContent(String title, String content, String sender) {
|
||||
this.title = title;
|
||||
this.content = content;
|
||||
this.sender = sender;
|
||||
}
|
||||
|
||||
public MailTextContent toProto() {
|
||||
return MailTextContent.newBuilder()
|
||||
.setTitle(this.title)
|
||||
.setContent(this.content)
|
||||
.setSender(this.sender)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
@Entity
|
||||
public static class MailItem {
|
||||
public int itemId;
|
||||
public int itemCount;
|
||||
public int itemLevel;
|
||||
|
||||
public MailItem() {
|
||||
this.itemId = 11101;
|
||||
this.itemCount = 1;
|
||||
this.itemLevel = 1;
|
||||
}
|
||||
|
||||
public MailItem(int itemId) {
|
||||
this(itemId, 1);
|
||||
}
|
||||
|
||||
public MailItem(int itemId, int itemCount) {
|
||||
this(itemId, itemCount, 1);
|
||||
}
|
||||
|
||||
public MailItem(int itemId, int itemCount, int itemLevel) {
|
||||
this.itemId = itemId;
|
||||
this.itemCount = itemCount;
|
||||
this.itemLevel = itemLevel;
|
||||
}
|
||||
|
||||
public MailItemOuterClass.MailItem toProto() {
|
||||
return newBuilder().setEquipParam(EquipParam.newBuilder()
|
||||
.setItemId(this.itemId)
|
||||
.setItemNum(this.itemCount)
|
||||
.setItemLevel(this.itemLevel)
|
||||
.setPromoteLevel(0)//mock
|
||||
.build())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
public void save() {
|
||||
if (this.expireTime * 1000 < System.currentTimeMillis()) {
|
||||
DatabaseHelper.deleteMail(this);
|
||||
} else {
|
||||
DatabaseHelper.saveMail(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
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.GetAllMailNotifyOuterClass.GetAllMailNotify;
|
||||
import emu.grasscutter.server.game.GameSession;
|
||||
import emu.grasscutter.server.packet.send.PacketGetAllMailResultNotify;
|
||||
|
||||
@Opcodes(PacketOpcodes.GetAllMailNotify)
|
||||
public final class HandlerGetAllMailNotify extends PacketHandler {
|
||||
@Override
|
||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||
var req = GetAllMailNotify.parseFrom(payload);
|
||||
session.send(new PacketGetAllMailResultNotify(session.getPlayer(), req.getIsCollected()));
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
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.GetAllMailReqOuterClass;
|
||||
import emu.grasscutter.server.game.GameSession;
|
||||
import emu.grasscutter.server.packet.send.PacketGetAllMailRsp;
|
||||
|
||||
@Opcodes(PacketOpcodes.GetAllMailReq)
|
||||
public class HandlerGetAllMailReq extends PacketHandler {
|
||||
|
||||
@Override
|
||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||
GetAllMailReqOuterClass.GetAllMailReq req =
|
||||
GetAllMailReqOuterClass.GetAllMailReq.parseFrom(payload);
|
||||
session.send(new PacketGetAllMailRsp(session.getPlayer(), req.getIsCollected()));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
|
||||
public final class PacketGetAllMailResultNotify extends BasePacket {
|
||||
/**
|
||||
* @param player The player to fetch the mail for.
|
||||
* @param gifts Is the mail for gifts?
|
||||
*/
|
||||
public PacketGetAllMailResultNotify(Player player, boolean gifts) {
|
||||
super(PacketOpcodes.GetAllMailResultNotify);
|
||||
|
||||
var packet = GetAllMailResultNotify.newBuilder()
|
||||
.setTransaction(player.getUid() + "-" + Utils.getCurrentSeconds() + "-" + 0)
|
||||
.setIsCollected(gifts)
|
||||
.setPacketBeSentNum(1)
|
||||
.setPacketNum(1);
|
||||
|
||||
var inbox = player.getAllMail();
|
||||
if (!gifts && inbox.size() > 0) {
|
||||
packet.addAllMailList(inbox.stream()
|
||||
.filter(mail -> mail.stateValue == 1)
|
||||
.filter(mail -> mail.expireTime > Instant.now().getEpochSecond())
|
||||
.map(mail -> mail.toProto(player)).toList());
|
||||
} else {
|
||||
// Empty mailbox.
|
||||
// TODO: Implement the gift mailbox.
|
||||
packet.addAllMailList(List.of());
|
||||
}
|
||||
|
||||
this.setData(packet.build());
|
||||
}
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.game.mail.Mail;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.EquipParamOuterClass;
|
||||
import emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp;
|
||||
import emu.grasscutter.net.proto.MailDataOuterClass;
|
||||
import emu.grasscutter.net.proto.MailDataOuterClass.MailData;
|
||||
import emu.grasscutter.net.proto.MailItemOuterClass;
|
||||
import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
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) {
|
||||
proto.setIsCollected(true);
|
||||
} else {
|
||||
proto.setIsCollected(false);
|
||||
|
||||
if (player.getAllMail().size() != 0) { // Make sure the player has mail
|
||||
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.)
|
||||
MailTextContent.Builder mailTextContent = MailTextContent.newBuilder();
|
||||
mailTextContent.setTitle(message.mailContent.title);
|
||||
mailTextContent.setContent(message.mailContent.content);
|
||||
mailTextContent.setSender(message.mailContent.sender);
|
||||
|
||||
List<MailItemOuterClass.MailItem> mailItems = new ArrayList<>();
|
||||
|
||||
for (Mail.MailItem item : message.itemList) {
|
||||
MailItemOuterClass.MailItem.Builder mailItem =
|
||||
MailItemOuterClass.MailItem.newBuilder();
|
||||
EquipParamOuterClass.EquipParam.Builder itemParam =
|
||||
EquipParamOuterClass.EquipParam.newBuilder();
|
||||
itemParam.setItemId(item.itemId);
|
||||
itemParam.setItemNum(item.itemCount);
|
||||
mailItem.setEquipParam(itemParam.build());
|
||||
|
||||
mailItems.add(mailItem.build());
|
||||
}
|
||||
|
||||
MailDataOuterClass.MailData.Builder mailData =
|
||||
MailDataOuterClass.MailData.newBuilder();
|
||||
mailData.setMailId(player.getMailId(message));
|
||||
mailData.setMailTextContent(mailTextContent.build());
|
||||
mailData.addAllItemList(mailItems);
|
||||
mailData.setSendTime((int) message.sendTime);
|
||||
mailData.setExpireTime((int) message.expireTime);
|
||||
mailData.setImportance(message.importance);
|
||||
mailData.setIsRead(message.isRead);
|
||||
mailData.setIsAttachmentGot(message.isAttachmentGot);
|
||||
mailData.setCollectStateValue(1);
|
||||
|
||||
mailDataList.add(mailData.build());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
proto.addAllMailList(mailDataList);
|
||||
proto.setIsTruncated(
|
||||
mailDataList.size()
|
||||
> 1000); // 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());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user