2.7 Merge

This commit is contained in:
Melledy
2022-06-17 23:36:16 -07:00
parent 30c7bb9443
commit 2915b14c1f
11 changed files with 54 additions and 42 deletions

View File

@@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;

View File

@@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import emu.grasscutter.utils.Position;
import lombok.AccessLevel;
@@ -7,13 +7,26 @@ import lombok.experimental.FieldDefaults;
import java.util.List;
import com.google.gson.annotations.SerializedName;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public class SceneNpcBornEntry {
@SerializedName(value="id", alternate={"_id", "ID"})
int id;
@SerializedName(value="configId", alternate={"_configId"})
int configId;
@SerializedName(value="pos", alternate={"_pos"})
Position pos;
@SerializedName(value="rot", alternate={"_rot"})
Position rot;
@SerializedName(value="groupId", alternate={"_groupId"})
int groupId;
@SerializedName(value="suiteIdList", alternate={"_suiteIdList"})
List<Integer> suiteIdList;
}