Format code [skip actions]

src/main/java/emu/grasscutter/data/GameResource.java

@@ -1,10 +1,10 @@
-package emu.grasscutter.data;
-
-public abstract class GameResource {
-
-    public int getId() {
-        return 0;
-    }
-
-    public void onLoad() {}
-}
+package emu.grasscutter.data;
+
+public abstract class GameResource {
+
+    public int getId() {
+        return 0;
+    }
+
+    public void onLoad() {}
+}

src/main/java/emu/grasscutter/data/ResourceType.java

@@ -1,40 +1,40 @@
-package emu.grasscutter.data;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.List;
-import java.util.stream.Stream;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ResourceType {
-
-    /** Names of the file that this Resource loads from */
-    String[] name();
-
-    /**
-     * Load priority - dictates which order to load this resource, with "highest" being loaded first
-     */
-    LoadPriority loadPriority() default LoadPriority.NORMAL;
-
-    enum LoadPriority {
-        HIGHEST(4),
-        HIGH(3),
-        NORMAL(2),
-        LOW(1),
-        LOWEST(0);
-
-        private final int value;
-
-        LoadPriority(int value) {
-            this.value = value;
-        }
-
-        public static List<LoadPriority> getInOrder() {
-            return Stream.of(LoadPriority.values()).sorted((x, y) -> y.value() - x.value()).toList();
-        }
-
-        public int value() {
-            return value;
-        }
-    }
-}
+package emu.grasscutter.data;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+import java.util.stream.Stream;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ResourceType {
+
+    /** Names of the file that this Resource loads from */
+    String[] name();
+
+    /**
+     * Load priority - dictates which order to load this resource, with "highest" being loaded first
+     */
+    LoadPriority loadPriority() default LoadPriority.NORMAL;
+
+    enum LoadPriority {
+        HIGHEST(4),
+        HIGH(3),
+        NORMAL(2),
+        LOW(1),
+        LOWEST(0);
+
+        private final int value;
+
+        LoadPriority(int value) {
+            this.value = value;
+        }
+
+        public static List<LoadPriority> getInOrder() {
+            return Stream.of(LoadPriority.values()).sorted((x, y) -> y.value() - x.value()).toList();
+        }
+
+        public int value() {
+            return value;
+        }
+    }
+}

src/main/java/emu/grasscutter/data/binout/AbilityEmbryoEntry.java

