Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-25 12:52:57 +08:00
Code Issues Projects Releases Wiki Activity

Rename excel classes

Browse Source
This commit is contained in:
Melledy 2022-05-28 04:21:47 -07:00
parent f139818224
commit a23b29b65a
123 changed files with 1289 additions and 1507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/command/commands/DropCommand.java
View File

@ -4,7 +4,7 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.entity.EntityItem;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.utils.Position;

4
src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java
View File

@ -4,8 +4,8 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.AvatarData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.inventory.ItemType;

2
src/main/java/emu/grasscutter/command/commands/GiveArtifactCommand.java
View File

@ -4,7 +4,7 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.inventory.ItemType;
import emu.grasscutter.game.player.Player;

2
src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java
View File

@ -4,7 +4,7 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.AvatarData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.player.Player;

2
src/main/java/emu/grasscutter/command/commands/GiveCommand.java
View File

@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.inventory.ItemType;
import emu.grasscutter.game.player.Player;

8
src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
View File

@ -4,10 +4,10 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.AvatarData;
import emu.grasscutter.data.def.GadgetData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.def.MonsterData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.data.excels.GadgetData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.data.excels.MonsterData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.*;
import emu.grasscutter.game.player.Player;

2
src/main/java/emu/grasscutter/command/commands/TalentCommand.java
View File

@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.player.Player;

12
src/main/java/emu/grasscutter/data/GameData.java
View File

@ -8,12 +8,12 @@ import java.util.Map;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.utils.Utils;
import emu.grasscutter.data.custom.AbilityEmbryoEntry;
import emu.grasscutter.data.custom.AbilityModifierEntry;
import emu.grasscutter.data.custom.OpenConfigEntry;
import emu.grasscutter.data.custom.MainQuestData;
import emu.grasscutter.data.custom.ScenePointEntry;
import emu.grasscutter.data.def.*;
import emu.grasscutter.data.binout.AbilityEmbryoEntry;
import emu.grasscutter.data.binout.AbilityModifierEntry;
import emu.grasscutter.data.binout.MainQuestData;
import emu.grasscutter.data.binout.OpenConfigEntry;
import emu.grasscutter.data.binout.ScenePointEntry;
import emu.grasscutter.data.excels.*;
import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

4
src/main/java/emu/grasscutter/data/GameDepot.java
View File

@ -7,8 +7,8 @@ import org.danilopianini.util.FlexibleQuadTree;
import org.danilopianini.util.SpatialIndex;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.def.ReliquaryAffixData;
import emu.grasscutter.data.def.ReliquaryMainPropData;
import emu.grasscutter.data.excels.ReliquaryAffixData;
import emu.grasscutter.data.excels.ReliquaryMainPropData;
import emu.grasscutter.game.world.SpawnDataEntry;
import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry;
import emu.grasscutter.utils.WeightedList;

34
src/main/java/emu/grasscutter/data/ResourceLoader.java
View File

@ -14,17 +14,17 @@ import com.google.gson.JsonElement;
import com.google.gson.reflect.TypeToken;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.binout.AbilityEmbryoEntry;
import emu.grasscutter.data.binout.AbilityModifier;
import emu.grasscutter.data.binout.AbilityModifierEntry;
import emu.grasscutter.data.binout.MainQuestData;
import emu.grasscutter.data.binout.OpenConfigEntry;
import emu.grasscutter.data.binout.ScenePointEntry;
import emu.grasscutter.data.binout.AbilityModifier.AbilityConfigData;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierActionType;
import emu.grasscutter.data.common.PointData;
import emu.grasscutter.data.common.ScenePointConfig;
import emu.grasscutter.data.custom.AbilityEmbryoEntry;
import emu.grasscutter.data.custom.AbilityModifier;
import emu.grasscutter.data.custom.AbilityModifier.AbilityConfigData;
import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierActionType;
import emu.grasscutter.data.custom.AbilityModifierEntry;
import emu.grasscutter.data.custom.OpenConfigEntry;
import emu.grasscutter.data.custom.MainQuestData;
import emu.grasscutter.data.custom.ScenePointEntry;
import emu.grasscutter.game.world.SpawnDataEntry.*;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@ -138,18 +138,14 @@ public class ResourceLoader {
@SuppressWarnings({"rawtypes", "unchecked"})
protected static void loadFromResource(Class<?> c, String fileName, Int2ObjectMap map) throws Exception {
FileReader fileReader = new FileReader(RESOURCE("ExcelBinOutput/" + fileName));
Gson gson = Grasscutter.getGsonFactory();
List list = gson.fromJson(fileReader, List.class);
try (FileReader fileReader = new FileReader(RESOURCE("ExcelBinOutput/" + fileName))) {
List list = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, c).getType());
for (Object o : list) {
Map<String, Object> tempMap = Utils.switchPropertiesUpperLowerCase((Map<String, Object>) o, c);
GameResource res = gson.fromJson(gson.toJson(tempMap), TypeToken.get(c).getType());
res.onLoad();
if(map.containsKey(res.getId())) {
map.remove(res.getId());
for (Object o : list) {
GameResource res = (GameResource) o;
res.onLoad();
map.put(res.getId(), res);
}
map.put(res.getId(), res);
}
}

2
src/main/java/emu/grasscutter/data/custom/AbilityEmbryoEntry.java → src/main/java/emu/grasscutter/data/binout/AbilityEmbryoEntry.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
public class AbilityEmbryoEntry {
private String name;

2
src/main/java/emu/grasscutter/data/custom/AbilityModifier.java → src/main/java/emu/grasscutter/data/binout/AbilityModifier.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import java.util.Map;

4
src/main/java/emu/grasscutter/data/custom/AbilityModifierEntry.java → src/main/java/emu/grasscutter/data/binout/AbilityModifierEntry.java
View File

@ -1,9 +1,9 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import java.util.ArrayList;
import java.util.List;
import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
public class AbilityModifierEntry {
private String name; // Custom value

2
src/main/java/emu/grasscutter/data/custom/MainQuestData.java → src/main/java/emu/grasscutter/data/binout/MainQuestData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import emu.grasscutter.game.quest.enums.LogicType;
import emu.grasscutter.game.quest.enums.QuestTrigger;

2
src/main/java/emu/grasscutter/data/custom/OpenConfigEntry.java → src/main/java/emu/grasscutter/data/binout/OpenConfigEntry.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import java.util.ArrayList;
import java.util.List;

42
src/main/java/emu/grasscutter/data/custom/ScenePointEntry.java → src/main/java/emu/grasscutter/data/binout/ScenePointEntry.java
View File

@ -1,21 +1,21 @@
package emu.grasscutter.data.custom;
import emu.grasscutter.data.common.PointData;
public class ScenePointEntry {
private String name;
private PointData pointData;
public ScenePointEntry(String name, PointData pointData) {
this.name = name;
this.pointData = pointData;
}
public String getName() {
return name;
}
public PointData getPointData() {
return pointData;
}
}
package emu.grasscutter.data.binout;
import emu.grasscutter.data.common.PointData;
public class ScenePointEntry {
private String name;
private PointData pointData;
public ScenePointEntry(String name, PointData pointData) {
this.name = name;
this.pointData = pointData;
}
public String getName() {
return name;
}
public PointData getPointData() {
return pointData;
}
}

12
src/main/java/emu/grasscutter/data/common/CurveInfo.java
View File

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

10
src/main/java/emu/grasscutter/data/common/FightPropData.java
View File

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

20
src/main/java/emu/grasscutter/data/common/ItemParamData.java
View File

@ -3,31 +3,31 @@ package emu.grasscutter.data.common;
import com.google.gson.annotations.SerializedName;
public class ItemParamData {
@SerializedName(value="Id", alternate={"ItemId"})
private int Id;
@SerializedName(value="Id", alternate={"itemId"})
private int id;
@SerializedName(value="Count", alternate={"ItemCount"})
private int Count;
@SerializedName(value="Count", alternate={"itemCount"})
private int count;
public ItemParamData() {}
public ItemParamData(int id, int count) {
this.Id = id;
this.Count = count;
this.id = id;
this.count = count;
}
public int getId() {
return Id;
return id;
}
public int getItemId() {
return Id;
return id;
}
public int getCount() {
return Count;
return count;
}
public int getItemCount() {
return Count;
return count;
}
}

20
src/main/java/emu/grasscutter/data/common/ItemParamStringData.java
View File

@ -1,26 +1,26 @@
package emu.grasscutter.data.common;
public class ItemParamStringData {
private int Id;
private String Count;
private int id;
private String count;
public ItemParamStringData() {}
public int getId() {
return Id;
return id;
}
public String getCount() {
return Count;
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)));
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));
return new ItemParamData(id, Integer.parseInt(count));
}
}

12
src/main/java/emu/grasscutter/data/common/OpenCondData.java
View File

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

2
src/main/java/emu/grasscutter/data/common/PointData.java
View File

@ -2,7 +2,7 @@ package emu.grasscutter.data.common;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.DailyDungeonData;
import emu.grasscutter.data.excels.DailyDungeonData;
import emu.grasscutter.utils.Position;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;

10
src/main/java/emu/grasscutter/data/common/PropGrowCurve.java
View File

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

84
src/main/java/emu/grasscutter/data/def/AvatarSkillData.java
View File

@ -1,84 +0,0 @@
package emu.grasscutter.data.def;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
@ResourceType(name = "AvatarSkillExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
public class AvatarSkillData extends GameResource {
private int Id;
private float CdTime;
private int CostElemVal;
private int MaxChargeNum;
private int TriggerID;
private boolean IsAttackCameraLock;
private int ProudSkillGroupId;
private String CostElemType;
private List<Float> LockWeightParams;
private long NameTextMapHash;
private String AbilityName;
private String LockShape;
private String GlobalValueKey;
@Override
public int getId(){
return this.Id;
}
public float getCdTime() {
return CdTime;
}
public int getCostElemVal() {
return CostElemVal;
}
public int getMaxChargeNum() {
return MaxChargeNum;
}
public int getTriggerID() {
return TriggerID;
}
public boolean isIsAttackCameraLock() {
return IsAttackCameraLock;
}
public int getProudSkillGroupId() {
return ProudSkillGroupId;
}
public String getCostElemType() {
return CostElemType;
}
public List<Float> getLockWeightParams() {
return LockWeightParams;
}
public long getNameTextMapHash() {
return NameTextMapHash;
}
public String getAbilityName() {
return AbilityName;
}
public String getLockShape() {
return LockShape;
}
public String getGlobalValueKey() {
return GlobalValueKey;
}
@Override
public void onLoad() {
}
}

173
src/main/java/emu/grasscutter/data/def/CombineData.java
View File

@ -1,173 +0,0 @@
package emu.grasscutter.data.def;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
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<CombineItemPair> RandomItems;
private List<CombineItemPair> MaterialItems;
private long EffectDescTextMapHash;
private String RecipeType;
@Override
public int getId() {
return this.CombineId;
}
@Override
public void onLoad() {
super.onLoad();
// clean data
RandomItems = RandomItems.stream().filter(item -> item.Id > 0).collect(Collectors.toList());
MaterialItems = MaterialItems.stream().filter(item -> item.Id > 0).collect(Collectors.toList());
}
public static class CombineItemPair {
private int Id;
private int Count;
public CombineItemPair(int id, int count) {
Id = id;
Count = count;
}
public int getId() {
return Id;
}
public void setId(int id) {
Id = id;
}
public int getCount() {
return Count;
}
public void setCount(int count) {
Count = count;
}
}
public int getCombineId() {
return CombineId;
}
public void setCombineId(int combineId) {
CombineId = combineId;
}
public int getPlayerLevel() {
return PlayerLevel;
}
public void setPlayerLevel(int playerLevel) {
PlayerLevel = playerLevel;
}
public boolean isDefaultShow() {
return IsDefaultShow;
}
public void setDefaultShow(boolean defaultShow) {
IsDefaultShow = defaultShow;
}
public int getCombineType() {
return CombineType;
}
public void setCombineType(int combineType) {
CombineType = combineType;
}
public int getSubCombineType() {
return SubCombineType;
}
public void setSubCombineType(int subCombineType) {
SubCombineType = subCombineType;
}
public int getResultItemId() {
return ResultItemId;
}
public void setResultItemId(int resultItemId) {
ResultItemId = resultItemId;
}
public int getResultItemCount() {
return ResultItemCount;
}
public void setResultItemCount(int resultItemCount) {
ResultItemCount = resultItemCount;
}
public int getScoinCost() {
return ScoinCost;
}
public void setScoinCost(int scoinCost) {
ScoinCost = scoinCost;
}
public List<CombineItemPair> getRandomItems() {
return RandomItems;
}
public void setRandomItems(List<CombineItemPair> randomItems) {
RandomItems = randomItems;
}
public List<CombineItemPair> getMaterialItems() {
return MaterialItems;
}
public void setMaterialItems(List<CombineItemPair> materialItems) {
MaterialItems = materialItems;
}
public long getEffectDescTextMapHash() {
return EffectDescTextMapHash;
}
public void setEffectDescTextMapHash(long effectDescTextMapHash) {
EffectDescTextMapHash = effectDescTextMapHash;
}
public String getRecipeType() {
return RecipeType;
}
public void setRecipeType(String recipeType) {
RecipeType = recipeType;
}
}

