mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-26 14:17:58 +00:00
Format code [skip actions]
This commit is contained in:
parent
db1cc788b4
commit
3f4578c0ba
@ -4,11 +4,10 @@ import com.google.gson.annotations.SerializedName;
|
|||||||
import emu.grasscutter.data.GameResource;
|
import emu.grasscutter.data.GameResource;
|
||||||
import emu.grasscutter.data.ResourceType;
|
import emu.grasscutter.data.ResourceType;
|
||||||
import emu.grasscutter.game.talk.TalkExec;
|
import emu.grasscutter.game.talk.TalkExec;
|
||||||
|
import java.util.List;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@ResourceType(name = "TalkExcelConfigData.json")
|
@ResourceType(name = "TalkExcelConfigData.json")
|
||||||
@EqualsAndHashCode(callSuper = false)
|
@EqualsAndHashCode(callSuper = false)
|
||||||
@Data
|
@Data
|
||||||
@ -29,8 +28,8 @@ public final class TalkConfigData extends GameResource {
|
|||||||
private int questId;
|
private int questId;
|
||||||
|
|
||||||
@SerializedName(
|
@SerializedName(
|
||||||
value = "npcId",
|
value = "npcId",
|
||||||
alternate = {"_npcId"})
|
alternate = {"_npcId"})
|
||||||
private List<Integer> npcId;
|
private List<Integer> npcId;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -21,15 +21,14 @@ import emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinC
|
|||||||
import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
|
import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
|
||||||
import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
|
import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
|
||||||
import io.netty.util.concurrent.FastThreadLocalThread;
|
import io.netty.util.concurrent.FastThreadLocalThread;
|
||||||
import lombok.Getter;
|
|
||||||
import org.reflections.Reflections;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
import java.util.concurrent.LinkedBlockingDeque;
|
import java.util.concurrent.LinkedBlockingDeque;
|
||||||
import java.util.concurrent.ThreadPoolExecutor;
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import lombok.Getter;
|
||||||
|
import org.reflections.Reflections;
|
||||||
|
|
||||||
public final class AbilityManager extends BasePlayerManager {
|
public final class AbilityManager extends BasePlayerManager {
|
||||||
public static final ExecutorService eventExecutor;
|
public static final ExecutorService eventExecutor;
|
||||||
|
@ -63,7 +63,8 @@ public class BasicActivityConditionExecutor implements ActivityConditionExecutor
|
|||||||
(BooleanSupplier)
|
(BooleanSupplier)
|
||||||
() ->
|
() ->
|
||||||
activityConditionsHandlers
|
activityConditionsHandlers
|
||||||
.getOrDefault(c.getType(), new UnknownActivityConditionHandler(c.getType()))
|
.getOrDefault(
|
||||||
|
c.getType(), new UnknownActivityConditionHandler(c.getType()))
|
||||||
.execute(activity, activityConfig, c.paramArray()))
|
.execute(activity, activityConfig, c.paramArray()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
@ -15,8 +15,7 @@ public class UnknownActivityConditionHandler extends ActivityConditionBaseHandle
|
|||||||
@Override
|
@Override
|
||||||
public boolean execute(
|
public boolean execute(
|
||||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||||
Grasscutter.getLogger().error("Called unknown condition handler {}.",
|
Grasscutter.getLogger().error("Called unknown condition handler {}.", conditions.name());
|
||||||
conditions.name());
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
package emu.grasscutter.game.talk;
|
package emu.grasscutter.game.talk;
|
||||||
|
|
||||||
|
import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
|
||||||
|
import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK;
|
||||||
|
import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
|
||||||
|
|
||||||
import emu.grasscutter.data.GameData;
|
import emu.grasscutter.data.GameData;
|
||||||
import emu.grasscutter.data.binout.MainQuestData.TalkData;
|
import emu.grasscutter.data.binout.MainQuestData.TalkData;
|
||||||
import emu.grasscutter.game.player.BasePlayerManager;
|
import emu.grasscutter.game.player.BasePlayerManager;
|
||||||
import emu.grasscutter.game.player.Player;
|
import emu.grasscutter.game.player.Player;
|
||||||
import lombok.NonNull;
|
import lombok.NonNull;
|
||||||
|
|
||||||
import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
|
|
||||||
import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK;
|
|
||||||
import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
|
|
||||||
|
|
||||||
public final class TalkManager extends BasePlayerManager {
|
public final class TalkManager extends BasePlayerManager {
|
||||||
public TalkManager(@NonNull Player player) {
|
public TalkManager(@NonNull Player player) {
|
||||||
super(player);
|
super(player);
|
||||||
@ -31,8 +31,7 @@ public final class TalkManager extends BasePlayerManager {
|
|||||||
if (entity == null) return;
|
if (entity == null) return;
|
||||||
|
|
||||||
// The config ID of the entity is the NPC's ID.
|
// The config ID of the entity is the NPC's ID.
|
||||||
if (!talkData.getNpcId().contains(entity.getConfigId()))
|
if (!talkData.getNpcId().contains(entity.getConfigId())) return;
|
||||||
return;
|
|
||||||
|
|
||||||
// Execute the talk action on associated handlers.
|
// Execute the talk action on associated handlers.
|
||||||
talkData
|
talkData
|
||||||
|
@ -5,11 +5,10 @@ import emu.grasscutter.utils.Utils;
|
|||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.buffer.Unpooled;
|
import io.netty.buffer.Unpooled;
|
||||||
import io.netty.channel.DefaultEventLoop;
|
import io.netty.channel.DefaultEventLoop;
|
||||||
import kcp.highway.KcpListener;
|
|
||||||
import kcp.highway.Ukcp;
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import kcp.highway.KcpListener;
|
||||||
|
import kcp.highway.Ukcp;
|
||||||
|
|
||||||
public class GameSessionManager {
|
public class GameSessionManager {
|
||||||
private static final DefaultEventLoop logicThread = new DefaultEventLoop();
|
private static final DefaultEventLoop logicThread = new DefaultEventLoop();
|
||||||
|
Loading…
Reference in New Issue
Block a user