@@ -1,21 +1,21 @@
-package emu.grasscutter.data.binout;
-
-public class AbilityEmbryoEntry {
-    private String name;
-    private String[] abilities;
-
-    public AbilityEmbryoEntry() {}
-
-    public AbilityEmbryoEntry(String avatarName, String[] array) {
-        this.name = avatarName;
-        this.abilities = array;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String[] getAbilities() {
-        return abilities;
-    }
-}
+package emu.grasscutter.data.binout;
+
+public class AbilityEmbryoEntry {
+    private String name;
+    private String[] abilities;
+
+    public AbilityEmbryoEntry() {}
+
+    public AbilityEmbryoEntry(String avatarName, String[] array) {
+        this.name = avatarName;
+        this.abilities = array;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String[] getAbilities() {
+        return abilities;
+    }
+}

src/main/java/emu/grasscutter/data/binout/ConfigGadget.java

@@ -1,13 +1,13 @@
-package emu.grasscutter.data.binout;
-
-import javax.annotation.Nullable;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConfigGadget {
-    // There are more values that can be added that might be useful in the json
-    @Nullable ConfigGadgetCombat combat;
-}
+package emu.grasscutter.data.binout;
+
+import javax.annotation.Nullable;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ConfigGadget {
+    // There are more values that can be added that might be useful in the json
+    @Nullable ConfigGadgetCombat combat;
+}

src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombatProperty.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.data.binout;
-
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConfigGadgetCombatProperty {
-    float HP;
-    boolean isLockHP;
-    boolean isInvincible;
-    boolean isGhostToAllied;
-    float attack;
-    float defence;
-    float weight;
-    boolean useCreatorProperty;
-}
+package emu.grasscutter.data.binout;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ConfigGadgetCombatProperty {
+    float HP;
+    boolean isLockHP;
+    boolean isInvincible;
+    boolean isGhostToAllied;
+    float attack;
+    float defence;
+    float weight;
+    boolean useCreatorProperty;
+}

src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java

@@ -1,61 +1,61 @@
-package emu.grasscutter.data.binout;
-
-import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.utils.Position;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class HomeworldDefaultSaveData {
-
-    @SerializedName(value = "KFHBFNPDJBE", alternate = "PKACPHDGGEI")
-    List<HomeBlock> homeBlockLists;
-
-    @SerializedName(value = "IJNPADKGNKE", alternate = "MINCKHBNING")
-    Position bornPos;
-
-    @SerializedName("IPIIGEMFLHK")
-    Position bornRot;
-
-    @SerializedName("HHOLBNPIHEM")
-    Position djinPos;
-
-    @SerializedName("KNHCJKHCOAN")
-    HomeFurniture mainhouse;
-
-    @SerializedName("NIHOJFEKFPG")
-    List<HomeFurniture> doorLists;
-
-    @SerializedName("EPGELGEFJFK")
-    List<HomeFurniture> stairLists;
-
-    @Data
-    @FieldDefaults(level = AccessLevel.PRIVATE)
-    public static class HomeBlock {
-
-        @SerializedName(value = "FGIJCELCGFI", alternate = "PGDPDIDJEEL")
-        int blockId;
-
-        @SerializedName("BEAPOFELABD")
-        List<HomeFurniture> furnitures;
-
-        @SerializedName("MLIODLGDFHJ")
-        List<HomeFurniture> persistentFurnitures;
-    }
-
-    @Data
-    @FieldDefaults(level = AccessLevel.PRIVATE)
-    public static class HomeFurniture {
-
-        @SerializedName(value = "ENHNGKJBJAB", alternate = "KMAAJJHPNBA")
-        int id;
-
-        @SerializedName(value = "NGIEEIOLPPO", alternate = "JFKAHNCPDME")
-        Position pos;
-        // @SerializedName(value = "HEOCEHKEBFM", alternate = "LKCKOOGFDBM")
-        Position rot;
-    }
-}
+package emu.grasscutter.data.binout;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.utils.Position;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class HomeworldDefaultSaveData {
+
+    @SerializedName(value = "KFHBFNPDJBE", alternate = "PKACPHDGGEI")
+    List<HomeBlock> homeBlockLists;
+
+    @SerializedName(value = "IJNPADKGNKE", alternate = "MINCKHBNING")
+    Position bornPos;
+
+    @SerializedName("IPIIGEMFLHK")
+    Position bornRot;
+
+    @SerializedName("HHOLBNPIHEM")
+    Position djinPos;
+
+    @SerializedName("KNHCJKHCOAN")
+    HomeFurniture mainhouse;
+
+    @SerializedName("NIHOJFEKFPG")
+    List<HomeFurniture> doorLists;
+
+    @SerializedName("EPGELGEFJFK")
+    List<HomeFurniture> stairLists;
+
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    public static class HomeBlock {
+
+        @SerializedName(value = "FGIJCELCGFI", alternate = "PGDPDIDJEEL")
+        int blockId;
+
+        @SerializedName("BEAPOFELABD")
+        List<HomeFurniture> furnitures;
+
+        @SerializedName("MLIODLGDFHJ")
+        List<HomeFurniture> persistentFurnitures;
+    }
+
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    public static class HomeFurniture {
+
+        @SerializedName(value = "ENHNGKJBJAB", alternate = "KMAAJJHPNBA")
+        int id;
+
+        @SerializedName(value = "NGIEEIOLPPO", alternate = "JFKAHNCPDME")
+        Position pos;
+        // @SerializedName(value = "HEOCEHKEBFM", alternate = "LKCKOOGFDBM")
+        Position rot;
+    }
+}

src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java

@@ -1,24 +1,24 @@
-package emu.grasscutter.data.binout;
-
-import com.github.davidmoten.rtreemulti.RTree;
-import com.github.davidmoten.rtreemulti.geometry.Geometry;
-import emu.grasscutter.scripts.data.SceneGroup;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class SceneNpcBornData {
-    int sceneId;
-    List<SceneNpcBornEntry> bornPosList;
-
-    /** Spatial Index For NPC */
-    transient RTree<SceneNpcBornEntry, Geometry> index;
-
-    /** npc groups */
-    transient Map<Integer, SceneGroup> groups = new ConcurrentHashMap<>();
-}
+package emu.grasscutter.data.binout;
+
+import com.github.davidmoten.rtreemulti.RTree;
+import com.github.davidmoten.rtreemulti.geometry.Geometry;
+import emu.grasscutter.scripts.data.SceneGroup;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class SceneNpcBornData {
+    int sceneId;
+    List<SceneNpcBornEntry> bornPosList;
+
+    /** Spatial Index For NPC */
+    transient RTree<SceneNpcBornEntry, Geometry> index;
+
+    /** npc groups */
+    transient Map<Integer, SceneGroup> groups = new ConcurrentHashMap<>();
+}

src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java

@@ -1,42 +1,42 @@
-package emu.grasscutter.data.binout;
-
-import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.utils.Position;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class SceneNpcBornEntry {
-    @SerializedName(
-            value = "id",
-            alternate = {"_id", "ID"})
-    int id;
-
-    @SerializedName(
-            value = "configId",
-            alternate = {"_configId"})
-    int configId;
-
-    @SerializedName(
-            value = "pos",
-            alternate = {"_pos"})
-    Position pos;
-
-    @SerializedName(
-            value = "rot",
-            alternate = {"_rot"})
-    Position rot;
-
-    @SerializedName(
-            value = "groupId",
-            alternate = {"_groupId"})
-    int groupId;
-
-    @SerializedName(
-            value = "suiteIdList",
-            alternate = {"_suiteIdList"})
-    List<Integer> suiteIdList;
-}
+package emu.grasscutter.data.binout;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.utils.Position;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class SceneNpcBornEntry {
+    @SerializedName(
+            value = "id",
+            alternate = {"_id", "ID"})
+    int id;
+
+    @SerializedName(
+            value = "configId",
+            alternate = {"_configId"})
+    int configId;
+
+    @SerializedName(
+            value = "pos",
+            alternate = {"_pos"})
+    Position pos;
+
+    @SerializedName(
+            value = "rot",
+            alternate = {"_rot"})
+    Position rot;
+
+    @SerializedName(
+            value = "groupId",
+            alternate = {"_groupId"})
+    int groupId;
+
+    @SerializedName(
+            value = "suiteIdList",
+            alternate = {"_suiteIdList"})
+    List<Integer> suiteIdList;
+}

src/main/java/emu/grasscutter/data/binout/ScenePointEntry.java

@@ -1,24 +1,24 @@
-package emu.grasscutter.data.binout;
-
-import emu.grasscutter.data.common.PointData;
-import lombok.Getter;
-
-public class ScenePointEntry {
-    @Getter private final int sceneId;
-    @Getter private final PointData pointData;
-
-    @Deprecated(forRemoval = true)
-    public ScenePointEntry(String name, PointData pointData) {
-        this.sceneId = Integer.parseInt(name.split("_")[0]);
-        this.pointData = pointData;
-    }
-
-    public ScenePointEntry(int sceneId, PointData pointData) {
-        this.sceneId = sceneId;
-        this.pointData = pointData;
-    }
-
-    public String getName() {
-        return this.sceneId + "_" + this.pointData.getId();
-    }
-}
+package emu.grasscutter.data.binout;
+
+import emu.grasscutter.data.common.PointData;
+import lombok.Getter;
+
+public class ScenePointEntry {
+    @Getter private final int sceneId;
+    @Getter private final PointData pointData;
+
+    @Deprecated(forRemoval = true)
+    public ScenePointEntry(String name, PointData pointData) {
+        this.sceneId = Integer.parseInt(name.split("_")[0]);
+        this.pointData = pointData;
+    }
+
+    public ScenePointEntry(int sceneId, PointData pointData) {
+        this.sceneId = sceneId;
+        this.pointData = pointData;
+    }
+
+    public String getName() {
+        return this.sceneId + "_" + this.pointData.getId();
+    }
+}

src/main/java/emu/grasscutter/data/binout/ScriptSceneData.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.data.binout;
-
-import com.google.gson.annotations.SerializedName;
-import java.util.List;
-import java.util.Map;
-import lombok.Data;
-
-@Data
-public class ScriptSceneData {
-    Map<String, ScriptObject> scriptObjectList;
-
-    @Data
-    public static class ScriptObject {
-        // private SceneGroup groups;
-        @SerializedName("dummy_points")
-        private Map<String, List<Float>> dummyPoints;
-    }
-}
+package emu.grasscutter.data.binout;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import java.util.Map;
+import lombok.Data;
+
+@Data
+public class ScriptSceneData {
+    Map<String, ScriptObject> scriptObjectList;
+
+    @Data
+    public static class ScriptObject {
+        // private SceneGroup groups;
+        @SerializedName("dummy_points")
+        private Map<String, List<Float>> dummyPoints;
+    }
+}

src/main/java/emu/grasscutter/data/common/CurveInfo.java

@@ -1,19 +1,19 @@
-package emu.grasscutter.data.common;
-
-public class CurveInfo {
-    private String type;
-    private String arith;
-    private float value;
-
-    public String getType() {
-        return type;
-    }
-
-    public String getArith() {
-        return arith;
-    }
-
-    public float getValue() {
-        return value;
-    }
-}
+package emu.grasscutter.data.common;
+
+public class CurveInfo {
+    private String type;
+    private String arith;
+    private float value;
+
+    public String getType() {
+        return type;
+    }
+
+    public String getArith() {
+        return arith;
+    }
+
+    public float getValue() {
+        return value;
+    }
+}

src/main/java/emu/grasscutter/data/common/DynamicFloat.java

@@ -1,105 +1,105 @@
-package emu.grasscutter.data.common;
-
-import it.unimi.dsi.fastutil.floats.FloatArrayList;
-import it.unimi.dsi.fastutil.objects.Object2FloatArrayMap;
-import it.unimi.dsi.fastutil.objects.Object2FloatMap;
-import java.util.List;
-import java.util.Optional;
-import lombok.val;
-
-public class DynamicFloat {
-    public static DynamicFloat ZERO = new DynamicFloat(0f);
-    private List<StackOp> ops;
-    private boolean dynamic = false;
-    private float constant = 0f;
-
-    public DynamicFloat(float constant) {
-        this.constant = constant;
-    }
-
-    public DynamicFloat(String key) {
-        this.dynamic = true;
-        this.ops = List.of(new StackOp(key));
-    }
-
-    public DynamicFloat(boolean b) {
-        this.dynamic = true;
-        this.ops = List.of(new StackOp(String.valueOf(b)));
-    }
-
-    public DynamicFloat(List<StackOp> ops) {
-        this.dynamic = true;
-        this.ops = ops;
-    }
-
-    public String toString(boolean nextBoolean) {
-        String key = String.valueOf(nextBoolean);
-        this.ops = List.of(new StackOp(key));
-        return ops.toString();
-    }
-
-    public float get() {
-        return this.get(new Object2FloatArrayMap<String>());
-    }
-
-    public float get(Object2FloatMap<String> props) {
-        if (!dynamic) return constant;
-
-        val fl = new FloatArrayList();
-        for (var op : this.ops) {
-            switch (op.op) {
-                case CONSTANT -> fl.push(op.fValue);
-                case KEY -> fl.push(props.getOrDefault(op.sValue, 0f));
-                case ADD -> fl.push(fl.popFloat() + fl.popFloat());
-                case SUB -> fl.push(
-                        -fl.popFloat() + fl.popFloat()); // [f0, f1, f2] -> [f0, f1-f2]  (opposite of RPN order)
-                case MUL -> fl.push(fl.popFloat() * fl.popFloat());
-                case DIV -> fl.push((1f / fl.popFloat()) * fl.popFloat()); // [f0, f1, f2] -> [f0, f1/f2]
-                case NEXBOOLEAN -> fl.push(props.getOrDefault(Optional.of(op.bValue), 0f));
-            }
-        }
-
-        return fl.popFloat(); // well-formed data will always have only one value left at this point
-    }
-
-    public static class StackOp {
-        public Op op;
-
-        public float fValue;
-        public String sValue;
-        public boolean bValue;
-
-        public StackOp(String s) {
-            switch (s.toUpperCase()) {
-                case "ADD" -> this.op = Op.ADD;
-                case "SUB" -> this.op = Op.SUB;
-                case "MUL" -> this.op = Op.MUL;
-                case "DIV" -> this.op = Op.DIV;
-                default -> {
-                    this.op = Op.KEY;
-                    this.sValue = s;
-                }
-            }
-        }
-
-        public StackOp(boolean b) {
-            this.op = Op.NEXBOOLEAN;
-            this.bValue = Boolean.parseBoolean(String.valueOf(b));
-        }
-
-        public StackOp(float f) {
-            this.op = Op.CONSTANT;
-            this.fValue = f;
-        }
-
-        enum Op {
-            CONSTANT,
-            KEY,
-            ADD,
-            SUB,
-            MUL,
-            DIV,
-            NEXBOOLEAN
-        }
-    }
-}
+package emu.grasscutter.data.common;
+
+import it.unimi.dsi.fastutil.floats.FloatArrayList;
+import it.unimi.dsi.fastutil.objects.Object2FloatArrayMap;
+import it.unimi.dsi.fastutil.objects.Object2FloatMap;
+import java.util.List;
+import java.util.Optional;
+import lombok.val;
+
+public class DynamicFloat {
+    public static DynamicFloat ZERO = new DynamicFloat(0f);
+    private List<StackOp> ops;
+    private boolean dynamic = false;
+    private float constant = 0f;
+
+    public DynamicFloat(float constant) {
+        this.constant = constant;
+    }
+
+    public DynamicFloat(String key) {
+        this.dynamic = true;
+        this.ops = List.of(new StackOp(key));
+    }
+
+    public DynamicFloat(boolean b) {
+        this.dynamic = true;
+        this.ops = List.of(new StackOp(String.valueOf(b)));
+    }
+
+    public DynamicFloat(List<StackOp> ops) {
+        this.dynamic = true;
+        this.ops = ops;
+    }
+
+    public String toString(boolean nextBoolean) {
+        String key = String.valueOf(nextBoolean);
+        this.ops = List.of(new StackOp(key));
+        return ops.toString();
+    }
+
+    public float get() {
+        return this.get(new Object2FloatArrayMap<String>());
+    }
+
+    public float get(Object2FloatMap<String> props) {
+        if (!dynamic) return constant;
+
+        val fl = new FloatArrayList();
+        for (var op : this.ops) {
+            switch (op.op) {
+                case CONSTANT -> fl.push(op.fValue);
+                case KEY -> fl.push(props.getOrDefault(op.sValue, 0f));
+                case ADD -> fl.push(fl.popFloat() + fl.popFloat());
+                case SUB -> fl.push(
+                        -fl.popFloat() + fl.popFloat()); // [f0, f1, f2] -> [f0, f1-f2]  (opposite of RPN order)
+                case MUL -> fl.push(fl.popFloat() * fl.popFloat());
+                case DIV -> fl.push((1f / fl.popFloat()) * fl.popFloat()); // [f0, f1, f2] -> [f0, f1/f2]
+                case NEXBOOLEAN -> fl.push(props.getOrDefault(Optional.of(op.bValue), 0f));
+            }
+        }
+
+        return fl.popFloat(); // well-formed data will always have only one value left at this point
+    }
+
+    public static class StackOp {
+        public Op op;
+
+        public float fValue;
+        public String sValue;
+        public boolean bValue;
+
+        public StackOp(String s) {
+            switch (s.toUpperCase()) {
+                case "ADD" -> this.op = Op.ADD;
+                case "SUB" -> this.op = Op.SUB;
+                case "MUL" -> this.op = Op.MUL;
+                case "DIV" -> this.op = Op.DIV;
+                default -> {
+                    this.op = Op.KEY;
+                    this.sValue = s;
+                }
+            }
+        }
+
+        public StackOp(boolean b) {
+            this.op = Op.NEXBOOLEAN;
+            this.bValue = Boolean.parseBoolean(String.valueOf(b));
+        }
+
+        public StackOp(float f) {
+            this.op = Op.CONSTANT;
+            this.fValue = f;
+        }
+
+        enum Op {
+            CONSTANT,
+            KEY,
+            ADD,
+            SUB,
+            MUL,
+            DIV,
+            NEXBOOLEAN
+        }
+    }
+}

src/main/java/emu/grasscutter/data/common/FightPropData.java

@@ -1,25 +1,25 @@
-package emu.grasscutter.data.common;
-
-import emu.grasscutter.game.props.FightProperty;
-
-public class FightPropData {
-    private String propType;
-    private FightProperty prop;
-    private float value;
-
-    public String getPropType() {
-        return propType;
-    }
-
-    public float getValue() {
-        return value;
-    }
-
-    public FightProperty getProp() {
-        return prop;
-    }
-
-    public void onLoad() {
-        this.prop = FightProperty.getPropByName(propType);
-    }
-}
+package emu.grasscutter.data.common;
+
+import emu.grasscutter.game.props.FightProperty;
+
+public class FightPropData {
+    private String propType;
+    private FightProperty prop;
+    private float value;
+
+    public String getPropType() {
+        return propType;
+    }
+
+    public float getValue() {
+        return value;
+    }
+
+    public FightProperty getProp() {
+        return prop;
+    }
+
+    public void onLoad() {
+        this.prop = FightProperty.getPropByName(propType);
+    }
+}

src/main/java/emu/grasscutter/data/common/ItemParamData.java

@@ -1,39 +1,39 @@
-package emu.grasscutter.data.common;
-
-import com.google.gson.annotations.SerializedName;
-
-// Used in excels
-public class ItemParamData {
-    @SerializedName(
-            value = "id",
-            alternate = {"itemId"})
-    private int id;
-
-    @SerializedName(
-            value = "count",
-            alternate = {"itemCount"})
-    private int count;
-
-    public ItemParamData() {}
-
-    public ItemParamData(int id, int count) {
-        this.id = id;
-        this.count = count;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public int getItemId() {
-        return id;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public int getItemCount() {
-        return count;
-    }
-}
+package emu.grasscutter.data.common;
+
+import com.google.gson.annotations.SerializedName;
+
+// Used in excels
+public class ItemParamData {
+    @SerializedName(
+            value = "id",
+            alternate = {"itemId"})
+    private int id;
+
+    @SerializedName(
+            value = "count",
+            alternate = {"itemCount"})
+    private int count;
+
+    public ItemParamData() {}
+
+    public ItemParamData(int id, int count) {
+        this.id = id;
+        this.count = count;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public int getItemId() {
+        return id;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public int getItemCount() {
+        return count;
+    }
+}

src/main/java/emu/grasscutter/data/common/ItemParamStringData.java

@@ -1,26 +1,26 @@
-package emu.grasscutter.data.common;
-
-public class ItemParamStringData {
-    private int id;
-    private String count;
-
-    public ItemParamStringData() {}
-
-    public int getId() {
-        return id;
-    }
-
-    public String getCount() {
-        return count;
-    }
-
-    public ItemParamData toItemParamData() {
-        if (count.contains(";")) {
-            String[] split = count.split(";");
-            count = count.split(";")[split.length - 1];
-        } else if (count.contains(".")) {
-            return new ItemParamData(id, (int) Math.ceil(Double.parseDouble(count)));
-        }
-        return new ItemParamData(id, Integer.parseInt(count));
-    }
-}
+package emu.grasscutter.data.common;
+
+public class ItemParamStringData {
+    private int id;
+    private String count;
+
+    public ItemParamStringData() {}
+
+    public int getId() {
+        return id;
+    }
+
+    public String getCount() {
+        return count;
+    }
+
+    public ItemParamData toItemParamData() {
+        if (count.contains(";")) {
+            String[] split = count.split(";");
+            count = count.split(";")[split.length - 1];
+        } else if (count.contains(".")) {
+            return new ItemParamData(id, (int) Math.ceil(Double.parseDouble(count)));
+        }
+        return new ItemParamData(id, Integer.parseInt(count));
+    }
+}

src/main/java/emu/grasscutter/data/common/OpenCondData.java

@@ -1,24 +1,24 @@
-package emu.grasscutter.data.common;
-
-import java.util.List;
-
-public class OpenCondData {
-    private String condType;
-    private List<Integer> paramList;
-
-    public String getCondType() {
-        return condType;
-    }
-
-    public void setCondType(String condType) {
-        condType = condType;
-    }
-
-    public List<Integer> getParamList() {
-        return paramList;
-    }
-
-    public void setParamList(List<Integer> paramList) {
-        paramList = paramList;
-    }
-}
+package emu.grasscutter.data.common;
+
+import java.util.List;
+
+public class OpenCondData {
+    private String condType;
+    private List<Integer> paramList;
+
+    public String getCondType() {
+        return condType;
+    }
+
+    public void setCondType(String condType) {
+        condType = condType;
+    }
+
+    public List<Integer> getParamList() {
+        return paramList;
+    }
+
+    public void setParamList(List<Integer> paramList) {
+        paramList = paramList;
+    }
+}

src/main/java/emu/grasscutter/data/common/PropGrowCurve.java

@@ -1,14 +1,14 @@
-package emu.grasscutter.data.common;
-
-public class PropGrowCurve {
-    private String type;
-    private String growCurve;
-
-    public String getType() {
-        return this.type;
-    }
-
-    public String getGrowCurve() {
-        return this.growCurve;
-    }
-}
+package emu.grasscutter.data.common;
+
+public class PropGrowCurve {
+    private String type;
+    private String growCurve;
+
+    public String getType() {
+        return this.type;
+    }
+
+    public String getGrowCurve() {
+        return this.growCurve;
+    }
+}

src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java

@@ -1,74 +1,74 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.game.props.BattlePassMissionRefreshType;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.Getter;
-
-@ResourceType(name = {"BattlePassMissionExcelConfigData.json"})
-@Getter
-public class BattlePassMissionData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    private int id;
-
-    private int addPoint;
-    private int scheduleId;
-    private int progress;
-    private TriggerConfig triggerConfig;
-    private BattlePassMissionRefreshType refreshType;
-
-    private transient Set<Integer> mainParams;
-
-    public WatcherTriggerType getTriggerType() {
-        return this.getTriggerConfig().getTriggerType();
-    }
-
-    public boolean isCycleRefresh() {
-        return getRefreshType() == null
-                || getRefreshType()
-                        == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE;
-    }
-
-    public boolean isValidRefreshType() {
-        return getRefreshType() == null
-                || getRefreshType()
-                        == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE
-                || getScheduleId() == 2701;
-    }
-
-    @Override
-    public void onLoad() {
-        if (this.getTriggerConfig() != null) {
-            var params = getTriggerConfig().getParamList()[0];
-            if ((params != null) && !params.isEmpty()) {
-                this.mainParams =
-                        Arrays.stream(params.split("[:;,]")).map(Integer::parseInt).collect(Collectors.toSet());
-            }
-        }
-    }
-
-    public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission toProto() {
-        var protoBuilder =
-                emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.newBuilder();
-
-        protoBuilder
-                .setMissionId(getId())
-                .setTotalProgress(this.getProgress())
-                .setRewardBattlePassPoint(this.getAddPoint())
-                .setMissionStatus(MissionStatus.MISSION_STATUS_UNFINISHED)
-                .setMissionType(this.getRefreshType() == null ? 0 : this.getRefreshType().getValue());
-
-        return protoBuilder.build();
-    }
-
-    @Getter
-    public static class TriggerConfig {
-        private WatcherTriggerType triggerType;
-        private String[] paramList;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.game.props.BattlePassMissionRefreshType;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.Getter;
+
+@ResourceType(name = {"BattlePassMissionExcelConfigData.json"})
+@Getter
+public class BattlePassMissionData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    private int addPoint;
+    private int scheduleId;
+    private int progress;
+    private TriggerConfig triggerConfig;
+    private BattlePassMissionRefreshType refreshType;
+
+    private transient Set<Integer> mainParams;
+
+    public WatcherTriggerType getTriggerType() {
+        return this.getTriggerConfig().getTriggerType();
+    }
+
+    public boolean isCycleRefresh() {
+        return getRefreshType() == null
+                || getRefreshType()
+                        == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE;
+    }
+
+    public boolean isValidRefreshType() {
+        return getRefreshType() == null
+                || getRefreshType()
+                        == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE
+                || getScheduleId() == 2701;
+    }
+
+    @Override
+    public void onLoad() {
+        if (this.getTriggerConfig() != null) {
+            var params = getTriggerConfig().getParamList()[0];
+            if ((params != null) && !params.isEmpty()) {
+                this.mainParams =
+                        Arrays.stream(params.split("[:;,]")).map(Integer::parseInt).collect(Collectors.toSet());
+            }
+        }
+    }
+
+    public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission toProto() {
+        var protoBuilder =
+                emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.newBuilder();
+
+        protoBuilder
+                .setMissionId(getId())
+                .setTotalProgress(this.getProgress())
+                .setRewardBattlePassPoint(this.getAddPoint())
+                .setMissionStatus(MissionStatus.MISSION_STATUS_UNFINISHED)
+                .setMissionType(this.getRefreshType() == null ? 0 : this.getRefreshType().getValue());
+
+        return protoBuilder.build();
+    }
+
+    @Getter
+    public static class TriggerConfig {
+        private WatcherTriggerType triggerType;
+        private String[] paramList;
+    }
+}

src/main/java/emu/grasscutter/data/excels/BattlePassRewardData.java

@@ -1,25 +1,25 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.Getter;
-
-@ResourceType(name = "BattlePassRewardExcelConfigData.json")
-@Getter
-public class BattlePassRewardData extends GameResource {
-    private int indexId;
-    private int level;
-    private List<Integer> freeRewardIdList;
-    private List<Integer> paidRewardIdList;
-
-    @Override
-    public int getId() {
-        // Reward ID is a combination of index and level.
-        // We do this to get a unique ID.
-        return this.indexId * 100 + this.level;
-    }
-
-    @Override
-    public void onLoad() {}
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import java.util.List;
+import lombok.Getter;
+
+@ResourceType(name = "BattlePassRewardExcelConfigData.json")
+@Getter
+public class BattlePassRewardData extends GameResource {
+    private int indexId;
+    private int level;
+    private List<Integer> freeRewardIdList;
+    private List<Integer> paidRewardIdList;
+
+    @Override
+    public int getId() {
+        // Reward ID is a combination of index and level.
+        // We do this to get a unique ID.
+        return this.indexId * 100 + this.level;
+    }
+
+    @Override
+    public void onLoad() {}
+}

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

@@ -1,46 +1,46 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.Getter;
-
-@ResourceType(name = "BlossomRefreshExcelConfigData.json")
-@Getter
-public class BlossomRefreshExcelConfigData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    private int id;
-    // Map details
-    private long nameTextMapHash;
-    private long descTextMapHash;
-    private String icon;
-    private String clientShowType; // BLOSSOM_SHOWTYPE_CHALLENGE, BLOSSOM_SHOWTYPE_NPCTALK
-
-    // Refresh details
-    private String refreshType; // Leyline blossoms, magical ore outcrops
-    private int
-            refreshCount; // Number of entries to spawn at refresh (1 for each leyline type for each city,
-    // 4 for magical ore for each city)
-    private String refreshTime; // Server time-of-day to refresh at
-    private RefreshCond[] refreshCondVec; // AR requirements etc.
-
-    private int cityId;
-    private int blossomChestId; // 1 for mora, 2 for exp
-    private Drop[] dropVec;
-
-    // Unknown details
-    // @Getter private int reviseLevel;
-    // @Getter private int campUpdateNeedCount;  // Always 1 if specified
-
-    @Getter
-    public static class Drop {
-        int dropId;
-        int previewReward;
-    }
-
-    @Getter
-    public static class RefreshCond {
-        String type;
-        List<Integer> param;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import java.util.List;
+import lombok.Getter;
+
+@ResourceType(name = "BlossomRefreshExcelConfigData.json")
+@Getter
+public class BlossomRefreshExcelConfigData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+    // Map details
+    private long nameTextMapHash;
+    private long descTextMapHash;
+    private String icon;
+    private String clientShowType; // BLOSSOM_SHOWTYPE_CHALLENGE, BLOSSOM_SHOWTYPE_NPCTALK
+
+    // Refresh details
+    private String refreshType; // Leyline blossoms, magical ore outcrops
+    private int
+            refreshCount; // Number of entries to spawn at refresh (1 for each leyline type for each city,
+    // 4 for magical ore for each city)
+    private String refreshTime; // Server time-of-day to refresh at
+    private RefreshCond[] refreshCondVec; // AR requirements etc.
+
+    private int cityId;
+    private int blossomChestId; // 1 for mora, 2 for exp
+    private Drop[] dropVec;
+
+    // Unknown details
+    // @Getter private int reviseLevel;
+    // @Getter private int campUpdateNeedCount;  // Always 1 if specified
+
+    @Getter
+    public static class Drop {
+        int dropId;
+        int previewReward;
+    }
+
+    @Getter
+    public static class RefreshCond {
+        String type;
+        List<Integer> param;
+    }
+}

src/main/java/emu/grasscutter/data/excels/BuffData.java

@@ -1,28 +1,28 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.game.props.ServerBuffType;
-import lombok.Getter;
-
-@ResourceType(name = "BuffExcelConfigData.json")
-@Getter
-public class BuffData extends GameResource {
-    private int groupId;
-    private int serverBuffId;
-    private float time;
-    private boolean isPersistent;
-    private ServerBuffType serverBuffType;
-    private String abilityName;
-    private String modifierName;
-
-    @Override
-    public int getId() {
-        return this.serverBuffId;
-    }
-
-    public void onLoad() {
-        this.serverBuffType =
-                this.serverBuffType != null ? this.serverBuffType : ServerBuffType.SERVER_BUFF_NONE;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.game.props.ServerBuffType;
+import lombok.Getter;
+
+@ResourceType(name = "BuffExcelConfigData.json")
+@Getter
+public class BuffData extends GameResource {
+    private int groupId;
+    private int serverBuffId;
+    private float time;
+    private boolean isPersistent;
+    private ServerBuffType serverBuffType;
+    private String abilityName;
+    private String modifierName;
+
+    @Override
+    public int getId() {
+        return this.serverBuffId;
+    }
+
+    public void onLoad() {
+        this.serverBuffType =
+                this.serverBuffType != null ? this.serverBuffType : ServerBuffType.SERVER_BUFF_NONE;
+    }
+}

src/main/java/emu/grasscutter/data/excels/CityData.java

@@ -1,24 +1,24 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.FieldDefaults;
-
-@ResourceType(name = "CityConfigData.json", loadPriority = ResourceType.LoadPriority.HIGH)
-@Getter
-@Setter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class CityData extends GameResource {
-    int cityId;
-    int sceneId;
-    List<Integer> areaIdVec;
-
-    @Override
-    public int getId() {
-        return this.cityId;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+
+@ResourceType(name = "CityConfigData.json", loadPriority = ResourceType.LoadPriority.HIGH)
+@Getter
+@Setter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class CityData extends GameResource {
+    int cityId;
+    int sceneId;
+    List<Integer> areaIdVec;
+
+    @Override
+    public int getId() {
+        return this.cityId;
+    }
+}

src/main/java/emu/grasscutter/data/excels/CombineData.java

@@ -1,82 +1,82 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@ResourceType(name = "CombineExcelConfigData.json")
-public class CombineData extends GameResource {
-
-    private int combineId;
-    private int playerLevel;
-    private boolean isDefaultShow;
-    private int combineType;
-    private int subCombineType;
-    private int resultItemId;
-    private int resultItemCount;
-    private int scoinCost;
-    private List<ItemParamData> randomItems;
-    private List<ItemParamData> materialItems;
-    private String recipeType;
-
-    @Override
-    public int getId() {
-        return this.combineId;
-    }
-
-    @Override
-    public void onLoad() {
-        super.onLoad();
-        // clean data
-        randomItems =
-                randomItems.stream().filter(item -> item.getId() > 0).collect(Collectors.toList());
-        materialItems =
-                materialItems.stream().filter(item -> item.getId() > 0).collect(Collectors.toList());
-    }
-
-    public int getCombineId() {
-        return combineId;
-    }
-
-    public int getPlayerLevel() {
-        return playerLevel;
-    }
-
-    public boolean isDefaultShow() {
-        return isDefaultShow;
-    }
-
-    public int getCombineType() {
-        return combineType;
-    }
-
-    public int getSubCombineType() {
-        return subCombineType;
-    }
-
-    public int getResultItemId() {
-        return resultItemId;
-    }
-
-    public int getResultItemCount() {
-        return resultItemCount;
-    }
-
-    public int getScoinCost() {
-        return scoinCost;
-    }
-
-    public List<ItemParamData> getRandomItems() {
-        return randomItems;
-    }
-
-    public List<ItemParamData> getMaterialItems() {
-        return materialItems;
-    }
-
-    public String getRecipeType() {
-        return recipeType;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.ItemParamData;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@ResourceType(name = "CombineExcelConfigData.json")
+public class CombineData extends GameResource {
+
+    private int combineId;
+    private int playerLevel;
+    private boolean isDefaultShow;
+    private int combineType;
+    private int subCombineType;
+    private int resultItemId;
+    private int resultItemCount;
+    private int scoinCost;
+    private List<ItemParamData> randomItems;
+    private List<ItemParamData> materialItems;
+    private String recipeType;
+
+    @Override
+    public int getId() {
+        return this.combineId;
+    }
+
+    @Override
+    public void onLoad() {
+        super.onLoad();
+        // clean data
+        randomItems =
+                randomItems.stream().filter(item -> item.getId() > 0).collect(Collectors.toList());
+        materialItems =
+                materialItems.stream().filter(item -> item.getId() > 0).collect(Collectors.toList());
+    }
+
+    public int getCombineId() {
+        return combineId;
+    }
+
+    public int getPlayerLevel() {
+        return playerLevel;
+    }
+
+    public boolean isDefaultShow() {
+        return isDefaultShow;
+    }
+
+    public int getCombineType() {
+        return combineType;
+    }
+
+    public int getSubCombineType() {
+        return subCombineType;
+    }
+
+    public int getResultItemId() {
+        return resultItemId;
+    }
+
+    public int getResultItemCount() {
+        return resultItemCount;
+    }
+
+    public int getScoinCost() {
+        return scoinCost;
+    }
+
+    public List<ItemParamData> getRandomItems() {
+        return randomItems;
+    }
+
+    public List<ItemParamData> getMaterialItems() {
+        return materialItems;
+    }
+
+    public String getRecipeType() {
+        return recipeType;
+    }
+}

src/main/java/emu/grasscutter/data/excels/CookBonusData.java

@@ -1,43 +1,43 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-
-@ResourceType(
-        name = {"CookBonusExcelConfigData.json"},
-        loadPriority = LoadPriority.LOW)
-public class CookBonusData extends GameResource {
-    private int avatarId;
-    private int recipeId;
-    private int[] paramVec;
-    private int[] complexParamVec;
-
-    @Override
-    public int getId() {
-        return this.avatarId;
-    }
-
-    public int getAvatarId() {
-        return avatarId;
-    }
-
-    public int getRecipeId() {
-        return recipeId;
-    }
-
-    public int[] getParamVec() {
-        return paramVec;
-    }
-
-    public int[] getComplexParamVec() {
-        return complexParamVec;
-    }
-
-    public int getReplacementItemId() {
-        return this.paramVec[0];
-    }
-
-    @Override
-    public void onLoad() {}
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+
+@ResourceType(
+        name = {"CookBonusExcelConfigData.json"},
+        loadPriority = LoadPriority.LOW)
+public class CookBonusData extends GameResource {
+    private int avatarId;
+    private int recipeId;
+    private int[] paramVec;
+    private int[] complexParamVec;
+
+    @Override
+    public int getId() {
+        return this.avatarId;
+    }
+
+    public int getAvatarId() {
+        return avatarId;
+    }
+
+    public int getRecipeId() {
+        return recipeId;
+    }
+
+    public int[] getParamVec() {
+        return paramVec;
+    }
+
+    public int[] getComplexParamVec() {
+        return complexParamVec;
+    }
+
+    public int getReplacementItemId() {
+        return this.paramVec[0];
+    }
+
+    @Override
+    public void onLoad() {}
+}

src/main/java/emu/grasscutter/data/excels/CookRecipeData.java

@@ -1,24 +1,24 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
-import lombok.Getter;
-
-@ResourceType(
-        name = {"CookRecipeExcelConfigData.json"},
-        loadPriority = LoadPriority.LOW)
-@Getter
-public class CookRecipeData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    private int id;
-
-    private int rankLevel;
-    private boolean isDefaultUnlocked;
-    private int maxProficiency;
-
-    private List<ItemParamData> qualityOutputVec;
-    private List<ItemParamData> inputVec;
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+import emu.grasscutter.data.common.ItemParamData;
+import java.util.List;
+import lombok.Getter;
+
+@ResourceType(
+        name = {"CookRecipeExcelConfigData.json"},
+        loadPriority = LoadPriority.LOW)
+@Getter
+public class CookRecipeData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    private int rankLevel;
+    private boolean isDefaultUnlocked;
+    private int maxProficiency;
+
+    private List<ItemParamData> qualityOutputVec;
+    private List<ItemParamData> inputVec;
+}

src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java

@@ -1,36 +1,36 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
-
-@ResourceType(
-        name = "EnvAnimalGatherExcelConfigData.json",
-        loadPriority = ResourceType.LoadPriority.LOW)
-public class EnvAnimalGatherConfigData extends GameResource {
-    private int animalId;
-    private String entityType;
-    private List<ItemParamData> gatherItemId;
-    private String excludeWeathers;
-    private int aliveTime;
-    private int escapeTime;
-    private int escapeRadius;
-
-    @Override
-    public int getId() {
-        return animalId;
-    }
-
-    public int getAnimalId() {
-        return animalId;
-    }
-
-    public String getEntityType() {
-        return entityType;
-    }
-
-    public ItemParamData getGatherItem() {
-        return gatherItemId.size() > 0 ? gatherItemId.get(0) : null;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.ItemParamData;
+import java.util.List;
+
+@ResourceType(
+        name = "EnvAnimalGatherExcelConfigData.json",
+        loadPriority = ResourceType.LoadPriority.LOW)
+public class EnvAnimalGatherConfigData extends GameResource {
+    private int animalId;
+    private String entityType;
+    private List<ItemParamData> gatherItemId;
+    private String excludeWeathers;
+    private int aliveTime;
+    private int escapeTime;
+    private int escapeRadius;
+
+    @Override
+    public int getId() {
+        return animalId;
+    }
+
+    public int getAnimalId() {
+        return animalId;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public ItemParamData getGatherItem() {
+        return gatherItemId.size() > 0 ? gatherItemId.get(0) : null;
+    }
+}

src/main/java/emu/grasscutter/data/excels/EquipAffixData.java

@@ -1,59 +1,59 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.FightPropData;
-import java.util.ArrayList;
-
-@ResourceType(name = "EquipAffixExcelConfigData.json")
-public class EquipAffixData extends GameResource {
-
-    private int affixId;
-    private int id;
-    private int level;
-    private long nameTextMapHash;
-    private String openConfig;
-    private FightPropData[] addProps;
-    private float[] paramList;
-
-    @Override
-    public int getId() {
-        return affixId;
-    }
-
-    public int getMainId() {
-        return id;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-
-    public long getNameTextMapHash() {
-        return nameTextMapHash;
-    }
-
-    public String getOpenConfig() {
-        return openConfig;
-    }
-
-    public FightPropData[] getAddProps() {
-        return addProps;
-    }
-
-    public float[] getParamList() {
-        return paramList;
-    }
-
-    @Override
-    public void onLoad() {
-        ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
-        for (FightPropData prop : getAddProps()) {
-            if (prop.getPropType() != null && prop.getValue() != 0f) {
-                prop.onLoad();
-                parsed.add(prop);
-            }
-        }
-        this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.FightPropData;
+import java.util.ArrayList;
+
+@ResourceType(name = "EquipAffixExcelConfigData.json")
+public class EquipAffixData extends GameResource {
+
+    private int affixId;
+    private int id;
+    private int level;
+    private long nameTextMapHash;
+    private String openConfig;
+    private FightPropData[] addProps;
+    private float[] paramList;
+
+    @Override
+    public int getId() {
+        return affixId;
+    }
+
+    public int getMainId() {
+        return id;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public long getNameTextMapHash() {
+        return nameTextMapHash;
+    }
+
+    public String getOpenConfig() {
+        return openConfig;
+    }
+
+    public FightPropData[] getAddProps() {
+        return addProps;
+    }
+
+    public float[] getParamList() {
+        return paramList;
+    }
+
+    @Override
+    public void onLoad() {
+        ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
+        for (FightPropData prop : getAddProps()) {
+            if (prop.getPropType() != null && prop.getValue() != 0f) {
+                prop.onLoad();
+                parsed.add(prop);
+            }
+        }
+        this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
+    }
+}

src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java

@@ -1,23 +1,23 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-
-@ResourceType(name = "FetterCharacterCardExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
-public class FetterCharacterCardData extends GameResource {
-    private int avatarId;
-    private int rewardId;
-
-    @Override
-    public int getId() {
-        return avatarId;
-    }
-
-    public int getRewardId() {
-        return rewardId;
-    }
-
-    @Override
-    public void onLoad() {}
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+
+@ResourceType(name = "FetterCharacterCardExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
+public class FetterCharacterCardData extends GameResource {
+    private int avatarId;
+    private int rewardId;
+
+    @Override
+    public int getId() {
+        return avatarId;
+    }
+
+    public int getRewardId() {
+        return rewardId;
+    }
+
+    @Override
+    public void onLoad() {}
+}

src/main/java/emu/grasscutter/data/excels/FetterData.java

@@ -1,38 +1,38 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-import emu.grasscutter.data.common.OpenCondData;
-import java.util.List;
-
-@ResourceType(
-        name = {
-            "FetterInfoExcelConfigData.json",
-            "FettersExcelConfigData.json",
-            "FetterStoryExcelConfigData.json",
-            "PhotographExpressionExcelConfigData.json",
-            "PhotographPosenameExcelConfigData.json"
-        },
-        loadPriority = LoadPriority.HIGHEST)
-public class FetterData extends GameResource {
-    private int avatarId;
-    private int fetterId;
-    private List<OpenCondData> openCond;
-
-    @Override
-    public int getId() {
-        return fetterId;
-    }
-
-    public int getAvatarId() {
-        return avatarId;
-    }
-
-    public List<OpenCondData> getOpenConds() {
-        return openCond;
-    }
-
-    @Override
-    public void onLoad() {}
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+import emu.grasscutter.data.common.OpenCondData;
+import java.util.List;
+
+@ResourceType(
+        name = {
+            "FetterInfoExcelConfigData.json",
+            "FettersExcelConfigData.json",
+            "FetterStoryExcelConfigData.json",
+            "PhotographExpressionExcelConfigData.json",
+            "PhotographPosenameExcelConfigData.json"
+        },
+        loadPriority = LoadPriority.HIGHEST)
+public class FetterData extends GameResource {
+    private int avatarId;
+    private int fetterId;
+    private List<OpenCondData> openCond;
+
+    @Override
+    public int getId() {
+        return fetterId;
+    }
+
+    public int getAvatarId() {
+        return avatarId;
+    }
+
+    public List<OpenCondData> getOpenConds() {
+        return openCond;
+    }
+
+    @Override
+    public void onLoad() {}
+}

src/main/java/emu/grasscutter/data/excels/ForgeData.java

@@ -1,29 +1,29 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
-import lombok.Getter;
-
-@ResourceType(
-        name = {"ForgeExcelConfigData.json"},
-        loadPriority = LoadPriority.HIGHEST)
-@Getter
-public class ForgeData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    private int id;
-
-    private int playerLevel;
-    private int forgeType;
-    private int showItemId;
-    private int resultItemId;
-    private int resultItemCount;
-    private int forgeTime;
-    private int queueNum;
-    private int scoinCost;
-    private int priority;
-    private int forgePoint;
-    private List<ItemParamData> materialItems;
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+import emu.grasscutter.data.common.ItemParamData;
+import java.util.List;
+import lombok.Getter;
+
+@ResourceType(
+        name = {"ForgeExcelConfigData.json"},
+        loadPriority = LoadPriority.HIGHEST)
+@Getter
+public class ForgeData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    private int playerLevel;
+    private int forgeType;
+    private int showItemId;
+    private int resultItemId;
+    private int resultItemCount;
+    private int forgeTime;
+    private int queueNum;
+    private int scoinCost;
+    private int priority;
+    private int forgePoint;
+    private List<ItemParamData> materialItems;
+}

src/main/java/emu/grasscutter/data/excels/FurnitureMakeConfigData.java

@@ -1,34 +1,34 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@ResourceType(name = {"FurnitureMakeExcelConfigData.json"})
-public class FurnitureMakeConfigData extends GameResource {
-
-    int configID;
-    int furnitureItemID;
-    int count;
-    int exp;
-    List<ItemParamData> materialItems;
-    int makeTime;
-    int maxAccelerateTime;
-    int quickFetchMaterialNum;
-
-    @Override
-    public int getId() {
-        return configID;
-    }
-
-    @Override
-    public void onLoad() {
-        this.materialItems = materialItems.stream().filter(x -> x.getId() > 0).toList();
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.ItemParamData;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@ResourceType(name = {"FurnitureMakeExcelConfigData.json"})
+public class FurnitureMakeConfigData extends GameResource {
+
+    int configID;
+    int furnitureItemID;
+    int count;
+    int exp;
+    List<ItemParamData> materialItems;
+    int makeTime;
+    int maxAccelerateTime;
+    int quickFetchMaterialNum;
+
+    @Override
+    public int getId() {
+        return configID;
+    }
+
+    @Override
+    public void onLoad() {
+        this.materialItems = materialItems.stream().filter(x -> x.getId() > 0).toList();
+    }
+}

src/main/java/emu/grasscutter/data/excels/GatherData.java

@@ -1,47 +1,47 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-
-@ResourceType(name = "GatherExcelConfigData.json")
-public class GatherData extends GameResource {
-    private int pointType;
-    private int id;
-    private int gadgetId;
-    private int itemId;
-    private int cd; // Probably hours
-    private boolean isForbidGuest;
-    private boolean initDisableInteract;
-
-    @Override
-    public int getId() {
-        return this.pointType;
-    }
-
-    public int getGatherId() {
-        return id;
-    }
-
-    public int getGadgetId() {
-        return gadgetId;
-    }
-
-    public int getItemId() {
-        return itemId;
-    }
-
-    public int getCd() {
-        return cd;
-    }
-
-    public boolean isForbidGuest() {
-        return isForbidGuest;
-    }
-
-    public boolean initDisableInteract() {
-        return initDisableInteract;
-    }
-
-    @Override
-    public void onLoad() {}
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+
+@ResourceType(name = "GatherExcelConfigData.json")
+public class GatherData extends GameResource {
+    private int pointType;
+    private int id;
+    private int gadgetId;
+    private int itemId;
+    private int cd; // Probably hours
+    private boolean isForbidGuest;
+    private boolean initDisableInteract;
+
+    @Override
+    public int getId() {
+        return this.pointType;
+    }
+
+    public int getGatherId() {
+        return id;
+    }
+
+    public int getGadgetId() {
+        return gadgetId;
+    }
+
+    public int getItemId() {
+        return itemId;
+    }
+
+    public int getCd() {
+        return cd;
+    }
+
+    public boolean isForbidGuest() {
+        return isForbidGuest;
+    }
+
+    public boolean initDisableInteract() {
+        return initDisableInteract;
+    }
+
+    @Override
+    public void onLoad() {}
+}

src/main/java/emu/grasscutter/data/excels/HomeWorldBgmData.java

@@ -1,31 +1,31 @@
-package emu.grasscutter.data.excels;
-
-import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@ResourceType(name = {"HomeWorldBgmExcelConfigData.json"})
-public class HomeWorldBgmData extends GameResource {
-    @SerializedName(value = "homeBgmId", alternate = "MJJENLEBKEF")
-    private int homeBgmId;
-
-    private boolean isDefaultUnlock;
-    private boolean NBIDHGOOCKD;
-    private boolean JJMNJMCCOKP;
-    private int cityId;
-    private int sortOrder;
-    private String GEGHMJBJMGB;
-
-    @SerializedName(value = "bgmNameTextMapHash", alternate = "LMLNBMJFFML")
-    private long bgmNameTextMapHash;
-
-    @Override
-    public int getId() {
-        return this.homeBgmId;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@ResourceType(name = {"HomeWorldBgmExcelConfigData.json"})
+public class HomeWorldBgmData extends GameResource {
+    @SerializedName(value = "homeBgmId", alternate = "MJJENLEBKEF")
+    private int homeBgmId;
+
+    private boolean isDefaultUnlock;
+    private boolean NBIDHGOOCKD;
+    private boolean JJMNJMCCOKP;
+    private int cityId;
+    private int sortOrder;
+    private String GEGHMJBJMGB;
+
+    @SerializedName(value = "bgmNameTextMapHash", alternate = "LMLNBMJFFML")
+    private long bgmNameTextMapHash;
+
+    @Override
+    public int getId() {
+        return this.homeBgmId;
+    }
+}

src/main/java/emu/grasscutter/data/excels/HomeWorldLevelData.java

@@ -1,31 +1,31 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@ResourceType(name = {"HomeworldLevelExcelConfigData.json"})
-public class HomeWorldLevelData extends GameResource {
-
-    int level;
-    int exp;
-    int homeCoinStoreLimit;
-    int homeFetterExpStoreLimit;
-    int rewardId;
-    int furnitureMakeSlotCount;
-    int outdoorUnlockBlockCount;
-    int freeUnlockModuleCount;
-    int deployNpcCount;
-    int limitShopGoodsCount;
-    List<String> levelFuncs;
-
-    @Override
-    public int getId() {
-        return level;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@ResourceType(name = {"HomeworldLevelExcelConfigData.json"})
+public class HomeWorldLevelData extends GameResource {
+
+    int level;
+    int exp;
+    int homeCoinStoreLimit;
+    int homeFetterExpStoreLimit;
+    int rewardId;
+    int furnitureMakeSlotCount;
+    int outdoorUnlockBlockCount;
+    int freeUnlockModuleCount;
+    int deployNpcCount;
+    int limitShopGoodsCount;
+    List<String> levelFuncs;
+
+    @Override
+    public int getId() {
+        return level;
+    }
+}

src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java

@@ -1,33 +1,33 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@ResourceType(
-        name = "InvestigationMonsterConfigData.json",
-        loadPriority = ResourceType.LoadPriority.LOW)
-@Getter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class InvestigationMonsterData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    int id;
-
-    int cityId;
-    List<Integer> monsterIdList;
-    List<Integer> groupIdList;
-    int rewardPreviewId;
-    String mapMarkCreateType;
-    String monsterCategory;
-
-    CityData cityData;
-
-    @Override
-    public void onLoad() {
-        this.cityData = GameData.getCityDataMap().get(cityId);
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@ResourceType(
+        name = "InvestigationMonsterConfigData.json",
+        loadPriority = ResourceType.LoadPriority.LOW)
+@Getter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class InvestigationMonsterData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    int id;
+
+    int cityId;
+    List<Integer> monsterIdList;
+    List<Integer> groupIdList;
+    int rewardPreviewId;
+    String mapMarkCreateType;
+    String monsterCategory;
+
+    CityData cityData;
+
+    @Override
+    public void onLoad() {
+        this.cityData = GameData.getCityDataMap().get(cityId);
+    }
+}

src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@ResourceType(name = "MusicGameBasicConfigData.json")
-@Getter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class MusicGameBasicData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    int id;
-
-    int musicID;
-    int musicLevel;
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@ResourceType(name = "MusicGameBasicConfigData.json")
+@Getter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class MusicGameBasicData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    int id;
+
+    int musicID;
+    int musicLevel;
+}

src/main/java/emu/grasscutter/data/excels/PersonalLineData.java

@@ -1,23 +1,23 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.FieldDefaults;
-
-@ResourceType(name = "PersonalLineExcelConfigData.json")
-@Getter
-@Setter // TODO: remove setters next API break
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class PersonalLineData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    int id;
-
-    int avatarID;
-    List<Integer> preQuestId;
-    int startQuestId;
-    int chapterId;
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+
+@ResourceType(name = "PersonalLineExcelConfigData.json")
+@Getter
+@Setter // TODO: remove setters next API break
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PersonalLineData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    int id;
+
+    int avatarID;
+    List<Integer> preQuestId;
+    int startQuestId;
+    int chapterId;
+}

src/main/java/emu/grasscutter/data/excels/ProudSkillData.java

@@ -1,57 +1,57 @@
-package emu.grasscutter.data.excels;
-
-import dev.morphia.annotations.Transient;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.FightPropData;
-import emu.grasscutter.data.common.ItemParamData;
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Getter;
-
-@ResourceType(name = "ProudSkillExcelConfigData.json")
-public class ProudSkillData extends GameResource {
-    private int proudSkillId;
-    @Getter private int proudSkillGroupId;
-    @Getter private int level;
-    @Getter private int coinCost;
-    @Getter private int breakLevel;
-    @Getter private int proudSkillType;
-    @Getter private String openConfig;
-    @Getter private List<ItemParamData> costItems;
-    @Getter private List<String> filterConds;
-    @Getter private List<String> lifeEffectParams;
-    @Getter private FightPropData[] addProps;
-    @Getter private float[] paramList;
-    @Getter private long[] paramDescList;
-    @Getter private long nameTextMapHash;
-    @Transient private Iterable<ItemParamData> totalCostItems;
-
-    @Override
-    public int getId() {
-        return proudSkillId;
-    }
-
-    public Iterable<ItemParamData> getTotalCostItems() {
-        if (this.totalCostItems == null) {
-            ArrayList<ItemParamData> total =
-                    (this.costItems != null) ? new ArrayList<>(this.costItems) : new ArrayList<>(1);
-            if (this.coinCost > 0) total.add(new ItemParamData(202, this.coinCost));
-            this.totalCostItems = total;
-        }
-        return this.totalCostItems;
-    }
-
-    @Override
-    public void onLoad() {
-        // Fight props
-        ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
-        for (FightPropData prop : getAddProps()) {
-            if (prop.getPropType() != null && prop.getValue() != 0f) {
-                prop.onLoad();
-                parsed.add(prop);
-            }
-        }
-        this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
-    }
-}
+package emu.grasscutter.data.excels;
+
+import dev.morphia.annotations.Transient;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.FightPropData;
+import emu.grasscutter.data.common.ItemParamData;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Getter;
+
+@ResourceType(name = "ProudSkillExcelConfigData.json")
+public class ProudSkillData extends GameResource {
+    private int proudSkillId;
+    @Getter private int proudSkillGroupId;
+    @Getter private int level;
+    @Getter private int coinCost;
+    @Getter private int breakLevel;
+    @Getter private int proudSkillType;
+    @Getter private String openConfig;
+    @Getter private List<ItemParamData> costItems;
+    @Getter private List<String> filterConds;
+    @Getter private List<String> lifeEffectParams;
+    @Getter private FightPropData[] addProps;
+    @Getter private float[] paramList;
+    @Getter private long[] paramDescList;
+    @Getter private long nameTextMapHash;
+    @Transient private Iterable<ItemParamData> totalCostItems;
+
+    @Override
+    public int getId() {
+        return proudSkillId;
+    }
+
+    public Iterable<ItemParamData> getTotalCostItems() {
+        if (this.totalCostItems == null) {
+            ArrayList<ItemParamData> total =
+                    (this.costItems != null) ? new ArrayList<>(this.costItems) : new ArrayList<>(1);
+            if (this.coinCost > 0) total.add(new ItemParamData(202, this.coinCost));
+            this.totalCostItems = total;
+        }
+        return this.totalCostItems;
+    }
+
+    @Override
+    public void onLoad() {
+        // Fight props
+        ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
+        for (FightPropData prop : getAddProps()) {
+            if (prop.getPropType() != null && prop.getValue() != 0f) {
+                prop.onLoad();
+                parsed.add(prop);
+            }
+        }
+        this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
+    }
+}

src/main/java/emu/grasscutter/data/excels/RewardData.java

@@ -1,26 +1,26 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.ItemParamData;
-import java.util.List;
-
-@ResourceType(name = "RewardExcelConfigData.json")
-public class RewardData extends GameResource {
-    public int rewardId;
-    public List<ItemParamData> rewardItemList;
-
-    @Override
-    public int getId() {
-        return rewardId;
-    }
-
-    public List<ItemParamData> getRewardItemList() {
-        return rewardItemList;
-    }
-
-    @Override
-    public void onLoad() {
-        rewardItemList = rewardItemList.stream().filter(i -> i.getId() > 0).toList();
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.ItemParamData;
+import java.util.List;
+
+@ResourceType(name = "RewardExcelConfigData.json")
+public class RewardData extends GameResource {
+    public int rewardId;
+    public List<ItemParamData> rewardItemList;
+
+    @Override
+    public int getId() {
+        return rewardId;
+    }
+
+    public List<ItemParamData> getRewardItemList() {
+        return rewardItemList;
+    }
+
+    @Override
+    public void onLoad() {
+        rewardItemList = rewardItemList.stream().filter(i -> i.getId() > 0).toList();
+    }
+}

src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java

@@ -1,35 +1,35 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.ResourceType.LoadPriority;
-import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.common.ItemParamStringData;
-import java.util.Arrays;
-import lombok.Getter;
-
-@ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
-public class RewardPreviewData extends GameResource {
-    @Getter(onMethod_ = @Override)
-    private int id;
-
-    private ItemParamStringData[] previewItems;
-    private ItemParamData[] previewItemsArray;
-
-    public ItemParamData[] getPreviewItems() {
-        return previewItemsArray;
-    }
-
-    @Override
-    public void onLoad() {
-        if (this.previewItems != null && this.previewItems.length > 0) {
-            this.previewItemsArray =
-                    Arrays.stream(this.previewItems)
-                            .filter(d -> d.getId() > 0 && d.getCount() != null && !d.getCount().isEmpty())
-                            .map(ItemParamStringData::toItemParamData)
-                            .toArray(size -> new ItemParamData[size]);
-        } else {
-            this.previewItemsArray = new ItemParamData[0];
-        }
-    }
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.ResourceType.LoadPriority;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.common.ItemParamStringData;
+import java.util.Arrays;
+import lombok.Getter;
+
+@ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
+public class RewardPreviewData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    private ItemParamStringData[] previewItems;
+    private ItemParamData[] previewItemsArray;
+
+    public ItemParamData[] getPreviewItems() {
+        return previewItemsArray;
+    }
+
+    @Override
+    public void onLoad() {
+        if (this.previewItems != null && this.previewItems.length > 0) {
+            this.previewItemsArray =
+                    Arrays.stream(this.previewItems)
+                            .filter(d -> d.getId() > 0 && d.getCount() != null && !d.getCount().isEmpty())
+                            .map(ItemParamStringData::toItemParamData)
+                            .toArray(size -> new ItemParamData[size]);
+        } else {
+            this.previewItemsArray = new ItemParamData[0];
+        }
+    }
+}

src/main/java/emu/grasscutter/data/excels/ShopGoodsData.java

@@ -1,112 +1,112 @@
-package emu.grasscutter.data.excels;
-
-import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.game.shop.ShopInfo;
-import java.util.List;
-
-@ResourceType(name = "ShopGoodsExcelConfigData.json")
-public class ShopGoodsData extends GameResource {
-    private int goodsId;
-    private int shopType;
-    private int itemId;
-
-    private int itemCount;
-
-    private int costScoin;
-    private int costHcoin;
-    private int costMcoin;
-
-    private List<ItemParamData> costItems;
-    private int minPlayerLevel;
-    private int maxPlayerLevel;
-
-    private int buyLimit;
-
-    @SerializedName(
-            value = "subTabId",
-            alternate = {"secondarySheetId"})
-    private int subTabId;
-
-    private String refreshType;
-    private transient ShopInfo.ShopRefreshType refreshTypeEnum;
-
-    private int refreshParam;
-
-    @Override
-    public void onLoad() {
-        if (this.refreshType == null) this.refreshTypeEnum = ShopInfo.ShopRefreshType.NONE;
-        else {
-            this.refreshTypeEnum =
-                    switch (this.refreshType) {
-                        case "SHOP_REFRESH_DAILY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_DAILY;
-                        case "SHOP_REFRESH_WEEKLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_WEEKLY;
-                        case "SHOP_REFRESH_MONTHLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_MONTHLY;
-                        default -> ShopInfo.ShopRefreshType.NONE;
-                    };
-        }
-    }
-
-    @Override
-    public int getId() {
-        return getGoodsId();
-    }
-
-    public int getGoodsId() {
-        return goodsId;
-    }
-
-    public int getShopType() {
-        return shopType;
-    }
-
-    public int getItemId() {
-        return itemId;
-    }
-
-    public int getItemCount() {
-        return itemCount;
-    }
-
-    public int getCostScoin() {
-        return costScoin;
-    }
-
-    public int getCostHcoin() {
-        return costHcoin;
-    }
-
-    public int getCostMcoin() {
-        return costMcoin;
-    }
-
-    public List<ItemParamData> getCostItems() {
-        return costItems;
-    }
-
-    public int getMinPlayerLevel() {
-        return minPlayerLevel;
-    }
-
-    public int getMaxPlayerLevel() {
-        return maxPlayerLevel;
-    }
-
-    public int getBuyLimit() {
-        return buyLimit;
-    }
-
-    public int getSubTabId() {
-        return subTabId;
-    }
-
-    public ShopInfo.ShopRefreshType getRefreshType() {
-        return refreshTypeEnum;
-    }
-
-    public int getRefreshParam() {
-        return refreshParam;
-    }
-}
+package emu.grasscutter.data.excels;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.game.shop.ShopInfo;
+import java.util.List;
+
+@ResourceType(name = "ShopGoodsExcelConfigData.json")
+public class ShopGoodsData extends GameResource {
+    private int goodsId;
+    private int shopType;
+    private int itemId;
+
+    private int itemCount;
+
+    private int costScoin;
+    private int costHcoin;
+    private int costMcoin;
+
+    private List<ItemParamData> costItems;
+    private int minPlayerLevel;
+    private int maxPlayerLevel;
+
+    private int buyLimit;
+
+    @SerializedName(
+            value = "subTabId",
+            alternate = {"secondarySheetId"})
+    private int subTabId;
+
+    private String refreshType;
+    private transient ShopInfo.ShopRefreshType refreshTypeEnum;
+
+    private int refreshParam;
+
+    @Override
+    public void onLoad() {
+        if (this.refreshType == null) this.refreshTypeEnum = ShopInfo.ShopRefreshType.NONE;
+        else {
+            this.refreshTypeEnum =
+                    switch (this.refreshType) {
+                        case "SHOP_REFRESH_DAILY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_DAILY;
+                        case "SHOP_REFRESH_WEEKLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_WEEKLY;
+                        case "SHOP_REFRESH_MONTHLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_MONTHLY;
+                        default -> ShopInfo.ShopRefreshType.NONE;
+                    };
+        }
+    }
+
+    @Override
+    public int getId() {
+        return getGoodsId();
+    }
+
+    public int getGoodsId() {
+        return goodsId;
+    }
+
+    public int getShopType() {
+        return shopType;
+    }
+
+    public int getItemId() {
+        return itemId;
+    }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public int getCostScoin() {
+        return costScoin;
+    }
+
+    public int getCostHcoin() {
+        return costHcoin;
+    }
+
+    public int getCostMcoin() {
+        return costMcoin;
+    }
+
+    public List<ItemParamData> getCostItems() {
+        return costItems;
+    }
+
+    public int getMinPlayerLevel() {
+        return minPlayerLevel;
+    }
+
+    public int getMaxPlayerLevel() {
+        return maxPlayerLevel;
+    }
+
+    public int getBuyLimit() {
+        return buyLimit;
+    }
+
+    public int getSubTabId() {
+        return subTabId;
+    }
+
+    public ShopInfo.ShopRefreshType getRefreshType() {
+        return refreshTypeEnum;
+    }
+
+    public int getRefreshParam() {
+        return refreshParam;
+    }
+}

src/main/java/emu/grasscutter/data/excels/TriggerExcelConfigData.java

@@ -1,14 +1,14 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import lombok.Getter;
-
-@ResourceType(name = "TriggerExcelConfigData.json")
-@Getter
-public class TriggerExcelConfigData extends GameResource {
-    @Getter private int id;
-    private int sceneId;
-    private int groupId;
-    private String triggerName;
-}
+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.Getter;
+
+@ResourceType(name = "TriggerExcelConfigData.json")
+@Getter
+public class TriggerExcelConfigData extends GameResource {
+    @Getter private int id;
+    private int sceneId;
+    private int groupId;
+    private String triggerName;
+}