Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-26 01:23:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run spotlessApply on previous commit

Browse Source
This commit is contained in:
KingRainbow44
2023-04-23 23:12:01 -04:00
parent c9d6225194
commit e85d269518
19 changed files with 579 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/grasscutter/game/ability/Ability.java
View File

@@ -1,12 +1,11 @@
package emu.grasscutter.game.ability;
import java.util.HashMap;
import java.util.Map;
import emu.grasscutter.data.binout.AbilityData;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.server.event.entity.EntityDamageEvent;
import emu.grasscutter.utils.Utils;
import java.util.HashMap;
import java.util.Map;
import lombok.Getter;
public final class Ability {
@@ -14,8 +13,7 @@ public final class Ability {
@Getter private GameEntity owner;
@Getter private AbilityManager manager;
@Getter private Map<String, AbilityModifierController> modifiers
= new HashMap<>();
@Getter private Map<String, AbilityModifierController> modifiers = new HashMap<>();
@Getter private int hash;

3
src/main/java/emu/grasscutter/game/ability/AbilityAction.java
View File

@@ -1,10 +1,9 @@
package emu.grasscutter.game.ability;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
@Retention(RetentionPolicy.RUNTIME)
public @interface AbilityAction {
AbilityModifierAction.Type value();

16
src/main/java/emu/grasscutter/game/ability/AbilityLocalIdGenerator.java
View File

@@ -2,9 +2,8 @@ package emu.grasscutter.game.ability;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import lombok.AllArgsConstructor;
import java.util.Map;
import lombok.AllArgsConstructor;
public final class AbilityLocalIdGenerator {
public ConfigAbilitySubContainerType type;
@@ -13,13 +12,12 @@ public final class AbilityLocalIdGenerator {
public long mixinIndex = 0;
private long actionIndex = 0;
public AbilityLocalIdGenerator(ConfigAbilitySubContainerType type)
{
public AbilityLocalIdGenerator(ConfigAbilitySubContainerType type) {
this.type = type;
}
public void initializeActionLocalIds(AbilityModifierAction[] actions, Map<Integer, AbilityModifierAction> localIdToAction)
{
public void initializeActionLocalIds(
AbilityModifierAction[] actions, Map<Integer, AbilityModifierAction> localIdToAction) {
if (actions == null) return;
actionIndex = 0;
@@ -44,7 +42,11 @@ public final class AbilityLocalIdGenerator {
return type.value + (modifierIndex << 3) + (configIndex << 9) + (actionIndex << 15);
}
case MODIFIER_MIXIN -> {
return type.value + (modifierIndex << 3) + (mixinIndex << 9) + (configIndex << 15) + (actionIndex << 21);
return type.value
+ (modifierIndex << 3)
+ (mixinIndex << 9)
+ (configIndex << 15)
+ (actionIndex << 21);
}
case NONE -> Grasscutter.getLogger().error("Ability local id generator using NONE type.");
}

158
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
View File

@@ -13,29 +13,36 @@ import emu.grasscutter.game.player.BasePlayerManager;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.enums.QuestContent;
import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
import emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddAbility;
import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange;
import emu.grasscutter.net.proto.AbilityMetaModifierDurabilityChangeOuterClass.AbilityMetaModifierDurabilityChange;
import emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap;
import emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina;
import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
import io.netty.util.concurrent.FastThreadLocalThread;
import lombok.Getter;
import org.reflections.Reflections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import lombok.Getter;
import org.reflections.Reflections;
public final class AbilityManager extends BasePlayerManager {
public static final ExecutorService eventExecutor;
static {
eventExecutor = new ThreadPoolExecutor(4, 4,
60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(1000),
FastThreadLocalThread::new, new ThreadPoolExecutor.AbortPolicy());
eventExecutor =
new ThreadPoolExecutor(
4,
4,
60,
TimeUnit.SECONDS,
new LinkedBlockingDeque<>(1000),
FastThreadLocalThread::new,
new ThreadPoolExecutor.AbortPolicy());
}
private final HealAbilityManager healAbilityManager;
@@ -52,9 +59,7 @@ public final class AbilityManager extends BasePlayerManager {
this.registerHandlers();
}
/**
* Registers all present ability handlers.
*/
/** Registers all present ability handlers. */
private void registerHandlers() {
var reflections = new Reflections("emu.grasscutter.game.ability.actions");
var handlerClasses = reflections.getSubTypesOf(AbilityActionHandler.class);
@@ -77,22 +82,31 @@ public final class AbilityManager extends BasePlayerManager {
var handler = actionHandlers.get(action.type);
if (handler == null || ability == null) {
Grasscutter.getLogger().debug("Could not execute ability action {} at {}", action.type, ability);
Grasscutter.getLogger()
.debug("Could not execute ability action {} at {}", action.type, ability);
return;
}
eventExecutor.submit(() -> {
if (!handler.execute(ability, action)) {
Grasscutter.getLogger().debug("exec ability action failed {} at {}", action.type, ability);
}
});
eventExecutor.submit(
() -> {
if (!handler.execute(ability, action)) {
Grasscutter.getLogger()
.debug("exec ability action failed {} at {}", action.type, ability);
}
});
}
public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
this.healAbilityManager.healHandler(invoke);
if (invoke.getEntityId() == 67109298) {
Grasscutter.getLogger().info(invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + invoke.getEntityId());
Grasscutter.getLogger()
.info(
invoke.getArgumentType()
+ " ("
+ invoke.getArgumentTypeValue()
+ "): "
+ invoke.getEntityId());
}
switch (invoke.getArgumentType()) {
@@ -102,7 +116,8 @@ public final class AbilityManager extends BasePlayerManager {
case ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA -> this.handleMixinCostStamina(invoke);
case ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL -> this.handleGenerateElemBall(invoke);
case ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE -> this.handleGlobalFloatValue(invoke);
case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE -> this.handleModifierDurabilityChange(invoke);
case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE -> this
.handleModifierDurabilityChange(invoke);
case ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY -> this.handleAddNewAbility(invoke);
case ABILITY_INVOKE_ARGUMENT_NONE -> this.handleInvoke(invoke);
default -> {}
@@ -173,29 +188,39 @@ public final class AbilityManager extends BasePlayerManager {
}
var head = invoke.getHead();
Grasscutter.getLogger().debug("{} {} {}", head.getInstancedAbilityId(), entity.getInstanceToHash(), head.getLocalId());
Grasscutter.getLogger()
.debug(
"{} {} {}",
head.getInstancedAbilityId(),
entity.getInstanceToHash(),
head.getLocalId());
var hash = entity.getInstanceToHash().get(head.getInstancedAbilityId());
if (hash == null) {
var abilities = entity.getAbilities().values().toArray(new Ability[0]);
if(head.getInstancedAbilityId() <= abilities.length) {
if (head.getInstancedAbilityId() <= abilities.length) {
var ability = abilities[head.getInstancedAbilityId() - 1];
Grasscutter.getLogger().warn("-> {}", ability.getData().localIdToAction);
var action = ability.getData().localIdToAction.get(head.getLocalId());
if(action != null) ability.getManager().executeAction(ability, action);
if (action != null) ability.getManager().executeAction(ability, action);
}
return;
}
var stream = entity.getAbilities().values().stream()
.filter(a -> a.getHash() == hash ||
a.getData().abilityName == entity.getInstanceToName().get(head.getInstancedAbilityId()));
stream.forEach(ability -> {
var action = ability.getData().localIdToAction.get(head.getLocalId());
if(action != null) ability.getManager().executeAction(ability, action);
});
var stream =
entity.getAbilities().values().stream()
.filter(
a ->
a.getHash() == hash
|| a.getData().abilityName
== entity.getInstanceToName().get(head.getInstancedAbilityId()));
stream.forEach(
ability -> {
var action = ability.getData().localIdToAction.get(head.getLocalId());
if (action != null) ability.getManager().executeAction(ability, action);
});
}
private void handleOverrideParam(AbilityInvokeEntry invoke) throws Exception {
@@ -248,7 +273,7 @@ public final class AbilityManager extends BasePlayerManager {
if (data.getAction() == ModifierAction.MODIFIER_ACTION_REMOVED) {
var ability = target.getAbilities().get(data.getParentAbilityName().getStr());
if(ability != null) {
if (ability != null) {
var modifier = ability.getModifiers().get(head.getInstancedModifierId());
if (modifier != null) {
modifier.onRemoved();
@@ -257,16 +282,26 @@ public final class AbilityManager extends BasePlayerManager {
}
}
if(data.getAction() == ModifierAction.MODIFIER_ACTION_ADDED) {
if (data.getAction() == ModifierAction.MODIFIER_ACTION_ADDED) {
var modifierString = data.getParentAbilityName().getStr();
var hash = target.getInstanceToHash().get(head.getInstancedAbilityId());
if(hash == null) return;
if (hash == null) return;
target.getAbilities().values().stream().filter(a -> a.getHash() == hash || a.getData().abilityName == target.getInstanceToName().get(head.getInstancedAbilityId())).forEach(a -> {
a.getModifiers().keySet().stream().filter(key -> key.compareTo(modifierString) == 0).forEach(key -> {
a.getModifiers().get(key).setLocalId(head.getInstancedModifierId());
});
});
target.getAbilities().values().stream()
.filter(
a ->
a.getHash() == hash
|| a.getData().abilityName
== target.getInstanceToName().get(head.getInstancedAbilityId()))
.forEach(
a -> {
a.getModifiers().keySet().stream()
.filter(key -> key.compareTo(modifierString) == 0)
.forEach(
key -> {
a.getModifiers().get(key).setLocalId(head.getInstancedModifierId());
});
});
}
var sourceEntity = this.player.getScene().getEntityById(data.getApplyEntityId());
@@ -362,7 +397,8 @@ public final class AbilityManager extends BasePlayerManager {
}
}
private void handleModifierDurabilityChange(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
private void handleModifierDurabilityChange(AbilityInvokeEntry invoke)
throws InvalidProtocolBufferException {
var target = this.player.getScene().getEntityById(invoke.getEntityId());
if (target == null) {
return;
@@ -374,41 +410,53 @@ public final class AbilityManager extends BasePlayerManager {
}
var head = invoke.getHead();
if (head == null) {
return;
}
var hash = target.getInstanceToHash().get(head.getInstancedAbilityId());
if(hash == null) return;
target.getAbilities().values().stream().filter(a -> a.getHash() == hash || a.getData().abilityName == target.getInstanceToName().get(head.getInstancedAbilityId())).forEach(a -> {
a.getModifiers().values().stream().filter(m -> m.getLocalId() == head.getInstancedModifierId()).forEach(modifier -> {
modifier.setElementDurability(data.getRemainDurability());
});
});
if (hash == null) return;
target.getAbilities().values().stream()
.filter(
a ->
a.getHash() == hash
|| a.getData().abilityName
== target.getInstanceToName().get(head.getInstancedAbilityId()))
.forEach(
a -> {
a.getModifiers().values().stream()
.filter(m -> m.getLocalId() == head.getInstancedModifierId())
.forEach(
modifier -> {
modifier.setElementDurability(data.getRemainDurability());
});
});
}
private void handleAddNewAbility(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
private void handleAddNewAbility(AbilityInvokeEntry invoke)
throws InvalidProtocolBufferException {
var data = AbilityMetaAddAbility.parseFrom(invoke.getAbilityData());
if (data == null) {
return;
}
}
if(data.getAbility().getAbilityName().getHash() != 0) Grasscutter.getLogger().warn("Instancing {} in to {}", data.getAbility().getAbilityName().getHash(), data.getAbility().getInstancedAbilityId());
else Grasscutter.getLogger().warn("Instancing {} in to {}", data.getAbility().getAbilityName().getStr(), data.getAbility().getInstancedAbilityId());
var ability = data.getAbility();
var abilityName = ability.getAbilityName();
if (abilityName.getHash() != 0)
Grasscutter.getLogger()
.warn("Instancing {} in to {}", abilityName.getHash(), ability.getInstancedAbilityId());
else
Grasscutter.getLogger()
.warn("Instancing {} in to {}", abilityName.getStr(), ability.getInstancedAbilityId());
GameEntity target = this.player.getScene().getEntityById(invoke.getEntityId());
var target = this.player.getScene().getEntityById(invoke.getEntityId());
if (target == null) {
return;
}
target.getInstanceToHash().put(data.getAbility().getInstancedAbilityId(), data.getAbility().getAbilityName().getHash());
target.getInstanceToName().put(data.getAbility().getInstancedAbilityId(), data.getAbility().getAbilityName().getStr());
target.getInstanceToHash().put(ability.getInstancedAbilityId(), abilityName.getHash());
target.getInstanceToName().put(ability.getInstancedAbilityId(), abilityName.getStr());
}
public void addAbilityToEntity(GameEntity entity, String name) {
var data = GameData.getAbilityData(name);
if(data != null)
addAbilityToEntity(entity, data, name);
if (data != null) addAbilityToEntity(entity, data, name);
}
public void addAbilityToEntity(GameEntity entity, AbilityData abilityData, String id) {

4
src/main/java/emu/grasscutter/game/ability/AbilityModifierController.java
View File

@@ -9,7 +9,7 @@ import lombok.Setter;
public final class AbilityModifierController {
@Getter private AbilityModifier data;
@Getter private Ability ability; //Owner ability instance
@Getter private Ability ability; // Owner ability instance
@Getter private float elementDurability;
@@ -54,7 +54,7 @@ public final class AbilityModifierController {
if (event.getAttackElementType().equals(data.elementType)) {
elementDurability -= event.getDamage();
if(elementDurability <= 0) {
if (elementDurability <= 0) {
onRemoved();
ability.getModifiers().values().removeIf(a -> a == this);
}

28
src/main/java/emu/grasscutter/game/ability/actions/ActionApplyModifier.java
View File

@@ -18,9 +18,10 @@ public final class ActionApplyModifier extends AbilityActionHandler {
return false;
}
if (modifierData.stacking != null && modifierData.stacking.compareTo("Unique") == 0 &&
ability.getModifiers().values().stream()
.anyMatch(m -> m.getData().equals(modifierData))) {
if (modifierData.stacking != null
&& modifierData.stacking.compareTo("Unique") == 0
&& ability.getModifiers().values().stream()
.anyMatch(m -> m.getData().equals(modifierData))) {
return true;
}
@@ -28,15 +29,18 @@ public final class ActionApplyModifier extends AbilityActionHandler {
ability.getModifiers().put(action.modifierName, modifier);
modifier.onAdded();
if(modifierData.duration != DynamicFloat.ZERO) {
Grasscutter.getGameServer().getScheduler().scheduleAsyncTask(() -> {
try {
Thread.sleep((int)(modifierData.duration.get() * 1000));
modifier.onRemoved();
} catch (InterruptedException ignored) {
Grasscutter.getLogger().error("Failed to schedule ability modifier async task.");
}
});
if (modifierData.duration != DynamicFloat.ZERO) {
Grasscutter.getGameServer()
.getScheduler()
.scheduleAsyncTask(
() -> {
try {
Thread.sleep((int) (modifierData.duration.get() * 1000));
modifier.onRemoved();
} catch (InterruptedException ignored) {
Grasscutter.getLogger().error("Failed to schedule ability modifier async task.");
}
});
}
return true;

7
src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java
View File

@@ -4,7 +4,6 @@ import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.game.ability.Ability;
import emu.grasscutter.game.ability.AbilityAction;
import emu.grasscutter.game.ability.AbilityActionHandler;
import emu.grasscutter.game.entity.GameEntity;
@AbilityAction(AbilityModifierAction.Type.ExecuteGadgetLua)
public final class ActionExecuteGadgetLua extends AbilityActionHandler {
@@ -12,8 +11,10 @@ public final class ActionExecuteGadgetLua extends AbilityActionHandler {
public boolean execute(Ability ability, AbilityModifierAction action) {
var owner = ability.getOwner();
if( owner.getEntityController() != null) {
owner.getEntityController().onClientExecuteRequest(owner, action.param1, action.param2, action.param3);
if (owner.getEntityController() != null) {
owner
.getEntityController()
.onClientExecuteRequest(owner, action.param1, action.param2, action.param3);
return true;
}

1
src/main/java/emu/grasscutter/game/ability/actions/ActionKillSelf.java
View File

@@ -4,7 +4,6 @@ import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.game.ability.Ability;
import emu.grasscutter.game.ability.AbilityAction;
import emu.grasscutter.game.ability.AbilityActionHandler;
import emu.grasscutter.game.entity.GameEntity;
@AbilityAction(AbilityModifierAction.Type.KillSelf)
public final class ActionKillSelf extends AbilityActionHandler {

11
src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
View File

@@ -71,11 +71,12 @@ public abstract class ActivityHandler {
.forEach(
condGroupId -> {
var condGroup = GameData.getActivityCondGroupMap().get((int) condGroupId);
if (condGroup != null) condGroup
.getCondIds()
.forEach(
condition ->
questManager.queueEvent(QuestCond.QUEST_COND_ACTIVITY_COND, condition));
if (condGroup != null)
condGroup
.getCondIds()
.forEach(
condition ->
questManager.queueEvent(QuestCond.QUEST_COND_ACTIVITY_COND, condition));
});
}

16
src/main/java/emu/grasscutter/game/entity/EntityGadget.java
View File

@@ -105,22 +105,24 @@ public class EntityGadget extends EntityBaseGadget {
this.addConfigAbilities();
}
private void addConfigAbilities(){
if(this.configGadget != null && this.configGadget.getAbilities() != null) {
private void addConfigAbilities() {
if (this.configGadget != null && this.configGadget.getAbilities() != null) {
for (var ability : this.configGadget.getAbilities()) {
this.addConfigAbility(ability);
}
}
}
private void addConfigAbility(ConfigAbilityData abilityData){
private void addConfigAbility(ConfigAbilityData abilityData) {
var data = GameData.getAbilityData(abilityData.getAbilityName());
if(data != null)
getScene().getWorld().getHost().getAbilityManager().addAbilityToEntity(
this, data, abilityData.getAbilityID());
if (data != null)
getScene()
.getWorld()
.getHost()
.getAbilityManager()
.addAbilityToEntity(this, data, abilityData.getAbilityID());
}
public void setState(int state) {
this.state = state;
// Cache the gadget state

5
src/main/java/emu/grasscutter/game/entity/GameEntity.java
View File

@@ -24,11 +24,10 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2FloatMap;
import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
import lombok.Getter;
import lombok.Setter;
import java.util.HashMap;
import java.util.Map;
import lombok.Getter;
import lombok.Setter;
public abstract class GameEntity {
@Getter private final Scene scene;

6
src/main/java/emu/grasscutter/game/player/TeamManager.java
View File

@@ -487,7 +487,8 @@ public final class TeamManager extends BasePlayerDataManager {
return this.getTrialAvatars().values().stream()
.filter(avatar -> avatar.getTrialAvatarId() == trialAvatarId)
.map(Avatar::getGuid)
.findFirst().orElse(0L);
.findFirst()
.orElse(0L);
}
/** Rollback changes from using a trial avatar team. */
@@ -1074,7 +1075,8 @@ public final class TeamManager extends BasePlayerDataManager {
this.getPlayer()
.sendPacket(
new PacketAvatarDelNotify(trialAvatarIds.stream().map(this::getTrialAvatarGuid).toList()));
new PacketAvatarDelNotify(
trialAvatarIds.stream().map(this::getTrialAvatarGuid).toList()));
this.removeTrialAvatarTeam(trialAvatarIds);
// Update the team.

19
src/main/java/emu/grasscutter/game/quest/GameQuest.java
View File

@@ -292,15 +292,16 @@ public class GameQuest {
if (this.state != QuestState.UNFINISHED) return List.of();
return this.getQuestData().getFinishCond().stream()
.filter(cond -> cond.getType() == QuestContent.QUEST_CONTENT_ENTER_DUNGEON)
.map(condition -> {
var params = condition.getParam();
// The first parameter is the ID of the dungeon.
// The second parameter is the dungeon entry's scene point.
// ex. [1, 1] = dungeon ID 1, scene point 1 or 'KaeyaDungeon'.
return new IntIntImmutablePair(params[0], params[1]);
})
.toList();
.filter(cond -> cond.getType() == QuestContent.QUEST_CONTENT_ENTER_DUNGEON)
.map(
condition -> {
var params = condition.getParam();
// The first parameter is the ID of the dungeon.
// The second parameter is the dungeon entry's scene point.
// ex. [1, 1] = dungeon ID 1, scene point 1 or 'KaeyaDungeon'.
return new IntIntImmutablePair(params[0], params[1]);
})
.toList();
}
public void save() {

6
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@@ -334,9 +334,7 @@ public final class Scene {
List<List<T>> parts = new ArrayList<List<T>>();
final int N = list.size();
for (int i = 0; i < N; i += L) {
parts.add(new ArrayList<T>(
list.subList(i, Math.min(N, i + L)))
);
parts.add(new ArrayList<T>(list.subList(i, Math.min(N, i + L))));
}
return parts;
}
@@ -351,7 +349,7 @@ public final class Scene {
this.addEntityDirectly(entity);
}
for(var l : chopped(new ArrayList<>(entities), 100)) {
for (var l : chopped(new ArrayList<>(entities), 100)) {
this.broadcastPacket(new PacketSceneEntityAppearNotify(l, visionType));
}
}