Clean up excels

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

@@ -13,15 +13,12 @@
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class ActivityWatcherData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     int id;
     int rewardID;
     int progress;
     WatcherTrigger triggerConfig;
 
-    @Override
-    public int getId() {
-        return this.id;
-    }
     @Override
     public void onLoad() {
         triggerConfig.paramList = triggerConfig.paramList.stream().filter(x -> !x.isBlank()).toList();

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

@@ -44,6 +44,7 @@ public class AvatarData extends GameResource {
     private float criticalHurt;
 
     private List<PropGrowCurve> propGrowCurves;
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     // Transient
@@ -60,11 +61,6 @@ public class AvatarData extends GameResource {
     @Getter private int nameCardRewardId;
     @Getter private int nameCardId;
 
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
     public float getBaseHp(int level) {
         try {
             return this.hpBase * this.hpGrowthCurve[level - 1];

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

@@ -7,26 +7,18 @@
 import lombok.Getter;
 
 @ResourceType(name = "AvatarSkillExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
+@Getter
 public class AvatarSkillData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
-    @Getter private float cdTime;
-    @Getter private int costElemVal;
-    @Getter private int maxChargeNum;
-    @Getter private int triggerID;
-    @Getter private boolean isAttackCameraLock;
-    @Getter private int proudSkillGroupId;
-    @Getter private ElementType costElemType;
-    @Getter private long nameTextMapHash;
-    @Getter private long descTextMapHash;
-    @Getter private String abilityName;
-
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
-    @Override
-    public void onLoad() {
-
-    }
+    private float cdTime;
+    private int costElemVal;
+    private int maxChargeNum;
+    private int triggerID;
+    private boolean isAttackCameraLock;
+    private int proudSkillGroupId;
+    private ElementType costElemType;
+    private long nameTextMapHash;
+    private long descTextMapHash;
+    private String abilityName;
 }

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

@@ -18,31 +18,27 @@
 import lombok.Getter;
 
 @ResourceType(name = "AvatarSkillDepotExcelConfigData.json", loadPriority = LoadPriority.HIGH)
+@Getter
 public class AvatarSkillDepotData extends GameResource {
-
+    @Getter(onMethod = @__(@Override))
     private int id;
-    @Getter private int energySkill;
-    @Getter private int attackModeSkill;
+    private int energySkill;
+    private int attackModeSkill;
 
-    @Getter private List<Integer> skills;
-    @Getter private List<Integer> subSkills;
-    @Getter private List<String> extraAbilities;
-    @Getter private List<Integer> talents;
-    @Getter private List<InherentProudSkillOpens> inherentProudSkillOpens;
+    private List<Integer> skills;
+    private List<Integer> subSkills;
+    private List<String> extraAbilities;
+    private List<Integer> talents;
+    private List<InherentProudSkillOpens> inherentProudSkillOpens;
 
-    @Getter private String talentStarName;
-    @Getter private String skillDepotAbilityGroup;
+    private String talentStarName;
+    private String skillDepotAbilityGroup;
 
     // Transient
-    @Getter private AvatarSkillData energySkillData;
-    @Getter private ElementType elementType;
-    @Getter private IntList abilities;
-    @Getter private int talentCostItemId;
-
-    @Override
-    public int getId() {
-        return this.id;
-    }
+    private AvatarSkillData energySkillData;
+    private ElementType elementType;
+    private IntList abilities;
+    private int talentCostItemId;
 
     public void setAbilities(AbilityEmbryoEntry info) {
         this.abilities = new IntArrayList(info.getAbilities().length);
@@ -77,9 +73,10 @@ public void onLoad() {
             .ifPresent(itemId -> this.talentCostItemId = itemId);
     }
 
+    @Getter
     public static class InherentProudSkillOpens {
-        @Getter private int proudSkillGroupId;
-        @Getter private int needAvatarPromoteLevel;
+        private int proudSkillGroupId;
+        private int needAvatarPromoteLevel;
     }
 
     public IntStream getSkillsAndEnergySkill() {

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

@@ -9,27 +9,20 @@
 import emu.grasscutter.game.props.BattlePassMissionRefreshType;
 import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus;
-import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.FieldDefaults;
 
 @ResourceType(name = {"BattlePassMissionExcelConfigData.json"})
 @Getter
 public class BattlePassMissionData extends GameResource {
-    private int addPoint;
+    @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;
-
-    @Override
-    public int getId() {
-        return this.id;
-    }
 
     public WatcherTriggerType getTriggerType() {
 		return this.getTriggerConfig().getTriggerType();

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

@@ -7,40 +7,39 @@
 import lombok.Getter;
 
 @ResourceType(name = "BlossomRefreshExcelConfigData.json")
+@Getter
 public class BlossomRefreshExcelConfigData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
     // Map details
-    @Getter private long nameTextMapHash;
-    @Getter private long descTextMapHash;
-    @Getter private String icon;
-    @Getter private String clientShowType;  // BLOSSOM_SHOWTYPE_CHALLENGE, BLOSSOM_SHOWTYPE_NPCTALK
+    private long nameTextMapHash;
+    private long descTextMapHash;
+    private String icon;
+    private String clientShowType;  // BLOSSOM_SHOWTYPE_CHALLENGE, BLOSSOM_SHOWTYPE_NPCTALK
 
     // Refresh details
-    @Getter private String refreshType;  // Leyline blossoms, magical ore outcrops
-    @Getter 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)
-    @Getter private String refreshTime;  // Server time-of-day to refresh at
-    @Getter private RefreshCond[] refreshCondVec;  // AR requirements etc.
+    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.
 
-    @Getter private int cityId;
-    @Getter private int blossomChestId;  // 1 for mora, 2 for exp
-    @Getter private Drop[] dropVec;
+    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
 
-    @Override
-    public int getId() {
-        return id;
-    }
-
+    @Getter
     public static class Drop {
-        @Getter int dropId;
-        @Getter int previewReward;
+        int dropId;
+        int previewReward;
     }
 
+    @Getter
     public static class RefreshCond {
-        @Getter String type;
-        @Getter List<Integer> param;
+        String type;
+        List<Integer> param;
     }
 }

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

@@ -8,27 +8,23 @@
 import lombok.experimental.FieldDefaults;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @ResourceType(name = "ChapterExcelConfigData.json")
 @Getter
-@Setter
+@Setter  // TODO: remove on next API break
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class ChapterData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     int id;
     int beginQuestId;
     int endQuestId;
     int needPlayerLevel;
 
+    // Why public? TODO: privatise next API break
     public static final Map<Integer, ChapterData> beginQuestChapterMap = new HashMap<>();
     public static final Map<Integer, ChapterData> endQuestChapterMap = new HashMap<>();
 
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
     @Override
     public void onLoad() {
         beginQuestChapterMap.put(beginQuestId, this);

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

@@ -22,9 +22,4 @@ public class CityData extends GameResource {
     public int getId() {
         return this.cityId;
     }
-
-    @Override
-    public void onLoad() {
-        super.onLoad();
-    }
 }

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

@@ -7,18 +7,15 @@
 import lombok.Getter;
 
 @ResourceType(name = {"AnimalCodexExcelConfigData.json"})
+@Getter
 public class CodexAnimalData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int Id;
-    @Getter private String type;
-    @Getter private int describeId;
-    @Getter private int sortOrder;
+    private String type;
+    private int describeId;
+    private int sortOrder;
     @SerializedName(value="countType", alternate={"OCCLHPBCDGL"})
-    @Getter private CountType countType;
-
-    @Override
-    public int getId() {
-        return Id;
-    }
+    private CountType countType;
 
     public enum CountType {
         CODEX_COUNT_TYPE_KILL,

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

@@ -8,19 +8,15 @@
 import java.util.List;
 
 @ResourceType(name = {"CompoundExcelConfigData.json"},loadPriority = ResourceType.LoadPriority.LOW)
+@Getter
 public class CompoundData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
-
-    @Override
-    public int getId() {return this.id;}
-    @Getter private int groupId;
-    @Getter private int rankLevel;
-    @Getter private boolean isDefaultUnlocked;
-    @Getter private int costTime;
-    @Getter private int queueSize;
-    @Getter private List<ItemParamData> inputVec;
-    @Getter private List<ItemParamData> outputVec;
-
-    @Override
-    public void onLoad(){}
+    private int groupId;
+    private int rankLevel;
+    private boolean isDefaultUnlocked;
+    private int costTime;
+    private int queueSize;
+    private List<ItemParamData> inputVec;
+    private List<ItemParamData> outputVec;
 }

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

@@ -9,21 +9,15 @@
 import lombok.Getter;
 
 @ResourceType(name = {"CookRecipeExcelConfigData.json"}, loadPriority = LoadPriority.LOW)
+@Getter
 public class CookRecipeData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
 
-    @Getter private int rankLevel;
-    @Getter boolean isDefaultUnlocked;
-    @Getter int maxProficiency;
+    private int rankLevel;
+    private boolean isDefaultUnlocked;
+    private int maxProficiency;
 
-    @Getter List<ItemParamData> qualityOutputVec;
-    @Getter List<ItemParamData> inputVec;
-
-    @Override
-    public int getId() {
-        return this.id;
-    }
-    @Override
-    public void onLoad() {
-    }
+    private List<ItemParamData> qualityOutputVec;
+    private List<ItemParamData> inputVec;
 }

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

@@ -7,9 +7,11 @@
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import lombok.Getter;
 
 @ResourceType(name = "DailyDungeonConfigData.json")
 public class DailyDungeonData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
     private int[] monday;
     private int[] tuesday;
@@ -26,11 +28,6 @@ public DailyDungeonData() {
         this.map = new Int2ObjectOpenHashMap<>();
     }
 
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
     public int[] getDungeonsByDay(int day) {
         return map.getOrDefault(day, empty);
     }