Merge branch 'Grasscutters:development' into development

src/main/java/emu/grasscutter/data/def/AvatarCurveData.java

@@ -4,12 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.CurveInfo;
 
 @ResourceType(name = "AvatarCurveExcelConfigData.json")
-public class AvatarCurveData extends GenshinResource {
+public class AvatarCurveData extends GameResource {
 	private int Level;
 	private CurveInfo[] CurveInfos;
     

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

@@ -2,8 +2,8 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinData;
-import emu.grasscutter.data.GenshinResource;
+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.common.PropGrowCurve;
@@ -15,7 +15,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 
 @ResourceType(name = "AvatarExcelConfigData.json", loadPriority = LoadPriority.LOW)
-public class AvatarData extends GenshinResource {
+public class AvatarData extends GameResource {
 	
 	private String name;
 	private String IconName;
@@ -178,7 +178,7 @@ public class AvatarData extends GenshinResource {
     	if (growCurve == null) {
     		return 1f;
     	}
-    	AvatarCurveData curveData = GenshinData.getAvatarCurveDataMap().get(level);
+    	AvatarCurveData curveData = GameData.getAvatarCurveDataMap().get(level);
     	if (curveData == null) {
     		return 1f;
     	}
@@ -211,24 +211,24 @@ public class AvatarData extends GenshinResource {
 
 	@Override
 	public void onLoad() {
-    	this.skillDepot = GenshinData.getAvatarSkillDepotDataMap().get(this.SkillDepotId);
+    	this.skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.SkillDepotId);
 
-        // Get fetters from GenshinData
-        this.fetters = GenshinData.getFetterDataEntries().get(this.Id);
+        // Get fetters from GameData
+        this.fetters = GameData.getFetterDataEntries().get(this.Id);
         
-        if (GenshinData.getFetterCharacterCardDataMap().get(this.Id) != null) {
-            this.nameCardRewardId = GenshinData.getFetterCharacterCardDataMap().get(this.Id).getRewardId();
+        if (GameData.getFetterCharacterCardDataMap().get(this.Id) != null) {
+            this.nameCardRewardId = GameData.getFetterCharacterCardDataMap().get(this.Id).getRewardId();
         }
 
-        if (GenshinData.getRewardDataMap().get(this.nameCardRewardId) != null) {
-            this.nameCardId = GenshinData.getRewardDataMap().get(this.nameCardRewardId).getRewardItemList().get(0).getItemId();
+        if (GameData.getRewardDataMap().get(this.nameCardRewardId) != null) {
+            this.nameCardId = GameData.getRewardDataMap().get(this.nameCardRewardId).getRewardItemList().get(0).getItemId();
         }
     	
-    	int size = GenshinData.getAvatarCurveDataMap().size();
+    	int size = GameData.getAvatarCurveDataMap().size();
     	this.hpGrowthCurve = new float[size];
     	this.attackGrowthCurve = new float[size];
     	this.defenseGrowthCurve = new float[size];
-    	for (AvatarCurveData curveData : GenshinData.getAvatarCurveDataMap().values()) {
+    	for (AvatarCurveData curveData : GameData.getAvatarCurveDataMap().values()) {
     		int level = curveData.getLevel() - 1;
     		for (PropGrowCurve growCurve : this.PropGrowCurves) {
     			FightProperty prop = FightProperty.getPropByName(growCurve.getType());
@@ -260,7 +260,7 @@ public class AvatarData extends GenshinResource {
     	if (split.length > 0) {
     		this.name = split[split.length - 1];
     		
-    		AbilityEmbryoEntry info = GenshinData.getAbilityEmbryoInfo().get(this.name);
+    		AbilityEmbryoEntry info = GameData.getAbilityEmbryoInfo().get(this.name);
     		if (info != null) {
     			this.abilities = new IntArrayList(info.getAbilities().length);
     			for (String ability : info.getAbilities()) {

src/main/java/emu/grasscutter/data/def/AvatarFetterLevelData.java

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "AvatarFettersLevelExcelConfigData.json")
-public class AvatarFetterLevelData extends GenshinResource {
+public class AvatarFetterLevelData extends GameResource {
 	private int FetterLevel;
 	private int NeedExp;
 	

src/main/java/emu/grasscutter/data/def/AvatarFlycloakData.java

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "AvatarFlycloakExcelConfigData.json")
-public class AvatarFlycloakData extends GenshinResource {
+public class AvatarFlycloakData extends GameResource {
 	private int FlycloakId;
     private long NameTextMapHash;
 

src/main/java/emu/grasscutter/data/def/AvatarLevelData.java

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "AvatarLevelExcelConfigData.json")
-public class AvatarLevelData extends GenshinResource {
+public class AvatarLevelData extends GameResource {
 	private int Level;
 	private int Exp;
 	

src/main/java/emu/grasscutter/data/def/AvatarPromoteData.java

 package emu.grasscutter.data.def;
 
 import java.util.ArrayList;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.FightPropData;
 import emu.grasscutter.data.common.ItemParamData;
 
 @ResourceType(name = "AvatarPromoteExcelConfigData.json")
-public class AvatarPromoteData extends GenshinResource {
+public class AvatarPromoteData extends GameResource {
 	
 	private int AvatarPromoteId;
 	private int PromoteLevel;

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

@@ -2,12 +2,12 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+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 GenshinResource {
+public class AvatarSkillData extends GameResource {
 	private int Id;
     private	float CdTime;
     private int CostElemVal;

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

@@ -2,8 +2,8 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinData;
-import emu.grasscutter.data.GenshinResource;
+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;
@@ -13,7 +13,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 
 @ResourceType(name = "AvatarSkillDepotExcelConfigData.json", loadPriority = LoadPriority.HIGH)
-public class AvatarSkillDepotData extends GenshinResource {
+public class AvatarSkillDepotData extends GameResource {
 	
     private int Id;
     private int EnergySkill;
@@ -94,7 +94,7 @@ public class AvatarSkillDepotData extends GenshinResource {
 	
 	@Override
 	public void onLoad() {
-    	this.energySkillData = GenshinData.getAvatarSkillDataMap().get(this.EnergySkill);
+    	this.energySkillData = GameData.getAvatarSkillDataMap().get(this.EnergySkill);
     	if (getEnergySkillData() != null) {
     		this.elementType = ElementType.getTypeByName(getEnergySkillData().getCostElemType());
     	} else {

src/main/java/emu/grasscutter/data/def/AvatarTalentData.java

 package emu.grasscutter.data.def;
 
 import java.util.ArrayList;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.FightPropData;
 
 @ResourceType(name = "AvatarTalentExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
-public class AvatarTalentData extends GenshinResource {
+public class AvatarTalentData extends GameResource {
 	private int TalentId;
 	private int PrevTalent;
     private long NameTextMapHash;

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

 package emu.grasscutter.data.def;
 
 import java.util.ArrayList;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.FightPropData;
 
 @ResourceType(name = "EquipAffixExcelConfigData.json")
-public class EquipAffixData extends GenshinResource {
+public class EquipAffixData extends GameResource {
 
 	private int AffixId;
     private int Id;

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

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+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 GenshinResource {
+public class FetterCharacterCardData extends GameResource {
     private int AvatarId;
     private int RewardId;
 

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

@@ -2,13 +2,13 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+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"}, loadPriority = LoadPriority.HIGHEST)
-public class FetterData extends GenshinResource {
+public class FetterData extends GameResource {
     private int AvatarId;
     private int FetterId;
     private List<OpenCondData> OpenCond;

src/main/java/emu/grasscutter/data/def/GadgetData.java

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "GadgetExcelConfigData.json")
-public class GadgetData extends GenshinResource {
+public class GadgetData extends GameResource {
 	private int Id;
 	
 	private String Type;

src/main/java/emu/grasscutter/data/def/ItemData.java

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 
 @ResourceType(name = {"MaterialExcelConfigData.json", "WeaponExcelConfigData.json", "ReliquaryExcelConfigData.json"})
-public class ItemData extends GenshinResource {
+public class ItemData extends GameResource {
 	
 	private int Id;
     private int StackLimit = 1;

src/main/java/emu/grasscutter/data/def/MonsterCurveData.java

@@ -4,12 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.CurveInfo;
 
 @ResourceType(name = "MonsterCurveExcelConfigData.json")
-public class MonsterCurveData extends GenshinResource {
+public class MonsterCurveData extends GameResource {
 	private int Level;
     private CurveInfo[] CurveInfos;
     

src/main/java/emu/grasscutter/data/def/MonsterData.java

@@ -2,14 +2,14 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinData;
-import emu.grasscutter.data.GenshinResource;
+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.common.PropGrowCurve;
 
 @ResourceType(name = "MonsterExcelConfigData.json", loadPriority = LoadPriority.LOW)
-public class MonsterData extends GenshinResource {
+public class MonsterData extends GameResource {
 	private int Id;
 	
 	private String MonsterName;
@@ -168,13 +168,13 @@ public class MonsterData extends GenshinResource {
 
 	@Override
 	public void onLoad() {
-		this.describeData = GenshinData.getMonsterDescribeDataMap().get(this.getDescribeId());
+		this.describeData = GameData.getMonsterDescribeDataMap().get(this.getDescribeId());
 		
 		for (int id : this.Equips) {
 			if (id == 0) {
 				continue;
 			}
-			GadgetData gadget = GenshinData.getGadgetDataMap().get(id);
+			GadgetData gadget = GameData.getGadgetDataMap().get(id);
 			if (gadget == null) {
 				continue;
 			}

src/main/java/emu/grasscutter/data/def/MonsterDescribeData.java

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 
 @ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
-public class MonsterDescribeData extends GenshinResource {
+public class MonsterDescribeData extends GameResource {
 	private int Id;
     private long NameTextMapHash;
     private int TitleID;

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

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "NpcExcelConfigData.json")
-public class NpcData extends GenshinResource {
+public class NpcData extends GameResource {
 	private int Id;
 	
 	private String JsonName;

src/main/java/emu/grasscutter/data/def/PlayerLevelData.java

 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "PlayerLevelExcelConfigData.json")
-public class PlayerLevelData extends GenshinResource {
+public class PlayerLevelData extends GameResource {
 	private int Level;
 	private int Exp;
 	private int RewardId;

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

@@ -3,13 +3,13 @@ package emu.grasscutter.data.def;
 import java.util.ArrayList;
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.FightPropData;
 import emu.grasscutter.data.common.ItemParamData;
 
 @ResourceType(name = "ProudSkillExcelConfigData.json")
-public class ProudSkillData extends GenshinResource {
+public class ProudSkillData extends GameResource {
 	
 	private int ProudSkillId;
     private int ProudSkillGroupId;