Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 08:56:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up excels

Browse Source
This commit is contained in:
AnimeGitB
2022-11-05 22:57:12 +10:30
parent 65915b7666
commit a30f16b0e1
30 changed files with 154 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/data/excels/ActivityWatcherData.java
View File

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

6
src/main/java/emu/grasscutter/data/excels/AvatarData.java
View File

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

32
src/main/java/emu/grasscutter/data/excels/AvatarSkillData.java
View File

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

39
src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java
View File

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

11
src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
View File

@@ -9,16 +9,14 @@ import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.props.BattlePassMissionRefreshType; import emu.grasscutter.game.props.BattlePassMissionRefreshType;
import emu.grasscutter.game.props.WatcherTriggerType; import emu.grasscutter.game.props.WatcherTriggerType;
import emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus; import emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus;
import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter;
import lombok.experimental.FieldDefaults;
@ResourceType(name = {"BattlePassMissionExcelConfigData.json"}) @ResourceType(name = {"BattlePassMissionExcelConfigData.json"})
@Getter @Getter
public class BattlePassMissionData extends GameResource { public class BattlePassMissionData extends GameResource {
private int addPoint; @Getter(onMethod = @__(@Override))
private int id; private int id;
private int addPoint;
private int scheduleId; private int scheduleId;
private int progress; private int progress;
private TriggerConfig triggerConfig; private TriggerConfig triggerConfig;
@@ -26,11 +24,6 @@ public class BattlePassMissionData extends GameResource {
private transient Set<Integer> mainParams; private transient Set<Integer> mainParams;
@Override
public int getId() {
return this.id;
}
public WatcherTriggerType getTriggerType() { public WatcherTriggerType getTriggerType() {
return this.getTriggerConfig().getTriggerType(); return this.getTriggerConfig().getTriggerType();
} }

39
src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
View File

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

10
src/main/java/emu/grasscutter/data/excels/ChapterData.java
View File

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

5
src/main/java/emu/grasscutter/data/excels/CityData.java
View File

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

15
src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java
View File

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

22
src/main/java/emu/grasscutter/data/excels/CompoundData.java
View File

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

20
src/main/java/emu/grasscutter/data/excels/CookRecipeData.java
View File

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

7
src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java
View File

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

37
src/main/java/emu/grasscutter/data/excels/DungeonData.java
View File

@@ -3,46 +3,23 @@ package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData; import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import lombok.Getter;
import emu.grasscutter.game.props.SceneType;
@ResourceType(name = "DungeonExcelConfigData.json") @ResourceType(name = "DungeonExcelConfigData.json")
public class DungeonData extends GameResource { public class DungeonData extends GameResource {
@Getter(onMethod = @__(@Override))
private int id; private int id;
private int sceneId; @Getter private int sceneId;
private int showLevel; @Getter private int showLevel;
private int passRewardPreviewID; private int passRewardPreviewID;
private String involveType; // TODO enum private String involveType; // TODO enum
private RewardPreviewData previewData; private RewardPreviewData previewData;
private int statueCostID; @Getter private int statueCostID;
private int statueCostCount; @Getter private int statueCostCount;
@Override public RewardPreviewData getRewardPreview() {return previewData;}
public int getId() {
return this.id;
}
public int getSceneId() {
return sceneId;
}
public int getShowLevel() {
return showLevel;
}
public RewardPreviewData getRewardPreview() {
return previewData;
}
public int getStatueCostID() {
return statueCostID;
}
public int getStatueCostCount() {
return statueCostCount;
}
@Override @Override
public void onLoad() { public void onLoad() {

15
src/main/java/emu/grasscutter/data/excels/DungeonEntryData.java
View File

@@ -7,19 +7,10 @@ import lombok.Setter;
@ResourceType(name = "DungeonEntryExcelConfigData.json") @ResourceType(name = "DungeonEntryExcelConfigData.json")
@Getter @Getter
@Setter @Setter // TODO: remove this next API break
public class DungeonEntryData extends GameResource { public class DungeonEntryData extends GameResource {
@Getter(onMethod = @__(@Override))
private int id;
private int dungeonEntryId; private int dungeonEntryId;
private int sceneId; private int sceneId;
private int id;
@Override
public int getId() {
return this.id;
}
@Override
public void onLoad() {
}
} }

56
src/main/java/emu/grasscutter/data/excels/ForgeData.java
View File

@@ -6,9 +6,12 @@ import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority; import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.common.ItemParamData; import emu.grasscutter.data.common.ItemParamData;
import lombok.Getter;
@ResourceType(name = {"ForgeExcelConfigData.json"}, loadPriority = LoadPriority.HIGHEST) @ResourceType(name = {"ForgeExcelConfigData.json"}, loadPriority = LoadPriority.HIGHEST)
@Getter
public class ForgeData extends GameResource { public class ForgeData extends GameResource {
@Getter(onMethod = @__(@Override))
private int id; private int id;
private int playerLevel; private int playerLevel;
private int forgeType; private int forgeType;
@@ -21,57 +24,4 @@ public class ForgeData extends GameResource {
private int priority; private int priority;
private int forgePoint; private int forgePoint;
private List<ItemParamData> materialItems; private List<ItemParamData> materialItems;
@Override
public int getId() {
return this.id;
}
public int getPlayerLevel() {
return playerLevel;
}
public int getForgeType() {
return forgeType;
}
public int getResultItemId() {
return resultItemId;
}
public int getResultItemCount() {
return resultItemCount;
}
public int getForgeTime() {
return forgeTime;
}
public int getQueueNum() {
return queueNum;
}
public int getScoinCost() {
return scoinCost;
}
public int getPriority() {
return priority;
}
public int getForgePoint() {
return forgePoint;
}
public List<ItemParamData> getMaterialItems() {
return materialItems;
}
public int getShowItemId() {
return showItemId;
}
@Override
public void onLoad() {
}
} }

41
src/main/java/emu/grasscutter/data/excels/GadgetData.java
View File

@@ -3,9 +3,12 @@ package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.props.EntityType; import emu.grasscutter.game.props.EntityType;
import lombok.Getter;
@ResourceType(name = "GadgetExcelConfigData.json") @ResourceType(name = "GadgetExcelConfigData.json")
@Getter
public class GadgetData extends GameResource { public class GadgetData extends GameResource {
@Getter(onMethod = @__(@Override))
private int id; private int id;
private EntityType type; private EntityType type;
@@ -15,42 +18,4 @@ public class GadgetData extends GameResource {
private String itemJsonName; private String itemJsonName;
private long nameTextMapHash; private long nameTextMapHash;
private int campID; private int campID;
@Override
public int getId() {
return this.id;
}
public EntityType getType() {
return type;
}
public String getJsonName() {
return jsonName;
}
public boolean isInteractive() {
return isInteractive;
}
public String[] getTags() {
return tags;
}
public String getItemJsonName() {
return itemJsonName;
}
public long getNameTextMapHash() {
return nameTextMapHash;
}
public int getCampID() {
return campID;
}
@Override
public void onLoad() {
}
} }

5
src/main/java/emu/grasscutter/data/excels/HomeWorldLevelData.java
View File

@@ -29,9 +29,4 @@ public class HomeWorldLevelData extends GameResource {
public int getId() { public int getId() {
return level; return level;
} }
@Override
public void onLoad() {
super.onLoad();
}
} }

6
src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
View File

@@ -4,7 +4,6 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
@@ -14,6 +13,7 @@ import java.util.List;
@Getter @Getter
@FieldDefaults(level = AccessLevel.PRIVATE) @FieldDefaults(level = AccessLevel.PRIVATE)
public class InvestigationMonsterData extends GameResource { public class InvestigationMonsterData extends GameResource {
@Getter(onMethod = @__(@Override))
int id; int id;
int cityId; int cityId;
List<Integer> monsterIdList; List<Integer> monsterIdList;
@@ -23,10 +23,6 @@ public class InvestigationMonsterData extends GameResource {
String monsterCategory; String monsterCategory;
CityData cityData; CityData cityData;
@Override
public int getId() {
return this.id;
}
@Override @Override
public void onLoad() { public void onLoad() {

6
src/main/java/emu/grasscutter/data/excels/ItemData.java
View File

@@ -25,6 +25,7 @@ import lombok.Getter;
@Getter @Getter
public class ItemData extends GameResource { public class ItemData extends GameResource {
// Main // Main
@Getter(onMethod = @__(@Override))
private int id; private int id;
private int stackLimit = 1; private int stackLimit = 1;
private int maxUseCount; private int maxUseCount;
@@ -87,11 +88,6 @@ public class ItemData extends GameResource {
// Custom // Custom
private transient IntSet addPropLevelSet; private transient IntSet addPropLevelSet;
@Override
public int getId() {
return this.id;
}
public WeaponProperty[] getWeaponProperties() { public WeaponProperty[] getWeaponProperties() {
return this.weaponProp; return this.weaponProp;
} }

25
src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java
View File

@@ -3,33 +3,14 @@ package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority; import emu.grasscutter.data.ResourceType.LoadPriority;
import lombok.Getter;
@ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH) @ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
@Getter
public class MonsterDescribeData extends GameResource { public class MonsterDescribeData extends GameResource {
@Getter(onMethod = @__(@Override))
private int id; private int id;
private long nameTextMapHash; private long nameTextMapHash;
private int titleID; private int titleID;
private int specialNameLabID; private int specialNameLabID;
@Override
public int getId() {
return id;
}
public long getNameTextMapHash() {
return nameTextMapHash;
}
public int getTitleID() {
return titleID;
}
public int getSpecialNameLabID() {
return specialNameLabID;
}
@Override
public void onLoad() {
}
} }

6
src/main/java/emu/grasscutter/data/excels/MusicGameBasicData.java
View File

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

57
src/main/java/emu/grasscutter/data/excels/NpcData.java
View File

@@ -2,12 +2,15 @@ package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import lombok.Getter;
@ResourceType(name = "NpcExcelConfigData.json") @ResourceType(name = "NpcExcelConfigData.json")
@Getter
public class NpcData extends GameResource { public class NpcData extends GameResource {
private int id; @Getter(onMethod = @__(@Override))
private int id;
private String jsonName; private String jsonName;
private String alias; private String alias;
private String scriptDataPath; private String scriptDataPath;
private String luaDataPath; private String luaDataPath;
@@ -19,54 +22,4 @@ public class NpcData extends GameResource {
private long nameTextMapHash; private long nameTextMapHash;
private int campID; 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() {
}
} }

8
src/main/java/emu/grasscutter/data/excels/OpenStateData.java
View File

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

9
src/main/java/emu/grasscutter/data/excels/PersonalLineData.java
View File

@@ -11,18 +11,13 @@ import java.util.List;
@ResourceType(name = "PersonalLineExcelConfigData.json") @ResourceType(name = "PersonalLineExcelConfigData.json")
@Getter @Getter
@Setter @Setter // TODO: remove setters next API break
@FieldDefaults(level = AccessLevel.PRIVATE) @FieldDefaults(level = AccessLevel.PRIVATE)
public class PersonalLineData extends GameResource { public class PersonalLineData extends GameResource {
@Getter(onMethod = @__(@Override))
int id; int id;
int avatarID; int avatarID;
List<Integer> preQuestId; List<Integer> preQuestId;
int startQuestId; int startQuestId;
int chapterId; int chapterId;
@Override
public int getId() {
return this.id;
}
} }

49
src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
View File

@@ -1,46 +1,23 @@
package emu.grasscutter.data.excels; package emu.grasscutter.data.excels;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.props.FightProperty; import emu.grasscutter.game.props.FightProperty;
import lombok.Getter;
@ResourceType(name = "ReliquaryAffixExcelConfigData.json") @ResourceType(name = "ReliquaryAffixExcelConfigData.json")
@Getter
public class ReliquaryAffixData extends GameResource { public class ReliquaryAffixData extends GameResource {
private int id; @Getter(onMethod = @__(@Override))
private int id;
private int depotId; private int depotId;
private int groupId; private int groupId;
private FightProperty propType; @SerializedName("propType")
private float propValue; private FightProperty fightProp;
private int weight; private float propValue;
private int upgradeWeight; 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;
}
} }

36
src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java
View File

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

31
src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java
View File

@@ -1,31 +1,20 @@
package emu.grasscutter.data.excels; package emu.grasscutter.data.excels;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.props.FightProperty; import emu.grasscutter.game.props.FightProperty;
import lombok.Getter;
@ResourceType(name = "ReliquaryMainPropExcelConfigData.json") @ResourceType(name = "ReliquaryMainPropExcelConfigData.json")
@Getter
public class ReliquaryMainPropData extends GameResource { public class ReliquaryMainPropData extends GameResource {
private int id; @Getter(onMethod = @__(@Override))
private int id;
private int propDepotId; private int propDepotId;
private FightProperty propType; @SerializedName("propType")
private int weight; 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;
}
} }

12
src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
View File

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

31
src/main/java/emu/grasscutter/data/excels/SceneData.java
View File

@@ -1,32 +1,19 @@
package emu.grasscutter.data.excels; 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.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.props.SceneType; import emu.grasscutter.game.props.SceneType;
import lombok.Getter;
@ResourceType(name = "SceneExcelConfigData.json") @ResourceType(name = "SceneExcelConfigData.json")
@Getter
public class SceneData extends GameResource { public class SceneData extends GameResource {
private int id; @Getter(onMethod = @__(@Override))
private SceneType type; private int id;
private String scriptData; @SerializedName("type")
private SceneType sceneType;
@Override private String scriptData;
public int getId() {
return this.id;
}
public SceneType getSceneType() {
return type;
}
public String getScriptData() {
return scriptData;
}
@Override
public void onLoad() {
}
} }

32
src/main/java/emu/grasscutter/data/excels/TowerFloorData.java
View File

@@ -2,10 +2,11 @@ package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource; import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType; import emu.grasscutter.data.ResourceType;
import lombok.Getter;
@ResourceType(name = "TowerFloorExcelConfigData.json") @ResourceType(name = "TowerFloorExcelConfigData.json")
@Getter
public class TowerFloorData extends GameResource { public class TowerFloorData extends GameResource {
private int floorId; private int floorId;
private int floorIndex; private int floorIndex;
private int levelGroupId; private int levelGroupId;
@@ -17,33 +18,4 @@ public class TowerFloorData extends GameResource {
public int getId() { public int getId() {
return this.floorId; 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;
}
} }