Bug fixes (#2314)

* 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

src/main/java/emu/grasscutter/command/commands/GroupCommand.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Command(
         label = "group",
-        aliases = {"g"},
+        aliases = {"gr"},
         usage = {"(refresh) [<groupId>] [<suiteId>]"},
         permission = "player.group",
         permissionTargeted = "player.group.others")

src/main/java/emu/grasscutter/command/commands/SoundCommand.java

@@ -12,7 +12,7 @@ import lombok.val;
 
 @Command(
         label = "sound",
-        aliases = {"s", "audio"},
+        aliases = {"audio"},
         usage = {"[<audioname>] [<x><y><z>]"},
         permission = "player.sound",
         permissionTargeted = "player.sound.others")

src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java

@@ -12,38 +12,38 @@ import lombok.experimental.FieldDefaults;
 public class HomeworldDefaultSaveData {
 
     @SerializedName(
-            value = "KFHBFNPDJBE",
+            value = "homeBlockLists",
-            alternate = {"PKACPHDGGEI", "AKOLOBLHDFK"})
+            alternate = {"PKACPHDGGEI", "AKOLOBLHDFK", "KFHBFNPDJBE"})
     List<HomeBlock> homeBlockLists;
 
     @SerializedName(
-            value = "IJNPADKGNKE",
+            value = "bornPos",
-            alternate = {"MINCKHBNING", "MBICDPDEKDM"})
+            alternate = {"MINCKHBNING", "MBICDPDEKDM", "IJNPADKGNKE"})
     Position bornPos;
 
     @SerializedName(
-            value = "IPIIGEMFLHK",
+            value = "bornRot",
-            alternate = {"EJJIOJKFKCO"})
+            alternate = {"EJJIOJKFKCO", "IPIIGEMFLHK"})
     Position bornRot;
 
     @SerializedName(
-            value = "HHOLBNPIHEM",
+            value = "djinPos",
-            alternate = {"CJAKHCIFHNP"})
+            alternate = {"CJAKHCIFHNP", "HHOLBNPIHEM"})
     Position djinPos;
 
     @SerializedName(
-            value = "KNHCJKHCOAN",
+            value = "mainhouse",
-            alternate = {"AMDNOHPGKMI"})
+            alternate = {"AMDNOHPGKMI", "KNHCJKHCOAN"})
     HomeFurniture mainhouse;
 
     @SerializedName(
-            value = "NIHOJFEKFPG",
+            value = "doorLists",
-            alternate = {"BHCPEAOPIDC"})
+            alternate = {"BHCPEAOPIDC", "NIHOJFEKFPG"})
     List<HomeFurniture> doorLists;
 
     @SerializedName(
-            value = "EPGELGEFJFK",
+            value = "stairLists",
-            alternate = {"AABEPENIFLN"})
+            alternate = {"AABEPENIFLN", "EPGELGEFJFK"})
     List<HomeFurniture> stairLists;
 
     @Data
@@ -51,18 +51,18 @@ public class HomeworldDefaultSaveData {
     public static class HomeBlock {
 
         @SerializedName(
-                value = "FGIJCELCGFI",
+                value = "blockId",
-                alternate = {"PGDPDIDJEEL", "ANICBLBOBKD"})
+                alternate = {"PGDPDIDJEEL", "ANICBLBOBKD", "FGIJCELCGFI"})
         int blockId;
 
         @SerializedName(
-                value = "BEAPOFELABD",
+                value = "furnitures",
-                alternate = {"NCIMIKKFLOH"})
+                alternate = {"NCIMIKKFLOH", "BEAPOFELABD"})
         List<HomeFurniture> furnitures;
 
         @SerializedName(
-                value = "MLIODLGDFHJ",
+                value = "persistentFurnitures",
-                alternate = {"GJGNLIINBGB"})
+                alternate = {"GJGNLIINBGB", "MLIODLGDFHJ"})
         List<HomeFurniture> persistentFurnitures;
     }
 
@@ -71,15 +71,18 @@ public class HomeworldDefaultSaveData {
     public static class HomeFurniture {
 
         @SerializedName(
-                value = "ENHNGKJBJAB",
+                value = "id",
-                alternate = {"KMAAJJHPNBA", "FFLCGFGGGND"})
+                alternate = {"KMAAJJHPNBA", "FFLCGFGGGND", "ENHNGKJBJAB"})
         int id;
 
         @SerializedName(
-                value = "NGIEEIOLPPO",
+                value = "pos",
-                alternate = {"JFKAHNCPDME", "BPCGGBKIAMG"})
+                alternate = {"JFKAHNCPDME", "BPCGGBKIAMG", "NGIEEIOLPPO"})
         Position pos;
-        // @SerializedName(value = "HEOCEHKEBFM", alternate = "LKCKOOGFDBM")
+
+        @SerializedName(
+                value = "rot",
+                alternate = {"LKCKOOGFDBM", "HEOCEHKEBFM"})
         Position rot;
     }
 }

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

@@ -157,6 +157,13 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<Avatar>
             // Add to avatar storage
             this.avatars.put(avatar.getAvatarId(), avatar);
             this.avatarsGuid.put(avatar.getGuid(), avatar);
+
+            // Set main character skill depot data, fixes loading with no element every login
+            if ((avatar.getAvatarId() == 10000007) || (avatar.getAvatarId() == 10000005)) {
+                avatar.setSkillDepot(skillDepot);
+                avatar.setSkillDepotData(skillDepot);
+                avatar.save();
+            }
         }
 
         this.setLoaded(true);

src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java

@@ -41,7 +41,7 @@ public class HomeFurnitureItem {
                 .furnitureId(homeFurniture.getId())
                 .parentFurnitureIndex(1)
                 .spawnPos(homeFurniture.getPos() == null ? new Position() : homeFurniture.getPos())
-                .spawnRot(homeFurniture.getRot() == null ? new Position() : homeFurniture.getRot())
+                .spawnRot(new Position())
                 .build();
     }
 

src/main/java/emu/grasscutter/game/props/ElementType.java

@@ -10,7 +10,10 @@ import java.util.stream.Stream;
 import lombok.Getter;
 
 public enum ElementType implements IntValueEnum {
-    None(0, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
+    None(
+            0,
+            FightProperty.FIGHT_PROP_CUR_WIND_ENERGY,
+            FightProperty.FIGHT_PROP_MAX_WIND_ENERGY),
     Fire(
             1,
             FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY,
@@ -90,7 +93,7 @@ public enum ElementType implements IntValueEnum {
     @Getter private final int configHash;
 
     ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp) {
-        this(value, curEnergyProp, maxEnergyProp, 0, null, 1);
+        this(value, curEnergyProp, maxEnergyProp, 0, null, 0);
     }
 
     ElementType(

src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java

@@ -267,7 +267,7 @@ public final class RegionHandler implements Router {
                                     .setRegionInfo(RegionInfo.newBuilder())
                                     .setStopServer(
                                             StopServerInfo.newBuilder()
-                                                    .setUrl("https://discord.gg/grasscutters")
+                                                    .setUrl("https://discord.gg/T5vZU6UyeG")
                                                     .setStopBeginTime((int) Instant.now().getEpochSecond())
                                                     .setStopEndTime((int) Instant.now().getEpochSecond() + 1)
                                                     .setContentMsg(