Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-22 03:45:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run spotlessApply

Browse Source
This commit is contained in:
KingRainbow44
2023-04-18 17:17:55 -04:00
parent 75f163f704
commit ee298235c2
44 changed files with 598 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeGameTimeReq.java
View File

@@ -15,6 +15,8 @@ public class HandlerChangeGameTimeReq extends PacketHandler {
var req = ChangeGameTimeReq.parseFrom(payload);
session.getPlayer().getWorld().changeTime(req.getGameTime(), req.getExtraDays());
session.getPlayer().sendPacket(new PacketChangeGameTimeRsp(session.getPlayer(), req.getExtraDays()));
session
.getPlayer()
.sendPacket(new PacketChangeGameTimeRsp(session.getPlayer(), req.getExtraDays()));
}
}

6
src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
View File

@@ -94,8 +94,10 @@ public class HandlerCombatInvocationsNotify extends PacketHandler {
}
}
// as long as one of these two packets be forwarded to client, the animation of avatar will be interrupted
if (motionState == MotionState.MOTION_STATE_NOTIFY || motionState == MotionState.MOTION_STATE_FIGHT) {
// as long as one of these two packets be forwarded to client, the animation of avatar
// will be interrupted
if (motionState == MotionState.MOTION_STATE_NOTIFY
|| motionState == MotionState.MOTION_STATE_FIGHT) {
continue;
}
}

5
src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
View File

@@ -13,6 +13,9 @@ public class HandlerDungeonEntryInfoReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
DungeonEntryInfoReq req = DungeonEntryInfoReq.parseFrom(payload);
session.getServer().getDungeonSystem().sendEntryInfoFor(session.getPlayer(), req.getPointId(), req.getSceneId());
session
.getServer()
.getDungeonSystem()
.sendEntryInfoFor(session.getPlayer(), req.getPointId(), req.getSceneId());
}
}

13
src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterDungeonReq.java
View File

@@ -15,12 +15,13 @@ public class HandlerPlayerEnterDungeonReq extends PacketHandler {
// Auto template
PlayerEnterDungeonReq req = PlayerEnterDungeonReq.parseFrom(payload);
var success = session
.getServer()
.getDungeonSystem()
.enterDungeon(session.getPlayer(), req.getPointId(), req.getDungeonId());
var success =
session
.getServer()
.getDungeonSystem()
.enterDungeon(session.getPlayer(), req.getPointId(), req.getDungeonId());
session
.getPlayer()
.sendPacket(new PacketPlayerEnterDungeonRsp(req.getPointId(), req.getDungeonId(), success));
.getPlayer()
.sendPacket(new PacketPlayerEnterDungeonRsp(req.getPointId(), req.getDungeonId(), success));
}
}

6
src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java
View File

