Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 02:49:57 +08:00
Code Issues Projects Releases Wiki Activity

Bug fixes (#2314)

Browse Source 
* Match resources names

* Fix loading with no skill

* Stop overriding common command alias

* Fix discord link in version check popup

* Forgot to add rotation fix

* Remove unnecessary set
This commit is contained in:
Thoronium
2023-08-29 10:15:19 -06:00
committed by GitHub
Unverified
parent 01766a0303
commit f54432a89a
7 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
+28 -25
View File
@@ -12,38 +12,38 @@ import lombok.experimental.FieldDefaults;
public class HomeworldDefaultSaveData {
@SerializedName(
value = "KFHBFNPDJBE",
alternate = {"PKACPHDGGEI", "AKOLOBLHDFK"})
value = "homeBlockLists",
alternate = {"PKACPHDGGEI", "AKOLOBLHDFK", "KFHBFNPDJBE"})
List<HomeBlock> homeBlockLists;
@SerializedName(
value = "IJNPADKGNKE",
alternate = {"MINCKHBNING", "MBICDPDEKDM"})
value = "bornPos",
alternate = {"MINCKHBNING", "MBICDPDEKDM", "IJNPADKGNKE"})
Position bornPos;
@SerializedName(
value = "IPIIGEMFLHK",
alternate = {"EJJIOJKFKCO"})
value = "bornRot",
alternate = {"EJJIOJKFKCO", "IPIIGEMFLHK"})
Position bornRot;
@SerializedName(
value = "HHOLBNPIHEM",
alternate = {"CJAKHCIFHNP"})
value = "djinPos",
alternate = {"CJAKHCIFHNP", "HHOLBNPIHEM"})
Position djinPos;
@SerializedName(
value = "KNHCJKHCOAN",
alternate = {"AMDNOHPGKMI"})
value = "mainhouse",
alternate = {"AMDNOHPGKMI", "KNHCJKHCOAN"})
HomeFurniture mainhouse;
@SerializedName(
value = "NIHOJFEKFPG",
alternate = {"BHCPEAOPIDC"})
value = "doorLists",
alternate = {"BHCPEAOPIDC", "NIHOJFEKFPG"})
List<HomeFurniture> doorLists;
@SerializedName(
value = "EPGELGEFJFK",
alternate = {"AABEPENIFLN"})
value = "stairLists",
alternate = {"AABEPENIFLN", "EPGELGEFJFK"})
List<HomeFurniture> stairLists;
@Data
@@ -51,18 +51,18 @@ public class HomeworldDefaultSaveData {
public static class HomeBlock {
@SerializedName(
value = "FGIJCELCGFI",
alternate = {"PGDPDIDJEEL", "ANICBLBOBKD"})
value = "blockId",
alternate = {"PGDPDIDJEEL", "ANICBLBOBKD", "FGIJCELCGFI"})
int blockId;
@SerializedName(
value = "BEAPOFELABD",
alternate = {"NCIMIKKFLOH"})
value = "furnitures",
alternate = {"NCIMIKKFLOH", "BEAPOFELABD"})
List<HomeFurniture> furnitures;
@SerializedName(
value = "MLIODLGDFHJ",
alternate = {"GJGNLIINBGB"})
value = "persistentFurnitures",
alternate = {"GJGNLIINBGB", "MLIODLGDFHJ"})
List<HomeFurniture> persistentFurnitures;
}
@@ -71,15 +71,18 @@ public class HomeworldDefaultSaveData {
public static class HomeFurniture {
@SerializedName(
value = "ENHNGKJBJAB",
alternate = {"KMAAJJHPNBA", "FFLCGFGGGND"})
value = "id",
alternate = {"KMAAJJHPNBA", "FFLCGFGGGND", "ENHNGKJBJAB"})
int id;
@SerializedName(
value = "NGIEEIOLPPO",
alternate = {"JFKAHNCPDME", "BPCGGBKIAMG"})
value = "pos",
alternate = {"JFKAHNCPDME", "BPCGGBKIAMG", "NGIEEIOLPPO"})
Position pos;
// @SerializedName(value = "HEOCEHKEBFM", alternate = "LKCKOOGFDBM")
@SerializedName(
value = "rot",
alternate = {"LKCKOOGFDBM", "HEOCEHKEBFM"})
Position rot;
}
}