Merge remote-tracking branch 'origin/development' into development

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

@@ -6,9 +6,17 @@ import emu.grasscutter.net.packet.PacketOpcodes;
 
 public class PacketGetGachaInfoRsp extends BasePacket {
 	
+	@Deprecated
 	public PacketGetGachaInfoRsp(GachaManager manager) {
 		super(PacketOpcodes.GetGachaInfoRsp);
 		
 		this.setData(manager.toProto());
 	}
+
+	public PacketGetGachaInfoRsp(GachaManager manager, String sessionKey) {
+		super(PacketOpcodes.GetGachaInfoRsp);
+		
+		this.setData(manager.toProto(sessionKey));
+	}
+
 }

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

@@ -4,12 +4,18 @@ import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp;
 
+import java.util.List;
+
 public class PacketGetShopmallDataRsp extends BasePacket {
 	
 	public PacketGetShopmallDataRsp() {
 		super(PacketOpcodes.GetShopmallDataRsp);
 
-		GetShopmallDataRsp proto = GetShopmallDataRsp.newBuilder().build();
+		List<Integer> shop_malls = List.of(900, 1052, 902, 1001, 903);
+
+		GetShopmallDataRsp proto = GetShopmallDataRsp.newBuilder()
+				.addAllShopTypeList(shop_malls)
+				.build();
 
 		this.setData(proto);
 	}

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

@@ -6,13 +6,13 @@ import emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass;
 
 public class PacketMcoinExchangeHcoinRsp extends BasePacket {
 
-    public PacketMcoinExchangeHcoinRsp(int mcoin, int hcoin) {
+    public PacketMcoinExchangeHcoinRsp(int retCode) {
         super(PacketOpcodes.McoinExchangeHcoinRsp);
 
-        McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp mcoinExchangeHcoinRsp = McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp.newBuilder()
-                .setMCoinNum(mcoin)
-                .setHCoinNum(hcoin).build();
+        McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp proto = McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp.newBuilder()
+                .setRetcode(retCode)
+                .build();
 
-        this.setData(mcoinExchangeHcoinRsp);
+        this.setData(proto);
     }
 }