Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 08:56:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Json helper functions to JsonUtils

Browse Source
This commit is contained in:
AnimeGitB
2022-08-11 17:54:59 +09:30
committed by Luke H-W
parent c6323e9759
commit 46223c8976
12 changed files with 117 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java
View File

@@ -3,7 +3,6 @@ package emu.grasscutter.game.activity;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Id;
import dev.morphia.annotations.Transient;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.ActivityWatcherData;
@@ -13,7 +12,7 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ActionReason;
import emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass;
import emu.grasscutter.server.packet.send.PacketActivityUpdateWatcherNotify;
import emu.grasscutter.utils.Utils;
import emu.grasscutter.utils.JsonUtils;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Data;
@@ -69,7 +68,7 @@ public class PlayerActivityData {
}
public void setDetail(Object detail){
this.detail = Utils.jsonEncode(detail);
this.detail = JsonUtils.encode(detail);
}
public void takeWatcherReward(int watcherId) {

5
src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java
View File

@@ -1,6 +1,5 @@
package emu.grasscutter.game.activity.musicgame;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.activity.ActivityHandler;
import emu.grasscutter.game.activity.GameActivity;
import emu.grasscutter.game.activity.PlayerActivityData;
@@ -8,7 +7,7 @@ import emu.grasscutter.game.props.ActivityType;
import emu.grasscutter.net.proto.ActivityInfoOuterClass;
import emu.grasscutter.net.proto.MusicBriefInfoOuterClass;
import emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass;
import emu.grasscutter.utils.Utils;
import emu.grasscutter.utils.JsonUtils;
import java.util.stream.Collectors;
@@ -48,7 +47,7 @@ public class MusicGameActivityHandler extends ActivityHandler {
playerActivityData.save();
}
return Utils.jsonDecode(playerActivityData.getDetail(), MusicGamePlayerData.class);
return JsonUtils.decode(playerActivityData.getDetail(), MusicGamePlayerData.class);
}
public boolean setMusicGameRecord(PlayerActivityData playerActivityData, MusicGamePlayerData.MusicGameRecord newRecord) {