@@ -1,6 +1,5 @@
package emu.grasscutter.server.packet.recv;
import emu.grasscutter.game.props.SceneType;
import emu.grasscutter.game.quest.enums.QuestContent;
import emu.grasscutter.net.packet.Opcodes;
import emu.grasscutter.net.packet.PacketHandler;
@@ -17,8 +16,9 @@ public class HandlerPostEnterSceneReq extends PacketHandler {
var scene = player.getScene();
var questManager = player.getQuestManager();
switch (session.getPlayer().getScene().getSceneType()){
case SCENE_ROOM -> questManager.queueEvent(QuestContent.QUEST_CONTENT_ENTER_ROOM, scene.getId(), 0);
switch (session.getPlayer().getScene().getSceneType()) {
case SCENE_ROOM -> questManager.queueEvent(
QuestContent.QUEST_CONTENT_ENTER_ROOM, scene.getId(), 0);
case SCENE_WORLD -> {
questManager.queueEvent(QuestContent.QUEST_CONTENT_ENTER_MY_WORLD, scene.getId());
questManager.queueEvent(QuestContent.QUEST_CONTENT_ENTER_MY_WORLD_SCENE, scene.getId());

17
src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestTransmitReq.java
View File

@@ -1,7 +1,6 @@
package emu.grasscutter.server.packet.recv;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.quest.GameMainQuest;
import emu.grasscutter.net.packet.Opcodes;
import emu.grasscutter.net.packet.PacketHandler;
import emu.grasscutter.net.packet.PacketOpcodes;
@@ -10,21 +9,18 @@ import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketQuestTransmitRsp;
import emu.grasscutter.utils.Position;
import java.util.ArrayList;
import java.util.List;
import lombok.val;
@Opcodes(PacketOpcodes.QuestTransmitReq)
public class HandlerQuestTransmitReq extends PacketHandler {
@Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
val req = QuestTransmitReq.parseFrom(payload);
GameMainQuest mainQuest =
session.getPlayer().getQuestManager().getMainQuestById(req.getQuestId() / 100);
List<Position> posAndRot = new ArrayList<>();
var req = QuestTransmitReq.parseFrom(payload);
var mainQuest = session.getPlayer().getQuestManager().getMainQuestById(req.getQuestId() / 100);
var posAndRot = new ArrayList<Position>();
boolean result = false;
if (mainQuest.hasTeleportPostion(req.getQuestId(), posAndRot)) {
int sceneId =
if (mainQuest.hasTeleportPosition(req.getQuestId(), posAndRot)) {
var sceneId =
GameData.getTeleportDataMap()
.get(req.getQuestId())
.getTransmit_points()
@@ -36,6 +32,7 @@ public class HandlerQuestTransmitReq extends PacketHandler {
.getWorld()
.transferPlayerToScene(session.getPlayer(), sceneId, posAndRot.get(0));
}
session.send(new PacketQuestTransmitRsp(result, req));
}
}

10
src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneAudioNotify.java
View File

@@ -1,8 +1,5 @@
package emu.grasscutter.server.packet.recv;
import javax.lang.model.type.TypeMirror;
import emu.grasscutter.net.packet.Opcodes;
import emu.grasscutter.net.packet.PacketHandler;
import emu.grasscutter.net.packet.PacketOpcodes;
@@ -24,8 +21,9 @@ public class HandlerSceneAudioNotify extends PacketHandler {
int type = notify.getType();
List<Integer> param1 = notify.getParam1List();
session.getPlayer().getScene().broadcastPacket(new PacketSceneAudioNotify(sourceUid, param2, param3, type, param1));
session
.getPlayer()
.getScene()
.broadcastPacket(new PacketSceneAudioNotify(sourceUid, param2, param3, type, param1));
}
}

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java
View File

@@ -55,7 +55,7 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
// Check if the default Anemo skill should be given.
if (!GAME_OPTIONS.questing) {
mainCharacter.setSkillDepotData(
GameData.getAvatarSkillDepotDataMap().get(startingSkillDepot));
GameData.getAvatarSkillDepotDataMap().get(startingSkillDepot));
}
// Manually handle adding to team

4
src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockPersonalLineReq.java
View File

@@ -17,9 +17,7 @@ public class HandlerUnlockPersonalLineReq extends PacketHandler {
var req = UnlockPersonalLineReq.parseFrom(payload);
var data = GameData.getPersonalLineDataMap().get(req.getPersonalLineId());
if (data == null) {
session.send(
new PacketUnlockPersonalLineRsp(
req.getPersonalLineId(), Retcode.RET_FAIL));
session.send(new PacketUnlockPersonalLineRsp(req.getPersonalLineId(), Retcode.RET_FAIL));
return;
}

1
src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropUpdateNotify.java
View File

@@ -5,7 +5,6 @@ import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify;
import java.util.Map;
public class PacketAvatarFightPropUpdateNotify extends BasePacket {

11
src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
View File

@@ -14,11 +14,14 @@ public class PacketAvatarTeamUpdateNotify extends BasePacket {
var teamManager = player.getTeamManager();
if (teamManager.isUsingTrialTeam()) {
proto.addAllTempAvatarGuidList(teamManager.getActiveTeam().stream()
.map(entity -> entity.getAvatar().getGuid()).toList());
proto.addAllTempAvatarGuidList(
teamManager.getActiveTeam().stream()
.map(entity -> entity.getAvatar().getGuid())
.toList());
} else {
teamManager.getTeams().forEach((key, value) ->
proto.putAvatarTeamMap(key, value.toProto(player)));
teamManager
.getTeams()
.forEach((key, value) -> proto.putAvatarTeamMap(key, value.toProto(player)));
}
this.setData(proto);

9
src/main/java/emu/grasscutter/server/packet/send/PacketBuyResinRsp.java
View File

@@ -10,9 +10,10 @@ public class PacketBuyResinRsp extends BasePacket {
public PacketBuyResinRsp(Player player, int ret) {
super(PacketOpcodes.BuyResinRsp);
this.setData(BuyResinRspOuterClass.BuyResinRsp.newBuilder()
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
.setRetcode(ret)
.build());
this.setData(
BuyResinRspOuterClass.BuyResinRsp.newBuilder()
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
.setRetcode(ret)
.build());
}
}

6
src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java
View File

@@ -12,9 +12,9 @@ public class PacketChangeGameTimeRsp extends BasePacket {
ChangeGameTimeRsp proto =
ChangeGameTimeRsp.newBuilder()
.setCurGameTime(player.getWorld().getGameTime())
.setExtraDays(extraDays)
.build();
.setCurGameTime(player.getWorld().getGameTime())
.setExtraDays(extraDays)
.build();
this.setData(proto);
}

4
src/main/java/emu/grasscutter/server/packet/send/PacketDropHintNotify.java
View File

@@ -10,9 +10,7 @@ public class PacketDropHintNotify extends BasePacket {
public PacketDropHintNotify(int itemId, Vector position) {
super(PacketOpcodes.DropHintNotify);
var proto = DropHintNotify.newBuilder()
.addItemIdList(itemId)
.setPosition(position);
var proto = DropHintNotify.newBuilder().addItemIdList(itemId).setPosition(position);
this.setData(proto.build());
}

12
src/main/java/emu/grasscutter/server/packet/send/PacketDungeonEntryInfoRsp.java
View File

@@ -5,7 +5,6 @@ import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo;
import emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp;
import java.util.Arrays;
import java.util.List;
@@ -36,19 +35,18 @@ public class PacketDungeonEntryInfoRsp extends BasePacket {
public PacketDungeonEntryInfoRsp(PointData pointData, List<Integer> additional) {
super(PacketOpcodes.DungeonEntryInfoRsp);
var packet = DungeonEntryInfoRsp.newBuilder()
.setPointId(pointData.getId());
var packet = DungeonEntryInfoRsp.newBuilder().setPointId(pointData.getId());
// Add dungeon IDs from the point data.
if (pointData.getDungeonIds() != null) {
Arrays.stream(pointData.getDungeonIds())
.forEach(id -> packet.addDungeonEntryList(
DungeonEntryInfo.newBuilder().setDungeonId(id)));
.forEach(
id -> packet.addDungeonEntryList(DungeonEntryInfo.newBuilder().setDungeonId(id)));
}
// Add additional dungeon IDs.
additional.forEach(id -> packet.addDungeonEntryList(
DungeonEntryInfo.newBuilder().setDungeonId(id)));
additional.forEach(
id -> packet.addDungeonEntryList(DungeonEntryInfo.newBuilder().setDungeonId(id)));
this.setData(packet);
}

13
src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
View File

@@ -8,14 +8,15 @@ import emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify;
public class PacketResinChangeNotify extends BasePacket {
public PacketResinChangeNotify(Player player) {
public PacketResinChangeNotify(Player player) {
super(PacketOpcodes.ResinChangeNotify);
ResinChangeNotify proto = ResinChangeNotify.newBuilder()
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
.setNextAddTimestamp(player.getNextResinRefresh())
.setCurBuyCount(player.getResinBuyCount())
.build();
ResinChangeNotify proto =
ResinChangeNotify.newBuilder()
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
.setNextAddTimestamp(player.getNextResinRefresh())
.setCurBuyCount(player.getResinBuyCount())
.build();
this.setData(proto);
}

22
src/main/java/emu/grasscutter/server/packet/send/PacketSceneAudioNotify.java
View File

@@ -7,17 +7,19 @@ import java.util.List;
public class PacketSceneAudioNotify extends BasePacket {
public PacketSceneAudioNotify(int sourceUid, List<Float> param2, List<String> param3, int type, List<Integer> param1) {
public PacketSceneAudioNotify(
int sourceUid, List<Float> param2, List<String> param3, int type, List<Integer> param1) {
super(PacketOpcodes.SceneAudioNotify);
SceneAudioNotifyOuterClass.SceneAudioNotify proto = SceneAudioNotifyOuterClass.SceneAudioNotify.newBuilder()
.setSourceUid(sourceUid)
.addAllParam2(param2)
.addAllParam3(param3)
.setType(type)
.addAllParam1(param1)
.build();
SceneAudioNotifyOuterClass.SceneAudioNotify proto =
SceneAudioNotifyOuterClass.SceneAudioNotify.newBuilder()
.setSourceUid(sourceUid)
.addAllParam2(param2)
.addAllParam3(param3)
.setType(type)
.addAllParam1(param1)
.build();
this.setData(proto);
}
}
}

8
src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java
View File

@@ -10,8 +10,10 @@ public final class PacketServerGlobalValueChangeNotify extends BasePacket {
public PacketServerGlobalValueChangeNotify(GameEntity entity, String abilityHash, int value) {
super(PacketOpcodes.ServerGlobalValueChangeNotify);
this.setData(ServerGlobalValueChangeNotify.newBuilder()
.setEntityId(entity.getId()).setValue(value)
.setKeyHash(Utils.abilityHash(abilityHash)));
this.setData(
ServerGlobalValueChangeNotify.newBuilder()
.setEntityId(entity.getId())
.setValue(value)
.setKeyHash(Utils.abilityHash(abilityHash)));
}
}

13
src/main/java/emu/grasscutter/server/packet/send/PacketWorldChestOpenNotify.java
View File

@@ -5,13 +5,14 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify;
public class PacketWorldChestOpenNotify extends BasePacket {
public PacketWorldChestOpenNotify(int groupId,int sceneId,int configId){
public PacketWorldChestOpenNotify(int groupId, int sceneId, int configId) {
super(PacketOpcodes.WorldChestOpenNotify);
this.setData(WorldChestOpenNotify.newBuilder()
.setGroupId(groupId)
.setSceneId(sceneId)
.setConfigId(configId)
.build());
this.setData(
WorldChestOpenNotify.newBuilder()
.setGroupId(groupId)
.setSceneId(sceneId)
.setConfigId(configId)
.build());
}
}