Merge branch 'development' into api

# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java

src/main/java/emu/grasscutter/command/commands/TalentCommand.java

@@ -3,9 +3,9 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.def.AvatarSkillDepotData;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarSkillChangeNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarSkillUpgradeRsp;
 
@@ -16,7 +16,7 @@ import java.util.List;
 public final class TalentCommand implements CommandHandler {
 
     @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
         if (sender == null) {
             CommandHandler.sendMessage(null, "Run this command in-game.");
             return;
@@ -41,7 +41,7 @@ public final class TalentCommand implements CommandHandler {
                         int skillId = Integer.parseInt(args.get(1));
                         int nextLevel = Integer.parseInt(args.get(2));
                         EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
-                        GenshinAvatar avatar = entity.getAvatar(); 
+                        Avatar avatar = entity.getAvatar(); 
                         int skillIdNorAtk = avatar.getData().getSkillDepot().getSkills().get(0);
                         int skillIdE = avatar.getData().getSkillDepot().getSkills().get(1);
                         int skillIdQ = avatar.getData().getSkillDepot().getEnergySkill();
@@ -97,7 +97,7 @@ public final class TalentCommand implements CommandHandler {
             case "n": case "e": case "q":
                 try {
                     EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
-                    GenshinAvatar avatar = entity.getAvatar();
+                    Avatar avatar = entity.getAvatar();
                     AvatarSkillDepotData SkillDepot = avatar.getData().getSkillDepot();
                     int skillId;
                     switch (cmdSwitch) {
@@ -135,7 +135,7 @@ public final class TalentCommand implements CommandHandler {
                 break;
             case "getid":           
                     EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
-                    GenshinAvatar avatar = entity.getAvatar(); 
+                    Avatar avatar = entity.getAvatar(); 
                     int skillIdNorAtk = avatar.getData().getSkillDepot().getSkills().get(0);
                     int skillIdE = avatar.getData().getSkillDepot().getSkills().get(1);
                     int skillIdQ = avatar.getData().getSkillDepot().getEnergySkill();

src/main/java/emu/grasscutter/command/commands/TeleportCommand.java

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Position;
 
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
 public final class TeleportCommand implements CommandHandler {
 
     @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
         if (sender == null) {
             CommandHandler.sendMessage(null, "Run this command in-game.");
             return;

src/main/java/emu/grasscutter/command/commands/WeatherCommand.java

@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
 
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ClimateType;
 import emu.grasscutter.server.packet.send.PacketSceneAreaWeatherNotify;
 
@@ -13,7 +13,7 @@ import java.util.List;
 public final class WeatherCommand implements CommandHandler {
 
     @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
         if (sender == null) {
             CommandHandler.sendMessage(null, "Run this command in-game.");
             return;

src/main/java/emu/grasscutter/data/GenshinData.java → src/main/java/emu/grasscutter/data/GameData.java

@@ -16,7 +16,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-public class GenshinData {
+public class GameData {
 	// BinOutputs
 	private static final Int2ObjectMap<String> abilityHashes = new Int2ObjectOpenHashMap<>();
 	private static final Map<String, AbilityEmbryoEntry> abilityEmbryos = new HashMap<>();
@@ -69,7 +69,7 @@ public class GenshinData {
 		Int2ObjectMap<?> map = null;
 		
 		try {
-			Field field = GenshinData.class.getDeclaredField(Utils.lowerCaseFirstChar(resourceDefinition.getSimpleName()) + "Map");
+			Field field = GameData.class.getDeclaredField(Utils.lowerCaseFirstChar(resourceDefinition.getSimpleName()) + "Map");
 			field.setAccessible(true);
 			
 			map = (Int2ObjectMap<?>) field.get(null);

src/main/java/emu/grasscutter/data/GenshinDepot.java → src/main/java/emu/grasscutter/data/GameDepot.java

@@ -15,21 +15,21 @@ import emu.grasscutter.utils.WeightedList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-public class GenshinDepot {
+public class GameDepot {
 	private static Int2ObjectMap<WeightedList<ReliquaryMainPropData>> relicMainPropDepot = new Int2ObjectOpenHashMap<>();
 	private static Int2ObjectMap<List<ReliquaryAffixData>> relicAffixDepot = new Int2ObjectOpenHashMap<>();
 	
 	private static Int2ObjectMap<SpatialIndex<SpawnGroupEntry>> spawnLists = new Int2ObjectOpenHashMap<>();
 	
 	public static void load() {
-		for (ReliquaryMainPropData data : GenshinData.getReliquaryMainPropDataMap().values()) {
+		for (ReliquaryMainPropData data : GameData.getReliquaryMainPropDataMap().values()) {
 			if (data.getWeight() <= 0 || data.getPropDepotId() <= 0) {
 				continue;
 			}
 			WeightedList<ReliquaryMainPropData> list = relicMainPropDepot.computeIfAbsent(data.getPropDepotId(), k -> new WeightedList<>());
 			list.add(data.getWeight(), data);
 		}
-		for (ReliquaryAffixData data : GenshinData.getReliquaryAffixDataMap().values()) {
+		for (ReliquaryAffixData data : GameData.getReliquaryAffixDataMap().values()) {
 			if (data.getWeight() <= 0 || data.getDepotId() <= 0) {
 				continue;
 			}

src/main/java/emu/grasscutter/data/GenshinResource.java → src/main/java/emu/grasscutter/data/GameResource.java

 package emu.grasscutter.data;
 
-public abstract class GenshinResource {
+public abstract class GameResource {
 	
 	public int getId() {
 		return 0;

src/main/java/emu/grasscutter/data/ResourceLoader.java

@@ -27,7 +27,7 @@ public class ResourceLoader {
 
 	public static List<Class<?>> getResourceDefClasses() {
 		Reflections reflections = new Reflections(ResourceLoader.class.getPackage().getName());
-		Set<?> classes = reflections.getSubTypesOf(GenshinResource.class);
+		Set<?> classes = reflections.getSubTypesOf(GameResource.class);
 
 		List<Class<?>> classList = new ArrayList<>(classes.size());
 		classes.forEach(o -> {
@@ -50,12 +50,12 @@ public class ResourceLoader {
 		loadResources();
 		loadScenePoints();
 		// Process into depots
-		GenshinDepot.load();
+		GameDepot.load();
 		// Load spawn data
 		loadSpawnData();
 		// Custom - TODO move this somewhere else
 		try {
-			GenshinData.getAvatarSkillDepotDataMap().get(504).setAbilities(
+			GameData.getAvatarSkillDepotDataMap().get(504).setAbilities(
 				new AbilityEmbryoEntry(
 					"", 
 					new String[] {
@@ -68,7 +68,7 @@ public class ResourceLoader {
 						"Avatar_Player_WindBreathe_CameraController"
 					}
 			));
-			GenshinData.getAvatarSkillDepotDataMap().get(704).setAbilities(
+			GameData.getAvatarSkillDepotDataMap().get(704).setAbilities(
 				new AbilityEmbryoEntry(
 					"", 
 					new String[] {
@@ -95,7 +95,7 @@ public class ResourceLoader {
 			}
 
 			@SuppressWarnings("rawtypes")
-			Int2ObjectMap map = GenshinData.getMapByResourceDef(resourceDefinition);
+			Int2ObjectMap map = GameData.getMapByResourceDef(resourceDefinition);
 
 			if (map == null) {
 				continue;
@@ -123,7 +123,7 @@ public class ResourceLoader {
 			List list = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, c).getType());
 
 			for (Object o : list) {
-				GenshinResource res = (GenshinResource) o;
+				GameResource res = (GameResource) o;
 				res.onLoad();
 				map.put(res.getId(), res);
 			}
@@ -140,7 +140,7 @@ public class ResourceLoader {
 		}
 
 		List<ScenePointEntry> scenePointList = new ArrayList<>();
-		for (File file : folder.listFiles()) {
+		for (File file : Objects.requireNonNull(folder.listFiles())) {
 			ScenePointConfig config = null;
 			Integer sceneId = null;
 			
@@ -170,7 +170,7 @@ public class ResourceLoader {
 			}
 
 			for (ScenePointEntry entry : scenePointList) {
-				GenshinData.getScenePointEntries().put(entry.getName(), entry);
+				GameData.getScenePointEntries().put(entry.getName(), entry);
 			}
 		}
 	}
@@ -233,7 +233,7 @@ public class ResourceLoader {
 		}
 
 		for (AbilityEmbryoEntry entry : embryoList) {
-			GenshinData.getAbilityEmbryoInfo().put(entry.getName(), entry);
+			GameData.getAbilityEmbryoInfo().put(entry.getName(), entry);
 		}
 	}
 	
@@ -260,7 +260,7 @@ public class ResourceLoader {
 			entry.getSpawns().stream().forEach(s -> {
 				s.setGroup(entry);
 			});
-			GenshinDepot.getSpawnListById(entry.getSceneId()).insert(entry, entry.getPos().getX(), entry.getPos().getZ());
+			GameDepot.getSpawnListById(entry.getSceneId()).insert(entry, entry.getPos().getX(), entry.getPos().getZ());
 		}
 	}
 	
@@ -328,7 +328,7 @@ public class ResourceLoader {
 		}
 		
 		for (OpenConfigEntry entry : list) {
-			GenshinData.getOpenConfigEntries().put(entry.getName(), entry);
+			GameData.getOpenConfigEntries().put(entry.getName(), entry);
 		}
 	}
 

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

 package emu.grasscutter.data.def;
 
-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;
 
 @ResourceType(name = "AvatarCostumeExcelConfigData.json")
-public class AvatarCostumeData extends GenshinResource {
+public class AvatarCostumeData extends GameResource {
 	private int CostumeId;
 	private int ItemId;
     private int AvatarId;
@@ -25,6 +25,6 @@ public class AvatarCostumeData extends GenshinResource {
 	
 	@Override
 	public void onLoad() {
-		GenshinData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this);
+		GameData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this);
 	}
 }

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/CombineData.java

+package emu.grasscutter.data.def;
+
+import emu.grasscutter.data.ResourceType;
+
+@ResourceType(name = "CombineExcelConfigData.json")
+public class CombineData {
+
+    
+
+}

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;