Skip to content

Commit e6895ca

Browse files
KingRainbow44KingRainbow44
committed
Merge remote-tracking branch 'origin/unstable' into unstable
2 parents 5ad5bd3 + b087e1f commit e6895ca

24 files changed

+53
-35
lines changed

‎src/main/java/emu/grasscutter/data/binout/AbilityModifier.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,9 @@ public enum Type {
346346
public String overrideMapKey;
347347

348348
public int paramNum;
349-
public DynamicFloat
350-
param1 = DynamicFloat.ZERO,
351-
param2 = DynamicFloat.ZERO,
352-
param3 = DynamicFloat.ZERO;
349+
public DynamicFloat param1 = DynamicFloat.ZERO,
350+
param2 = DynamicFloat.ZERO,
351+
param3 = DynamicFloat.ZERO;
353352

354353
public String funcName;
355354
public LuaCallType luaCallType;

‎src/main/java/emu/grasscutter/data/binout/config/ConfigGlobalCombat.java

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@Data
77
public class ConfigGlobalCombat {
88
private DefaultAbilities defaultAbilities;
9+
910
// TODO: Add more indices
1011

1112
@Data

‎src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class RoutePoint {
1313
private float waitTime; // optional
1414
private float targetVelocity; // optional
1515
private boolean hasReachEvent; // optional
16+
1617
// rotRoundReachDir //optional Pos with optional values
1718
// rotRoundLeaveDir //optional Pos with optional values
1819

‎src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
public class BlossomRefreshExcelConfigData extends GameResource {
1010
@Getter(onMethod_ = @Override)
1111
private int id;
12+
1213
// Map details
1314
private long nameTextMapHash;
1415
private long descTextMapHash;

‎src/main/java/emu/grasscutter/data/excels/CoopChapterData.java

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class CoopChapterData extends GameResource {
2121
// int avatarSortId;
2222
// String chapterIcon;
2323
List<CoopCondition> unlockCond;
24+
2425
// int [] unlockCondTips;
2526
// int openMaterialId;
2627
// int openMaterialNum;

‎src/main/java/emu/grasscutter/game/ability/Ability.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ public Ability(AbilityData data, GameEntity owner, Player playerOwner) {
6565
data.modifiers.values().stream()
6666
.map(
6767
m ->
68-
m.onAdded == null ? Collections.<AbilityModifierAction>emptyList() : Arrays.asList(m.onAdded))
68+
m.onAdded == null
69+
? Collections.<AbilityModifierAction>emptyList()
70+
: Arrays.asList(m.onAdded))
6971
.flatMap(List::stream)
7072
.filter(action -> action.type == AbilityModifierAction.Type.AvatarSkillStart)
7173
.map(action -> action.skillID)

‎src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ public boolean execute(
1919
var param2 = action.param2.getInt(ability);
2020
var param3 = action.param3.getInt(ability);
2121

22-
owner
23-
.getEntityController()
24-
.onClientExecuteRequest(owner, param1, param2, param3);
22+
owner.getEntityController().onClientExecuteRequest(owner, param1, param2, param3);
2523
return true;
2624
}
2725

‎src/main/java/emu/grasscutter/game/ability/actions/ActionServerLuaCall.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ public boolean execute(
7070
* @return Whether the function was called successfully.
7171
*/
7272
private static boolean callFunction(
73-
Bindings bindings, String functionName,
74-
Ability ability, AbilityModifierAction action
75-
) {
73+
Bindings bindings, String functionName, Ability ability, AbilityModifierAction action) {
7674
try {
7775
// Resolve the function from the script.
7876
var function = bindings.get(functionName);
@@ -86,10 +84,10 @@ private static boolean callFunction(
8684

8785
// Invoke the function with the parameters.
8886
switch (action.paramNum) {
89-
case 1 -> luaFunction.invoke(new LuaValue[] { lParam1 });
90-
case 2 -> luaFunction.invoke(new LuaValue[] { lParam1, lParam2 });
91-
case 3 -> luaFunction.invoke(new LuaValue[] { lParam1, lParam2, lParam3 });
92-
default -> luaFunction.invoke(new LuaValue[] { ScriptLoader.getScriptLibLua() });
87+
case 1 -> luaFunction.invoke(new LuaValue[] {lParam1});
88+
case 2 -> luaFunction.invoke(new LuaValue[] {lParam1, lParam2});
89+
case 3 -> luaFunction.invoke(new LuaValue[] {lParam1, lParam2, lParam3});
90+
default -> luaFunction.invoke(new LuaValue[] {ScriptLoader.getScriptLibLua()});
9391
}
9492

9593
return true;

‎src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class PlayerActivityData {
2424
int uid;
2525
int activityId;
2626
Map<Integer, WatcherInfo> watcherInfoMap;
27+
2728
/** the detail data of each type of activity (Json format) */
2829
String detail;
2930

‎src/main/java/emu/grasscutter/game/avatar/Avatar.java

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public class Avatar {
8686

8787
// trial avatar property
8888
@Getter @Setter private int trialAvatarId = 0;
89+
8990
// cannot store to db if grant reason is not integer
9091
@Getter @Setter
9192
private int grantReason = TrialAvatarGrantRecord.GrantReason.GRANT_REASON_INVALID.getNumber();

‎src/main/java/emu/grasscutter/game/gacha/GachaBanner.java

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class GachaBanner {
4949
@Getter private int[] rateUpItems5 = {};
5050
// This now handles default values for the fields below
5151
@Getter private BannerType bannerType = BannerType.STANDARD;
52+
5253
// These don't change between banner types (apart from Standard having three extra 4star avatars)
5354
@Getter
5455
private int[] fallbackItems3 = {

‎src/main/java/emu/grasscutter/game/gacha/GachaSystem.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@
2525
import java.nio.file.*;
2626
import java.util.*;
2727
import java.util.concurrent.ThreadLocalRandom;
28-
2928
import lombok.Getter;
3029
import org.greenrobot.eventbus.Subscribe;
3130

3231
public class GachaSystem extends BaseGameSystem {
3332
private static final int starglitterId = 221;
3433
private static final int stardustId = 222;
35-
@Getter
36-
private final Int2ObjectMap<GachaBanner> gachaBanners;
34+
@Getter private final Int2ObjectMap<GachaBanner> gachaBanners;
3735
private WatchService watchService;
3836

3937
public GachaSystem(GameServer server) {
@@ -422,8 +420,7 @@ private synchronized void startWatcher(GameServer server) {
422420
if (this.watchService == null) {
423421
try {
424422
this.watchService = FileSystems.getDefault().newWatchService();
425-
FileUtils.getDataUserPath("")
426-
.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY);
423+
FileUtils.getDataUserPath("").register(watchService, StandardWatchEventKinds.ENTRY_MODIFY);
427424
} catch (Exception e) {
428425
Grasscutter.getLogger()
429426
.error(

‎src/main/java/emu/grasscutter/game/quest/GameMainQuest.java

+1
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ public void finish() {
195195
// .forEach(getQuestManager()::startMainQuest);
196196
// }
197197
}
198+
198199
// TODO
199200
public void fail() {}
200201

‎src/main/java/emu/grasscutter/game/tower/TowerLevelRecord.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
public class TowerLevelRecord {
88
/** floorId in config */
99
private int floorId;
10+
1011
/** LevelId - Stars */
1112
private Map<Integer, Integer> passedLevelMap;
1213

‎src/main/java/emu/grasscutter/scripts/SceneScriptManager.java

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class SceneScriptManager {
5656
private final Map<Integer, SceneGroupInstance> cachedSceneGroupsInstances;
5757
private ScriptMonsterTideService scriptMonsterTideService;
5858
private ScriptMonsterSpawnService scriptMonsterSpawnService;
59+
5960
/** blockid - loaded groupSet */
6061
private final Map<Integer, Set<SceneGroup>> loadedGroupSetPerBlock;
6162

@@ -846,6 +847,7 @@ public void spawnMonstersByConfigId(SceneGroup group, int configId, int delayTim
846847
.warn("failed to create entity with group {} and config {}", group.id, configId);
847848
}
848849
}
850+
849851
// Events
850852
public Future<?> callEvent(int groupId, int eventType) {
851853
return callEvent(new ScriptArgs(groupId, eventType));

‎src/main/java/emu/grasscutter/scripts/ScriptLoader.java

+2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ public class ScriptLoader {
2828
@Getter private static Serializer serializer;
2929
@Getter private static ScriptLib scriptLib;
3030
@Getter private static LuaValue scriptLibLua;
31+
3132
/** suggest GC to remove it if the memory is less */
3233
private static Map<String, SoftReference<String>> scriptSources = new ConcurrentHashMap<>();
3334

3435
private static Map<String, SoftReference<CompiledScript>> scriptsCache =
3536
new ConcurrentHashMap<>();
37+
3638
/** sceneId - SceneMeta */
3739
private static Map<Integer, SoftReference<SceneMeta>> sceneMetaCache = new ConcurrentHashMap<>();
3840

‎src/main/java/emu/grasscutter/scripts/constants/EventType.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
public class EventType {
44
public static final int EVENT_NONE = 0;
5+
56
/** param1: monster.configId */
67
public static final int EVENT_ANY_MONSTER_DIE = 1;
78

‎src/main/java/emu/grasscutter/scripts/data/SceneGadget.java

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public class SceneGadget extends SceneObject {
1818
public int owner;
1919
public SceneBossChest boss_chest;
2020
public int interact_id;
21+
2122
/**
2223
* Note: this field indicates whether the gadget should disappear permanently. For example, if
2324
* isOneOff=true, like most chests, it will disappear permanently after interacted. If

‎src/main/java/emu/grasscutter/scripts/data/SceneObject.java

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public abstract class SceneObject {
1313

1414
public Position pos;
1515
public Position rot;
16+
1617
/** not set by lua */
1718
public transient SceneGroup group;
1819
}

‎src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public int onClientExecuteRequest(GameEntity entity, int param1, int param2, int
6161
}
6262

6363
/**
64-
* Invoked from {@link emu.grasscutter.game.ability.actions.ActionServerLuaCall} to call an entity controller function.
64+
* Invoked from {@link emu.grasscutter.game.ability.actions.ActionServerLuaCall} to call an entity
65+
* controller function.
6566
*
6667
* @param entity The entity which called the function.
6768
* @param funcName The name of the function to call.
@@ -70,8 +71,7 @@ public int onClientExecuteRequest(GameEntity entity, int param1, int param2, int
7071
* @return The return value of the function.
7172
*/
7273
public LuaValue callControllerScriptFunc(
73-
GameEntity entity, String funcName,
74-
Ability ability, AbilityModifierAction action) {
74+
GameEntity entity, String funcName, Ability ability, AbilityModifierAction action) {
7575
var lParam1 = LuaValue.valueOf(action.param1.getInt(ability));
7676
var lParam2 = LuaValue.valueOf(action.param2.getInt(ability));
7777
var lParam3 = LuaValue.valueOf(action.param3.getInt(ability));

‎src/main/java/emu/grasscutter/server/dispatch/DispatchClient.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.slf4j.Logger;
2323

2424
/**
25-
* This is a simple implementation of a server-to-server IPC client.
26-
* It is implemented over WebSockets, and supports all Grasscutter versions past 1.6.0
25+
* This is a simple implementation of a server-to-server IPC client. It is implemented over
26+
* WebSockets, and supports all Grasscutter versions past 1.6.0
2727
*/
2828
@Getter
2929
public final class DispatchClient extends WebSocketClient implements IDispatcher {

‎src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarUpgradeReq.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex
1616
// These are bundled into a list of items.
1717
for (var item : req.getItemParamListList()) {
1818
session
19-
.getServer()
20-
.getInventorySystem()
21-
.upgradeAvatar(session.getPlayer(), req.getAvatarGuid(), item.getItemId(), item.getCount());
19+
.getServer()
20+
.getInventorySystem()
21+
.upgradeAvatar(
22+
session.getPlayer(), req.getAvatarGuid(), item.getItemId(), item.getCount());
2223
}
2324
}
2425
}

‎src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java

+12-6
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ public PacketPlayerEnterSceneNotify(Player player) {
2828
.setTargetUid(player.getUid())
2929
.setEnterSceneToken(player.getEnterSceneToken())
3030
.setWorldLevel(player.getWorldLevel())
31-
// .setEnterReason(EnterReason.Login.getValue()) // Removed in 5.0; we don't know what it is
32-
// .setIsFirstLoginEnterScene(player.isFirstLoginEnterScene()) // Removed in 5.0; we don't know what it is
31+
// .setEnterReason(EnterReason.Login.getValue()) // Removed in 5.0; we don't know what
32+
// it is
33+
// .setIsFirstLoginEnterScene(player.isFirstLoginEnterScene()) // Removed in 5.0; we
34+
// don't know what it is
3335
// .setWorldType(1) // Removed in 5.0; we don't know what it is
3436
.setSceneTransaction(
3537
"3-"
@@ -80,15 +82,17 @@ public PacketPlayerEnterSceneNotify(
8082
var proto =
8183
PlayerEnterSceneNotify.newBuilder()
8284
// .setPrevSceneId(player.getSceneId()) // Removed in 5.0; we don't know what it is
83-
// .setPrevPos(player.getPosition().toProto()) // Removed in 5.0; we don't know what it is
85+
// .setPrevPos(player.getPosition().toProto()) // Removed in 5.0; we don't know what it
86+
// is
8487
.setSceneId(teleportProperties.getSceneId())
8588
.setPos(teleportProperties.getTeleportTo().toProto())
8689
.setSceneBeginTime(System.currentTimeMillis())
8790
.setType(teleportProperties.getEnterType())
8891
.setTargetUid(target.getUid())
8992
.setEnterSceneToken(player.getEnterSceneToken())
9093
.setWorldLevel(target.getWorld().getWorldLevel())
91-
// .setEnterReason(teleportProperties.getEnterReason().getValue()) // Removed in 5.0; we don't know what it is
94+
// .setEnterReason(teleportProperties.getEnterReason().getValue()) // Removed in 5.0; we
95+
// don't know what it is
9296
// .setWorldType(1) // Removed in 5.0; we don't know what it is
9397
.setSceneTransaction(
9498
teleportProperties.getSceneId()
@@ -118,14 +122,16 @@ public PacketPlayerEnterSceneNotify(
118122
var proto =
119123
PlayerEnterSceneNotify.newBuilder()
120124
// .setPrevSceneId(player.getSceneId()) // Removed in 5.0; we don't know what it is
121-
// .setPrevPos(player.getPosition().toProto()) // Removed in 5.0; we don't know what it is
125+
// .setPrevPos(player.getPosition().toProto()) // Removed in 5.0; we don't know what it
126+
// is
122127
.setSceneId(teleportProperties.getSceneId())
123128
.setPos(teleportProperties.getTeleportTo().toProto())
124129
.setSceneBeginTime(System.currentTimeMillis())
125130
.setType(other ? EnterType.ENTER_TYPE_OTHER_HOME : EnterType.ENTER_TYPE_SELF_HOME)
126131
.setTargetUid(targetUid)
127132
.setEnterSceneToken(player.getEnterSceneToken())
128-
// .setEnterReason(teleportProperties.getEnterReason().getValue()) // Removed in 5.0; we don't know what it is
133+
// .setEnterReason(teleportProperties.getEnterReason().getValue()) // Removed in 5.0; we
134+
// don't know what it is
129135
// .setWorldType(64) // Removed in 5.0; we don't know what it is
130136
.setSceneTransaction(
131137
teleportProperties.getSceneId()

‎src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public PacketPlayerLoginRsp(GameSession session) {
5858
.setClientDataVersion(info.getClientDataVersion())
5959
.setClientSilenceDataVersion(info.getClientSilenceDataVersion())
6060
// .setClientMd5(info.getClientDataMd5()) // Removed in 5.0; we don't know what it is
61-
// .setClientSilenceMd5(info.getClientSilenceDataMd5()) // Removed in 5.0; we don't know what it is
61+
// .setClientSilenceMd5(info.getClientSilenceDataMd5()) // Removed in 5.0; we don't know
62+
// what it is
6263
.setResVersionConfig(info.getResVersionConfig())
6364
.setClientVersionSuffix(info.getClientVersionSuffix())
6465
.setClientSilenceVersionSuffix(info.getClientSilenceVersionSuffix())

0 commit comments

Comments
 (0)