Rename excel classes

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

-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

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

-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;
     }
 }

src/main/java/emu/grasscutter/data/def/TowerFloorData.java → src/main/java/emu/grasscutter/data/excels/TowerFloorData.java

-package emu.grasscutter.data.def;
+package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
@@ -6,16 +6,16 @@ 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;
+    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;
+        return this.floorId;
     }
 
     @Override
@@ -24,50 +24,26 @@ public class TowerFloorData extends GameResource {
     }
 
     public int getFloorId() {
-        return FloorId;
-    }
-
-    public void setFloorId(int floorId) {
-        FloorId = floorId;
+        return floorId;
     }
 
     public int getFloorIndex() {
-        return FloorIndex;
-    }
-
-    public void setFloorIndex(int floorIndex) {
-        FloorIndex = floorIndex;
+        return floorIndex;
     }
 
     public int getLevelId() {
-        return LevelId;
-    }
-
-    public void setLevelId(int levelId) {
-        LevelId = levelId;
+        return levelId;
     }
 
     public int getOverrideMonsterLevel() {
-        return OverrideMonsterLevel;
-    }
-
-    public void setOverrideMonsterLevel(int overrideMonsterLevel) {
-        OverrideMonsterLevel = overrideMonsterLevel;
+        return overrideMonsterLevel;
     }
 
     public int getTeamNum() {
-        return TeamNum;
-    }
-
-    public void setTeamNum(int teamNum) {
-        TeamNum = teamNum;
+        return teamNum;
     }
 
     public int getFloorLevelConfigId() {
-        return FloorLevelConfigId;
-    }
-
-    public void setFloorLevelConfigId(int floorLevelConfigId) {
-        FloorLevelConfigId = floorLevelConfigId;
+        return floorLevelConfigId;
     }
 }

src/main/java/emu/grasscutter/data/def/TowerLevelData.java → src/main/java/emu/grasscutter/data/excels/TowerLevelData.java

-package emu.grasscutter.data.def;
+package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
@@ -6,50 +6,24 @@ 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;
+    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;
+        return this.getLevelId();
     }
 
     public int getLevelId() {
-        return LevelId;
-    }
-
-    public void setLevelId(int levelId) {
-        LevelId = levelId;
+        return levelId;
     }
 
     public int getLevelIndex() {
-        return LevelIndex;
-    }
-
-    public void setLevelIndex(int levelIndex) {
-        LevelIndex = levelIndex;
+        return levelIndex;
     }
 
     public int getDungeonId() {
-        return DungeonId;
-    }
-
-    public void setDungeonId(int dungeonId) {
-        DungeonId = dungeonId;
+        return dungeonId;
     }
 }

src/main/java/emu/grasscutter/data/def/TowerScheduleData.java → src/main/java/emu/grasscutter/data/excels/TowerScheduleData.java

-package emu.grasscutter.data.def;
+package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
@@ -7,64 +7,45 @@ 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;
+    private int scheduleId;
+    private List<Integer> entranceFloorId;
+    private List<ScheduleDetail> schedules;
+    private int monthlyLevelConfigId;
+    
     @Override
     public int getId() {
-        return ScheduleId;
+        return scheduleId;
     }
 
     @Override
     public void onLoad() {
         super.onLoad();
-        this.Schedules = this.Schedules.stream()
+        this.schedules = this.schedules.stream()
                 .filter(item -> item.getFloorList().size() > 0)
                 .toList();
     }
 
     public int getScheduleId() {
-        return ScheduleId;
-    }
-
-    public void setScheduleId(int scheduleId) {
-        ScheduleId = scheduleId;
+        return scheduleId;
     }
 
     public List<Integer> getEntranceFloorId() {
-        return EntranceFloorId;
-    }
-
-    public void setEntranceFloorId(List<Integer> entranceFloorId) {
-        EntranceFloorId = entranceFloorId;
+        return entranceFloorId;
     }
 
     public List<ScheduleDetail> getSchedules() {
-        return Schedules;
-    }
-
-    public void setSchedules(List<ScheduleDetail> schedules) {
-        Schedules = schedules;
+        return schedules;
     }
     
     public int getMonthlyLevelConfigId() {
-        return MonthlyLevelConfigId;
-    }
-
-    public void setMonthlyLevelConfigId(int monthlyLevelConfigId) {
-        MonthlyLevelConfigId = monthlyLevelConfigId;
+        return monthlyLevelConfigId;
     }
 
     public static class ScheduleDetail{
-        private List<Integer> FloorList;
+        private List<Integer> floorList;
 
         public List<Integer> getFloorList() {
-            return FloorList;
-        }
-
-        public void setFloorList(List<Integer> floorList) {
-            FloorList = floorList;
+            return floorList;
         }
     }
 }

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

-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()));
 	}
 }

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

-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;
 	}
 }

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

-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()]);
 	}
 }

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

-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

src/main/java/emu/grasscutter/game/ability/AbilityManager.java

@@ -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;

src/main/java/emu/grasscutter/game/avatar/Avatar.java

@@ -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;

src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java

@@ -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;

src/main/java/emu/grasscutter/game/combine/CombineManger.java

 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());

src/main/java/emu/grasscutter/game/combine/CombineResult.java

 package emu.grasscutter.game.combine;
 
-import emu.grasscutter.data.def.CombineData;
-
 import java.util.List;
 
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.excels.CombineData;
+
 public class CombineResult {
-    private List<CombineData.CombineItemPair> material;
-    private List<CombineData.CombineItemPair> result;
-    private List<CombineData.CombineItemPair> extra;
-    private List<CombineData.CombineItemPair> back;
+    private List<ItemParamData> material;
+    private List<ItemParamData> result;
+    private List<ItemParamData> extra;
+    private List<ItemParamData> back;
 
-    public List<CombineData.CombineItemPair> getMaterial() {
+    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;
     }
 

src/main/java/emu/grasscutter/game/drop/DropManager.java

@@ -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;

src/main/java/emu/grasscutter/game/dungeons/DungeonChallenge.java

 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;

src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java

@@ -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;

src/main/java/emu/grasscutter/game/entity/EntityAvatar.java

@@ -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;

src/main/java/emu/grasscutter/game/entity/EntityGadget.java

@@ -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;

src/main/java/emu/grasscutter/game/entity/EntityItem.java

 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;