73
src/main/java/emu/grasscutter/data/def/TowerFloorData.java
View File

@ -1,73 +0,0 @@
package emu.grasscutter.data.def;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "TowerFloorExcelConfigData.json")
public class TowerFloorData extends GameResource {
private int FloorId;
private int FloorIndex;
private int LevelId;
private int OverrideMonsterLevel;
private int TeamNum;
private int FloorLevelConfigId;
@Override
public int getId() {
return this.FloorId;
}
@Override
public void onLoad() {
super.onLoad();
}
public int getFloorId() {
return FloorId;
}
public void setFloorId(int floorId) {
FloorId = floorId;
}
public int getFloorIndex() {
return FloorIndex;
}
public void setFloorIndex(int floorIndex) {
FloorIndex = floorIndex;
}
public int getLevelId() {
return LevelId;
}
public void setLevelId(int levelId) {
LevelId = levelId;
}
public int getOverrideMonsterLevel() {
return OverrideMonsterLevel;
}
public void setOverrideMonsterLevel(int overrideMonsterLevel) {
OverrideMonsterLevel = overrideMonsterLevel;
}
public int getTeamNum() {
return TeamNum;
}
public void setTeamNum(int teamNum) {
TeamNum = teamNum;
}
public int getFloorLevelConfigId() {
return FloorLevelConfigId;
}
public void setFloorLevelConfigId(int floorLevelConfigId) {
FloorLevelConfigId = floorLevelConfigId;
}
}

55
src/main/java/emu/grasscutter/data/def/TowerLevelData.java
View File

@ -1,55 +0,0 @@
package emu.grasscutter.data.def;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "TowerLevelExcelConfigData.json")
public class TowerLevelData extends GameResource {
private int ID;
private int LevelId;
private int LevelIndex;
private int DungeonId;
@Override
public int getId() {
return this.ID;
}
@Override
public void onLoad() {
super.onLoad();
}
public int getID() {
return ID;
}
public void setID(int ID) {
this.ID = ID;
}
public int getLevelId() {
return LevelId;
}
public void setLevelId(int levelId) {
LevelId = levelId;
}
public int getLevelIndex() {
return LevelIndex;
}
public void setLevelIndex(int levelIndex) {
LevelIndex = levelIndex;
}
public int getDungeonId() {
return DungeonId;
}
public void setDungeonId(int dungeonId) {
DungeonId = dungeonId;
}
}

70
src/main/java/emu/grasscutter/data/def/TowerScheduleData.java
View File

@ -1,70 +0,0 @@
package emu.grasscutter.data.def;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import java.util.List;
@ResourceType(name = "TowerScheduleExcelConfigData.json")
public class TowerScheduleData extends GameResource {
private int ScheduleId;
private List<Integer> EntranceFloorId;
private List<ScheduleDetail> Schedules;
private int MonthlyLevelConfigId;
@Override
public int getId() {
return ScheduleId;
}
@Override
public void onLoad() {
super.onLoad();
this.Schedules = this.Schedules.stream()
.filter(item -> item.getFloorList().size() > 0)
.toList();
}
public int getScheduleId() {
return ScheduleId;
}
public void setScheduleId(int scheduleId) {
ScheduleId = scheduleId;
}
public List<Integer> getEntranceFloorId() {
return EntranceFloorId;
}
public void setEntranceFloorId(List<Integer> entranceFloorId) {
EntranceFloorId = entranceFloorId;
}
public List<ScheduleDetail> getSchedules() {
return Schedules;
}
public void setSchedules(List<ScheduleDetail> schedules) {
Schedules = schedules;
}
public int getMonthlyLevelConfigId() {
return MonthlyLevelConfigId;
}
public void setMonthlyLevelConfigId(int monthlyLevelConfigId) {
MonthlyLevelConfigId = monthlyLevelConfigId;
}
public static class ScheduleDetail{
private List<Integer> FloorList;
public List<Integer> getFloorList() {
return FloorList;
}
public void setFloorList(List<Integer> floorList) {
FloorList = floorList;
}
}
}

