Clean up excels

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

@@ -10,12 +10,8 @@ import lombok.experimental.FieldDefaults;
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class MusicGameBasicData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     int id;
     int musicID;
     int musicLevel;
-
-    @Override
-    public int getId() {
-        return this.id;
-    }
 }

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

@@ -2,9 +2,12 @@ package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
+import lombok.Getter;
 
 @ResourceType(name = "NpcExcelConfigData.json")
+@Getter
 public class NpcData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     private String jsonName;
@@ -19,54 +22,4 @@ public class NpcData extends GameResource {
 
     private long nameTextMapHash;
     private int campID;
-	    
-	@Override
-	public int getId() {
-		return this.id;
-	}
-
-	public String getJsonName() {
-		return jsonName;
-	}
-
-	public String getAlias() {
-		return alias;
-	}
-
-	public String getScriptDataPath() {
-		return scriptDataPath;
-	}
-
-	public String getLuaDataPath() {
-		return luaDataPath;
-	}
-
-	public boolean isIsInteractive() {
-		return isInteractive;
-	}
-
-	public boolean isHasMove() {
-		return hasMove;
-	}
-
-	public String getDyePart() {
-		return dyePart;
-	}
-
-	public String getBillboardIcon() {
-		return billboardIcon;
-	}
-
-	public long getNameTextMapHash() {
-		return nameTextMapHash;
-	}
-
-	public int getCampID() {
-		return campID;
-	}
-
-	@Override
-	public void onLoad() {
-
-	}
 }

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

@@ -3,15 +3,14 @@ package emu.grasscutter.data.excels;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
-import lombok.AccessLevel;
 import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @ResourceType(name = "OpenStateConfigData.json", loadPriority = ResourceType.LoadPriority.HIGHEST)
 public class OpenStateData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
     @Getter private boolean defaultState;
     @Getter private boolean allowClientOpen;
@@ -32,11 +31,6 @@ public class OpenStateData extends GameResource {
         OPEN_STATE_COND_PARENT_QUEST;
     }
 
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
     @Override
     public void onLoad() {
         // Add this open state to the global list.

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

@@ -11,18 +11,13 @@ import java.util.List;
 
 @ResourceType(name = "PersonalLineExcelConfigData.json")
 @Getter
-@Setter
+@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;
-
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
 }

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

 package emu.grasscutter.data.excels;
 
+import com.google.gson.annotations.SerializedName;
+
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
+import lombok.Getter;
 
 @ResourceType(name = "ReliquaryAffixExcelConfigData.json")
+@Getter
 public class ReliquaryAffixData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     private int depotId;
     private int groupId;
-	private FightProperty propType;
+    @SerializedName("propType")
+    private FightProperty fightProp;
     private float propValue;
     private int weight;
     private int upgradeWeight;
-	
-	@Override
-	public int getId() {
-		return id;
-	}
-	
-	public int getDepotId() {
-		return depotId;
-	}
-	
-	public int getGroupId() {
-		return groupId;
-	}
-	
-	public float getPropValue() {
-		return propValue;
-	}
-	
-	public int getWeight() {
-		return weight;
-	}
-	
-	public int getUpgradeWeight() {
-		return upgradeWeight;
-	}
-	
-	public FightProperty getFightProp() {
-		return propType;
-	}
 }

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

@@ -7,36 +7,19 @@ import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import lombok.Getter;
 
 @ResourceType(name = "ReliquaryLevelExcelConfigData.json")
 public class ReliquaryLevelData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
     private Int2FloatMap propMap;
 
-    private int rank;
-    private int level;
-    private int exp;
+    @Getter private int rank;
+    @Getter private int level;
+    @Getter private int exp;
     private List<RelicLevelProperty> addProps;
 
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
-    public int getRank() {
-        return rank;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-
-    public int getExp() {
-        return exp;
-    }
-
     public float getPropValue(FightProperty prop) {
         return getPropValue(prop.getId());
     }
@@ -54,16 +37,9 @@ public class ReliquaryLevelData extends GameResource {
         }
     }
 
+    @Getter
     public class RelicLevelProperty {
         private String propType;
         private float value;
-
-        public String getPropType() {
-            return propType;
-        }
-
-        public float getValue() {
-            return value;
-        }
     }
 }

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

 package emu.grasscutter.data.excels;
 
+import com.google.gson.annotations.SerializedName;
+
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
+import lombok.Getter;
 
 @ResourceType(name = "ReliquaryMainPropExcelConfigData.json")
+@Getter
 public class ReliquaryMainPropData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
 
     private int propDepotId;
-	private FightProperty propType;
+    @SerializedName("propType")
+    private FightProperty fightProp;
     private int weight;
-	
-	@Override
-	public int getId() {
-		return id;
-	}
-	
-	public int getPropDepotId() {
-		return propDepotId;
-	}
-	
-	public int getWeight() {
-		return weight;
-	}
-
-	public FightProperty getFightProp() {
-		return propType;
-	}
 }

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

 package emu.grasscutter.data.excels;
 
 import java.util.Arrays;
-import java.util.List;
 
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
-import emu.grasscutter.game.props.SceneType;
-
+import lombok.Getter;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.common.ItemParamStringData;
 
 @ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
 public class RewardPreviewData extends GameResource {
+    @Getter(onMethod = @__(@Override))
 	private int id;
 	private ItemParamStringData[] previewItems;
 	private ItemParamData[] previewItemsArray;
 
-	@Override
-	public int getId() {
-		return this.id;
-	}
-
 	public ItemParamData[] getPreviewItems() {
 		return previewItemsArray;
 	}

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

 package emu.grasscutter.data.excels;
 
-import emu.grasscutter.data.GameData;
+import com.google.gson.annotations.SerializedName;
+
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 import emu.grasscutter.game.props.SceneType;
+import lombok.Getter;
 
 @ResourceType(name = "SceneExcelConfigData.json")
+@Getter
 public class SceneData extends GameResource {
+    @Getter(onMethod = @__(@Override))
     private int id;
-	private SceneType type;
+    @SerializedName("type")
+    private SceneType sceneType;
     private String scriptData;
-
-	@Override
-	public int getId() {
-		return this.id;
-	}
-
-	public SceneType getSceneType() {
-		return type;
-	}
-
-	public String getScriptData() {
-		return scriptData;
-	}
-
-	@Override
-	public void onLoad() {
-
-	}
 }

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

@@ -2,10 +2,11 @@ package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
+import lombok.Getter;
 
 @ResourceType(name = "TowerFloorExcelConfigData.json")
+@Getter
 public class TowerFloorData extends GameResource {
-
     private int floorId;
     private int floorIndex;
     private int levelGroupId;
@@ -17,33 +18,4 @@ public class TowerFloorData extends GameResource {
     public int getId() {
         return this.floorId;
     }
-
-    @Override
-    public void onLoad() {
-        super.onLoad();
-    }
-
-    public int getFloorId() {
-        return floorId;
-    }
-
-    public int getFloorIndex() {
-        return floorIndex;
-    }
-
-    public int getLevelGroupId() {
-        return levelGroupId;
-    }
-
-    public int getOverrideMonsterLevel() {
-        return overrideMonsterLevel;
-    }
-
-    public int getTeamNum() {
-        return teamNum;
-    }
-
-    public int getFloorLevelConfigId() {
-        return floorLevelConfigId;
-    }
 }