diff --git a/src/main/java/emu/grasscutter/data/excels/WorldAreaData.java b/src/main/java/emu/grasscutter/data/excels/WorldAreaData.java index 22233e89..1d79d806 100644 --- a/src/main/java/emu/grasscutter/data/excels/WorldAreaData.java +++ b/src/main/java/emu/grasscutter/data/excels/WorldAreaData.java @@ -1,32 +1,25 @@ package emu.grasscutter.data.excels; +import com.google.gson.annotations.SerializedName; import emu.grasscutter.data.GameResource; import emu.grasscutter.data.ResourceType; import emu.grasscutter.game.props.ElementType; +import lombok.Getter; @ResourceType(name = "WorldAreaConfigData.json") public class WorldAreaData extends GameResource { - private int id; - private int areaID1; - private int areaID2; - private int sceneID; - private ElementType elementType; + private int ID; + @Getter @SerializedName("AreaID1") + private int areaID1; + @Getter @SerializedName("AreaID2") + private int areaID2; + @Getter @SerializedName("SceneID") + private int sceneID; + @Getter + private ElementType elementType; - @Override - public int getId() { - return (this.areaID2 << 16) + this.areaID1; - } - - public int getSceneID() { - return this.sceneID; - } - - public ElementType getElementType() { - return this.elementType; - } - - @Override - public void onLoad() { - - } + @Override + public int getId() { + return (this.areaID2 << 16) + this.areaID1; + } }