14
src/main/java/emu/grasscutter/data/def/AvatarCostumeData.java → src/main/java/emu/grasscutter/data/excels/AvatarCostumeData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
@ -6,21 +6,21 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarCostumeExcelConfigData.json")
public class AvatarCostumeData extends GameResource {
private int CostumeId;
private int ItemId;
private int AvatarId;
private int costumeId;
private int itemId;
private int avatarId;
@Override
public int getId() {
return this.CostumeId;
return this.costumeId;
}
public int getItemId() {
return this.ItemId;
return this.itemId;
}
public int getAvatarId() {
return AvatarId;
return avatarId;
}
@Override

18
src/main/java/emu/grasscutter/data/def/AvatarCurveData.java → src/main/java/emu/grasscutter/data/excels/AvatarCurveData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.HashMap;
import java.util.Map;
@ -10,27 +10,27 @@ import emu.grasscutter.data.common.CurveInfo;
@ResourceType(name = "AvatarCurveExcelConfigData.json")
public class AvatarCurveData extends GameResource {
private int Level;
private CurveInfo[] CurveInfos;
private int level;
private CurveInfo[] curveInfos;
private Map<String, Float> curveInfos;
private Map<String, Float> curveInfoMap;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getLevel() {
return Level;
return level;
}
public Map<String, Float> getCurveInfos() {
return curveInfos;
return curveInfoMap;
}
@Override
public void onLoad() {
this.curveInfos = new HashMap<>();
Stream.of(this.CurveInfos).forEach(info -> this.curveInfos.put(info.getType(), info.getValue()));
this.curveInfoMap = new HashMap<>();
Stream.of(this.curveInfos).forEach(info -> this.curveInfoMap.put(info.getType(), info.getValue()));
}
}

142
src/main/java/emu/grasscutter/data/def/AvatarData.java → src/main/java/emu/grasscutter/data/excels/AvatarData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
@ -6,8 +6,8 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.binout.AbilityEmbryoEntry;
import emu.grasscutter.data.common.PropGrowCurve;
import emu.grasscutter.data.custom.AbilityEmbryoEntry;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@ -17,38 +17,36 @@ import it.unimi.dsi.fastutil.ints.IntList;
@ResourceType(name = "AvatarExcelConfigData.json", loadPriority = LoadPriority.LOW)
public class AvatarData extends GameResource {
private String name;
private String IconName;
private String BodyType;
private String QualityType;
private int ChargeEfficiency;
private int InitialWeapon;
private String WeaponType;
private String ImageName;
private int AvatarPromoteId;
private String CutsceneShow;
private int SkillDepotId;
private int StaminaRecoverSpeed;
private List<String> CandSkillDepotIds;
private long DescTextMapHash;
private String AvatarIdentityType;
private List<Integer> AvatarPromoteRewardLevelList;
private List<Integer> AvatarPromoteRewardIdList;
private int FeatureTagGroupID;
private long NameTextMapHash;
private long GachaImageNameHashSuffix;
private long InfoDescTextMapHash;
private float HpBase;
private float AttackBase;
private float DefenseBase;
private float Critical;
private float CriticalHurt;
private String iconName;
private String bodyType;
private String qualityType;
private int chargeEfficiency;
private int initialWeapon;
private String weaponType;
private String imageName;
private int avatarPromoteId;
private String cutsceneShow;
private int skillDepotId;
private int staminaRecoverSpeed;
private List<String> candSkillDepotIds;
private String avatarIdentityType;
private List<Integer> avatarPromoteRewardLevelList;
private List<Integer> avatarPromoteRewardIdList;
private List<PropGrowCurve> PropGrowCurves;
private int Id;
private long nameTextMapHash;
private float hpBase;
private float attackBase;
private float defenseBase;
private float critical;
private float criticalHurt;
private List<PropGrowCurve> propGrowCurves;
private int id;
// Transient
private String name;
private Int2ObjectMap<String> growthCurveMap;
private float[] hpGrowthCurve;
private float[] attackGrowthCurve;
@ -58,11 +56,11 @@ public class AvatarData extends GameResource {
private List<Integer> fetters;
private int nameCardRewardId;
private int nameCardId;
private int nameCardId;
@Override
public int getId(){
return this.Id;
return this.id;
}
public String getName() {
@ -70,107 +68,91 @@ public class AvatarData extends GameResource {
}
public String getBodyType(){
return this.BodyType;
return this.bodyType;
}
public String getQualityType(){
return this.QualityType;
return this.qualityType;
}
public int getChargeEfficiency(){
return this.ChargeEfficiency;
return this.chargeEfficiency;
}
public int getInitialWeapon(){
return this.InitialWeapon;
return this.initialWeapon;
}
public String getWeaponType(){
return this.WeaponType;
return this.weaponType;
}
public String getImageName(){
return this.ImageName;
return this.imageName;
}
public int getAvatarPromoteId(){
return this.AvatarPromoteId;
}
public long getGachaImageNameHashSuffix(){
return this.GachaImageNameHashSuffix;
return this.avatarPromoteId;
}
public String getCutsceneShow(){
return this.CutsceneShow;
return this.cutsceneShow;
}
public int getSkillDepotId(){
return this.SkillDepotId;
return this.skillDepotId;
}
public int getStaminaRecoverSpeed(){
return this.StaminaRecoverSpeed;
return this.staminaRecoverSpeed;
}
public List<String> getCandSkillDepotIds(){
return this.CandSkillDepotIds;
return this.candSkillDepotIds;
}
public long getDescTextMapHash(){
return this.DescTextMapHash;
}
public String getAvatarIdentityType(){
return this.AvatarIdentityType;
return this.avatarIdentityType;
}
public List<Integer> getAvatarPromoteRewardLevelList(){
return this.AvatarPromoteRewardLevelList;
return this.avatarPromoteRewardLevelList;
}
public List<Integer> getAvatarPromoteRewardIdList(){
return this.AvatarPromoteRewardIdList;
return this.avatarPromoteRewardIdList;
}
public int getFeatureTagGroupID(){
return this.FeatureTagGroupID;
}
public long getInfoDescTextMapHash(){
return this.InfoDescTextMapHash;
}
public float getBaseHp(int level){
try {
return this.HpBase * this.hpGrowthCurve[level - 1];
return this.hpBase * this.hpGrowthCurve[level - 1];
} catch (Exception e) {
return this.HpBase;
return this.hpBase;
}
}
public float getBaseAttack(int level){
try {
return this.AttackBase * this.attackGrowthCurve[level - 1];
return this.attackBase * this.attackGrowthCurve[level - 1];
} catch (Exception e) {
return this.AttackBase;
return this.attackBase;
}
}
public float getBaseDefense(int level){
try {
return this.DefenseBase * this.defenseGrowthCurve[level - 1];
return this.defenseBase * this.defenseGrowthCurve[level - 1];
} catch (Exception e) {
return this.DefenseBase;
return this.defenseBase;
}
}
public float getBaseCritical(){
return this.Critical;
return this.critical;
}
public float getBaseCriticalHurt(){
return this.CriticalHurt;
return this.criticalHurt;
}
public float getGrowthCurveById(int level, FightProperty prop) {
@ -186,7 +168,7 @@ public class AvatarData extends GameResource {
}
public long getNameTextMapHash(){
return this.NameTextMapHash;
return this.nameTextMapHash;
}
public AvatarSkillDepotData getSkillDepot() {
@ -211,13 +193,13 @@ public class AvatarData extends GameResource {
@Override
public void onLoad() {
this.skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.SkillDepotId);
this.skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.skillDepotId);
// Get fetters from GameData
this.fetters = GameData.getFetterDataEntries().get(this.Id);
this.fetters = GameData.getFetterDataEntries().get(this.id);
if (GameData.getFetterCharacterCardDataMap().get(this.Id) != null) {
this.nameCardRewardId = GameData.getFetterCharacterCardDataMap().get(this.Id).getRewardId();
if (GameData.getFetterCharacterCardDataMap().get(this.id) != null) {
this.nameCardRewardId = GameData.getFetterCharacterCardDataMap().get(this.id).getRewardId();
}
if (GameData.getRewardDataMap().get(this.nameCardRewardId) != null) {
@ -230,7 +212,7 @@ public class AvatarData extends GameResource {
this.defenseGrowthCurve = new float[size];
for (AvatarCurveData curveData : GameData.getAvatarCurveDataMap().values()) {
int level = curveData.getLevel() - 1;
for (PropGrowCurve growCurve : this.PropGrowCurves) {
for (PropGrowCurve growCurve : this.propGrowCurves) {
FightProperty prop = FightProperty.getPropByName(growCurve.getType());
switch (prop) {
case FIGHT_PROP_BASE_HP:
@ -256,7 +238,7 @@ public class AvatarData extends GameResource {
*/
// Cache abilities
String[] split = this.IconName.split("_");
String[] split = this.iconName.split("_");
if (split.length > 0) {
this.name = split[split.length - 1];

46
src/main/java/emu/grasscutter/data/def/AvatarFetterLevelData.java → src/main/java/emu/grasscutter/data/excels/AvatarFetterLevelData.java
View File

@ -1,23 +1,23 @@
package emu.grasscutter.data.def;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarFettersLevelExcelConfigData.json")
public class AvatarFetterLevelData extends GameResource {
private int FetterLevel;
private int NeedExp;
@Override
public int getId() {
return this.FetterLevel;
}
public int getLevel() {
return FetterLevel;
}
public int getExp() {
return NeedExp;
}
}
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarFettersLevelExcelConfigData.json")
public class AvatarFetterLevelData extends GameResource {
private int fetterLevel;
private int needExp;
@Override
public int getId() {
return this.fetterLevel;
}
public int getLevel() {
return fetterLevel;
}
public int getExp() {
return needExp;
}
}

10
src/main/java/emu/grasscutter/data/def/AvatarFlycloakData.java → src/main/java/emu/grasscutter/data/excels/AvatarFlycloakData.java
View File

@ -1,20 +1,20 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarFlycloakExcelConfigData.json")
public class AvatarFlycloakData extends GameResource {
private int FlycloakId;
private long NameTextMapHash;
private int flycloakId;
private long nameTextMapHash;
@Override
public int getId() {
return this.FlycloakId;
return this.flycloakId;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
@Override

12
src/main/java/emu/grasscutter/data/def/AvatarLevelData.java → src/main/java/emu/grasscutter/data/excels/AvatarLevelData.java
View File

@ -1,23 +1,23 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarLevelExcelConfigData.json")
public class AvatarLevelData extends GameResource {
private int Level;
private int Exp;
private int level;
private int exp;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getLevel() {
return Level;
return level;
}
public int getExp() {
return Exp;
return exp;
}
}

36
src/main/java/emu/grasscutter/data/def/AvatarPromoteData.java → src/main/java/emu/grasscutter/data/excels/AvatarPromoteData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import emu.grasscutter.data.GameResource;
@ -9,45 +9,45 @@ import emu.grasscutter.data.common.ItemParamData;
@ResourceType(name = "AvatarPromoteExcelConfigData.json")
public class AvatarPromoteData extends GameResource {
private int AvatarPromoteId;
private int PromoteLevel;
private int ScoinCost;
private ItemParamData[] CostItems;
private int UnlockMaxLevel;
private FightPropData[] AddProps;
private int RequiredPlayerLevel;
private int avatarPromoteId;
private int promoteLevel;
private int scoinCost;
private ItemParamData[] costItems;
private int unlockMaxLevel;
private FightPropData[] addProps;
private int requiredPlayerLevel;
@Override
public int getId() {
return (AvatarPromoteId << 8) + PromoteLevel;
return (avatarPromoteId << 8) + promoteLevel;
}
public int getAvatarPromoteId() {
return AvatarPromoteId;
return avatarPromoteId;
}
public int getPromoteLevel() {
return PromoteLevel;
return promoteLevel;
}
public ItemParamData[] getCostItems() {
return CostItems;
return costItems;
}
public int getCoinCost() {
return ScoinCost;
return scoinCost;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public int getUnlockMaxLevel() {
return UnlockMaxLevel;
return unlockMaxLevel;
}
public int getRequiredPlayerLevel() {
return RequiredPlayerLevel;
return requiredPlayerLevel;
}
@Override
@ -60,7 +60,7 @@ public class AvatarPromoteData extends GameResource {
}
trim.add(itemParam);
}
this.CostItems = trim.toArray(new ItemParamData[trim.size()]);
this.costItems = trim.toArray(new ItemParamData[trim.size()]);
// Trim fight prop data (just in case)
ArrayList<FightPropData> parsed = new ArrayList<>(getAddProps().length);
for (FightPropData prop : getAddProps()) {
@ -69,6 +69,6 @@ public class AvatarPromoteData extends GameResource {
parsed.add(prop);
}
}
this.AddProps = parsed.toArray(new FightPropData[parsed.size()]);
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}

85
src/main/java/emu/grasscutter/data/excels/AvatarSkillData.java Normal file
View File

@ -0,0 +1,85 @@
package emu.grasscutter.data.excels;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.game.props.ElementType;
@ResourceType(name = "AvatarSkillExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
public class AvatarSkillData extends GameResource {
private int id;
private float cdTime;
private int costElemVal;
private int maxChargeNum;
private int triggerID;
private boolean isAttackCameraLock;
private int proudSkillGroupId;
private ElementType costElemType;
private List<Float> lockWeightParams;
private long nameTextMapHash;
private String abilityName;
private String lockShape;
private String globalValueKey;
@Override
public int getId(){
return this.id;
}
public float getCdTime() {
return cdTime;
}
public int getCostElemVal() {
return costElemVal;
}
public int getMaxChargeNum() {
return maxChargeNum;
}
public int getTriggerID() {
return triggerID;
}
public boolean isIsAttackCameraLock() {
return isAttackCameraLock;
}
public int getProudSkillGroupId() {
return proudSkillGroupId;
}
public ElementType getCostElemType() {
return costElemType;
}
public List<Float> getLockWeightParams() {
return lockWeightParams;
}
public long getNameTextMapHash() {
return nameTextMapHash;
}
public String getAbilityName() {
return abilityName;
}
public String getLockShape() {
return lockShape;
}
public String getGlobalValueKey() {
return globalValueKey;
}
@Override
public void onLoad() {
}
}

65
src/main/java/emu/grasscutter/data/def/AvatarSkillDepotData.java → src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
@ -6,7 +6,7 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.custom.AbilityEmbryoEntry;
import emu.grasscutter.data.binout.AbilityEmbryoEntry;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.IntArrayList;
@ -15,62 +15,63 @@ import it.unimi.dsi.fastutil.ints.IntList;
@ResourceType(name = "AvatarSkillDepotExcelConfigData.json", loadPriority = LoadPriority.HIGH)
public class AvatarSkillDepotData extends GameResource {
private int Id;
private int EnergySkill;
private int AttackModeSkill;
private int id;
private int energySkill;
private int attackModeSkill;
private List<Integer> Skills;
private List<Integer> SubSkills;
private List<String> ExtraAbilities;
private List<Integer> Talents;
private List<InherentProudSkillOpens> InherentProudSkillOpens;
private List<Integer> skills;
private List<Integer> subSkills;
private List<String> extraAbilities;
private List<Integer> talents;
private List<InherentProudSkillOpens> inherentProudSkillOpens;
private String TalentStarName;
private String SkillDepotAbilityGroup;
private String talentStarName;
private String skillDepotAbilityGroup;
// Transient
private AvatarSkillData energySkillData;
private ElementType elementType;
private IntList abilities;
@Override
public int getId(){
return this.Id;
return this.id;
}
public int getEnergySkill(){
return this.EnergySkill;
return this.energySkill;
}
public List<Integer> getSkills(){
return this.Skills;
return this.skills;
}
public List<Integer> getSubSkills(){
return this.SubSkills;
return this.subSkills;
}
public int getAttackModeSkill(){
return this.AttackModeSkill;
return this.attackModeSkill;
}
public List<String> getExtraAbilities(){
return this.ExtraAbilities;
return this.extraAbilities;
}
public List<Integer> getTalents(){
return this.Talents;
return this.talents;
}
public String getTalentStarName(){
return this.TalentStarName;
return this.talentStarName;
}
public List<InherentProudSkillOpens> getInherentProudSkillOpens(){
return this.InherentProudSkillOpens;
return this.inherentProudSkillOpens;
}
public String getSkillDepotAbilityGroup(){
return this.SkillDepotAbilityGroup;
return this.skillDepotAbilityGroup;
}
public AvatarSkillData getEnergySkillData() {
@ -94,30 +95,24 @@ public class AvatarSkillDepotData extends GameResource {
@Override
public void onLoad() {
this.energySkillData = GameData.getAvatarSkillDataMap().get(this.EnergySkill);
this.energySkillData = GameData.getAvatarSkillDataMap().get(this.energySkill);
if (getEnergySkillData() != null) {
this.elementType = ElementType.getTypeByName(getEnergySkillData().getCostElemType());
this.elementType = getEnergySkillData().getCostElemType();
} else {
this.elementType = ElementType.None;
}
}
public static class InherentProudSkillOpens {
private int ProudSkillGroupId;
private int proudSkillGroupId;
private int needAvatarPromoteLevel;
private int NeedAvatarPromoteLevel;
public void setProudSkillGroupId(int ProudSkillGroupId){
this.ProudSkillGroupId = ProudSkillGroupId;
}
public int getProudSkillGroupId(){
return this.ProudSkillGroupId;
}
public void setNeedAvatarPromoteLevel(int NeedAvatarPromoteLevel){
this.NeedAvatarPromoteLevel = NeedAvatarPromoteLevel;
return this.proudSkillGroupId;
}
public int getNeedAvatarPromoteLevel(){
return this.NeedAvatarPromoteLevel;
return this.needAvatarPromoteLevel;
}
}
}

40
src/main/java/emu/grasscutter/data/def/AvatarTalentData.java → src/main/java/emu/grasscutter/data/excels/AvatarTalentData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import emu.grasscutter.data.GameResource;
@ -8,51 +8,51 @@ import emu.grasscutter.data.common.FightPropData;
@ResourceType(name = "AvatarTalentExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
public class AvatarTalentData extends GameResource {
private int TalentId;
private int PrevTalent;
private long NameTextMapHash;
private String Icon;
private int MainCostItemId;
private int MainCostItemCount;
private String OpenConfig;
private FightPropData[] AddProps;
private float[] ParamList;
private int talentId;
private int prevTalent;
private long nameTextMapHash;
private String icon;
private int mainCostItemId;
private int mainCostItemCount;
private String openConfig;
private FightPropData[] addProps;
private float[] paramList;
@Override
public int getId(){
return this.TalentId;
return this.talentId;
}
public int PrevTalent() {
return PrevTalent;
return prevTalent;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public String getIcon() {
return Icon;
return icon;
}
public int getMainCostItemId() {
return MainCostItemId;
return mainCostItemId;
}
public int getMainCostItemCount() {
return MainCostItemCount;
return mainCostItemCount;
}
public String getOpenConfig() {
return OpenConfig;
return openConfig;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public float[] getParamList() {
return ParamList;
return paramList;
}
@Override
@ -64,6 +64,6 @@ public class AvatarTalentData extends GameResource {
parsed.add(prop);
}
}
this.AddProps = parsed.toArray(new FightPropData[parsed.size()]);
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}

18
src/main/java/emu/grasscutter/data/def/CodexAnimalData.java → src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ -6,10 +6,10 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"AnimalCodexExcelConfigData.json"})
public class CodexAnimalData extends GameResource {
private int Id;
private String Type;
private int DescribeId;
private int SortOrder;
private CodexAnimalUnlockCondition BAINKHIIMJE;
private String type;
private int describeId;
private int sortOrder;
private CodexAnimalUnlockCondition OCCLHPBCDGL;
@Override
public int getId() {
@ -17,19 +17,19 @@ public class CodexAnimalData extends GameResource {
}
public String getType() {
return Type;
return type;
}
public int getDescribeId() {
return DescribeId;
return describeId;
}
public int getSortOrder() {
return SortOrder;
return sortOrder;
}
public CodexAnimalUnlockCondition getUnlockCondition() {
return BAINKHIIMJE;
return OCCLHPBCDGL;
}
public enum CodexAnimalUnlockCondition {

10
src/main/java/emu/grasscutter/data/def/CodexMaterialData.java → src/main/java/emu/grasscutter/data/excels/CodexMaterialData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
@ -7,15 +7,15 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"MaterialCodexExcelConfigData.json"})
public class CodexMaterialData extends GameResource {
private int Id;
private int MaterialId;
private int SortOrder;
private int materialId;
private int sortOrder;
public int getSortOrder() {
return SortOrder;
return sortOrder;
}
public int getMaterialId() {
return MaterialId;
return materialId;
}
public int getId() {

18
src/main/java/emu/grasscutter/data/def/CodexQuestData.java → src/main/java/emu/grasscutter/data/excels/CodexQuestData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
@ -7,13 +7,13 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"QuestCodexExcelConfigData.json"})
public class CodexQuestData extends GameResource {
private int Id;
private int ParentQuestId;
private int ChapterId;
private int SortOrder;
private boolean IsDisuse;
private int parentQuestId;
private int chapterId;
private int sortOrder;
private boolean isDisuse;
public int getParentQuestId() {
return ParentQuestId;
return parentQuestId;
}
public int getId() {
@ -21,15 +21,15 @@ public class CodexQuestData extends GameResource {
}
public int getChapterId() {
return ChapterId;
return chapterId;
}
public int getSortOrder() {
return SortOrder;
return sortOrder;
}
public boolean getIsDisuse() {
return IsDisuse;
return isDisuse;
}
@Override

34
src/main/java/emu/grasscutter/data/def/CodexReliquaryData.java → src/main/java/emu/grasscutter/data/excels/CodexReliquaryData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
@ -7,17 +7,17 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"ReliquaryCodexExcelConfigData.json"})
public class CodexReliquaryData extends GameResource {
private int Id;
private int SuitId;
private int Level;
private int CupId;
private int LeatherId;
private int CapId;
private int FlowerId;
private int SandId;
private int SortOrder;
private int suitId;
private int level;
private int cupId;
private int leatherId;
private int capId;
private int flowerId;
private int sandId;
private int sortOrder;
public int getSortOrder() {
return SortOrder;
return sortOrder;
}
public int getId() {
@ -25,31 +25,31 @@ public class CodexReliquaryData extends GameResource {
}
public int getSuitId() {
return SuitId;
return suitId;
}
public int getLevel() {
return Level;
return level;
}
public int getCupId() {
return CupId;
return cupId;
}
public int getLeatherId() {
return LeatherId;
return leatherId;
}
public int getCapId() {
return CapId;
return capId;
}
public int getFlowerId() {
return FlowerId;
return flowerId;
}
public int getSandId() {
return SandId;
return sandId;
}
@Override

10
src/main/java/emu/grasscutter/data/def/CodexWeaponData.java → src/main/java/emu/grasscutter/data/excels/CodexWeaponData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
@ -7,15 +7,15 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"WeaponCodexExcelConfigData.json"})
public class CodexWeaponData extends GameResource {
private int Id;
private int WeaponId;
private int SortOrder;
private int weaponId;
private int sortOrder;
public int getSortOrder() {
return SortOrder;
return sortOrder;
}
public int getWeaponId() {
return WeaponId;
return weaponId;
}
public int getId() {

83
src/main/java/emu/grasscutter/data/excels/CombineData.java Normal file
View File

@ -0,0 +1,83 @@
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;
}
}

34
src/main/java/emu/grasscutter/data/def/DailyDungeonData.java → src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.Calendar;
@ -12,14 +12,14 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@ResourceType(name = "DailyDungeonConfigData.json")
public class DailyDungeonData extends GameResource {
private int Id;
private int[] Monday;
private int[] Tuesday;
private int[] Wednesday;
private int[] Thursday;
private int[] Friday;
private int[] Saturday;
private int[] Sunday;
private int id;
private int[] monday;
private int[] tuesday;
private int[] wednesday;
private int[] thursday;
private int[] friday;
private int[] saturday;
private int[] sunday;
private static final int[] empty = new int[0];
private final Int2ObjectMap<int[]> map;
@ -30,7 +30,7 @@ public class DailyDungeonData extends GameResource {
@Override
public int getId() {
return this.Id;
return this.id;
}
public int[] getDungeonsByDay(int day) {
@ -39,12 +39,12 @@ public class DailyDungeonData extends GameResource {
@Override
public void onLoad() {
map.put(Calendar.MONDAY, Monday);
map.put(Calendar.TUESDAY, Tuesday);
map.put(Calendar.WEDNESDAY, Wednesday);
map.put(Calendar.THURSDAY, Thursday);
map.put(Calendar.FRIDAY, Friday);
map.put(Calendar.SATURDAY, Saturday);
map.put(Calendar.SUNDAY, Sunday);
map.put(Calendar.MONDAY, monday);
map.put(Calendar.TUESDAY, tuesday);
map.put(Calendar.WEDNESDAY, wednesday);
map.put(Calendar.THURSDAY, thursday);
map.put(Calendar.FRIDAY, friday);
map.put(Calendar.SATURDAY, saturday);
map.put(Calendar.SUNDAY, sunday);
}
}

22
src/main/java/emu/grasscutter/data/def/DungeonData.java → src/main/java/emu/grasscutter/data/excels/DungeonData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
@ -8,25 +8,25 @@ import emu.grasscutter.game.props.SceneType;
@ResourceType(name = "DungeonExcelConfigData.json")
public class DungeonData extends GameResource {
private int Id;
private int SceneId;
private int ShowLevel;
private int PassRewardPreviewID;
private String InvolveType; // TODO enum
private int id;
private int sceneId;
private int showLevel;
private int passRewardPreviewID;
private String involveType; // TODO enum
private RewardPreviewData previewData;
@Override
public int getId() {
return this.Id;
return this.id;
}
public int getSceneId() {
return SceneId;
return sceneId;
}
public int getShowLevel() {
return ShowLevel;
return showLevel;
}
public RewardPreviewData getRewardPreview() {
@ -35,8 +35,8 @@ public class DungeonData extends GameResource {
@Override
public void onLoad() {
if (this.PassRewardPreviewID > 0) {
this.previewData = GameData.getRewardPreviewDataMap().get(this.PassRewardPreviewID);
if (this.passRewardPreviewID > 0) {
this.previewData = GameData.getRewardPreviewDataMap().get(this.passRewardPreviewID);
}
}
}

32
src/main/java/emu/grasscutter/data/def/EquipAffixData.java → src/main/java/emu/grasscutter/data/excels/EquipAffixData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import emu.grasscutter.data.GameResource;
@ -8,41 +8,41 @@ import emu.grasscutter.data.common.FightPropData;
@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;
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;
return affixId;
}
public int getMainId() {
return Id;
return id;
}
public int getLevel() {
return Level;
return level;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public String getOpenConfig() {
return OpenConfig;
return openConfig;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public float[] getParamList() {
return ParamList;
return paramList;
}
@Override
@ -54,6 +54,6 @@ public class EquipAffixData extends GameResource {
parsed.add(prop);
}
}
this.AddProps = parsed.toArray(new FightPropData[parsed.size()]);
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}

48
src/main/java/emu/grasscutter/data/def/FetterCharacterCardData.java → src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java
View File

@ -1,24 +1,24 @@
package emu.grasscutter.data.def;
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() {
}
}

64
src/main/java/emu/grasscutter/data/def/FetterData.java → src/main/java/emu/grasscutter/data/excels/FetterData.java
View File

@ -1,32 +1,32 @@
package emu.grasscutter.data.def;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.common.OpenCondData;
@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 java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.common.OpenCondData;
@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() {
}
}

38
src/main/java/emu/grasscutter/data/def/GadgetData.java → src/main/java/emu/grasscutter/data/excels/GadgetData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ -6,53 +6,53 @@ import emu.grasscutter.game.props.EntityType;
@ResourceType(name = "GadgetExcelConfigData.json")
public class GadgetData extends GameResource {
private int Id;
private int id;
private EntityType Type;
private String JsonName;
private boolean IsInteractive;
private String[] Tags;
private String ItemJsonName;
private String InteeIconName;
private long NameTextMapHash;
private int CampID;
private EntityType type;
private String jsonName;
private boolean isInteractive;
private String[] tags;
private String itemJsonName;
private String inteeIconName;
private long nameTextMapHash;
private int campID;
private String LODPatternName;
@Override
public int getId() {
return this.Id;
return this.id;
}
public EntityType getType() {
return Type;
return type;
}
public String getJsonName() {
return JsonName;
return jsonName;
}
public boolean isInteractive() {
return IsInteractive;
return isInteractive;
}
public String[] getTags() {
return Tags;
return tags;
}
public String getItemJsonName() {
return ItemJsonName;
return itemJsonName;
}
public String getInteeIconName() {
return InteeIconName;
return inteeIconName;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getCampID() {
return CampID;
return campID;
}
public String getLODPatternName() { return LODPatternName; }

164
src/main/java/emu/grasscutter/data/def/ItemData.java → src/main/java/emu/grasscutter/data/excels/ItemData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ -9,164 +9,164 @@ import it.unimi.dsi.fastutil.ints.IntSet;
@ResourceType(name = {"MaterialExcelConfigData.json", "WeaponExcelConfigData.json", "ReliquaryExcelConfigData.json"})
public class ItemData extends GameResource {
private int Id;
private int StackLimit = 1;
private int MaxUseCount;
private int RankLevel;
private String EffectName;
private int[] SatiationParams;
private int Rank;
private int Weight;
private int GadgetId;
private int id;
private int stackLimit = 1;
private int maxUseCount;
private int rankLevel;
private String effectName;
private int[] satiationParams;
private int rank;
private int weight;
private int gadgetId;
private int[] DestroyReturnMaterial;
private int[] DestroyReturnMaterialCount;
private int[] destroyReturnMaterial;
private int[] destroyReturnMaterialCount;
// Food
private String FoodQuality;
private String UseTarget;
private String[] UseParam;
private String foodQuality;
private String useTarget;
private String[] iseParam;
// String enums
private String ItemType;
private String MaterialType;
private String EquipType;
private String EffectType;
private String DestroyRule;
private String itemType;
private String materialType;
private String equipType;
private String effectType;
private String destroyRule;
// Relic
private int MainPropDepotId;
private int AppendPropDepotId;
private int AppendPropNum;
private int SetId;
private int[] AddPropLevels;
private int BaseConvExp;
private int MaxLevel;
private int mainPropDepotId;
private int appendPropDepotId;
private int appendPropNum;
private int setId;
private int[] addPropLevels;
private int baseConvExp;
private int maxLevel;
// Weapon
private int WeaponPromoteId;
private int WeaponBaseExp;
private int StoryId;
private int AvatarPromoteId;
private int AwakenMaterial;
private int[] AwakenCosts;
private int[] SkillAffix;
private WeaponProperty[] WeaponProp;
private int weaponPromoteId;
private int weaponBaseExp;
private int storyId;
private int avatarPromoteId;
private int awakenMaterial;
private int[] awakenCosts;
private int[] skillAffix;
private WeaponProperty[] weaponProp;
// Hash
private String Icon;
private long NameTextMapHash;
private String icon;
private long nameTextMapHash;
// Post load
private transient emu.grasscutter.game.inventory.MaterialType materialType;
private transient emu.grasscutter.game.inventory.ItemType itemType;
private transient emu.grasscutter.game.inventory.EquipType equipType;
private transient emu.grasscutter.game.inventory.MaterialType materialEnumType;
private transient emu.grasscutter.game.inventory.ItemType itemEnumType;
private transient emu.grasscutter.game.inventory.EquipType equipEnumType;
private IntSet addPropLevelSet;
@Override
public int getId(){
return this.Id;
return this.id;
}
public String getMaterialTypeString(){
return this.MaterialType;
return this.materialType;
}
public int getStackLimit(){
return this.StackLimit;
return this.stackLimit;
}
public int getMaxUseCount(){
return this.MaxUseCount;
return this.maxUseCount;
}
public String getUseTarget(){
return this.UseTarget;
return this.useTarget;
}
public String[] getUseParam(){
return this.UseParam;
return this.iseParam;
}
public int getRankLevel(){
return this.RankLevel;
return this.rankLevel;
}
public String getFoodQuality(){
return this.FoodQuality;
return this.foodQuality;
}
public String getEffectName(){
return this.EffectName;
return this.effectName;
}
public int[] getSatiationParams(){
return this.SatiationParams;
return this.satiationParams;
}
public int[] getDestroyReturnMaterial(){
return this.DestroyReturnMaterial;
return this.destroyReturnMaterial;
}
public int[] getDestroyReturnMaterialCount(){
return this.DestroyReturnMaterialCount;
return this.destroyReturnMaterialCount;
}
public long getNameTextMapHash(){
return this.NameTextMapHash;
return this.nameTextMapHash;
}
public String getIcon(){
return this.Icon;
return this.icon;
}
public String getItemTypeString(){
return this.ItemType;
return this.itemType;
}
public int getRank(){
return this.Rank;
return this.rank;
}
public int getGadgetId() {
return GadgetId;
return gadgetId;
}
public int getBaseConvExp() {
return BaseConvExp;
return baseConvExp;
}
public int getMainPropDepotId() {
return MainPropDepotId;
return mainPropDepotId;
}
public int getAppendPropDepotId() {
return AppendPropDepotId;
return appendPropDepotId;
}
public int getAppendPropNum() {
return AppendPropNum;
return appendPropNum;
}
public int getSetId() {
return SetId;
return setId;
}
public int getWeaponPromoteId() {
return WeaponPromoteId;
return weaponPromoteId;
}
public int getWeaponBaseExp() {
return WeaponBaseExp;
return weaponBaseExp;
}
public int getAwakenMaterial() {
return AwakenMaterial;
return awakenMaterial;
}
public int[] getAwakenCosts() {
return AwakenCosts;
return awakenCosts;
}
public IntSet getAddPropLevelSet() {
@ -174,27 +174,27 @@ public class ItemData extends GameResource {
}
public int[] getSkillAffix() {
return SkillAffix;
return skillAffix;
}
public WeaponProperty[] getWeaponProperties() {
return WeaponProp;
return weaponProp;
}
public int getMaxLevel() {
return MaxLevel;
return maxLevel;
}
public emu.grasscutter.game.inventory.ItemType getItemType() {
return this.itemType;
return this.itemEnumType;
}
public emu.grasscutter.game.inventory.MaterialType getMaterialType() {
return this.materialType;
return this.materialEnumType;
}
public emu.grasscutter.game.inventory.EquipType getEquipType() {
return this.equipType;
return this.equipEnumType;
}
public boolean canAddRelicProp(int level) {
@ -202,23 +202,23 @@ public class ItemData extends GameResource {
}
public boolean isEquip() {
return this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY || this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON;
return this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY || this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON;
}
@Override
public void onLoad() {
this.itemType = emu.grasscutter.game.inventory.ItemType.getTypeByName(getItemTypeString());
this.materialType = emu.grasscutter.game.inventory.MaterialType.getTypeByName(getMaterialTypeString());
this.itemEnumType = emu.grasscutter.game.inventory.ItemType.getTypeByName(getItemTypeString());
this.materialEnumType = emu.grasscutter.game.inventory.MaterialType.getTypeByName(getMaterialTypeString());
if (this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY) {
this.equipType = emu.grasscutter.game.inventory.EquipType.getTypeByName(this.EquipType);
if (this.AddPropLevels != null && this.AddPropLevels.length > 0) {
this.addPropLevelSet = new IntOpenHashSet(this.AddPropLevels);
if (this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY) {
this.equipEnumType = emu.grasscutter.game.inventory.EquipType.getTypeByName(this.equipType);
if (this.addPropLevels != null && this.addPropLevels.length > 0) {
this.addPropLevelSet = new IntOpenHashSet(this.addPropLevels);
}
} else if (this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON) {
this.equipType = emu.grasscutter.game.inventory.EquipType.EQUIP_WEAPON;
} else if (this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON) {
this.equipEnumType = emu.grasscutter.game.inventory.EquipType.EQUIP_WEAPON;
} else {
this.equipType = emu.grasscutter.game.inventory.EquipType.EQUIP_NONE;
this.equipEnumType = emu.grasscutter.game.inventory.EquipType.EQUIP_NONE;
}
if (this.getWeaponProperties() != null) {

16
src/main/java/emu/grasscutter/data/def/MonsterCurveData.java → src/main/java/emu/grasscutter/data/excels/MonsterCurveData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.HashMap;
import java.util.Map;
@ -10,23 +10,23 @@ import emu.grasscutter.data.common.CurveInfo;
@ResourceType(name = "MonsterCurveExcelConfigData.json")
public class MonsterCurveData extends GameResource {
private int Level;
private CurveInfo[] CurveInfos;
private int level;
private CurveInfo[] curveInfos;
private Map<String, Float> curveInfos;
private Map<String, Float> curveInfoMap;
@Override
public int getId() {
return Level;
return level;
}
public float getMultByProp(String fightProp) {
return curveInfos.getOrDefault(fightProp, 1f);
return curveInfoMap.getOrDefault(fightProp, 1f);
}
@Override
public void onLoad() {
this.curveInfos = new HashMap<>();
Stream.of(this.CurveInfos).forEach(info -> this.curveInfos.put(info.getType(), info.getValue()));
this.curveInfoMap = new HashMap<>();
Stream.of(this.curveInfos).forEach(info -> this.curveInfoMap.put(info.getType(), info.getValue()));
}
}

121
src/main/java/emu/grasscutter/data/def/MonsterData.java → src/main/java/emu/grasscutter/data/excels/MonsterData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
@ -10,152 +10,153 @@ import emu.grasscutter.data.common.PropGrowCurve;
@ResourceType(name = "MonsterExcelConfigData.json", loadPriority = LoadPriority.LOW)
public class MonsterData extends GameResource {
private int Id;
private int id;
private String MonsterName;
private String Type;
private String ServerScript;
private List<Integer> Affix;
private String Ai;
private int[] Equips;
private List<HpDrops> HpDrops;
private int KillDropId;
private String ExcludeWeathers;
private int FeatureTagGroupID;
private int MpPropID;
private String Skin;
private int DescribeId;
private int CombatBGMLevel;
private int EntityBudgetLevel;
private float HpBase;
private float AttackBase;
private float DefenseBase;
private float FireSubHurt;
private float ElecSubHurt;
private float GrassSubHurt;
private float WaterSubHurt;
private float WindSubHurt;
private float RockSubHurt;
private float IceSubHurt;
private float PhysicalSubHurt;
private List<PropGrowCurve> PropGrowCurves;
private long NameTextMapHash;
private int CampID;
private String monsterName;
private String type;
private String serverScript;
private List<Integer> affix;
private String ai;
private int[] equips;
private List<HpDrops> hpDrops;
private int killDropId;
private String excludeWeathers;
private int featureTagGroupID;
private int mpPropID;
private String skin;
private int describeId;
private int combatBGMLevel;
private int entityBudgetLevel;
private float hpBase;
private float attackBase;
private float defenseBase;
private float fireSubHurt;
private float elecSubHurt;
private float grassSubHurt;
private float waterSubHurt;
private float windSubHurt;
private float rockSubHurt;
private float iceSubHurt;
private float physicalSubHurt;
private List<PropGrowCurve> propGrowCurves;
private long nameTextMapHash;
private int campID;
// Transient
private int weaponId;
private MonsterDescribeData describeData;
@Override
public int getId() {
return this.Id;
return this.id;
}
public String getMonsterName() {
return MonsterName;
return monsterName;
}
public String getType() {
return Type;
return type;
}
public String getServerScript() {
return ServerScript;
return serverScript;
}
public List<Integer> getAffix() {
return Affix;
return affix;
}
public String getAi() {
return Ai;
return ai;
}
public int[] getEquips() {
return Equips;
return equips;
}
public List<HpDrops> getHpDrops() {
return HpDrops;
return hpDrops;
}
public int getKillDropId() {
return KillDropId;
return killDropId;
}
public String getExcludeWeathers() {
return ExcludeWeathers;
return excludeWeathers;
}
public int getFeatureTagGroupID() {
return FeatureTagGroupID;
return featureTagGroupID;
}
public int getMpPropID() {
return MpPropID;
return mpPropID;
}
public String getSkin() {
return Skin;
return skin;
}
public int getDescribeId() {
return DescribeId;
return describeId;
}
public int getCombatBGMLevel() {
return CombatBGMLevel;
return combatBGMLevel;
}
public int getEntityBudgetLevel() {
return EntityBudgetLevel;
return entityBudgetLevel;
}
public float getBaseHp() {
return HpBase;
return hpBase;
}
public float getBaseAttack() {
return AttackBase;
return attackBase;
}
public float getBaseDefense() {
return DefenseBase;
return defenseBase;
}
public float getElecSubHurt() {
return ElecSubHurt;
return elecSubHurt;
}
public float getGrassSubHurt() {
return GrassSubHurt;
return grassSubHurt;
}
public float getWaterSubHurt() {
return WaterSubHurt;
return waterSubHurt;
}
public float getWindSubHurt() {
return WindSubHurt;
return windSubHurt;
}
public float getIceSubHurt() {
return IceSubHurt;
return iceSubHurt;
}
public float getPhysicalSubHurt() {
return PhysicalSubHurt;
return physicalSubHurt;
}
public List<PropGrowCurve> getPropGrowCurves() {
return PropGrowCurves;
return propGrowCurves;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getCampID() {
return CampID;
return campID;
}
public MonsterDescribeData getDescribeData() {
@ -170,7 +171,7 @@ public class MonsterData extends GameResource {
public void onLoad() {
this.describeData = GameData.getMonsterDescribeDataMap().get(this.getDescribeId());
for (int id : this.Equips) {
for (int id : this.equips) {
if (id == 0) {
continue;
}

22
src/main/java/emu/grasscutter/data/def/MonsterDescribeData.java → src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ -6,31 +6,31 @@ import emu.grasscutter.data.ResourceType.LoadPriority;
@ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
public class MonsterDescribeData extends GameResource {
private int Id;
private long NameTextMapHash;
private int TitleID;
private int SpecialNameLabID;
private String Icon;
private int id;
private long nameTextMapHash;
private int titleID;
private int specialNameLabID;
private String icon;
@Override
public int getId() {
return Id;
return id;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getTitleID() {
return TitleID;
return titleID;
}
public int getSpecialNameLabID() {
return SpecialNameLabID;
return specialNameLabID;
}
public String getIcon() {
return Icon;
return icon;
}
@Override

46
src/main/java/emu/grasscutter/data/def/NpcData.java → src/main/java/emu/grasscutter/data/excels/NpcData.java
View File

@ -1,68 +1,68 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "NpcExcelConfigData.json")
public class NpcData extends GameResource {
private int Id;
private int id;
private String JsonName;
private String Alias;
private String ScriptDataPath;
private String LuaDataPath;
private String jsonName;
private String alias;
private String scriptDataPath;
private String luaDataPath;
private boolean IsInteractive;
private boolean HasMove;
private String DyePart;
private String BillboardIcon;
private boolean isInteractive;
private boolean hasMove;
private String dyePart;
private String billboardIcon;
private long NameTextMapHash;
private int CampID;
private long nameTextMapHash;
private int campID;
@Override
public int getId() {
return this.Id;
return this.id;
}
public String getJsonName() {
return JsonName;
return jsonName;
}
public String getAlias() {
return Alias;
return alias;
}
public String getScriptDataPath() {
return ScriptDataPath;
return scriptDataPath;
}
public String getLuaDataPath() {
return LuaDataPath;
return luaDataPath;
}
public boolean isIsInteractive() {
return IsInteractive;
return isInteractive;
}
public boolean isHasMove() {
return HasMove;
return hasMove;
}
public String getDyePart() {
return DyePart;
return dyePart;
}
public String getBillboardIcon() {
return BillboardIcon;
return billboardIcon;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getCampID() {
return CampID;
return campID;
}
@Override

20
src/main/java/emu/grasscutter/data/def/PlayerLevelData.java → src/main/java/emu/grasscutter/data/excels/PlayerLevelData.java
View File

@ -1,33 +1,33 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "PlayerLevelExcelConfigData.json")
public class PlayerLevelData extends GameResource {
private int Level;
private int Exp;
private int RewardId;
private int UnlockWorldLevel;
private int level;
private int exp;
private int rewardId;
private int unlockWorldLevel;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getLevel() {
return Level;
return level;
}
public int getExp() {
return Exp;
return exp;
}
public int getRewardId() {
return RewardId;
return rewardId;
}
public int getUnlockWorldLevel() {
return UnlockWorldLevel;
return unlockWorldLevel;
}
}

62
src/main/java/emu/grasscutter/data/def/ProudSkillData.java → src/main/java/emu/grasscutter/data/excels/ProudSkillData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import java.util.List;
@ -11,82 +11,82 @@ import emu.grasscutter.data.common.ItemParamData;
@ResourceType(name = "ProudSkillExcelConfigData.json")
public class ProudSkillData extends GameResource {
private int ProudSkillId;
private int ProudSkillGroupId;
private int Level;
private int CoinCost;
private int BreakLevel;
private int ProudSkillType;
private String OpenConfig;
private List<ItemParamData> CostItems;
private List<String> FilterConds;
private List<String> LifeEffectParams;
private FightPropData[] AddProps;
private float[] ParamList;
private long[] ParamDescList;
private long NameTextMapHash;
private int proudSkillId;
private int proudSkillGroupId;
private int level;
private int coinCost;
private int breakLevel;
private int proudSkillType;
private String openConfig;
private List<ItemParamData> costItems;
private List<String> filterConds;
private List<String> lifeEffectParams;
private FightPropData[] addProps;
private float[] paramList;
private long[] paramDescList;
private long nameTextMapHash;
@Override
public int getId() {
return ProudSkillId;
return proudSkillId;
}
public int getProudSkillGroupId() {
return ProudSkillGroupId;
return proudSkillGroupId;
}
public int getLevel() {
return Level;
return level;
}
public int getCoinCost() {
return CoinCost;
return coinCost;
}
public int getBreakLevel() {
return BreakLevel;
return breakLevel;
}
public int getProudSkillType() {
return ProudSkillType;
return proudSkillType;
}
public String getOpenConfig() {
return OpenConfig;
return openConfig;
}
public List<ItemParamData> getCostItems() {
return CostItems;
return costItems;
}
public List<String> getFilterConds() {
return FilterConds;
return filterConds;
}
public List<String> getLifeEffectParams() {
return LifeEffectParams;
return lifeEffectParams;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public float[] getParamList() {
return ParamList;
return paramList;
}
public long[] getParamDescList() {
return ParamDescList;
return paramDescList;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
@Override
public void onLoad() {
if (this.getOpenConfig() != null & this.getOpenConfig().length() > 0) {
this.OpenConfig = "Avatar_" + this.getOpenConfig();
this.openConfig = "Avatar_" + this.getOpenConfig();
}
// Fight props
ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
@ -96,6 +96,6 @@ public class ProudSkillData extends GameResource {
parsed.add(prop);
}
}
this.AddProps = parsed.toArray(new FightPropData[parsed.size()]);
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}

62
src/main/java/emu/grasscutter/data/def/QuestData.java → src/main/java/emu/grasscutter/data/excels/QuestData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.Arrays;
import java.util.List;
@ -10,54 +10,54 @@ import emu.grasscutter.game.quest.enums.QuestTrigger;
@ResourceType(name = "QuestExcelConfigData.json")
public class QuestData extends GameResource {
private int SubId;
private int MainId;
private int Order;
private long DescTextMapHash;
private int subId;
private int mainId;
private int order;
private long descTextMapHash;
private boolean FinishParent;
private boolean IsRewind;
private boolean finishParent;
private boolean isRewind;
private LogicType AcceptCondComb;
private LogicType acceptCondComb;
private QuestCondition[] acceptConditons;
private LogicType FinishCondComb;
private LogicType finishCondComb;
private QuestCondition[] finishConditons;
private LogicType FailCondComb;
private LogicType failCondComb;
private QuestCondition[] failConditons;
private List<QuestParam> AcceptCond;
private List<QuestParam> FinishCond;
private List<QuestParam> FailCond;
private List<QuestExecParam> BeginExec;
private List<QuestExecParam> FinishExec;
private List<QuestExecParam> FailExec;
private List<QuestParam> acceptCond;
private List<QuestParam> finishCond;
private List<QuestParam> failCond;
private List<QuestExecParam> beginExec;
private List<QuestExecParam> finishExec;
private List<QuestExecParam> failExec;
public int getId() {
return SubId;
return subId;
}
public int getMainId() {
return MainId;
return mainId;
}
public int getOrder() {
return Order;
return order;
}
public long getDescTextMapHash() {
return DescTextMapHash;
return descTextMapHash;
}
public boolean finishParent() {
return FinishParent;
return finishParent;
}
public boolean isRewind() {
return IsRewind;
return isRewind;
}
public LogicType getAcceptCondComb() {
return AcceptCondComb;
return acceptCondComb;
}
public QuestCondition[] getAcceptCond() {
@ -65,7 +65,7 @@ public class QuestData extends GameResource {
}
public LogicType getFinishCondComb() {
return FinishCondComb;
return finishCondComb;
}
public QuestCondition[] getFinishCond() {
@ -73,7 +73,7 @@ public class QuestData extends GameResource {
}
public LogicType getFailCondComb() {
return FailCondComb;
return failCondComb;
}
public QuestCondition[] getFailCond() {
@ -81,12 +81,12 @@ public class QuestData extends GameResource {
}
public void onLoad() {
this.acceptConditons = AcceptCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
AcceptCond = null;
this.finishConditons = FinishCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
FinishCond = null;
this.failConditons = FailCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
FailCond = null;
this.acceptConditons = acceptCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
acceptCond = null;
this.finishConditons = finishCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
finishCond = null;
this.failConditons = failCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
failCond = null;
}
public class QuestParam {

18
src/main/java/emu/grasscutter/data/def/ReliquaryAffixData.java → src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ -10,39 +10,37 @@ public class ReliquaryAffixData extends GameResource {
private int DepotId;
private int GroupId;
private String PropType;
private FightProperty PropType;
private float PropValue;
private int Weight;
private int UpgradeWeight;
private FightProperty fightProp;
@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 fightProp;
}
@Override
public void onLoad() {
this.fightProp = FightProperty.getPropByName(this.PropType);
return PropType;
}
}

28
src/main/java/emu/grasscutter/data/def/ReliquaryLevelData.java → src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
@ -13,10 +13,10 @@ public class ReliquaryLevelData extends GameResource {
private int id;
private Int2ObjectMap<Float> propMap;
private int Rank;
private int Level;
private int Exp;
private List<RelicLevelProperty> AddProps;
private int rank;
private int level;
private int exp;
private List<RelicLevelProperty> addProps;
@Override
public int getId() {
@ -24,15 +24,15 @@ public class ReliquaryLevelData extends GameResource {
}
public int getRank() {
return Rank;
return rank;
}
public int getLevel() {
return Level;
return level;
}
public int getExp() {
return Exp;
return exp;
}
public float getPropValue(FightProperty prop) {
@ -45,23 +45,23 @@ public class ReliquaryLevelData extends GameResource {
@Override
public void onLoad() {
this.id = (Rank << 8) + this.getLevel();
this.id = (rank << 8) + this.getLevel();
this.propMap = new Int2ObjectOpenHashMap<>();
for (RelicLevelProperty p : AddProps) {
for (RelicLevelProperty p : addProps) {
this.propMap.put(FightProperty.getPropByName(p.getPropType()).getId(), (Float) p.getValue());
}
}
public class RelicLevelProperty {
private String PropType;
private float Value;
private String propType;
private float value;
public String getPropType() {
return PropType;
return propType;
}
public float getValue() {
return Value;
return value;
}
}
}

28
src/main/java/emu/grasscutter/data/def/ReliquaryMainPropData.java → src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ -6,32 +6,26 @@ import emu.grasscutter.game.props.FightProperty;
@ResourceType(name = "ReliquaryMainPropExcelConfigData.json")
public class ReliquaryMainPropData extends GameResource {
private int Id;
private int id;
private int PropDepotId;
private String PropType;
private String AffixName;
private int Weight;
private FightProperty fightProp;
private int propDepotId;
private FightProperty propType;
private int weight;
@Override
public int getId() {
return Id;
return id;
}
public int getPropDepotId() {
return PropDepotId;
return propDepotId;
}
public int getWeight() {
return Weight;
return weight;
}
public FightProperty getFightProp() {
return fightProp;
}
@Override
public void onLoad() {
this.fightProp = FightProperty.getPropByName(this.PropType);
return propType;
}
}

18
src/main/java/emu/grasscutter/data/def/ReliquarySetData.java → src/main/java/emu/grasscutter/data/excels/ReliquarySetData.java
View File

@ -1,23 +1,23 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "ReliquarySetExcelConfigData.json")
public class ReliquarySetData extends GameResource {
private int SetId;
private int[] SetNeedNum;
private int setId;
private int[] setNeedNum;
private int EquipAffixId;
private int DisableFilter;
private int[] ContainsList;
private int disableFilter;
private int[] containsList;
@Override
public int getId() {
return SetId;
return setId;
}
public int[] getSetNeedNum() {
return SetNeedNum;
return setNeedNum;
}
public int getEquipAffixId() {
@ -25,11 +25,11 @@ public class ReliquarySetData extends GameResource {
}
public int getDisableFilter() {
return DisableFilter;
return disableFilter;
}
public int[] getContainsList() {
return ContainsList;
return containsList;
}
@Override

54
src/main/java/emu/grasscutter/data/def/RewardData.java → src/main/java/emu/grasscutter/data/excels/RewardData.java
View File

@ -1,27 +1,27 @@
package emu.grasscutter.data.def;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.common.ItemParamData;
@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 java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.common.ItemParamData;
@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();
}
}

18
src/main/java/emu/grasscutter/data/def/RewardPreviewData.java → src/main/java/emu/grasscutter/data/excels/RewardPreviewData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.Arrays;
import java.util.List;
@ -16,28 +16,28 @@ import emu.grasscutter.data.common.ItemParamStringData;
@ResourceType(name = "RewardPreviewExcelConfigData.json", loadPriority = LoadPriority.HIGH)
public class RewardPreviewData extends GameResource {
private int Id;
private ItemParamStringData[] PreviewItems;
private ItemParamData[] PreviewItemsArray;
private int id;
private ItemParamStringData[] previewItems;
private ItemParamData[] previewItemsArray;
@Override
public int getId() {
return this.Id;
return this.id;
}
public ItemParamData[] getPreviewItems() {
return PreviewItemsArray;
return previewItemsArray;
}
@Override
public void onLoad() {
if (this.PreviewItems != null && this.PreviewItems.length > 0) {
this.PreviewItemsArray = Arrays.stream(this.PreviewItems)
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];
this.previewItemsArray = new ItemParamData[0];
}
}
}

15
src/main/java/emu/grasscutter/data/def/SceneData.java → src/main/java/emu/grasscutter/data/excels/SceneData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
@ -8,22 +8,21 @@ import emu.grasscutter.game.props.SceneType;
@ResourceType(name = "SceneExcelConfigData.json")
public class SceneData extends GameResource {
private int Id;
private SceneType Type;
private String ScriptData;
private int id;
private SceneType type;
private String scriptData;
@Override
public int getId() {
return this.Id;
return this.id;
}
public SceneType getSceneType() {
return Type;
return type;
}
public String getScriptData() {
return ScriptData;
return scriptData;
}
@Override

66
src/main/java/emu/grasscutter/data/def/ShopGoodsData.java → src/main/java/emu/grasscutter/data/excels/ShopGoodsData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ -9,34 +9,34 @@ import java.util.List;
@ResourceType(name = "ShopGoodsExcelConfigData.json")
public class ShopGoodsData extends GameResource {
private int GoodsId;
private int ShopType;
private int ItemId;
private int goodsId;
private int shopType;
private int itemId;
private int ItemCount;
private int itemCount;
private int CostScoin;
private int CostHcoin;
private int CostMcoin;
private int costScoin;
private int costHcoin;
private int costMcoin;
private List<ItemParamData> CostItems;
private int MinPlayerLevel;
private int MaxPlayerLevel;
private List<ItemParamData> costItems;
private int minPlayerLevel;
private int maxPlayerLevel;
private int BuyLimit;
private int SubTabId;
private int buyLimit;
private int subTabId;
private String RefreshType;
private transient ShopInfo.ShopRefreshType RefreshTypeEnum;
private String refreshType;
private transient ShopInfo.ShopRefreshType refreshTypeEnum;
private int RefreshParam;
private int refreshParam;
@Override
public void onLoad() {
if (this.RefreshType == null)
this.RefreshTypeEnum = ShopInfo.ShopRefreshType.NONE;
if (this.refreshType == null)
this.refreshTypeEnum = ShopInfo.ShopRefreshType.NONE;
else {
this.RefreshTypeEnum = switch (this.RefreshType) {
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;
@ -51,58 +51,58 @@ public class ShopGoodsData extends GameResource {
}
public int getGoodsId() {
return GoodsId;
return goodsId;
}
public int getShopType() {
return ShopType;
return shopType;
}
public int getItemId() {
return ItemId;
return itemId;
}
public int getItemCount() {
return ItemCount;
return itemCount;
}
public int getCostScoin() {
return CostScoin;
return costScoin;
}
public int getCostHcoin() {
return CostHcoin;
return costHcoin;
}
public int getCostMcoin() {
return CostMcoin;
return costMcoin;
}
public List<ItemParamData> getCostItems() {
return CostItems;
return costItems;
}
public int getMinPlayerLevel() {
return MinPlayerLevel;
return minPlayerLevel;
}
public int getMaxPlayerLevel() {
return MaxPlayerLevel;
return maxPlayerLevel;
}
public int getBuyLimit() {
return BuyLimit;
return buyLimit;
}
public int getSubTabId() {
return SubTabId;
return subTabId;
}
public ShopInfo.ShopRefreshType getRefreshType() {
return RefreshTypeEnum;
return refreshTypeEnum;
}
public int getRefreshParam() {
return RefreshParam;
return refreshParam;
}
}

49
src/main/java/emu/grasscutter/data/excels/TowerFloorData.java Normal file
View File

@ -0,0 +1,49 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "TowerFloorExcelConfigData.json")
public class TowerFloorData extends GameResource {
private int floorId;
private int floorIndex;
private int levelId;
private int overrideMonsterLevel;
private int teamNum;
private int floorLevelConfigId;
@Override
public int getId() {
return this.floorId;
}
@Override
public void onLoad() {
super.onLoad();
}
public int getFloorId() {
return floorId;
}
public int getFloorIndex() {
return floorIndex;
}
public int getLevelId() {
return levelId;
}
public int getOverrideMonsterLevel() {
return overrideMonsterLevel;
}
public int getTeamNum() {
return teamNum;
}
public int getFloorLevelConfigId() {
return floorLevelConfigId;
}
}

29
src/main/java/emu/grasscutter/data/excels/TowerLevelData.java Normal file
View File

@ -0,0 +1,29 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "TowerLevelExcelConfigData.json")
public class TowerLevelData extends GameResource {
private int levelId;
private int levelIndex;
private int dungeonId;
@Override
public int getId() {
return this.getLevelId();
}
public int getLevelId() {
return levelId;
}
public int getLevelIndex() {
return levelIndex;
}
public int getDungeonId() {
return dungeonId;
}
}

51
src/main/java/emu/grasscutter/data/excels/TowerScheduleData.java Normal file
View File

@ -0,0 +1,51 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import java.util.List;
@ResourceType(name = "TowerScheduleExcelConfigData.json")
public class TowerScheduleData extends GameResource {
private int scheduleId;
private List<Integer> entranceFloorId;
private List<ScheduleDetail> schedules;
private int monthlyLevelConfigId;
@Override
public int getId() {
return scheduleId;
}
@Override
public void onLoad() {
super.onLoad();
this.schedules = this.schedules.stream()
.filter(item -> item.getFloorList().size() > 0)
.toList();
}
public int getScheduleId() {
return scheduleId;
}
public List<Integer> getEntranceFloorId() {
return entranceFloorId;
}
public List<ScheduleDetail> getSchedules() {
return schedules;
}
public int getMonthlyLevelConfigId() {
return monthlyLevelConfigId;
}
public static class ScheduleDetail{
private List<Integer> floorList;
public List<Integer> getFloorList() {
return floorList;
}
}
}

16
src/main/java/emu/grasscutter/data/def/WeaponCurveData.java → src/main/java/emu/grasscutter/data/excels/WeaponCurveData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.HashMap;
import java.util.Map;
@ -10,23 +10,23 @@ import emu.grasscutter.data.common.CurveInfo;
@ResourceType(name = "WeaponCurveExcelConfigData.json")
public class WeaponCurveData extends GameResource {
private int Level;
private CurveInfo[] CurveInfos;
private int level;
private CurveInfo[] curveInfos;
private Map<String, Float> curveInfos;
private Map<String, Float> curveInfosMap;
@Override
public int getId() {
return Level;
return level;
}
public float getMultByProp(String fightProp) {
return curveInfos.getOrDefault(fightProp, 1f);
return curveInfosMap.getOrDefault(fightProp, 1f);
}
@Override
public void onLoad() {
this.curveInfos = new HashMap<>();
Stream.of(this.CurveInfos).forEach(info -> this.curveInfos.put(info.getType(), info.getValue()));
this.curveInfosMap = new HashMap<>();
Stream.of(this.curveInfos).forEach(info -> this.curveInfosMap.put(info.getType(), info.getValue()));
}
}

12
src/main/java/emu/grasscutter/data/def/WeaponLevelData.java → src/main/java/emu/grasscutter/data/excels/WeaponLevelData.java
View File

@ -1,23 +1,23 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "WeaponLevelExcelConfigData.json")
public class WeaponLevelData extends GameResource {
private int Level;
private int[] RequiredExps;
private int level;
private int[] requiredExps;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getLevel() {
return Level;
return level;
}
public int[] getRequiredExps() {
return RequiredExps;
return requiredExps;
}
}

36
src/main/java/emu/grasscutter/data/def/WeaponPromoteData.java → src/main/java/emu/grasscutter/data/excels/WeaponPromoteData.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import emu.grasscutter.data.GameResource;
@ -9,45 +9,45 @@ import emu.grasscutter.data.common.ItemParamData;
@ResourceType(name = "WeaponPromoteExcelConfigData.json")
public class WeaponPromoteData extends GameResource {
private int WeaponPromoteId;
private int PromoteLevel;
private ItemParamData[] CostItems;
private int CoinCost;
private FightPropData[] AddProps;
private int UnlockMaxLevel;
private int RequiredPlayerLevel;
private int weaponPromoteId;
private int promoteLevel;
private ItemParamData[] costItems;
private int coinCost;
private FightPropData[] addProps;
private int unlockMaxLevel;
private int requiredPlayerLevel;
@Override
public int getId() {
return (WeaponPromoteId << 8) + PromoteLevel;
return (weaponPromoteId << 8) + promoteLevel;
}
public int getWeaponPromoteId() {
return WeaponPromoteId;
return weaponPromoteId;
}
public int getPromoteLevel() {
return PromoteLevel;
return promoteLevel;
}
public ItemParamData[] getCostItems() {
return CostItems;
return costItems;
}
public int getCoinCost() {
return CoinCost;
return coinCost;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public int getUnlockMaxLevel() {
return UnlockMaxLevel;
return unlockMaxLevel;
}
public int getRequiredPlayerLevel() {
return RequiredPlayerLevel;
return requiredPlayerLevel;
}
@Override
@ -60,7 +60,7 @@ public class WeaponPromoteData extends GameResource {
}
trim.add(itemParam);
}
this.CostItems = trim.toArray(new ItemParamData[trim.size()]);
this.costItems = trim.toArray(new ItemParamData[trim.size()]);
// Trim fight prop data
ArrayList<FightPropData> parsed = new ArrayList<>(getAddProps().length);
for (FightPropData prop : getAddProps()) {
@ -69,6 +69,6 @@ public class WeaponPromoteData extends GameResource {
parsed.add(prop);
}
}
this.AddProps = parsed.toArray(new FightPropData[parsed.size()]);
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}

10
src/main/java/emu/grasscutter/data/def/WorldLevelData.java → src/main/java/emu/grasscutter/data/excels/WorldLevelData.java
View File

@ -1,20 +1,20 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "WorldLevelExcelConfigData.json")
public class WorldLevelData extends GameResource {
private int Level;
private int MonsterLevel;
private int level;
private int monsterLevel;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getMonsterLevel() {
return MonsterLevel;
return monsterLevel;
}
@Override

8
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
View File

@ -7,10 +7,10 @@ import com.google.protobuf.InvalidProtocolBufferException;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.custom.AbilityModifierEntry;
import emu.grasscutter.data.binout.AbilityModifierEntry;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.entity.EntityClientGadget;

34
src/main/java/emu/grasscutter/game/avatar/Avatar.java
View File

@ -17,24 +17,24 @@ import dev.morphia.annotations.PostLoad;
import dev.morphia.annotations.PrePersist;
import dev.morphia.annotations.Transient;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.OpenConfigEntry;
import emu.grasscutter.data.binout.OpenConfigEntry.SkillPointModifier;
import emu.grasscutter.data.common.FightPropData;
import emu.grasscutter.data.custom.OpenConfigEntry;
import emu.grasscutter.data.custom.OpenConfigEntry.SkillPointModifier;
import emu.grasscutter.data.def.AvatarData;
import emu.grasscutter.data.def.AvatarPromoteData;
import emu.grasscutter.data.def.AvatarSkillData;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.def.AvatarSkillDepotData.InherentProudSkillOpens;
import emu.grasscutter.data.def.AvatarTalentData;
import emu.grasscutter.data.def.EquipAffixData;
import emu.grasscutter.data.def.ItemData.WeaponProperty;
import emu.grasscutter.data.def.ProudSkillData;
import emu.grasscutter.data.def.ReliquaryAffixData;
import emu.grasscutter.data.def.ReliquaryLevelData;
import emu.grasscutter.data.def.ReliquaryMainPropData;
import emu.grasscutter.data.def.ReliquarySetData;
import emu.grasscutter.data.def.WeaponCurveData;
import emu.grasscutter.data.def.WeaponPromoteData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.data.excels.AvatarPromoteData;
import emu.grasscutter.data.excels.AvatarSkillData;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.data.excels.AvatarTalentData;
import emu.grasscutter.data.excels.EquipAffixData;
import emu.grasscutter.data.excels.ProudSkillData;
import emu.grasscutter.data.excels.ReliquaryAffixData;
import emu.grasscutter.data.excels.ReliquaryLevelData;
import emu.grasscutter.data.excels.ReliquaryMainPropData;
import emu.grasscutter.data.excels.ReliquarySetData;
import emu.grasscutter.data.excels.WeaponCurveData;
import emu.grasscutter.data.excels.WeaponPromoteData;
import emu.grasscutter.data.excels.AvatarSkillDepotData.InherentProudSkillOpens;
import emu.grasscutter.data.excels.ItemData.WeaponProperty;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.inventory.EquipType;

4
src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java
View File

@ -4,8 +4,8 @@ import java.util.Iterator;
import java.util.List;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.AvatarData;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.inventory.GameItem;

5
src/main/java/emu/grasscutter/game/combine/CombineManger.java
View File

@ -1,7 +1,8 @@
package emu.grasscutter.game.combine;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.CombineData;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.CombineData;
import emu.grasscutter.game.inventory.ItemType;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.proto.RetcodeOuterClass;
@ -71,7 +72,7 @@ public class CombineManger {
CombineResult result = new CombineResult();
result.setMaterial(List.of());
result.setResult(List.of(new CombineData.CombineItemPair(combineData.getResultItemId(),
result.setResult(List.of(new ItemParamData(combineData.getResultItemId(),
combineData.getResultItemCount() * count)));
// TODO lucky characters
result.setExtra(List.of());

31
src/main/java/emu/grasscutter/game/combine/CombineResult.java
View File

@ -1,44 +1,45 @@
package emu.grasscutter.game.combine;
import emu.grasscutter.data.def.CombineData;
import java.util.List;
public class CombineResult {
private List<CombineData.CombineItemPair> material;
private List<CombineData.CombineItemPair> result;
private List<CombineData.CombineItemPair> extra;
private List<CombineData.CombineItemPair> back;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.CombineData;
public List<CombineData.CombineItemPair> getMaterial() {
public class CombineResult {
private List<ItemParamData> material;
private List<ItemParamData> result;
private List<ItemParamData> extra;
private List<ItemParamData> back;
public List<ItemParamData> getMaterial() {
return material;
}
public void setMaterial(List<CombineData.CombineItemPair> material) {
public void setMaterial(List<ItemParamData> material) {
this.material = material;
}
public List<CombineData.CombineItemPair> getResult() {
public List<ItemParamData> getResult() {
return result;
}
public void setResult(List<CombineData.CombineItemPair> result) {
public void setResult(List<ItemParamData> result) {
this.result = result;
}
public List<CombineData.CombineItemPair> getExtra() {
public List<ItemParamData> getExtra() {
return extra;
}
public void setExtra(List<CombineData.CombineItemPair> extra) {
public void setExtra(List<ItemParamData> extra) {
this.extra = extra;
}
public List<CombineData.CombineItemPair> getBack() {
public List<ItemParamData> getBack() {
return back;
}
public void setBack(List<CombineData.CombineItemPair> back) {
public void setBack(List<ItemParamData> back) {
this.back = back;
}

2
src/main/java/emu/grasscutter/game/drop/DropManager.java
View File

@ -4,7 +4,7 @@ import com.google.gson.reflect.TypeToken;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.entity.EntityItem;
import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.game.inventory.GameItem;

2
src/main/java/emu/grasscutter/game/dungeons/DungeonChallenge.java
View File

@ -1,7 +1,7 @@
package emu.grasscutter.game.dungeons;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.def.DungeonData;
import emu.grasscutter.data.excels.DungeonData;
import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.player.Player;

4
src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
View File

@ -3,8 +3,8 @@ package emu.grasscutter.game.dungeons;
import emu.grasscutter.GameConstants;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.custom.ScenePointEntry;
import emu.grasscutter.data.def.DungeonData;
import emu.grasscutter.data.binout.ScenePointEntry;
import emu.grasscutter.data.excels.DungeonData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.SceneType;
import emu.grasscutter.game.quest.enums.QuestTrigger;

4
src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
View File

@ -2,8 +2,8 @@ package emu.grasscutter.game.entity;
import emu.grasscutter.GameConstants;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.AvatarData;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.inventory.EquipType;
import emu.grasscutter.game.inventory.GameItem;

2
src/main/java/emu/grasscutter/game/entity/EntityGadget.java
View File

@ -4,7 +4,7 @@ import java.util.Arrays;
import java.util.List;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.GadgetData;
import emu.grasscutter.data.excels.GadgetData;
import emu.grasscutter.game.props.EntityIdType;
import emu.grasscutter.game.props.EntityType;
import emu.grasscutter.game.props.PlayerProperty;

2
src/main/java/emu/grasscutter/game/entity/EntityItem.java
View File

@ -1,6 +1,6 @@
package emu.grasscutter.game.entity;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.EntityIdType;

4
src/main/java/emu/grasscutter/game/entity/EntityMonster.java
View File

@ -2,8 +2,8 @@ package emu.grasscutter.game.entity;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.common.PropGrowCurve;
import emu.grasscutter.data.def.MonsterCurveData;
import emu.grasscutter.data.def.MonsterData;
import emu.grasscutter.data.excels.MonsterCurveData;
import emu.grasscutter.data.excels.MonsterData;
import emu.grasscutter.game.dungeons.DungeonChallenge;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.EntityIdType;

2
src/main/java/emu/grasscutter/game/gacha/GachaManager.java
View File

@ -18,7 +18,7 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.gacha.GachaBanner.BannerType;

6
src/main/java/emu/grasscutter/game/inventory/GameItem.java
View File

@ -15,9 +15,9 @@ import dev.morphia.annotations.Transient;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameDepot;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.def.ReliquaryAffixData;
import emu.grasscutter.data.def.ReliquaryMainPropData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.data.excels.ReliquaryAffixData;
import emu.grasscutter.data.excels.ReliquaryMainPropData;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.FightProperty;

8
src/main/java/emu/grasscutter/game/inventory/Inventory.java
View File

@ -8,10 +8,10 @@ import java.util.List;
import emu.grasscutter.GameConstants;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.def.AvatarCostumeData;
import emu.grasscutter.data.def.AvatarData;
import emu.grasscutter.data.def.AvatarFlycloakData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.excels.AvatarCostumeData;
import emu.grasscutter.data.excels.AvatarData;
import emu.grasscutter.data.excels.AvatarFlycloakData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.avatar.AvatarStorage;
import emu.grasscutter.game.avatar.Avatar;

6
src/main/java/emu/grasscutter/game/managers/EnergyManager/EnergyManager.java
View File

@ -3,9 +3,9 @@ package emu.grasscutter.game.managers.EnergyManager;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.def.MonsterData.HpDrops;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.data.excels.MonsterData.HpDrops;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.entity.EntityClientGadget;

20
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
View File

@ -7,17 +7,17 @@ import java.util.Map;
import java.util.stream.Collectors;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.OpenConfigEntry;
import emu.grasscutter.data.binout.OpenConfigEntry.SkillPointModifier;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.custom.OpenConfigEntry;
import emu.grasscutter.data.custom.OpenConfigEntry.SkillPointModifier;
import emu.grasscutter.data.def.AvatarPromoteData;
import emu.grasscutter.data.def.AvatarSkillData;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.def.ItemData;
import emu.grasscutter.data.def.WeaponPromoteData;
import emu.grasscutter.data.def.AvatarSkillDepotData.InherentProudSkillOpens;
import emu.grasscutter.data.def.AvatarTalentData;
import emu.grasscutter.data.def.ProudSkillData;
import emu.grasscutter.data.excels.AvatarPromoteData;
import emu.grasscutter.data.excels.AvatarSkillData;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.data.excels.AvatarTalentData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.data.excels.ProudSkillData;
import emu.grasscutter.data.excels.WeaponPromoteData;
import emu.grasscutter.data.excels.AvatarSkillDepotData.InherentProudSkillOpens;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.inventory.ItemType;

2
src/main/java/emu/grasscutter/game/player/Player.java
View File

@ -3,7 +3,7 @@ package emu.grasscutter.game.player;
import dev.morphia.annotations.*;
import emu.grasscutter.GameConstants;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.PlayerLevelData;
import emu.grasscutter.data.excels.PlayerLevelData;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.Account;
import emu.grasscutter.game.CoopRequest;

4
src/main/java/emu/grasscutter/game/player/PlayerCodex.java
View File

@ -3,8 +3,8 @@ package emu.grasscutter.game.player;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Transient;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.CodexAnimalData;
import emu.grasscutter.data.def.CodexReliquaryData;
import emu.grasscutter.data.excels.CodexAnimalData;
import emu.grasscutter.data.excels.CodexReliquaryData;
import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.inventory.GameItem;

2
src/main/java/emu/grasscutter/game/player/TeamManager.java
View File

@ -5,7 +5,7 @@ import java.util.*;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Transient;
import emu.grasscutter.GameConstants;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.data.excels.AvatarSkillDepotData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.entity.EntityBaseGadget;

4
src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
View File

@ -11,8 +11,8 @@ import dev.morphia.annotations.Id;
import dev.morphia.annotations.Indexed;
import dev.morphia.annotations.Transient;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.custom.MainQuestData;
import emu.grasscutter.data.def.RewardData;
import emu.grasscutter.data.binout.MainQuestData;
import emu.grasscutter.data.excels.RewardData;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ActionReason;

8
src/main/java/emu/grasscutter/game/quest/GameQuest.java
View File

@ -3,10 +3,10 @@ package emu.grasscutter.game.quest;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Transient;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.custom.MainQuestData;
import emu.grasscutter.data.custom.MainQuestData.SubQuestData;
import emu.grasscutter.data.def.QuestData;
import emu.grasscutter.data.def.QuestData.QuestCondition;
import emu.grasscutter.data.binout.MainQuestData;
import emu.grasscutter.data.binout.MainQuestData.SubQuestData;
import emu.grasscutter.data.excels.QuestData;
import emu.grasscutter.data.excels.QuestData.QuestCondition;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.enums.LogicType;
import emu.grasscutter.game.quest.enums.QuestState;

4
src/main/java/emu/grasscutter/game/quest/QuestManager.java
View File

@ -9,8 +9,8 @@ import java.util.function.Consumer;
import java.util.function.Function;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.QuestData;
import emu.grasscutter.data.def.QuestData.QuestCondition;
import emu.grasscutter.data.excels.QuestData;
import emu.grasscutter.data.excels.QuestData.QuestCondition;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.enums.QuestTrigger;

2
src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
View File

@ -5,7 +5,7 @@ import java.util.Set;
import org.reflections.Reflections;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.def.QuestData.QuestCondition;
import emu.grasscutter.data.excels.QuestData.QuestCondition;
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

2
src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
View File

@ -1,7 +1,7 @@
package emu.grasscutter.game.quest.conditions;
import emu.grasscutter.data.def.QuestData.QuestCondition;
import emu.grasscutter.game.quest.QuestValue;
import emu.grasscutter.data.excels.QuestData.QuestCondition;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.enums.QuestTrigger;
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;

2
src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
View File

@ -1,7 +1,7 @@
package emu.grasscutter.game.quest.conditions;
import emu.grasscutter.data.def.QuestData.QuestCondition;
import emu.grasscutter.game.quest.QuestValue;
import emu.grasscutter.data.excels.QuestData.QuestCondition;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.enums.QuestTrigger;
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;

2
src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
View File

@ -1,7 +1,7 @@
package emu.grasscutter.game.quest.conditions;
import emu.grasscutter.data.def.QuestData.QuestCondition;
import emu.grasscutter.game.quest.QuestValue;
import emu.grasscutter.data.excels.QuestData.QuestCondition;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.enums.QuestTrigger;
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;

Some files were not shown because too many files have changed in this diff Show More