From 591ca4805ac0969c2ecfd5042128fa63d4b58ae1 Mon Sep 17 00:00:00 2001 From: AnimeGitB Date: Wed, 13 Jul 2022 12:09:02 +0930 Subject: [PATCH] Some proto name changes --- .../musicgame/MusicGameActivityHandler.java | 3 +- .../musicgame/MusicGamePlayerData.java | 3 +- .../grasscutter/game/entity/EntityAvatar.java | 2 +- .../game/managers/SotSManager.java | 2 +- .../deforestation/DeforestationManager.java | 4 +- .../grasscutter/net/packet/BasePacket.java | 2 +- .../packet/recv/HandlerGetAllMailReq.java | 2 +- .../packet/recv/HandlerHomeUnknown2Req.java | 2 +- .../send/PacketAllWidgetDataNotify.java | 43 +++++++++---------- .../packet/send/PacketGetAllMailRsp.java | 6 +-- .../packet/send/PacketHomeUnknown1Notify.java | 12 +++--- .../packet/send/PacketHomeUnknown2Rsp.java | 6 +-- .../packet/send/PacketMailChangeNotify.java | 2 +- ...PacketQueryCodexMonsterBeKilledNumRsp.java | 6 +-- 14 files changed, 46 insertions(+), 49 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java index 1fec26c56..18f937c9e 100644 --- a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java +++ b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameActivityHandler.java @@ -29,13 +29,12 @@ public class MusicGameActivityHandler extends ActivityHandler { .putAllMusicGameRecordMap( musicGamePlayerData.getMusicGameRecord().values().stream() .collect(Collectors.toMap(MusicGamePlayerData.MusicGameRecord::getMusicId, MusicGamePlayerData.MusicGameRecord::toProto))) - .addAllPersonCustomBeatmap(musicGamePlayerData.getPersonalCustomBeatmapRecord().values().stream() .map(MusicGamePlayerData.CustomBeatmapRecord::toPersonalBriefProto) .map(MusicBriefInfoOuterClass.MusicBriefInfo.Builder::build) .toList()) - .addAllPersonCustomBeatmap(musicGamePlayerData.getOthersCustomBeatmapRecord().values().stream() + .addAllOthersCustomBeatmap(musicGamePlayerData.getOthersCustomBeatmapRecord().values().stream() .map(MusicGamePlayerData.CustomBeatmapRecord::toOthersBriefProto) .map(MusicBriefInfoOuterClass.MusicBriefInfo.Builder::build) .toList()) diff --git a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java index 9b1b97197..4fd25c5bb 100644 --- a/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java +++ b/src/main/java/emu/grasscutter/game/activity/musicgame/MusicGamePlayerData.java @@ -71,8 +71,7 @@ public class MusicGamePlayerData { .setMaxScore(musicGameBeatmap.getMaxScore()) .setPosition(musicGameBeatmap.getSavePosition()) .setMusicNoteCount(musicGameBeatmap.getMusicNoteCount()) - .setMusicShareId(musicShareId) - ; + .setMusicShareId(musicShareId); } public MusicBriefInfoOuterClass.MusicBriefInfo.Builder toOthersBriefProto(){ diff --git a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java index 311f25a89..f200a6559 100644 --- a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java +++ b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java @@ -125,7 +125,7 @@ public class EntityAvatar extends GameEntity { if (healed > 0f) { getScene().broadcastPacket( - new PacketEntityFightPropChangeReasonNotify(this, FightProperty.FIGHT_PROP_CUR_HP, healed, PropChangeReason.PROP_CHANGE_REASON_ABILITY, ChangeHpReason.CHANGE_HP_REASON_CHANGE_HP_ADD_ABILITY) + new PacketEntityFightPropChangeReasonNotify(this, FightProperty.FIGHT_PROP_CUR_HP, healed, PropChangeReason.PROP_CHANGE_REASON_ABILITY, ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY) ); } diff --git a/src/main/java/emu/grasscutter/game/managers/SotSManager.java b/src/main/java/emu/grasscutter/game/managers/SotSManager.java index 5f394a800..c1d1326a6 100644 --- a/src/main/java/emu/grasscutter/game/managers/SotSManager.java +++ b/src/main/java/emu/grasscutter/game/managers/SotSManager.java @@ -158,7 +158,7 @@ public class SotSManager { player.getTeamManager().healAvatar(entity.getAvatar(), 0, needHP); player.getSession().send(new PacketEntityFightPropChangeReasonNotify(entity, FightProperty.FIGHT_PROP_CUR_HP, ((float) needHP / 100), List.of(3), PropChangeReason.PROP_CHANGE_REASON_STATUE_RECOVER, - ChangeHpReason.CHANGE_HP_REASON_CHANGE_HP_ADD_STATUE)); + ChangeHpReason.CHANGE_HP_REASON_ADD_STATUE)); player.getSession().send(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP)); } diff --git a/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java b/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java index 36e1c0e22..3650bdb31 100644 --- a/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java +++ b/src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java @@ -48,8 +48,8 @@ public class DeforestationManager { public void onDeforestationInvoke(HitTreeNotifyOuterClass.HitTreeNotify hit){ synchronized (currentRecord) { //Grasscutter.getLogger().info("onDeforestationInvoke! Wood records {}", currentRecord); - VectorOuterClass.Vector hitPosition = hit.getHitPostion(); - int woodType = hit.getWoodType(); + VectorOuterClass.Vector hitPosition = hit.getTreePos(); + int woodType = hit.getTreeType(); if (ColliderTypeToWoodItemID.containsKey(woodType)) {// is a available wood type Scene scene = player.getScene(); int itemId = ColliderTypeToWoodItemID.get(woodType); diff --git a/src/main/java/emu/grasscutter/net/packet/BasePacket.java b/src/main/java/emu/grasscutter/net/packet/BasePacket.java index 7fae74c8a..12009ffd3 100644 --- a/src/main/java/emu/grasscutter/net/packet/BasePacket.java +++ b/src/main/java/emu/grasscutter/net/packet/BasePacket.java @@ -84,7 +84,7 @@ public class BasePacket { if (this.getHeader() != null && clientSequence == 0) { return this; } - setHeader(PacketHead.newBuilder().setClientSequenceId(clientSequence).setTimestamp(System.currentTimeMillis()).build().toByteArray()); + setHeader(PacketHead.newBuilder().setClientSequenceId(clientSequence).setSentMs(System.currentTimeMillis()).build().toByteArray()); return this; } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java index 2a7fdc295..8e47b1159 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java @@ -16,6 +16,6 @@ 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.getANKKGPJCINB())); + session.send(new PacketGetAllMailRsp(session.getPlayer(), req.getUnk2700OPEHLDAGICF())); } } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUnknown2Req.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUnknown2Req.java index 8e05c08bb..517f9c17e 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUnknown2Req.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeUnknown2Req.java @@ -6,7 +6,7 @@ import emu.grasscutter.net.packet.PacketOpcodes; import emu.grasscutter.server.game.GameSession; import emu.grasscutter.server.packet.send.PacketHomeUnknown2Rsp; -@Opcodes(PacketOpcodes.HomeUnknown2Req) +@Opcodes(PacketOpcodes.Unk2700_ACILPONNGGK_ClientReq) public class HandlerHomeUnknown2Req extends PacketHandler { @Override diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java index 8d3d42261..275909c04 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java @@ -9,7 +9,6 @@ import emu.grasscutter.net.proto.WidgetSlotDataOuterClass; import emu.grasscutter.net.proto.WidgetSlotTagOuterClass; import java.util.List; -import java.util.Map; public class PacketAllWidgetDataNotify extends BasePacket { @@ -19,35 +18,35 @@ public class PacketAllWidgetDataNotify extends BasePacket { // TODO: Implement this AllWidgetDataNotify.Builder proto = AllWidgetDataNotify.newBuilder() - // If you want to implement this, feel free to do so. :) - .setLunchBoxData( - LunchBoxDataOuterClass.LunchBoxData.newBuilder().build() - ) - // Maybe it's a little difficult, or it makes you upset :( - .addAllOneoffGatherPointDetectorDataList(List.of()) - // So, goodbye, and hopefully sometime in the future o(*￣▽￣*)ブ - .addAllCoolDownGroupDataList(List.of()) - // I'll see your PR with a title that says (・∀・(・∀・(・∀・*) - .addAllAnchorPointList(List.of()) - // "Complete implementation of widget functionality" b（￣▽￣）d　 - .addAllClientCollectorDataList(List.of()) - // Good luck, my boy. - .addAllNormalCoolDownDataList(List.of()); + // If you want to implement this, feel free to do so. :) + .setLunchBoxData( + LunchBoxDataOuterClass.LunchBoxData.newBuilder().build() + ) + // Maybe it's a little difficult, or it makes you upset :( + .addAllOneofGatherPointDetectorDataList(List.of()) + // So, goodbye, and hopefully sometime in the future o(*￣▽￣*)ブ + .addAllCoolDownGroupDataList(List.of()) + // I'll see your PR with a title that says (・∀・(・∀・(・∀・*) + .addAllAnchorPointList(List.of()) + // "Complete implementation of widget functionality" b（￣▽￣）d　 + .addAllClientCollectorDataList(List.of()) + // Good luck, my boy. + .addAllNormalCoolDownDataList(List.of()); if (player.getWidgetId() == null) { proto.addAllSlotList(List.of()); } else { proto.addSlotList( - WidgetSlotDataOuterClass.WidgetSlotData.newBuilder() - .setIsActive(true) - .setMaterialId(player.getWidgetId()) - .build() + WidgetSlotDataOuterClass.WidgetSlotData.newBuilder() + .setIsActive(true) + .setMaterialId(player.getWidgetId()) + .build() ); proto.addSlotList( - WidgetSlotDataOuterClass.WidgetSlotData.newBuilder() - .setTag(WidgetSlotTagOuterClass.WidgetSlotTag.WIDGET_SLOT_TAG_ATTACH_AVATAR) - .build() + WidgetSlotDataOuterClass.WidgetSlotData.newBuilder() + .setTag(WidgetSlotTagOuterClass.WidgetSlotTag.WIDGET_SLOT_TAG_ATTACH_AVATAR) + .build() ); } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java index ff7f83721..c6f2b7194 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java @@ -24,9 +24,9 @@ public class PacketGetAllMailRsp extends BasePacket { GetAllMailRsp.Builder proto = GetAllMailRsp.newBuilder(); if (isGiftMail) { - proto.setANKKGPJCINB(true); + proto.setUnk2700OPEHLDAGICF(true); } else { - proto.setANKKGPJCINB(false); + proto.setUnk2700OPEHLDAGICF(false); if (player.getAllMail().size() != 0) { // Make sure the player has mail List mailDataList = new ArrayList(); @@ -61,7 +61,7 @@ public class PacketGetAllMailRsp extends BasePacket { mailData.setImportance(message.importance); mailData.setIsRead(message.isRead); mailData.setIsAttachmentGot(message.isAttachmentGot); - mailData.setBHCAHLJIKFFValue(1); + mailData.setUnk2700NDPPGJKJOMHValue(1); mailDataList.add(mailData.build()); } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown1Notify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown1Notify.java index ec22dce27..8fdaca533 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown1Notify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown1Notify.java @@ -6,13 +6,13 @@ import emu.grasscutter.net.proto.HomeUnknown1NotifyOuterClass; public class PacketHomeUnknown1Notify extends BasePacket { - public PacketHomeUnknown1Notify(boolean isEnterEditMode) { - super(PacketOpcodes.HomeUnknown1Notify); + public PacketHomeUnknown1Notify(boolean isEnterEditMode) { + super(PacketOpcodes.Unk2700_JDMPECKFGIG_ServerNotify); - var proto = HomeUnknown1NotifyOuterClass.HomeUnknown1Notify.newBuilder(); + var proto = HomeUnknown1NotifyOuterClass.HomeUnknown1Notify.newBuilder(); - proto.setIsEnterEditMode(isEnterEditMode); + proto.setIsEnterEditMode(isEnterEditMode); - this.setData(proto); - } + this.setData(proto); + } } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown2Rsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown2Rsp.java index 8766531e8..1aac1f721 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown2Rsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown2Rsp.java @@ -5,8 +5,8 @@ import emu.grasscutter.net.packet.PacketOpcodes; public class PacketHomeUnknown2Rsp extends BasePacket { - public PacketHomeUnknown2Rsp() { - super(PacketOpcodes.HomeUnknown2Rsp); + public PacketHomeUnknown2Rsp() { + super(PacketOpcodes.Unk2700_KIIOGMKFNNP_ServerRsp); - } + } } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java index 0a43a1c61..d0ea5d96b 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMailChangeNotify.java @@ -54,7 +54,7 @@ public class PacketMailChangeNotify extends BasePacket { mailData.setImportance(message.importance); mailData.setIsRead(message.isRead); mailData.setIsAttachmentGot(message.isAttachmentGot); - mailData.setBHCAHLJIKFFValue(message.stateValue); + mailData.setUnk2700NDPPGJKJOMHValue(message.stateValue); proto.addMailList(mailData.build()); } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java index 8da5c4fe2..5d68fc625 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQueryCodexMonsterBeKilledNumRsp.java @@ -14,10 +14,10 @@ public class PacketQueryCodexMonsterBeKilledNumRsp extends BasePacket { QueryCodexMonsterBeKilledNumRsp.Builder proto = QueryCodexMonsterBeKilledNumRsp.newBuilder(); codexList.forEach(animal -> { - if(player.getCodex().getUnlockedAnimal().containsKey(animal)){ + if (player.getCodex().getUnlockedAnimal().containsKey(animal)) { proto.addCodexIdList(animal) - .addBeKilledNumList(player.getCodex().getUnlockedAnimal().get(animal)) - .addCHPBKCLKPCJ(0); + .addBeKilledNumList(player.getCodex().getUnlockedAnimal().get(animal)) + .addUnk2700MKOBMGGPNMI(0); } });