From ae2ab20b5b247ae6af7eaca0fed6ffe7332146e6 Mon Sep 17 00:00:00 2001 From: pfyy <112098515+pfyy@users.noreply.github.com> Date: Sun, 23 Jul 2023 11:17:02 +0800 Subject: [PATCH] add support for 3.8 teapot binout files (scene 2005, 2204) (#2265) --- .../data/binout/HomeworldDefaultSaveData.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java b/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java index bf65544c8..050a2d8a9 100644 --- a/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java +++ b/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java @@ -11,38 +11,38 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(level = AccessLevel.PRIVATE) public class HomeworldDefaultSaveData { - @SerializedName(value = "KFHBFNPDJBE", alternate = "PKACPHDGGEI") + @SerializedName(value = "KFHBFNPDJBE", alternate = {"PKACPHDGGEI", "AKOLOBLHDFK"}) List homeBlockLists; - @SerializedName(value = "IJNPADKGNKE", alternate = "MINCKHBNING") + @SerializedName(value = "IJNPADKGNKE", alternate = {"MINCKHBNING", "MBICDPDEKDM"}) Position bornPos; - @SerializedName("IPIIGEMFLHK") + @SerializedName(value = "IPIIGEMFLHK", alternate = {"EJJIOJKFKCO"}) Position bornRot; - @SerializedName("HHOLBNPIHEM") + @SerializedName(value = "HHOLBNPIHEM", alternate = {"CJAKHCIFHNP"}) Position djinPos; - @SerializedName("KNHCJKHCOAN") + @SerializedName(value = "KNHCJKHCOAN", alternate = {"AMDNOHPGKMI"}) HomeFurniture mainhouse; - @SerializedName("NIHOJFEKFPG") + @SerializedName(value = "NIHOJFEKFPG", alternate = {"BHCPEAOPIDC"}) List doorLists; - @SerializedName("EPGELGEFJFK") + @SerializedName(value = "EPGELGEFJFK", alternate = {"AABEPENIFLN"}) List stairLists; @Data @FieldDefaults(level = AccessLevel.PRIVATE) public static class HomeBlock { - @SerializedName(value = "FGIJCELCGFI", alternate = "PGDPDIDJEEL") + @SerializedName(value = "FGIJCELCGFI", alternate = {"PGDPDIDJEEL", "ANICBLBOBKD"}) int blockId; - @SerializedName("BEAPOFELABD") + @SerializedName(value = "BEAPOFELABD", alternate = {"NCIMIKKFLOH"}) List furnitures; - @SerializedName("MLIODLGDFHJ") + @SerializedName(value = "MLIODLGDFHJ", alternate = {"GJGNLIINBGB"}) List persistentFurnitures; } @@ -50,10 +50,10 @@ public class HomeworldDefaultSaveData { @FieldDefaults(level = AccessLevel.PRIVATE) public static class HomeFurniture { - @SerializedName(value = "ENHNGKJBJAB", alternate = "KMAAJJHPNBA") + @SerializedName(value = "ENHNGKJBJAB", alternate = {"KMAAJJHPNBA", "FFLCGFGGGND"}) int id; - @SerializedName(value = "NGIEEIOLPPO", alternate = "JFKAHNCPDME") + @SerializedName(value = "NGIEEIOLPPO", alternate = {"JFKAHNCPDME", "BPCGGBKIAMG"}) Position pos; // @SerializedName(value = "HEOCEHKEBFM", alternate = "LKCKOOGFDBM") Position rot;