Rename excel classes

src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java

 package emu.grasscutter.game.quest.handlers;
 
-import emu.grasscutter.data.def.QuestData.QuestCondition;
+import emu.grasscutter.data.excels.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.GameQuest;
 
 public abstract class QuestBaseHandler {

src/main/java/emu/grasscutter/game/shop/ShopInfo.java

 package emu.grasscutter.game.shop;
 
 import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.def.ShopGoodsData;
+import emu.grasscutter.data.excels.ShopGoodsData;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/emu/grasscutter/game/shop/ShopManager.java

@@ -5,7 +5,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.ShopGoodsData;
+import emu.grasscutter.data.excels.ShopGoodsData;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;

src/main/java/emu/grasscutter/game/tower/TowerManager.java

@@ -3,7 +3,7 @@ package emu.grasscutter.game.tower;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Transient;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.TowerLevelData;
+import emu.grasscutter.data.excels.TowerLevelData;
 import emu.grasscutter.game.dungeons.DungeonSettleListener;
 import emu.grasscutter.game.dungeons.TowerDungeonSettleListener;
 import emu.grasscutter.game.player.Player;
@@ -73,7 +73,7 @@ public class TowerManager {
         this.currentLevelId = GameData.getTowerLevelDataMap().values().stream()
                 .filter(x -> x.getLevelId() == floorData.getLevelId() && x.getLevelIndex() == 1)
                 .findFirst()
-                .map(TowerLevelData::getID)
+                .map(TowerLevelData::getId)
                 .orElse(0);
 
         if (entryScene == 0){

src/main/java/emu/grasscutter/game/tower/TowerScheduleManager.java

@@ -3,7 +3,7 @@ package emu.grasscutter.game.tower;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.DataLoader;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.TowerScheduleData;
+import emu.grasscutter.data.excels.TowerScheduleData;
 import emu.grasscutter.server.game.GameServer;
 
 import java.io.FileReader;

src/main/java/emu/grasscutter/game/world/Scene.java

@@ -2,7 +2,7 @@ package emu.grasscutter.game.world;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.GameDepot;
-import emu.grasscutter.data.def.*;
+import emu.grasscutter.data.excels.*;
 import emu.grasscutter.game.dungeons.DungeonChallenge;
 import emu.grasscutter.game.dungeons.DungeonSettleListener;
 import emu.grasscutter.game.entity.*;

src/main/java/emu/grasscutter/game/world/World.java

@@ -12,8 +12,8 @@ import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.SceneType;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.DungeonData;
-import emu.grasscutter.data.def.SceneData;
+import emu.grasscutter.data.excels.DungeonData;
+import emu.grasscutter.data.excels.SceneData;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.scripts.data.SceneConfig;

src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java

 package emu.grasscutter.scripts.service;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.MonsterData;
-import emu.grasscutter.data.def.WorldLevelData;
+import emu.grasscutter.data.excels.MonsterData;
+import emu.grasscutter.data.excels.WorldLevelData;
 import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.scripts.SceneScriptManager;
 import emu.grasscutter.scripts.constants.EventType;

src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java

@@ -5,8 +5,8 @@ import static emu.grasscutter.Configuration.RESOURCE;
 import com.google.gson.reflect.TypeToken;
 import emu.grasscutter.Grasscutter;
 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.utils.Utils;
 import static emu.grasscutter.Configuration.DOCUMENT_LANGUAGE;
 import express.http.Request;

src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java

@@ -7,10 +7,10 @@ import com.google.gson.reflect.TypeToken;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.AvatarData;
-import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.data.def.MonsterData;
-import emu.grasscutter.data.def.SceneData;
+import emu.grasscutter.data.excels.AvatarData;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.data.excels.MonsterData;
+import emu.grasscutter.data.excels.SceneData;
 import emu.grasscutter.utils.FileUtils;
 import emu.grasscutter.utils.Utils;
 import express.http.Request;

src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarFetterLevelRewardReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.RewardData;
+import emu.grasscutter.data.excels.RewardData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.props.ActionReason;

src/main/java/emu/grasscutter/server/packet/recv/HandlerCombineReq.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.data.def.CombineData;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.excels.CombineData;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.packet.PacketOpcodes;
@@ -35,7 +36,7 @@ public class HandlerCombineReq extends PacketHandler {
                 toItemParamList(result.getBack())));
     }
 
-    private List<ItemParamOuterClass.ItemParam> toItemParamList(List<CombineData.CombineItemPair> list){
+    private List<ItemParamOuterClass.ItemParam> toItemParamList(List<ItemParamData> list){
         return list.stream()
                 .map(item -> ItemParamOuterClass.ItemParam.newBuilder()
                         .setItemId(item.getId())

src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalSceneJumpReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.custom.ScenePointEntry;
+import emu.grasscutter.data.binout.ScenePointEntry;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.packet.PacketOpcodes;

src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.custom.ScenePointEntry;
+import emu.grasscutter.data.binout.ScenePointEntry;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq;

src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java

@@ -2,7 +2,7 @@ package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.GadgetData;
+import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.game.entity.EntityVehicle;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.LifeState;

src/main/java/emu/grasscutter/server/packet/send/PacketSceneTransToPointRsp.java

 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.custom.ScenePointEntry;
+import emu.grasscutter.data.binout.ScenePointEntry;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;

src/main/java/emu/grasscutter/tools/Tools.java

@@ -19,12 +19,12 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.ResourceLoader;
-import emu.grasscutter.data.custom.MainQuestData;
-import emu.grasscutter.data.def.AvatarData;
-import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.data.def.MonsterData;
-import emu.grasscutter.data.def.QuestData;
-import emu.grasscutter.data.def.SceneData;
+import emu.grasscutter.data.binout.MainQuestData;
+import emu.grasscutter.data.excels.AvatarData;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.data.excels.MonsterData;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.SceneData;
 import emu.grasscutter.utils.Utils;
 
 import static emu.grasscutter.utils.Language.translate;

src/main/java/emu/grasscutter/utils/Position.java

@@ -2,6 +2,8 @@ package emu.grasscutter.utils;
 
 import java.io.Serializable;
 
+import com.google.gson.annotations.SerializedName;
+
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 
@@ -9,8 +11,13 @@ import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 public class Position implements Serializable {
 	private static final long serialVersionUID = -2001232313615923575L;
 	
+	@SerializedName(value="x", alternate={"_x", "X"})
 	private float x;
+	
+	@SerializedName(value="y", alternate={"_y", "Y"})
 	private float y;
+	
+	@SerializedName(value="z", alternate={"_z", "Z"})
 	private float z;
 	
 	public Position() {

src/main/java/emu/grasscutter/utils/Utils.java

@@ -273,43 +273,6 @@ public final class Utils {
 		} return stringBuilder.toString();
 	}
 
-	/**
-	 * Switch properties from upper case to lower case?
-	 */
-	public static Map<String, Object> switchPropertiesUpperLowerCase(Map<String, Object> objMap, Class<?> cls) {
-		Map<String, Object> map = new HashMap<>(objMap.size());
-		for (String key : objMap.keySet()) {
-			try {
-				char c = key.charAt(0);
-				if (c >= 'a' && c <= 'z') {
-					try {
-						cls.getDeclaredField(key);
-						map.put(key, objMap.get(key));
-					} catch (NoSuchFieldException e) {
-						String s1 = String.valueOf(c).toUpperCase();
-						String after = key.length() > 1 ? s1 + key.substring(1) : s1;
-						cls.getDeclaredField(after);
-						map.put(after, objMap.get(key));
-					}
-				} else if (c >= 'A' && c <= 'Z') {
-					try {
-						cls.getDeclaredField(key);
-						map.put(key, objMap.get(key));
-					} catch (NoSuchFieldException e) {
-						String s1 = String.valueOf(c).toLowerCase();
-						String after = key.length() > 1 ? s1 + key.substring(1) : s1;
-						cls.getDeclaredField(after);
-						map.put(after, objMap.get(key));
-					}
-				}
-			} catch (NoSuchFieldException e) {
-				map.put(key, objMap.get(key));
-			}
-		}
-
-		return map;
-	}
-
 	/**
 	 * Performs a linear interpolation using a table of fixed points to create an effective piecewise f(x) = y function.
 	 * @param x