feat(5.0): Update protocol definitions

src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedAbilityOuterClass.java

@@ -79,10 +79,6 @@ public final class AbilityAppliedAbilityOuterClass {
     int getInstancedAbilityId();
   }
   /**
-   * <pre>
-   * Obf: NKCDMLBKHGI
-   * </pre>
-   *
    * Protobuf type {@code AbilityAppliedAbility}
    */
   public static final class AbilityAppliedAbility extends
@@ -508,10 +504,6 @@ public final class AbilityAppliedAbilityOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NKCDMLBKHGI
-     * </pre>
-     *
      * Protobuf type {@code AbilityAppliedAbility}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedModifierOuterClass.java

@@ -131,12 +131,14 @@ public final class AbilityAppliedModifierOuterClass {
      * @return The isServerbuffModifier.
      */
     boolean getIsServerbuffModifier();
+
+    /**
+     * <code>bool NCEGKBANOBP = 14;</code>
+     * @return The nCEGKBANOBP.
+     */
+    boolean getNCEGKBANOBP();
   }
   /**
-   * <pre>
-   * Obf: OAHPGFENJJK
-   * </pre>
-   *
    * Protobuf type {@code AbilityAppliedModifier}
    */
   public static final class AbilityAppliedModifier extends
@@ -278,6 +280,11 @@ public final class AbilityAppliedModifierOuterClass {
               isServerbuffModifier_ = input.readBool();
               break;
             }
+            case 112: {
+
+              nCEGKBANOBP_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -513,6 +520,17 @@ public final class AbilityAppliedModifierOuterClass {
       return isServerbuffModifier_;
     }
 
+    public static final int NCEGKBANOBP_FIELD_NUMBER = 14;
+    private boolean nCEGKBANOBP_;
+    /**
+     * <code>bool NCEGKBANOBP = 14;</code>
+     * @return The nCEGKBANOBP.
+     */
+    @java.lang.Override
+    public boolean getNCEGKBANOBP() {
+      return nCEGKBANOBP_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -566,6 +584,9 @@ public final class AbilityAppliedModifierOuterClass {
       if (isServerbuffModifier_ != false) {
         output.writeBool(13, isServerbuffModifier_);
       }
+      if (nCEGKBANOBP_ != false) {
+        output.writeBool(14, nCEGKBANOBP_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -627,6 +648,10 @@ public final class AbilityAppliedModifierOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(13, isServerbuffModifier_);
       }
+      if (nCEGKBANOBP_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, nCEGKBANOBP_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -681,6 +706,8 @@ public final class AbilityAppliedModifierOuterClass {
           != other.getSbuffUid()) return false;
       if (getIsServerbuffModifier()
           != other.getIsServerbuffModifier()) return false;
+      if (getNCEGKBANOBP()
+          != other.getNCEGKBANOBP()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -729,6 +756,9 @@ public final class AbilityAppliedModifierOuterClass {
       hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsServerbuffModifier());
+      hash = (37 * hash) + NCEGKBANOBP_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getNCEGKBANOBP());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -825,10 +855,6 @@ public final class AbilityAppliedModifierOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OAHPGFENJJK
-     * </pre>
-     *
      * Protobuf type {@code AbilityAppliedModifier}
      */
     public static final class Builder extends
@@ -908,6 +934,8 @@ public final class AbilityAppliedModifierOuterClass {
 
         isServerbuffModifier_ = false;
 
+        nCEGKBANOBP_ = false;
+
         return this;
       }
 
@@ -963,6 +991,7 @@ public final class AbilityAppliedModifierOuterClass {
         }
         result.sbuffUid_ = sbuffUid_;
         result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.nCEGKBANOBP_ = nCEGKBANOBP_;
         onBuilt();
         return result;
       }
@@ -1050,6 +1079,9 @@ public final class AbilityAppliedModifierOuterClass {
         if (other.getIsServerbuffModifier() != false) {
           setIsServerbuffModifier(other.getIsServerbuffModifier());
         }
+        if (other.getNCEGKBANOBP() != false) {
+          setNCEGKBANOBP(other.getNCEGKBANOBP());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1833,6 +1865,37 @@ public final class AbilityAppliedModifierOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean nCEGKBANOBP_ ;
+      /**
+       * <code>bool NCEGKBANOBP = 14;</code>
+       * @return The nCEGKBANOBP.
+       */
+      @java.lang.Override
+      public boolean getNCEGKBANOBP() {
+        return nCEGKBANOBP_;
+      }
+      /**
+       * <code>bool NCEGKBANOBP = 14;</code>
+       * @param value The nCEGKBANOBP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNCEGKBANOBP(boolean value) {
+        
+        nCEGKBANOBP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool NCEGKBANOBP = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNCEGKBANOBP() {
+        
+        nCEGKBANOBP_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1902,7 +1965,7 @@ public final class AbilityAppliedModifierOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AbilityAppliedModifier.proto\032\023AbilityS" +
       "tring.proto\032\035AbilityAttachedModifier.pro" +
-      "to\032\030ModifierDurability.proto\"\351\003\n\026Ability" +
+      "to\032\030ModifierDurability.proto\"\376\003\n\026Ability" +
       "AppliedModifier\022\031\n\021modifier_local_id\030\001 \001" +
       "(\005\022 \n\030parent_ability_entity_id\030\002 \001(\r\022+\n\023" +
       "parent_ability_name\030\003 \001(\0132\016.AbilityStrin" +
@@ -1915,7 +1978,8 @@ public final class AbilityAppliedModifierOuterClass {
       "arent_ability\030\n \001(\010\0220\n\023modifier_durabili" +
       "ty\030\013 \001(\0132\023.ModifierDurability\022\021\n\tsbuff_u" +
       "id\030\014 \001(\r\022\036\n\026is_serverbuff_modifier\030\r \001(\010" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\022\023\n\013NCEGKBANOBP\030\016 \001(\010B\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1929,7 +1993,7 @@ public final class AbilityAppliedModifierOuterClass {
     internal_static_AbilityAppliedModifier_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityAppliedModifier_descriptor,
-        new java.lang.String[] { "ModifierLocalId", "ParentAbilityEntityId", "ParentAbilityName", "ParentAbilityOverride", "InstancedAbilityId", "InstancedModifierId", "ExistDuration", "AttachedInstancedModifier", "ApplyEntityId", "IsAttachedParentAbility", "ModifierDurability", "SbuffUid", "IsServerbuffModifier", });
+        new java.lang.String[] { "ModifierLocalId", "ParentAbilityEntityId", "ParentAbilityName", "ParentAbilityOverride", "InstancedAbilityId", "InstancedModifierId", "ExistDuration", "AttachedInstancedModifier", "ApplyEntityId", "IsAttachedParentAbility", "ModifierDurability", "SbuffUid", "IsServerbuffModifier", "NCEGKBANOBP", });
     emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ModifierDurabilityOuterClass.getDescriptor();

src/generated/main/java/emu/grasscutter/net/proto/AbilityAttachedModifierOuterClass.java

@@ -50,7 +50,7 @@ public final class AbilityAttachedModifierOuterClass {
   }
   /**
    * <pre>
-   * Obf: COGFLLLFFFC
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code AbilityAttachedModifier}
@@ -412,7 +412,7 @@ public final class AbilityAttachedModifierOuterClass {
     }
     /**
      * <pre>
-     * Obf: COGFLLLFFFC
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code AbilityAttachedModifier}

src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java

@@ -18,6 +18,12 @@ public final class AbilityChangeNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:AbilityChangeNotify)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>uint32 entity_id = 9;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
     /**
      * <code>.AbilityControlBlock ability_control_block = 12;</code>
      * @return Whether the abilityControlBlock field is set.
@@ -32,19 +38,8 @@ public final class AbilityChangeNotifyOuterClass {
      * <code>.AbilityControlBlock ability_control_block = 12;</code>
      */
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 300
-   * Obf: GEMMGPJKGAF
-   * </pre>
-   *
    * Protobuf type {@code AbilityChangeNotify}
    */
   public static final class AbilityChangeNotify extends
@@ -89,7 +84,7 @@ public final class AbilityChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 72: {
 
               entityId_ = input.readUInt32();
               break;
@@ -139,6 +134,17 @@ public final class AbilityChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.class, emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.Builder.class);
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 9;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 9;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
     /**
@@ -165,17 +171,6 @@ public final class AbilityChangeNotifyOuterClass {
       return getAbilityControlBlock();
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 8;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,7 +186,7 @@ public final class AbilityChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityId_ != 0) {
-        output.writeUInt32(8, entityId_);
+        output.writeUInt32(9, entityId_);
       }
       if (abilityControlBlock_ != null) {
         output.writeMessage(12, getAbilityControlBlock());
@@ -207,7 +202,7 @@ public final class AbilityChangeNotifyOuterClass {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, entityId_);
+          .computeUInt32Size(9, entityId_);
       }
       if (abilityControlBlock_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -228,13 +223,13 @@ public final class AbilityChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other = (emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify) obj;
 
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
       if (hasAbilityControlBlock()) {
         if (!getAbilityControlBlock()
             .equals(other.getAbilityControlBlock())) return false;
       }
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class AbilityChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       if (hasAbilityControlBlock()) {
         hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityControlBlock().hashCode();
       }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class AbilityChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 300
-     * Obf: GEMMGPJKGAF
-     * </pre>
-     *
      * Protobuf type {@code AbilityChangeNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class AbilityChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityId_ = 0;
+
         if (abilityControlBlockBuilder_ == null) {
           abilityControlBlock_ = null;
         } else {
           abilityControlBlock_ = null;
           abilityControlBlockBuilder_ = null;
         }
-        entityId_ = 0;
-
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class AbilityChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify result = new emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify(this);
+        result.entityId_ = entityId_;
         if (abilityControlBlockBuilder_ == null) {
           result.abilityControlBlock_ = abilityControlBlock_;
         } else {
           result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
         }
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class AbilityChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.getDefaultInstance()) return this;
-        if (other.hasAbilityControlBlock()) {
-          mergeAbilityControlBlock(other.getAbilityControlBlock());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.hasAbilityControlBlock()) {
+          mergeAbilityControlBlock(other.getAbilityControlBlock());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,6 +503,37 @@ public final class AbilityChangeNotifyOuterClass {
         return this;
       }
 
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 9;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 9;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 entity_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
@@ -631,37 +652,6 @@ public final class AbilityChangeNotifyOuterClass {
         }
         return abilityControlBlockBuilder_;
       }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 8;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 8;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +720,9 @@ public final class AbilityChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031AbilityChangeNotify.proto\032\031AbilityCont" +
-      "rolBlock.proto\"]\n\023AbilityChangeNotify\0223\n" +
+      "rolBlock.proto\"]\n\023AbilityChangeNotify\022\021\n" +
-      "\025ability_control_block\030\014 \001(\0132\024.AbilityCo" +
+      "\tentity_id\030\t \001(\r\0223\n\025ability_control_bloc" +
-      "ntrolBlock\022\021\n\tentity_id\030\010 \001(\rB\033\n\031emu.gra" +
+      "k\030\014 \001(\0132\024.AbilityControlBlockB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +735,7 @@ public final class AbilityChangeNotifyOuterClass {
     internal_static_AbilityChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityChangeNotify_descriptor,
-        new java.lang.String[] { "AbilityControlBlock", "EntityId", });
+        new java.lang.String[] { "EntityId", "AbilityControlBlock", });
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AbilityControlBlockOuterClass.java

@@ -43,10 +43,6 @@ public final class AbilityControlBlockOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Obf: GGPHMELJCOL
-   * </pre>
-   *
    * Protobuf type {@code AbilityControlBlock}
    */
   public static final class AbilityControlBlock extends
@@ -335,10 +331,6 @@ public final class AbilityControlBlockOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GGPHMELJCOL
-     * </pre>
-     *
      * Protobuf type {@code AbilityControlBlock}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityEmbryoOuterClass.java

@@ -37,10 +37,6 @@ public final class AbilityEmbryoOuterClass {
     int getAbilityOverrideNameHash();
   }
   /**
-   * <pre>
-   * Obf: PLELJEGMEOD
-   * </pre>
-   *
    * Protobuf type {@code AbilityEmbryo}
    */
   public static final class AbilityEmbryo extends
@@ -343,10 +339,6 @@ public final class AbilityEmbryoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PLELJEGMEOD
-     * </pre>
-     *
      * Protobuf type {@code AbilityEmbryo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityGadgetInfoOuterClass.java

@@ -38,7 +38,7 @@ public final class AbilityGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: AHHOEHNNEIN
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code AbilityGadgetInfo}
@@ -344,7 +344,7 @@ public final class AbilityGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: AHHOEHNNEIN
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code AbilityGadgetInfo}

src/generated/main/java/emu/grasscutter/net/proto/AbilityIdentifierOuterClass.java

@@ -19,46 +19,42 @@ public final class AbilityIdentifierOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 local_id = 5;</code>
+     * <code>uint32 NKIEALGKIJD = 2;</code>
-     * @return The localId.
+     * @return The nKIEALGKIJD.
      */
-    int getLocalId();
+    int getNKIEALGKIJD();
 
     /**
-     * <code>uint32 instanced_ability_id = 11;</code>
+     * <code>uint32 instanced_modifier_id = 5;</code>
-     * @return The instancedAbilityId.
-     */
-    int getInstancedAbilityId();
-
-    /**
-     * <code>bool is_serverbuff_modifier = 2;</code>
-     * @return The isServerbuffModifier.
-     */
-    boolean getIsServerbuffModifier();
-
-    /**
-     * <code>uint32 instanced_modifier_id = 12;</code>
      * @return The instancedModifierId.
      */
     int getInstancedModifierId();
 
     /**
-     * <code>uint32 MDEDDJNNKOI = 6;</code>
+     * <code>uint32 instanced_ability_id = 9;</code>
-     * @return The mDEDDJNNKOI.
+     * @return The instancedAbilityId.
      */
-    int getMDEDDJNNKOI();
+    int getInstancedAbilityId();
 
     /**
-     * <code>uint32 BKJOIGAMEAM = 10;</code>
+     * <code>uint32 AJAEPNGNILD = 13;</code>
-     * @return The bKJOIGAMEAM.
+     * @return The aJAEPNGNILD.
      */
-    int getBKJOIGAMEAM();
+    int getAJAEPNGNILD();
+
+    /**
+     * <code>bool is_serverbuff_modifier = 14;</code>
+     * @return The isServerbuffModifier.
+     */
+    boolean getIsServerbuffModifier();
+
+    /**
+     * <code>int32 local_id = 15;</code>
+     * @return The localId.
+     */
+    int getLocalId();
   }
   /**
-   * <pre>
-   * Obf: JJPHDINFFJI
-   * </pre>
-   *
    * Protobuf type {@code AbilityIdentifier}
    */
   public static final class AbilityIdentifier extends
@@ -105,32 +101,32 @@ public final class AbilityIdentifierOuterClass {
               break;
             case 16: {
 
-              isServerbuffModifier_ = input.readBool();
+              nKIEALGKIJD_ = input.readUInt32();
               break;
             }
             case 40: {
 
-              localId_ = input.readInt32();
+              instancedModifierId_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 72: {
-
-              mDEDDJNNKOI_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              bKJOIGAMEAM_ = input.readUInt32();
-              break;
-            }
-            case 88: {
 
               instancedAbilityId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 104: {
 
-              instancedModifierId_ = input.readUInt32();
+              aJAEPNGNILD_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              isServerbuffModifier_ = input.readBool();
+              break;
+            }
+            case 120: {
+
+              localId_ = input.readInt32();
               break;
             }
             default: {
@@ -165,43 +161,21 @@ public final class AbilityIdentifierOuterClass {
               emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.class, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder.class);
     }
 
-    public static final int LOCAL_ID_FIELD_NUMBER = 5;
+    public static final int NKIEALGKIJD_FIELD_NUMBER = 2;
-    private int localId_;
+    private int nKIEALGKIJD_;
     /**
-     * <code>int32 local_id = 5;</code>
+     * <code>uint32 NKIEALGKIJD = 2;</code>
-     * @return The localId.
+     * @return The nKIEALGKIJD.
      */
     @java.lang.Override
-    public int getLocalId() {
+    public int getNKIEALGKIJD() {
-      return localId_;
+      return nKIEALGKIJD_;
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 11;
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 5;
-    private int instancedAbilityId_;
-    /**
-     * <code>uint32 instanced_ability_id = 11;</code>
-     * @return The instancedAbilityId.
-     */
-    @java.lang.Override
-    public int getInstancedAbilityId() {
-      return instancedAbilityId_;
-    }
-
-    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 2;
-    private boolean isServerbuffModifier_;
-    /**
-     * <code>bool is_serverbuff_modifier = 2;</code>
-     * @return The isServerbuffModifier.
-     */
-    @java.lang.Override
-    public boolean getIsServerbuffModifier() {
-      return isServerbuffModifier_;
-    }
-
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 12;
     private int instancedModifierId_;
     /**
-     * <code>uint32 instanced_modifier_id = 12;</code>
+     * <code>uint32 instanced_modifier_id = 5;</code>
      * @return The instancedModifierId.
      */
     @java.lang.Override
@@ -209,26 +183,48 @@ public final class AbilityIdentifierOuterClass {
       return instancedModifierId_;
     }
 
-    public static final int MDEDDJNNKOI_FIELD_NUMBER = 6;
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 9;
-    private int mDEDDJNNKOI_;
+    private int instancedAbilityId_;
     /**
-     * <code>uint32 MDEDDJNNKOI = 6;</code>
+     * <code>uint32 instanced_ability_id = 9;</code>
-     * @return The mDEDDJNNKOI.
+     * @return The instancedAbilityId.
      */
     @java.lang.Override
-    public int getMDEDDJNNKOI() {
+    public int getInstancedAbilityId() {
-      return mDEDDJNNKOI_;
+      return instancedAbilityId_;
     }
 
-    public static final int BKJOIGAMEAM_FIELD_NUMBER = 10;
+    public static final int AJAEPNGNILD_FIELD_NUMBER = 13;
-    private int bKJOIGAMEAM_;
+    private int aJAEPNGNILD_;
     /**
-     * <code>uint32 BKJOIGAMEAM = 10;</code>
+     * <code>uint32 AJAEPNGNILD = 13;</code>
-     * @return The bKJOIGAMEAM.
+     * @return The aJAEPNGNILD.
      */
     @java.lang.Override
-    public int getBKJOIGAMEAM() {
+    public int getAJAEPNGNILD() {
-      return bKJOIGAMEAM_;
+      return aJAEPNGNILD_;
+    }
+
+    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 14;
+    private boolean isServerbuffModifier_;
+    /**
+     * <code>bool is_serverbuff_modifier = 14;</code>
+     * @return The isServerbuffModifier.
+     */
+    @java.lang.Override
+    public boolean getIsServerbuffModifier() {
+      return isServerbuffModifier_;
+    }
+
+    public static final int LOCAL_ID_FIELD_NUMBER = 15;
+    private int localId_;
+    /**
+     * <code>int32 local_id = 15;</code>
+     * @return The localId.
+     */
+    @java.lang.Override
+    public int getLocalId() {
+      return localId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -245,23 +241,23 @@ public final class AbilityIdentifierOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isServerbuffModifier_ != false) {
+      if (nKIEALGKIJD_ != 0) {
-        output.writeBool(2, isServerbuffModifier_);
+        output.writeUInt32(2, nKIEALGKIJD_);
-      }
-      if (localId_ != 0) {
-        output.writeInt32(5, localId_);
-      }
-      if (mDEDDJNNKOI_ != 0) {
-        output.writeUInt32(6, mDEDDJNNKOI_);
-      }
-      if (bKJOIGAMEAM_ != 0) {
-        output.writeUInt32(10, bKJOIGAMEAM_);
-      }
-      if (instancedAbilityId_ != 0) {
-        output.writeUInt32(11, instancedAbilityId_);
       }
       if (instancedModifierId_ != 0) {
-        output.writeUInt32(12, instancedModifierId_);
+        output.writeUInt32(5, instancedModifierId_);
+      }
+      if (instancedAbilityId_ != 0) {
+        output.writeUInt32(9, instancedAbilityId_);
+      }
+      if (aJAEPNGNILD_ != 0) {
+        output.writeUInt32(13, aJAEPNGNILD_);
+      }
+      if (isServerbuffModifier_ != false) {
+        output.writeBool(14, isServerbuffModifier_);
+      }
+      if (localId_ != 0) {
+        output.writeInt32(15, localId_);
       }
       unknownFields.writeTo(output);
     }
@@ -272,29 +268,29 @@ public final class AbilityIdentifierOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isServerbuffModifier_ != false) {
+      if (nKIEALGKIJD_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isServerbuffModifier_);
+          .computeUInt32Size(2, nKIEALGKIJD_);
-      }
-      if (localId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, localId_);
-      }
-      if (mDEDDJNNKOI_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, mDEDDJNNKOI_);
-      }
-      if (bKJOIGAMEAM_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, bKJOIGAMEAM_);
-      }
-      if (instancedAbilityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, instancedAbilityId_);
       }
       if (instancedModifierId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, instancedModifierId_);
+          .computeUInt32Size(5, instancedModifierId_);
+      }
+      if (instancedAbilityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, instancedAbilityId_);
+      }
+      if (aJAEPNGNILD_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, aJAEPNGNILD_);
+      }
+      if (isServerbuffModifier_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, isServerbuffModifier_);
+      }
+      if (localId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, localId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,18 +307,18 @@ public final class AbilityIdentifierOuterClass {
       }
       emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other = (emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier) obj;
 
-      if (getLocalId()
+      if (getNKIEALGKIJD()
-          != other.getLocalId()) return false;
+          != other.getNKIEALGKIJD()) return false;
-      if (getInstancedAbilityId()
-          != other.getInstancedAbilityId()) return false;
-      if (getIsServerbuffModifier()
-          != other.getIsServerbuffModifier()) return false;
       if (getInstancedModifierId()
           != other.getInstancedModifierId()) return false;
-      if (getMDEDDJNNKOI()
+      if (getInstancedAbilityId()
-          != other.getMDEDDJNNKOI()) return false;
+          != other.getInstancedAbilityId()) return false;
-      if (getBKJOIGAMEAM()
+      if (getAJAEPNGNILD()
-          != other.getBKJOIGAMEAM()) return false;
+          != other.getAJAEPNGNILD()) return false;
+      if (getIsServerbuffModifier()
+          != other.getIsServerbuffModifier()) return false;
+      if (getLocalId()
+          != other.getLocalId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -334,19 +330,19 @@ public final class AbilityIdentifierOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
+      hash = (37 * hash) + NKIEALGKIJD_FIELD_NUMBER;
-      hash = (53 * hash) + getLocalId();
+      hash = (53 * hash) + getNKIEALGKIJD();
+      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedModifierId();
       hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getInstancedAbilityId();
+      hash = (37 * hash) + AJAEPNGNILD_FIELD_NUMBER;
+      hash = (53 * hash) + getAJAEPNGNILD();
       hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsServerbuffModifier());
-      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
+      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedModifierId();
+      hash = (53 * hash) + getLocalId();
-      hash = (37 * hash) + MDEDDJNNKOI_FIELD_NUMBER;
-      hash = (53 * hash) + getMDEDDJNNKOI();
-      hash = (37 * hash) + BKJOIGAMEAM_FIELD_NUMBER;
-      hash = (53 * hash) + getBKJOIGAMEAM();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -443,10 +439,6 @@ public final class AbilityIdentifierOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JJPHDINFFJI
-     * </pre>
-     *
      * Protobuf type {@code AbilityIdentifier}
      */
     public static final class Builder extends
@@ -484,17 +476,17 @@ public final class AbilityIdentifierOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        localId_ = 0;
+        nKIEALGKIJD_ = 0;
-
-        instancedAbilityId_ = 0;
-
-        isServerbuffModifier_ = false;
 
         instancedModifierId_ = 0;
 
-        mDEDDJNNKOI_ = 0;
+        instancedAbilityId_ = 0;
 
-        bKJOIGAMEAM_ = 0;
+        aJAEPNGNILD_ = 0;
+
+        isServerbuffModifier_ = false;
+
+        localId_ = 0;
 
         return this;
       }
@@ -522,12 +514,12 @@ public final class AbilityIdentifierOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier buildPartial() {
         emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier result = new emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier(this);
-        result.localId_ = localId_;
+        result.nKIEALGKIJD_ = nKIEALGKIJD_;
-        result.instancedAbilityId_ = instancedAbilityId_;
-        result.isServerbuffModifier_ = isServerbuffModifier_;
         result.instancedModifierId_ = instancedModifierId_;
-        result.mDEDDJNNKOI_ = mDEDDJNNKOI_;
+        result.instancedAbilityId_ = instancedAbilityId_;
-        result.bKJOIGAMEAM_ = bKJOIGAMEAM_;
+        result.aJAEPNGNILD_ = aJAEPNGNILD_;
+        result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.localId_ = localId_;
         onBuilt();
         return result;
       }
@@ -576,23 +568,23 @@ public final class AbilityIdentifierOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other) {
         if (other == emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.getDefaultInstance()) return this;
-        if (other.getLocalId() != 0) {
+        if (other.getNKIEALGKIJD() != 0) {
-          setLocalId(other.getLocalId());
+          setNKIEALGKIJD(other.getNKIEALGKIJD());
-        }
-        if (other.getInstancedAbilityId() != 0) {
-          setInstancedAbilityId(other.getInstancedAbilityId());
-        }
-        if (other.getIsServerbuffModifier() != false) {
-          setIsServerbuffModifier(other.getIsServerbuffModifier());
         }
         if (other.getInstancedModifierId() != 0) {
           setInstancedModifierId(other.getInstancedModifierId());
         }
-        if (other.getMDEDDJNNKOI() != 0) {
+        if (other.getInstancedAbilityId() != 0) {
-          setMDEDDJNNKOI(other.getMDEDDJNNKOI());
+          setInstancedAbilityId(other.getInstancedAbilityId());
         }
-        if (other.getBKJOIGAMEAM() != 0) {
+        if (other.getAJAEPNGNILD() != 0) {
-          setBKJOIGAMEAM(other.getBKJOIGAMEAM());
+          setAJAEPNGNILD(other.getAJAEPNGNILD());
+        }
+        if (other.getIsServerbuffModifier() != false) {
+          setIsServerbuffModifier(other.getIsServerbuffModifier());
+        }
+        if (other.getLocalId() != 0) {
+          setLocalId(other.getLocalId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -623,102 +615,40 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
 
-      private int localId_ ;
+      private int nKIEALGKIJD_ ;
       /**
-       * <code>int32 local_id = 5;</code>
+       * <code>uint32 NKIEALGKIJD = 2;</code>
-       * @return The localId.
+       * @return The nKIEALGKIJD.
        */
       @java.lang.Override
-      public int getLocalId() {
+      public int getNKIEALGKIJD() {
-        return localId_;
+        return nKIEALGKIJD_;
       }
       /**
-       * <code>int32 local_id = 5;</code>
+       * <code>uint32 NKIEALGKIJD = 2;</code>
-       * @param value The localId to set.
+       * @param value The nKIEALGKIJD to set.
        * @return This builder for chaining.
        */
-      public Builder setLocalId(int value) {
+      public Builder setNKIEALGKIJD(int value) {
         
-        localId_ = value;
+        nKIEALGKIJD_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 local_id = 5;</code>
+       * <code>uint32 NKIEALGKIJD = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLocalId() {
+      public Builder clearNKIEALGKIJD() {
         
-        localId_ = 0;
+        nKIEALGKIJD_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int instancedAbilityId_ ;
-      /**
-       * <code>uint32 instanced_ability_id = 11;</code>
-       * @return The instancedAbilityId.
-       */
-      @java.lang.Override
-      public int getInstancedAbilityId() {
-        return instancedAbilityId_;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 11;</code>
-       * @param value The instancedAbilityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedAbilityId(int value) {
-        
-        instancedAbilityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedAbilityId() {
-        
-        instancedAbilityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isServerbuffModifier_ ;
-      /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
-       * @return The isServerbuffModifier.
-       */
-      @java.lang.Override
-      public boolean getIsServerbuffModifier() {
-        return isServerbuffModifier_;
-      }
-      /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
-       * @param value The isServerbuffModifier to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsServerbuffModifier(boolean value) {
-        
-        isServerbuffModifier_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsServerbuffModifier() {
-        
-        isServerbuffModifier_ = false;
         onChanged();
         return this;
       }
 
       private int instancedModifierId_ ;
       /**
-       * <code>uint32 instanced_modifier_id = 12;</code>
+       * <code>uint32 instanced_modifier_id = 5;</code>
        * @return The instancedModifierId.
        */
       @java.lang.Override
@@ -726,7 +656,7 @@ public final class AbilityIdentifierOuterClass {
         return instancedModifierId_;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 12;</code>
+       * <code>uint32 instanced_modifier_id = 5;</code>
        * @param value The instancedModifierId to set.
        * @return This builder for chaining.
        */
@@ -737,7 +667,7 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 12;</code>
+       * <code>uint32 instanced_modifier_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearInstancedModifierId() {
@@ -747,64 +677,126 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
 
-      private int mDEDDJNNKOI_ ;
+      private int instancedAbilityId_ ;
       /**
-       * <code>uint32 MDEDDJNNKOI = 6;</code>
+       * <code>uint32 instanced_ability_id = 9;</code>
-       * @return The mDEDDJNNKOI.
+       * @return The instancedAbilityId.
        */
       @java.lang.Override
-      public int getMDEDDJNNKOI() {
+      public int getInstancedAbilityId() {
-        return mDEDDJNNKOI_;
+        return instancedAbilityId_;
       }
       /**
-       * <code>uint32 MDEDDJNNKOI = 6;</code>
+       * <code>uint32 instanced_ability_id = 9;</code>
-       * @param value The mDEDDJNNKOI to set.
+       * @param value The instancedAbilityId to set.
        * @return This builder for chaining.
        */
-      public Builder setMDEDDJNNKOI(int value) {
+      public Builder setInstancedAbilityId(int value) {
         
-        mDEDDJNNKOI_ = value;
+        instancedAbilityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 MDEDDJNNKOI = 6;</code>
+       * <code>uint32 instanced_ability_id = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMDEDDJNNKOI() {
+      public Builder clearInstancedAbilityId() {
         
-        mDEDDJNNKOI_ = 0;
+        instancedAbilityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int bKJOIGAMEAM_ ;
+      private int aJAEPNGNILD_ ;
       /**
-       * <code>uint32 BKJOIGAMEAM = 10;</code>
+       * <code>uint32 AJAEPNGNILD = 13;</code>
-       * @return The bKJOIGAMEAM.
+       * @return The aJAEPNGNILD.
        */
       @java.lang.Override
-      public int getBKJOIGAMEAM() {
+      public int getAJAEPNGNILD() {
-        return bKJOIGAMEAM_;
+        return aJAEPNGNILD_;
       }
       /**
-       * <code>uint32 BKJOIGAMEAM = 10;</code>
+       * <code>uint32 AJAEPNGNILD = 13;</code>
-       * @param value The bKJOIGAMEAM to set.
+       * @param value The aJAEPNGNILD to set.
        * @return This builder for chaining.
        */
-      public Builder setBKJOIGAMEAM(int value) {
+      public Builder setAJAEPNGNILD(int value) {
         
-        bKJOIGAMEAM_ = value;
+        aJAEPNGNILD_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 BKJOIGAMEAM = 10;</code>
+       * <code>uint32 AJAEPNGNILD = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBKJOIGAMEAM() {
+      public Builder clearAJAEPNGNILD() {
         
-        bKJOIGAMEAM_ = 0;
+        aJAEPNGNILD_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isServerbuffModifier_ ;
+      /**
+       * <code>bool is_serverbuff_modifier = 14;</code>
+       * @return The isServerbuffModifier.
+       */
+      @java.lang.Override
+      public boolean getIsServerbuffModifier() {
+        return isServerbuffModifier_;
+      }
+      /**
+       * <code>bool is_serverbuff_modifier = 14;</code>
+       * @param value The isServerbuffModifier to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsServerbuffModifier(boolean value) {
+        
+        isServerbuffModifier_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_serverbuff_modifier = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsServerbuffModifier() {
+        
+        isServerbuffModifier_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int localId_ ;
+      /**
+       * <code>int32 local_id = 15;</code>
+       * @return The localId.
+       */
+      @java.lang.Override
+      public int getLocalId() {
+        return localId_;
+      }
+      /**
+       * <code>int32 local_id = 15;</code>
+       * @param value The localId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLocalId(int value) {
+        
+        localId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 local_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLocalId() {
+        
+        localId_ = 0;
         onChanged();
         return this;
       }
@@ -876,10 +868,10 @@ public final class AbilityIdentifierOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027AbilityIdentifier.proto\"\254\001\n\021AbilityIde" +
-      "ntifier\022\020\n\010local_id\030\005 \001(\005\022\034\n\024instanced_a" +
+      "ntifier\022\023\n\013NKIEALGKIJD\030\002 \001(\r\022\035\n\025instance" +
-      "bility_id\030\013 \001(\r\022\036\n\026is_serverbuff_modifie" +
+      "d_modifier_id\030\005 \001(\r\022\034\n\024instanced_ability" +
-      "r\030\002 \001(\010\022\035\n\025instanced_modifier_id\030\014 \001(\r\022\023" +
+      "_id\030\t \001(\r\022\023\n\013AJAEPNGNILD\030\r \001(\r\022\036\n\026is_ser" +
-      "\n\013MDEDDJNNKOI\030\006 \001(\r\022\023\n\013BKJOIGAMEAM\030\n \001(\r" +
+      "verbuff_modifier\030\016 \001(\010\022\020\n\010local_id\030\017 \001(\005" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -891,7 +883,7 @@ public final class AbilityIdentifierOuterClass {
     internal_static_AbilityIdentifier_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityIdentifier_descriptor,
-        new java.lang.String[] { "LocalId", "InstancedAbilityId", "IsServerbuffModifier", "InstancedModifierId", "MDEDDJNNKOI", "BKJOIGAMEAM", });
+        new java.lang.String[] { "NKIEALGKIJD", "InstancedModifierId", "InstancedAbilityId", "AJAEPNGNILD", "IsServerbuffModifier", "LocalId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java

@@ -19,42 +19,41 @@ public final class AbilityInvocationFailNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
+     * <code>string reason = 2;</code>
-     * @return Whether the invoke field is set.
-     */
-    boolean hasInvoke();
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     * @return The invoke.
-     */
-    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke();
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     */
-    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>string reason = 1;</code>
      * @return The reason.
      */
     java.lang.String getReason();
     /**
-     * <code>string reason = 1;</code>
+     * <code>string reason = 2;</code>
      * @return The bytes for reason.
      */
     com.google.protobuf.ByteString
         getReasonBytes();
+
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return Whether the invoke field is set.
+     */
+    boolean hasInvoke();
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return The invoke.
+     */
+    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke();
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     */
+    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder();
+
+    /**
+     * <code>uint32 entity_id = 15;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 26730
+   * CmdId: 9225
-   * Obf: PKAPLLHEELP
    * </pre>
    *
    * Protobuf type {@code AbilityInvocationFailNotify}
@@ -102,13 +101,13 @@ public final class AbilityInvocationFailNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
               reason_ = s;
               break;
             }
-            case 50: {
+            case 74: {
               emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder subBuilder = null;
               if (invoke_ != null) {
                 subBuilder = invoke_.toBuilder();
@@ -121,7 +120,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
               break;
             }
-            case 72: {
+            case 120: {
 
               entityId_ = input.readUInt32();
               break;
@@ -158,47 +157,10 @@ public final class AbilityInvocationFailNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify.class, emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify.Builder.class);
     }
 
-    public static final int INVOKE_FIELD_NUMBER = 6;
+    public static final int REASON_FIELD_NUMBER = 2;
-    private emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry invoke_;
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     * @return Whether the invoke field is set.
-     */
-    @java.lang.Override
-    public boolean hasInvoke() {
-      return invoke_ != null;
-    }
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     * @return The invoke.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke() {
-      return invoke_ == null ? emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance() : invoke_;
-    }
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder() {
-      return getInvoke();
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 9;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int REASON_FIELD_NUMBER = 1;
     private volatile java.lang.Object reason_;
     /**
-     * <code>string reason = 1;</code>
+     * <code>string reason = 2;</code>
      * @return The reason.
      */
     @java.lang.Override
@@ -215,7 +177,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
     }
     /**
-     * <code>string reason = 1;</code>
+     * <code>string reason = 2;</code>
      * @return The bytes for reason.
      */
     @java.lang.Override
@@ -233,6 +195,43 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
     }
 
+    public static final int INVOKE_FIELD_NUMBER = 9;
+    private emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry invoke_;
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return Whether the invoke field is set.
+     */
+    @java.lang.Override
+    public boolean hasInvoke() {
+      return invoke_ != null;
+    }
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return The invoke.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke() {
+      return invoke_ == null ? emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance() : invoke_;
+    }
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder() {
+      return getInvoke();
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 15;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 15;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -248,13 +247,13 @@ public final class AbilityInvocationFailNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, reason_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, reason_);
       }
       if (invoke_ != null) {
-        output.writeMessage(6, getInvoke());
+        output.writeMessage(9, getInvoke());
       }
       if (entityId_ != 0) {
-        output.writeUInt32(9, entityId_);
+        output.writeUInt32(15, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -266,15 +265,15 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, reason_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, reason_);
       }
       if (invoke_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getInvoke());
+          .computeMessageSize(9, getInvoke());
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, entityId_);
+          .computeUInt32Size(15, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -291,6 +290,8 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify other = (emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify) obj;
 
+      if (!getReason()
+          .equals(other.getReason())) return false;
       if (hasInvoke() != other.hasInvoke()) return false;
       if (hasInvoke()) {
         if (!getInvoke()
@@ -298,8 +299,6 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (!getReason()
-          .equals(other.getReason())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -311,14 +310,14 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + getReason().hashCode();
       if (hasInvoke()) {
         hash = (37 * hash) + INVOKE_FIELD_NUMBER;
         hash = (53 * hash) + getInvoke().hashCode();
       }
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + getReason().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -416,8 +415,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 26730
+     * CmdId: 9225
-     * Obf: PKAPLLHEELP
      * </pre>
      *
      * Protobuf type {@code AbilityInvocationFailNotify}
@@ -457,6 +455,8 @@ public final class AbilityInvocationFailNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        reason_ = "";
+
         if (invokeBuilder_ == null) {
           invoke_ = null;
         } else {
@@ -465,8 +465,6 @@ public final class AbilityInvocationFailNotifyOuterClass {
         }
         entityId_ = 0;
 
-        reason_ = "";
-
         return this;
       }
 
@@ -493,13 +491,13 @@ public final class AbilityInvocationFailNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify buildPartial() {
         emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify result = new emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify(this);
+        result.reason_ = reason_;
         if (invokeBuilder_ == null) {
           result.invoke_ = invoke_;
         } else {
           result.invoke_ = invokeBuilder_.build();
         }
         result.entityId_ = entityId_;
-        result.reason_ = reason_;
         onBuilt();
         return result;
       }
@@ -548,16 +546,16 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify other) {
         if (other == emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify.getDefaultInstance()) return this;
+        if (!other.getReason().isEmpty()) {
+          reason_ = other.reason_;
+          onChanged();
+        }
         if (other.hasInvoke()) {
           mergeInvoke(other.getInvoke());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (!other.getReason().isEmpty()) {
-          reason_ = other.reason_;
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -587,18 +585,94 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
 
+      private java.lang.Object reason_ = "";
+      /**
+       * <code>string reason = 2;</code>
+       * @return The reason.
+       */
+      public java.lang.String getReason() {
+        java.lang.Object ref = reason_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          reason_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @return The bytes for reason.
+       */
+      public com.google.protobuf.ByteString
+          getReasonBytes() {
+        java.lang.Object ref = reason_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          reason_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @param value The reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReason(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        reason_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReason() {
+        
+        reason_ = getDefaultInstance().getReason();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @param value The bytes for reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReasonBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        reason_ = value;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry invoke_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokeBuilder_;
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        * @return Whether the invoke field is set.
        */
       public boolean hasInvoke() {
         return invokeBuilder_ != null || invoke_ != null;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        * @return The invoke.
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke() {
@@ -609,7 +683,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         }
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder setInvoke(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokeBuilder_ == null) {
@@ -625,7 +699,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder setInvoke(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -639,7 +713,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder mergeInvoke(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokeBuilder_ == null) {
@@ -657,7 +731,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder clearInvoke() {
         if (invokeBuilder_ == null) {
@@ -671,7 +745,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokeBuilder() {
         
@@ -679,7 +753,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return getInvokeFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder() {
         if (invokeBuilder_ != null) {
@@ -690,7 +764,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         }
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -708,7 +782,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 9;</code>
+       * <code>uint32 entity_id = 15;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -716,7 +790,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 9;</code>
+       * <code>uint32 entity_id = 15;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -727,7 +801,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 9;</code>
+       * <code>uint32 entity_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -736,82 +810,6 @@ public final class AbilityInvocationFailNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private java.lang.Object reason_ = "";
-      /**
-       * <code>string reason = 1;</code>
-       * @return The reason.
-       */
-      public java.lang.String getReason() {
-        java.lang.Object ref = reason_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          reason_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @return The bytes for reason.
-       */
-      public com.google.protobuf.ByteString
-          getReasonBytes() {
-        java.lang.Object ref = reason_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          reason_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @param value The reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReason(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        reason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReason() {
-        
-        reason_ = getDefaultInstance().getReason();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @param value The bytes for reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReasonBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        reason_ = value;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -881,9 +879,9 @@ public final class AbilityInvocationFailNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!AbilityInvocationFailNotify.proto\032\030Abi" +
       "lityInvokeEntry.proto\"e\n\033AbilityInvocati" +
-      "onFailNotify\022#\n\006invoke\030\006 \001(\0132\023.AbilityIn" +
+      "onFailNotify\022\016\n\006reason\030\002 \001(\t\022#\n\006invoke\030\t" +
-      "vokeEntry\022\021\n\tentity_id\030\t \001(\r\022\016\n\006reason\030\001" +
+      " \001(\0132\023.AbilityInvokeEntry\022\021\n\tentity_id\030\017" +
-      " \001(\tB\033\n\031emu.grasscutter.net.protob\006proto" +
+      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -896,7 +894,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
     internal_static_AbilityInvocationFailNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvocationFailNotify_descriptor,
-        new java.lang.String[] { "Invoke", "EntityId", "Reason", });
+        new java.lang.String[] { "Reason", "Invoke", "EntityId", });
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationsNotifyOuterClass.java

@@ -19,35 +19,30 @@ public final class AbilityInvocationsNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> 
         getInvokesList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     int getInvokesCount();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
         getInvokesOrBuilderList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 26313
-   * Obf: IFAKFDEJFLI
-   * </pre>
-   *
    * Protobuf type {@code AbilityInvocationsNotify}
    */
   public static final class AbilityInvocationsNotify extends
@@ -94,7 +89,7 @@ public final class AbilityInvocationsNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class AbilityInvocationsNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify.class, emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify.Builder.class);
     }
 
-    public static final int INVOKES_FIELD_NUMBER = 15;
+    public static final int INVOKES_FIELD_NUMBER = 13;
     private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -156,21 +151,21 @@ public final class AbilityInvocationsNotifyOuterClass {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public int getInvokesCount() {
       return invokes_.size();
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
       return invokes_.get(index);
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -193,7 +188,7 @@ public final class AbilityInvocationsNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < invokes_.size(); i++) {
-        output.writeMessage(15, invokes_.get(i));
+        output.writeMessage(13, invokes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class AbilityInvocationsNotifyOuterClass {
       size = 0;
       for (int i = 0; i < invokes_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, invokes_.get(i));
+          .computeMessageSize(13, invokes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class AbilityInvocationsNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26313
-     * Obf: IFAKFDEJFLI
-     * </pre>
-     *
      * Protobuf type {@code AbilityInvocationsNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class AbilityInvocationsNotifyOuterClass {
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
 
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
         if (invokesBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public int getInvokesCount() {
         if (invokesBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -585,7 +575,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokesBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -632,7 +622,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addAllInvokes(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -675,7 +665,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder clearInvokes() {
         if (invokesBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder removeInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
           int index) {
         return getInvokesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
            getInvokesOrBuilderList() {
@@ -729,14 +719,14 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
         return getInvokesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class AbilityInvocationsNotifyOuterClass {
             index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder> 
            getInvokesBuilderList() {
@@ -833,7 +823,7 @@ public final class AbilityInvocationsNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036AbilityInvocationsNotify.proto\032\030Abilit" +
       "yInvokeEntry.proto\"@\n\030AbilityInvocations" +
-      "Notify\022$\n\007invokes\030\017 \003(\0132\023.AbilityInvokeE" +
+      "Notify\022$\n\007invokes\030\r \003(\0132\023.AbilityInvokeE" +
       "ntryB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java

@@ -15,10 +15,6 @@ public final class AbilityInvokeArgumentOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: LBKBGBCCGMA
-   * </pre>
-   *
    * Protobuf enum {@code AbilityInvokeArgument}
    */
   public enum AbilityInvokeArgument
@@ -311,6 +307,38 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;</code>
      */
     ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE(129),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME(130),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY(131),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER(133),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW = 134;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW(134),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON = 135;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON(135),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL(136),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR = 137;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR(137),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA = 141;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA(141),
     UNRECOGNIZED(-1),
     ;
 
@@ -602,6 +630,38 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;</code>
      */
     public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE_VALUE = 129;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME_VALUE = 130;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY_VALUE = 131;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER_VALUE = 133;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW = 134;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW_VALUE = 134;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON = 135;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON_VALUE = 135;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL_VALUE = 136;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR = 137;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR_VALUE = 137;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA = 141;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA_VALUE = 141;
 
 
     public final int getNumber() {
@@ -700,6 +760,14 @@ public final class AbilityInvokeArgumentOuterClass {
         case 127: return ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET;
         case 128: return ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA;
         case 129: return ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE;
+        case 130: return ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME;
+        case 131: return ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY;
+        case 133: return ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER;
+        case 134: return ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW;
+        case 135: return ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON;
+        case 136: return ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL;
+        case 137: return ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR;
+        case 141: return ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA;
         default: return null;
       }
     }
@@ -765,7 +833,7 @@ public final class AbilityInvokeArgumentOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033AbilityInvokeArgument.proto*\245\036\n\025Abilit" +
+      "\n\033AbilityInvokeArgument.proto*\360!\n\025Abilit" +
       "yInvokeArgument\022 \n\034ABILITY_INVOKE_ARGUME" +
       "NT_NONE\020\000\0220\n,ABILITY_INVOKE_ARGUMENT_MET" +
       "A_MODIFIER_CHANGE\020\001\022@\n<ABILITY_INVOKE_AR" +
@@ -862,8 +930,20 @@ public final class AbilityInvokeArgumentOuterClass {
       "E_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET\020\177" +
       "\0229\n4ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATI" +
       "ON_FOLLOW_CAMERA\020\200\001\0220\n+ABILITY_INVOKE_AR" +
-      "GUMENT_MIXIN_BUOYANT_FORCE\020\201\001B\033\n\031emu.gra" +
+      "GUMENT_MIXIN_BUOYANT_FORCE\020\201\001\0225\n0ABILITY" +
-      "sscutter.net.protob\006proto3"
+      "_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAM" +
+      "E\020\202\001\0224\n/ABILITY_INVOKE_ARGUMENT_MIXIN_CH" +
+      "ECK_SCAN_ENTITY\020\203\001\0224\n/ABILITY_INVOKE_ARG" +
+      "UMENT_MIXIN_TIME_TRACK_PLAYER\020\205\001\022.\n)ABIL" +
+      "ITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW\020\206\001" +
+      "\0224\n/ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE" +
+      "_PHLOGISTON\020\207\001\022K\nFABILITY_INVOKE_ARGUMEN" +
+      "T_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGIS" +
+      "TON_BALL\020\210\001\0227\n2ABILITY_INVOKE_ARGUMENT_M" +
+      "IXIN_FREQUENCY_SHIELD_BAR\020\211\001\022:\n5ABILITY_" +
+      "INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_C" +
+      "AMERA\020\215\001B\033\n\031emu.grasscutter.net.protob\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryHeadOuterClass.java

@@ -19,52 +19,48 @@ public final class AbilityInvokeEntryHeadOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 instanced_ability_id = 5;</code>
+     * <code>int32 local_id = 1;</code>
-     * @return The instancedAbilityId.
-     */
-    int getInstancedAbilityId();
-
-    /**
-     * <code>int32 modifier_config_local_id = 4;</code>
-     * @return The modifierConfigLocalId.
-     */
-    int getModifierConfigLocalId();
-
-    /**
-     * <code>int32 local_id = 9;</code>
      * @return The localId.
      */
     int getLocalId();
 
     /**
-     * <code>uint32 server_buff_uid = 7;</code>
+     * <code>uint32 server_buff_uid = 5;</code>
      * @return The serverBuffUid.
      */
     int getServerBuffUid();
 
     /**
-     * <code>uint32 instanced_modifier_id = 11;</code>
+     * <code>int32 modifier_config_local_id = 6;</code>
-     * @return The instancedModifierId.
+     * @return The modifierConfigLocalId.
      */
-    int getInstancedModifierId();
+    int getModifierConfigLocalId();
 
     /**
-     * <code>bool is_serverbuff_modifier = 12;</code>
+     * <code>bool is_serverbuff_modifier = 7;</code>
      * @return The isServerbuffModifier.
      */
     boolean getIsServerbuffModifier();
 
     /**
-     * <code>uint32 target_id = 8;</code>
+     * <code>uint32 instanced_ability_id = 9;</code>
+     * @return The instancedAbilityId.
+     */
+    int getInstancedAbilityId();
+
+    /**
+     * <code>uint32 target_id = 13;</code>
      * @return The targetId.
      */
     int getTargetId();
+
+    /**
+     * <code>uint32 instanced_modifier_id = 14;</code>
+     * @return The instancedModifierId.
+     */
+    int getInstancedModifierId();
   }
   /**
-   * <pre>
-   * Obf: JOJGDABCHAP
-   * </pre>
-   *
    * Protobuf type {@code AbilityInvokeEntryHead}
    */
   public static final class AbilityInvokeEntryHead extends
@@ -109,41 +105,41 @@ public final class AbilityInvokeEntryHeadOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
-
-              modifierConfigLocalId_ = input.readInt32();
-              break;
-            }
-            case 40: {
-
-              instancedAbilityId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              serverBuffUid_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              targetId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
 
               localId_ = input.readInt32();
               break;
             }
-            case 88: {
+            case 40: {
 
-              instancedModifierId_ = input.readUInt32();
+              serverBuffUid_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 48: {
+
+              modifierConfigLocalId_ = input.readInt32();
+              break;
+            }
+            case 56: {
 
               isServerbuffModifier_ = input.readBool();
               break;
             }
+            case 72: {
+
+              instancedAbilityId_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              targetId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              instancedModifierId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -176,32 +172,10 @@ public final class AbilityInvokeEntryHeadOuterClass {
               emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.class, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder.class);
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 5;
+    public static final int LOCAL_ID_FIELD_NUMBER = 1;
-    private int instancedAbilityId_;
-    /**
-     * <code>uint32 instanced_ability_id = 5;</code>
-     * @return The instancedAbilityId.
-     */
-    @java.lang.Override
-    public int getInstancedAbilityId() {
-      return instancedAbilityId_;
-    }
-
-    public static final int MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER = 4;
-    private int modifierConfigLocalId_;
-    /**
-     * <code>int32 modifier_config_local_id = 4;</code>
-     * @return The modifierConfigLocalId.
-     */
-    @java.lang.Override
-    public int getModifierConfigLocalId() {
-      return modifierConfigLocalId_;
-    }
-
-    public static final int LOCAL_ID_FIELD_NUMBER = 9;
     private int localId_;
     /**
-     * <code>int32 local_id = 9;</code>
+     * <code>int32 local_id = 1;</code>
      * @return The localId.
      */
     @java.lang.Override
@@ -209,10 +183,10 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return localId_;
     }
 
-    public static final int SERVER_BUFF_UID_FIELD_NUMBER = 7;
+    public static final int SERVER_BUFF_UID_FIELD_NUMBER = 5;
     private int serverBuffUid_;
     /**
-     * <code>uint32 server_buff_uid = 7;</code>
+     * <code>uint32 server_buff_uid = 5;</code>
      * @return The serverBuffUid.
      */
     @java.lang.Override
@@ -220,21 +194,21 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return serverBuffUid_;
     }
 
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 11;
+    public static final int MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER = 6;
-    private int instancedModifierId_;
+    private int modifierConfigLocalId_;
     /**
-     * <code>uint32 instanced_modifier_id = 11;</code>
+     * <code>int32 modifier_config_local_id = 6;</code>
-     * @return The instancedModifierId.
+     * @return The modifierConfigLocalId.
      */
     @java.lang.Override
-    public int getInstancedModifierId() {
+    public int getModifierConfigLocalId() {
-      return instancedModifierId_;
+      return modifierConfigLocalId_;
     }
 
-    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 12;
+    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 7;
     private boolean isServerbuffModifier_;
     /**
-     * <code>bool is_serverbuff_modifier = 12;</code>
+     * <code>bool is_serverbuff_modifier = 7;</code>
      * @return The isServerbuffModifier.
      */
     @java.lang.Override
@@ -242,10 +216,21 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return isServerbuffModifier_;
     }
 
-    public static final int TARGET_ID_FIELD_NUMBER = 8;
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 9;
+    private int instancedAbilityId_;
+    /**
+     * <code>uint32 instanced_ability_id = 9;</code>
+     * @return The instancedAbilityId.
+     */
+    @java.lang.Override
+    public int getInstancedAbilityId() {
+      return instancedAbilityId_;
+    }
+
+    public static final int TARGET_ID_FIELD_NUMBER = 13;
     private int targetId_;
     /**
-     * <code>uint32 target_id = 8;</code>
+     * <code>uint32 target_id = 13;</code>
      * @return The targetId.
      */
     @java.lang.Override
@@ -253,6 +238,17 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return targetId_;
     }
 
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 14;
+    private int instancedModifierId_;
+    /**
+     * <code>uint32 instanced_modifier_id = 14;</code>
+     * @return The instancedModifierId.
+     */
+    @java.lang.Override
+    public int getInstancedModifierId() {
+      return instancedModifierId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -267,26 +263,26 @@ public final class AbilityInvokeEntryHeadOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (modifierConfigLocalId_ != 0) {
+      if (localId_ != 0) {
-        output.writeInt32(4, modifierConfigLocalId_);
+        output.writeInt32(1, localId_);
-      }
-      if (instancedAbilityId_ != 0) {
-        output.writeUInt32(5, instancedAbilityId_);
       }
       if (serverBuffUid_ != 0) {
-        output.writeUInt32(7, serverBuffUid_);
+        output.writeUInt32(5, serverBuffUid_);
       }
-      if (targetId_ != 0) {
+      if (modifierConfigLocalId_ != 0) {
-        output.writeUInt32(8, targetId_);
+        output.writeInt32(6, modifierConfigLocalId_);
-      }
-      if (localId_ != 0) {
-        output.writeInt32(9, localId_);
-      }
-      if (instancedModifierId_ != 0) {
-        output.writeUInt32(11, instancedModifierId_);
       }
       if (isServerbuffModifier_ != false) {
-        output.writeBool(12, isServerbuffModifier_);
+        output.writeBool(7, isServerbuffModifier_);
+      }
+      if (instancedAbilityId_ != 0) {
+        output.writeUInt32(9, instancedAbilityId_);
+      }
+      if (targetId_ != 0) {
+        output.writeUInt32(13, targetId_);
+      }
+      if (instancedModifierId_ != 0) {
+        output.writeUInt32(14, instancedModifierId_);
       }
       unknownFields.writeTo(output);
     }
@@ -297,33 +293,33 @@ public final class AbilityInvokeEntryHeadOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (modifierConfigLocalId_ != 0) {
+      if (localId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, modifierConfigLocalId_);
+          .computeInt32Size(1, localId_);
-      }
-      if (instancedAbilityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, instancedAbilityId_);
       }
       if (serverBuffUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, serverBuffUid_);
+          .computeUInt32Size(5, serverBuffUid_);
       }
-      if (targetId_ != 0) {
+      if (modifierConfigLocalId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, targetId_);
+          .computeInt32Size(6, modifierConfigLocalId_);
-      }
-      if (localId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, localId_);
-      }
-      if (instancedModifierId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, instancedModifierId_);
       }
       if (isServerbuffModifier_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isServerbuffModifier_);
+          .computeBoolSize(7, isServerbuffModifier_);
+      }
+      if (instancedAbilityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, instancedAbilityId_);
+      }
+      if (targetId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, targetId_);
+      }
+      if (instancedModifierId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, instancedModifierId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -340,20 +336,20 @@ public final class AbilityInvokeEntryHeadOuterClass {
       }
       emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead other = (emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead) obj;
 
-      if (getInstancedAbilityId()
-          != other.getInstancedAbilityId()) return false;
-      if (getModifierConfigLocalId()
-          != other.getModifierConfigLocalId()) return false;
       if (getLocalId()
           != other.getLocalId()) return false;
       if (getServerBuffUid()
           != other.getServerBuffUid()) return false;
-      if (getInstancedModifierId()
+      if (getModifierConfigLocalId()
-          != other.getInstancedModifierId()) return false;
+          != other.getModifierConfigLocalId()) return false;
       if (getIsServerbuffModifier()
           != other.getIsServerbuffModifier()) return false;
+      if (getInstancedAbilityId()
+          != other.getInstancedAbilityId()) return false;
       if (getTargetId()
           != other.getTargetId()) return false;
+      if (getInstancedModifierId()
+          != other.getInstancedModifierId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -365,21 +361,21 @@ public final class AbilityInvokeEntryHeadOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedAbilityId();
-      hash = (37 * hash) + MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getModifierConfigLocalId();
       hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getLocalId();
       hash = (37 * hash) + SERVER_BUFF_UID_FIELD_NUMBER;
       hash = (53 * hash) + getServerBuffUid();
-      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
+      hash = (37 * hash) + MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedModifierId();
+      hash = (53 * hash) + getModifierConfigLocalId();
       hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsServerbuffModifier());
+      hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedAbilityId();
       hash = (37 * hash) + TARGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetId();
+      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedModifierId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -476,10 +472,6 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JOJGDABCHAP
-     * </pre>
-     *
      * Protobuf type {@code AbilityInvokeEntryHead}
      */
     public static final class Builder extends
@@ -517,20 +509,20 @@ public final class AbilityInvokeEntryHeadOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        instancedAbilityId_ = 0;
-
-        modifierConfigLocalId_ = 0;
-
         localId_ = 0;
 
         serverBuffUid_ = 0;
 
-        instancedModifierId_ = 0;
+        modifierConfigLocalId_ = 0;
 
         isServerbuffModifier_ = false;
 
+        instancedAbilityId_ = 0;
+
         targetId_ = 0;
 
+        instancedModifierId_ = 0;
+
         return this;
       }
 
@@ -557,13 +549,13 @@ public final class AbilityInvokeEntryHeadOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead buildPartial() {
         emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead result = new emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead(this);
-        result.instancedAbilityId_ = instancedAbilityId_;
-        result.modifierConfigLocalId_ = modifierConfigLocalId_;
         result.localId_ = localId_;
         result.serverBuffUid_ = serverBuffUid_;
-        result.instancedModifierId_ = instancedModifierId_;
+        result.modifierConfigLocalId_ = modifierConfigLocalId_;
         result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.instancedAbilityId_ = instancedAbilityId_;
         result.targetId_ = targetId_;
+        result.instancedModifierId_ = instancedModifierId_;
         onBuilt();
         return result;
       }
@@ -612,27 +604,27 @@ public final class AbilityInvokeEntryHeadOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead other) {
         if (other == emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.getDefaultInstance()) return this;
-        if (other.getInstancedAbilityId() != 0) {
-          setInstancedAbilityId(other.getInstancedAbilityId());
-        }
-        if (other.getModifierConfigLocalId() != 0) {
-          setModifierConfigLocalId(other.getModifierConfigLocalId());
-        }
         if (other.getLocalId() != 0) {
           setLocalId(other.getLocalId());
         }
         if (other.getServerBuffUid() != 0) {
           setServerBuffUid(other.getServerBuffUid());
         }
-        if (other.getInstancedModifierId() != 0) {
+        if (other.getModifierConfigLocalId() != 0) {
-          setInstancedModifierId(other.getInstancedModifierId());
+          setModifierConfigLocalId(other.getModifierConfigLocalId());
         }
         if (other.getIsServerbuffModifier() != false) {
           setIsServerbuffModifier(other.getIsServerbuffModifier());
         }
+        if (other.getInstancedAbilityId() != 0) {
+          setInstancedAbilityId(other.getInstancedAbilityId());
+        }
         if (other.getTargetId() != 0) {
           setTargetId(other.getTargetId());
         }
+        if (other.getInstancedModifierId() != 0) {
+          setInstancedModifierId(other.getInstancedModifierId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -662,71 +654,9 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
 
-      private int instancedAbilityId_ ;
-      /**
-       * <code>uint32 instanced_ability_id = 5;</code>
-       * @return The instancedAbilityId.
-       */
-      @java.lang.Override
-      public int getInstancedAbilityId() {
-        return instancedAbilityId_;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 5;</code>
-       * @param value The instancedAbilityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedAbilityId(int value) {
-        
-        instancedAbilityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedAbilityId() {
-        
-        instancedAbilityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int modifierConfigLocalId_ ;
-      /**
-       * <code>int32 modifier_config_local_id = 4;</code>
-       * @return The modifierConfigLocalId.
-       */
-      @java.lang.Override
-      public int getModifierConfigLocalId() {
-        return modifierConfigLocalId_;
-      }
-      /**
-       * <code>int32 modifier_config_local_id = 4;</code>
-       * @param value The modifierConfigLocalId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setModifierConfigLocalId(int value) {
-        
-        modifierConfigLocalId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 modifier_config_local_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearModifierConfigLocalId() {
-        
-        modifierConfigLocalId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int localId_ ;
       /**
-       * <code>int32 local_id = 9;</code>
+       * <code>int32 local_id = 1;</code>
        * @return The localId.
        */
       @java.lang.Override
@@ -734,7 +664,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return localId_;
       }
       /**
-       * <code>int32 local_id = 9;</code>
+       * <code>int32 local_id = 1;</code>
        * @param value The localId to set.
        * @return This builder for chaining.
        */
@@ -745,7 +675,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>int32 local_id = 9;</code>
+       * <code>int32 local_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearLocalId() {
@@ -757,7 +687,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
 
       private int serverBuffUid_ ;
       /**
-       * <code>uint32 server_buff_uid = 7;</code>
+       * <code>uint32 server_buff_uid = 5;</code>
        * @return The serverBuffUid.
        */
       @java.lang.Override
@@ -765,7 +695,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return serverBuffUid_;
       }
       /**
-       * <code>uint32 server_buff_uid = 7;</code>
+       * <code>uint32 server_buff_uid = 5;</code>
        * @param value The serverBuffUid to set.
        * @return This builder for chaining.
        */
@@ -776,7 +706,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>uint32 server_buff_uid = 7;</code>
+       * <code>uint32 server_buff_uid = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerBuffUid() {
@@ -786,40 +716,40 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
 
-      private int instancedModifierId_ ;
+      private int modifierConfigLocalId_ ;
       /**
-       * <code>uint32 instanced_modifier_id = 11;</code>
+       * <code>int32 modifier_config_local_id = 6;</code>
-       * @return The instancedModifierId.
+       * @return The modifierConfigLocalId.
        */
       @java.lang.Override
-      public int getInstancedModifierId() {
+      public int getModifierConfigLocalId() {
-        return instancedModifierId_;
+        return modifierConfigLocalId_;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 11;</code>
+       * <code>int32 modifier_config_local_id = 6;</code>
-       * @param value The instancedModifierId to set.
+       * @param value The modifierConfigLocalId to set.
        * @return This builder for chaining.
        */
-      public Builder setInstancedModifierId(int value) {
+      public Builder setModifierConfigLocalId(int value) {
         
-        instancedModifierId_ = value;
+        modifierConfigLocalId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 11;</code>
+       * <code>int32 modifier_config_local_id = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearInstancedModifierId() {
+      public Builder clearModifierConfigLocalId() {
         
-        instancedModifierId_ = 0;
+        modifierConfigLocalId_ = 0;
         onChanged();
         return this;
       }
 
       private boolean isServerbuffModifier_ ;
       /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
+       * <code>bool is_serverbuff_modifier = 7;</code>
        * @return The isServerbuffModifier.
        */
       @java.lang.Override
@@ -827,7 +757,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return isServerbuffModifier_;
       }
       /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
+       * <code>bool is_serverbuff_modifier = 7;</code>
        * @param value The isServerbuffModifier to set.
        * @return This builder for chaining.
        */
@@ -838,7 +768,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
+       * <code>bool is_serverbuff_modifier = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsServerbuffModifier() {
@@ -848,9 +778,40 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
 
+      private int instancedAbilityId_ ;
+      /**
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @return The instancedAbilityId.
+       */
+      @java.lang.Override
+      public int getInstancedAbilityId() {
+        return instancedAbilityId_;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @param value The instancedAbilityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedAbilityId(int value) {
+        
+        instancedAbilityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedAbilityId() {
+        
+        instancedAbilityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int targetId_ ;
       /**
-       * <code>uint32 target_id = 8;</code>
+       * <code>uint32 target_id = 13;</code>
        * @return The targetId.
        */
       @java.lang.Override
@@ -858,7 +819,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return targetId_;
       }
       /**
-       * <code>uint32 target_id = 8;</code>
+       * <code>uint32 target_id = 13;</code>
        * @param value The targetId to set.
        * @return This builder for chaining.
        */
@@ -869,7 +830,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_id = 8;</code>
+       * <code>uint32 target_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetId() {
@@ -878,6 +839,37 @@ public final class AbilityInvokeEntryHeadOuterClass {
         onChanged();
         return this;
       }
+
+      private int instancedModifierId_ ;
+      /**
+       * <code>uint32 instanced_modifier_id = 14;</code>
+       * @return The instancedModifierId.
+       */
+      @java.lang.Override
+      public int getInstancedModifierId() {
+        return instancedModifierId_;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 14;</code>
+       * @param value The instancedModifierId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedModifierId(int value) {
+        
+        instancedModifierId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedModifierId() {
+        
+        instancedModifierId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -946,12 +938,12 @@ public final class AbilityInvokeEntryHeadOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AbilityInvokeEntryHead.proto\"\325\001\n\026Abili" +
-      "tyInvokeEntryHead\022\034\n\024instanced_ability_i" +
+      "tyInvokeEntryHead\022\020\n\010local_id\030\001 \001(\005\022\027\n\017s" +
-      "d\030\005 \001(\r\022 \n\030modifier_config_local_id\030\004 \001(" +
+      "erver_buff_uid\030\005 \001(\r\022 \n\030modifier_config_" +
-      "\005\022\020\n\010local_id\030\t \001(\005\022\027\n\017server_buff_uid\030\007" +
+      "local_id\030\006 \001(\005\022\036\n\026is_serverbuff_modifier" +
-      " \001(\r\022\035\n\025instanced_modifier_id\030\013 \001(\r\022\036\n\026i" +
+      "\030\007 \001(\010\022\034\n\024instanced_ability_id\030\t \001(\r\022\021\n\t" +
-      "s_serverbuff_modifier\030\014 \001(\010\022\021\n\ttarget_id" +
+      "target_id\030\r \001(\r\022\035\n\025instanced_modifier_id" +
-      "\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -963,7 +955,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
     internal_static_AbilityInvokeEntryHead_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvokeEntryHead_descriptor,
-        new java.lang.String[] { "InstancedAbilityId", "ModifierConfigLocalId", "LocalId", "ServerBuffUid", "InstancedModifierId", "IsServerbuffModifier", "TargetId", });
+        new java.lang.String[] { "LocalId", "ServerBuffUid", "ModifierConfigLocalId", "IsServerbuffModifier", "InstancedAbilityId", "TargetId", "InstancedModifierId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinRecoverInfoOuterClass.java

@@ -18,28 +18,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:AbilityMixinRecoverInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return Whether the instancedAbilityId field is set.
-     */
-    boolean hasInstancedAbilityId();
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return The instancedAbilityId.
-     */
-    int getInstancedAbilityId();
-
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return Whether the instancedModifierId field is set.
-     */
-    boolean hasInstancedModifierId();
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return The instancedModifierId.
-     */
-    int getInstancedModifierId();
-
     /**
      * <code>uint32 local_id = 3;</code>
      * @return The localId.
@@ -108,13 +86,31 @@ public final class AbilityMixinRecoverInfoOuterClass {
      */
     emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder getBreakoutSnapShotOrBuilder();
 
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return Whether the instancedAbilityId field is set.
+     */
+    boolean hasInstancedAbilityId();
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return The instancedAbilityId.
+     */
+    int getInstancedAbilityId();
+
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return Whether the instancedModifierId field is set.
+     */
+    boolean hasInstancedModifierId();
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return The instancedModifierId.
+     */
+    int getInstancedModifierId();
+
     public emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo.SourceCase getSourceCase();
   }
   /**
-   * <pre>
-   * Obf: NNBAGDGFEKA
-   * </pre>
-   *
    * Protobuf type {@code AbilityMixinRecoverInfo}
    */
   public static final class AbilityMixinRecoverInfo extends
@@ -304,48 +300,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
           sourceCase_);
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 1;
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return Whether the instancedAbilityId field is set.
-     */
-    @java.lang.Override
-    public boolean hasInstancedAbilityId() {
-      return sourceCase_ == 1;
-    }
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return The instancedAbilityId.
-     */
-    @java.lang.Override
-    public int getInstancedAbilityId() {
-      if (sourceCase_ == 1) {
-        return (java.lang.Integer) source_;
-      }
-      return 0;
-    }
-
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 2;
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return Whether the instancedModifierId field is set.
-     */
-    @java.lang.Override
-    public boolean hasInstancedModifierId() {
-      return sourceCase_ == 2;
-    }
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return The instancedModifierId.
-     */
-    @java.lang.Override
-    public int getInstancedModifierId() {
-      if (sourceCase_ == 2) {
-        return (java.lang.Integer) source_;
-      }
-      return 0;
-    }
-
     public static final int LOCAL_ID_FIELD_NUMBER = 3;
     private int localId_;
     /**
@@ -462,6 +416,48 @@ public final class AbilityMixinRecoverInfoOuterClass {
       return getBreakoutSnapShot();
     }
 
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 1;
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return Whether the instancedAbilityId field is set.
+     */
+    @java.lang.Override
+    public boolean hasInstancedAbilityId() {
+      return sourceCase_ == 1;
+    }
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return The instancedAbilityId.
+     */
+    @java.lang.Override
+    public int getInstancedAbilityId() {
+      if (sourceCase_ == 1) {
+        return (java.lang.Integer) source_;
+      }
+      return 0;
+    }
+
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 2;
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return Whether the instancedModifierId field is set.
+     */
+    @java.lang.Override
+    public boolean hasInstancedModifierId() {
+      return sourceCase_ == 2;
+    }
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return The instancedModifierId.
+     */
+    @java.lang.Override
+    public int getInstancedModifierId() {
+      if (sourceCase_ == 2) {
+        return (java.lang.Integer) source_;
+      }
+      return 0;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -730,10 +726,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NNBAGDGFEKA
-     * </pre>
-     *
      * Protobuf type {@code AbilityMixinRecoverInfo}
      */
     public static final class Builder extends
@@ -819,12 +811,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       public emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo buildPartial() {
         emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo result = new emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo(this);
         int from_bitField0_ = bitField0_;
-        if (sourceCase_ == 1) {
-          result.source_ = source_;
-        }
-        if (sourceCase_ == 2) {
-          result.source_ = source_;
-        }
         result.localId_ = localId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           dataList_.makeImmutable();
@@ -846,6 +832,12 @@ public final class AbilityMixinRecoverInfoOuterClass {
         } else {
           result.breakoutSnapShot_ = breakoutSnapShotBuilder_.build();
         }
+        if (sourceCase_ == 1) {
+          result.source_ = source_;
+        }
+        if (sourceCase_ == 2) {
+          result.source_ = source_;
+        }
         result.sourceCase_ = sourceCase_;
         onBuilt();
         return result;
@@ -998,88 +990,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
 
       private int bitField0_;
 
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @return Whether the instancedAbilityId field is set.
-       */
-      public boolean hasInstancedAbilityId() {
-        return sourceCase_ == 1;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @return The instancedAbilityId.
-       */
-      public int getInstancedAbilityId() {
-        if (sourceCase_ == 1) {
-          return (java.lang.Integer) source_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @param value The instancedAbilityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedAbilityId(int value) {
-        sourceCase_ = 1;
-        source_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedAbilityId() {
-        if (sourceCase_ == 1) {
-          sourceCase_ = 0;
-          source_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @return Whether the instancedModifierId field is set.
-       */
-      public boolean hasInstancedModifierId() {
-        return sourceCase_ == 2;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @return The instancedModifierId.
-       */
-      public int getInstancedModifierId() {
-        if (sourceCase_ == 2) {
-          return (java.lang.Integer) source_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @param value The instancedModifierId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedModifierId(int value) {
-        sourceCase_ = 2;
-        source_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedModifierId() {
-        if (sourceCase_ == 2) {
-          sourceCase_ = 0;
-          source_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
       private int localId_ ;
       /**
        * <code>uint32 local_id = 3;</code>
@@ -1579,6 +1489,88 @@ public final class AbilityMixinRecoverInfoOuterClass {
         }
         return breakoutSnapShotBuilder_;
       }
+
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return Whether the instancedAbilityId field is set.
+       */
+      public boolean hasInstancedAbilityId() {
+        return sourceCase_ == 1;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return The instancedAbilityId.
+       */
+      public int getInstancedAbilityId() {
+        if (sourceCase_ == 1) {
+          return (java.lang.Integer) source_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @param value The instancedAbilityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedAbilityId(int value) {
+        sourceCase_ = 1;
+        source_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedAbilityId() {
+        if (sourceCase_ == 1) {
+          sourceCase_ = 0;
+          source_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @return Whether the instancedModifierId field is set.
+       */
+      public boolean hasInstancedModifierId() {
+        return sourceCase_ == 2;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @return The instancedModifierId.
+       */
+      public int getInstancedModifierId() {
+        if (sourceCase_ == 2) {
+          return (java.lang.Integer) source_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @param value The instancedModifierId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedModifierId(int value) {
+        sourceCase_ = 2;
+        source_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedModifierId() {
+        if (sourceCase_ == 2) {
+          sourceCase_ = 0;
+          source_ = null;
+          onChanged();
+        }
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1648,13 +1640,13 @@ public final class AbilityMixinRecoverInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035AbilityMixinRecoverInfo.proto\032\031Massive" +
       "PropSyncInfo.proto\032\026BreakoutSnapShot.pro" +
-      "to\"\211\002\n\027AbilityMixinRecoverInfo\022\036\n\024instan" +
+      "to\"\211\002\n\027AbilityMixinRecoverInfo\022\020\n\010local_" +
-      "ced_ability_id\030\001 \001(\rH\000\022\037\n\025instanced_modi" +
+      "id\030\003 \001(\r\022\021\n\tdata_list\030\004 \003(\r\022\036\n\026is_server" +
-      "fier_id\030\002 \001(\rH\000\022\020\n\010local_id\030\003 \001(\r\022\021\n\tdat" +
+      "buff_modifier\030\005 \001(\010\022/\n\021massive_prop_list" +
-      "a_list\030\004 \003(\r\022\036\n\026is_serverbuff_modifier\030\005" +
+      "\030\006 \003(\0132\024.MassivePropSyncInfo\022-\n\022breakout" +
-      " \001(\010\022/\n\021massive_prop_list\030\006 \003(\0132\024.Massiv" +
+      "_snap_shot\030\007 \001(\0132\021.BreakoutSnapShot\022\036\n\024i" +
-      "ePropSyncInfo\022-\n\022breakout_snap_shot\030\007 \001(" +
+      "nstanced_ability_id\030\001 \001(\rH\000\022\037\n\025instanced" +
-      "\0132\021.BreakoutSnapShotB\010\n\006SourceB\033\n\031emu.gr" +
+      "_modifier_id\030\002 \001(\rH\000B\010\n\006SourceB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1668,7 +1660,7 @@ public final class AbilityMixinRecoverInfoOuterClass {
     internal_static_AbilityMixinRecoverInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityMixinRecoverInfo_descriptor,
-        new java.lang.String[] { "InstancedAbilityId", "InstancedModifierId", "LocalId", "DataList", "IsServerbuffModifier", "MassivePropList", "BreakoutSnapShot", "Source", });
+        new java.lang.String[] { "LocalId", "DataList", "IsServerbuffModifier", "MassivePropList", "BreakoutSnapShot", "InstancedAbilityId", "InstancedModifierId", "Source", });
     emu.grasscutter.net.proto.MassivePropSyncInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.getDescriptor();
   }

src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarTypeOuterClass.java

@@ -16,7 +16,7 @@ public final class AbilityScalarTypeOuterClass {
   }
   /**
    * <pre>
-   * Obf: HOIECOCMCMI
+   * 5.0.0
    * </pre>
    *
    * Protobuf enum {@code AbilityScalarType}

src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java

@@ -97,10 +97,6 @@ public final class AbilityScalarValueEntryOuterClass {
     public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.ValueCase getValueCase();
   }
   /**
-   * <pre>
-   * Obf: DAEKOPFKPMK
-   * </pre>
-   *
    * Protobuf type {@code AbilityScalarValueEntry}
    */
   public static final class AbilityScalarValueEntry extends
@@ -670,10 +666,6 @@ public final class AbilityScalarValueEntryOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DAEKOPFKPMK
-     * </pre>
-     *
      * Protobuf type {@code AbilityScalarValueEntry}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityStringOuterClass.java

@@ -50,7 +50,8 @@ public final class AbilityStringOuterClass {
   }
   /**
    * <pre>
-   * Obf: PPIBJBLBJDL
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code AbilityString}
@@ -440,7 +441,8 @@ public final class AbilityStringOuterClass {
     }
     /**
      * <pre>
-     * Obf: PPIBJBLBJDL
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code AbilityString}

src/generated/main/java/emu/grasscutter/net/proto/AbilitySyncStateInfoOuterClass.java

@@ -145,10 +145,6 @@ public final class AbilitySyncStateInfoOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Obf: JDIFMANDKLC
-   * </pre>
-   *
    * Protobuf type {@code AbilitySyncStateInfo}
    */
   public static final class AbilitySyncStateInfo extends
@@ -729,10 +725,6 @@ public final class AbilitySyncStateInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JDIFMANDKLC
-     * </pre>
-     *
      * Protobuf type {@code AbilitySyncStateInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AchievementAllDataNotifyOuterClass.java

@@ -19,52 +19,47 @@ public final class AchievementAllDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
-     * @return A list containing the rewardTakenGoalIdList.
-     */
-    java.util.List<java.lang.Integer> getRewardTakenGoalIdListList();
-    /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-     * @return The count of rewardTakenGoalIdList.
-     */
-    int getRewardTakenGoalIdListCount();
-    /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-     * @param index The index of the element to return.
-     * @return The rewardTakenGoalIdList at the given index.
-     */
-    int getRewardTakenGoalIdList(int index);
-
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> 
         getAchievementListList();
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index);
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     int getAchievementListCount();
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
         getAchievementListOrBuilderList();
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
         int index);
+
+    /**
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * @return A list containing the rewardTakenGoalIdList.
+     */
+    java.util.List<java.lang.Integer> getRewardTakenGoalIdListList();
+    /**
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * @return The count of rewardTakenGoalIdList.
+     */
+    int getRewardTakenGoalIdListCount();
+    /**
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * @param index The index of the element to return.
+     * @return The rewardTakenGoalIdList at the given index.
+     */
+    int getRewardTakenGoalIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 27422
-   * Obf: BMJFIOKJEMJ
-   * </pre>
-   *
    * Protobuf type {@code AchievementAllDataNotify}
    */
   public static final class AchievementAllDataNotify extends
@@ -77,8 +72,8 @@ public final class AchievementAllDataNotifyOuterClass {
       super(builder);
     }
     private AchievementAllDataNotify() {
-      rewardTakenGoalIdList_ = emptyIntList();
       achievementList_ = java.util.Collections.emptyList();
+      rewardTakenGoalIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -112,20 +107,29 @@ public final class AchievementAllDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                rewardTakenGoalIdList_ = newIntList();
+                achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>();
                 mutable_bitField0_ |= 0x00000001;
               }
+              achievementList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.parser(), extensionRegistry));
+              break;
+            }
+            case 120: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                rewardTakenGoalIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
               rewardTakenGoalIdList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 rewardTakenGoalIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 rewardTakenGoalIdList_.addInt(input.readUInt32());
@@ -133,15 +137,6 @@ public final class AchievementAllDataNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              achievementList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.parser(), extensionRegistry));
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -158,10 +153,10 @@ public final class AchievementAllDataNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          rewardTakenGoalIdList_.makeImmutable(); // C
+          achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
+          rewardTakenGoalIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -180,10 +175,50 @@ public final class AchievementAllDataNotifyOuterClass {
               emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.class, emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.Builder.class);
     }
 
-    public static final int REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER = 4;
+    public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 8;
+    private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_;
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
+      return achievementList_;
+    }
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
+        getAchievementListOrBuilderList() {
+      return achievementList_;
+    }
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public int getAchievementListCount() {
+      return achievementList_.size();
+    }
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
+      return achievementList_.get(index);
+    }
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
+        int index) {
+      return achievementList_.get(index);
+    }
+
+    public static final int REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER = 15;
     private com.google.protobuf.Internal.IntList rewardTakenGoalIdList_;
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
      * @return A list containing the rewardTakenGoalIdList.
      */
     @java.lang.Override
@@ -192,14 +227,14 @@ public final class AchievementAllDataNotifyOuterClass {
       return rewardTakenGoalIdList_;
     }
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
      * @return The count of rewardTakenGoalIdList.
      */
     public int getRewardTakenGoalIdListCount() {
       return rewardTakenGoalIdList_.size();
     }
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
      * @param index The index of the element to return.
      * @return The rewardTakenGoalIdList at the given index.
      */
@@ -208,46 +243,6 @@ public final class AchievementAllDataNotifyOuterClass {
     }
     private int rewardTakenGoalIdListMemoizedSerializedSize = -1;
 
-    public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 9;
-    private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_;
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
-      return achievementList_;
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
-        getAchievementListOrBuilderList() {
-      return achievementList_;
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
-     */
-    @java.lang.Override
-    public int getAchievementListCount() {
-      return achievementList_.size();
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
-      return achievementList_.get(index);
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
-        int index) {
-      return achievementList_.get(index);
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -263,16 +258,16 @@ public final class AchievementAllDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      for (int i = 0; i < achievementList_.size(); i++) {
+        output.writeMessage(8, achievementList_.get(i));
+      }
       if (getRewardTakenGoalIdListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(122);
         output.writeUInt32NoTag(rewardTakenGoalIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < rewardTakenGoalIdList_.size(); i++) {
         output.writeUInt32NoTag(rewardTakenGoalIdList_.getInt(i));
       }
-      for (int i = 0; i < achievementList_.size(); i++) {
-        output.writeMessage(9, achievementList_.get(i));
-      }
       unknownFields.writeTo(output);
     }
 
@@ -282,6 +277,10 @@ public final class AchievementAllDataNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      for (int i = 0; i < achievementList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, achievementList_.get(i));
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < rewardTakenGoalIdList_.size(); i++) {
@@ -296,10 +295,6 @@ public final class AchievementAllDataNotifyOuterClass {
         }
         rewardTakenGoalIdListMemoizedSerializedSize = dataSize;
       }
-      for (int i = 0; i < achievementList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, achievementList_.get(i));
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -315,10 +310,10 @@ public final class AchievementAllDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify other = (emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify) obj;
 
-      if (!getRewardTakenGoalIdListList()
-          .equals(other.getRewardTakenGoalIdListList())) return false;
       if (!getAchievementListList()
           .equals(other.getAchievementListList())) return false;
+      if (!getRewardTakenGoalIdListList()
+          .equals(other.getRewardTakenGoalIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -330,14 +325,14 @@ public final class AchievementAllDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getRewardTakenGoalIdListCount() > 0) {
-        hash = (37 * hash) + REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getRewardTakenGoalIdListList().hashCode();
-      }
       if (getAchievementListCount() > 0) {
         hash = (37 * hash) + ACHIEVEMENT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAchievementListList().hashCode();
       }
+      if (getRewardTakenGoalIdListCount() > 0) {
+        hash = (37 * hash) + REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getRewardTakenGoalIdListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -434,11 +429,6 @@ public final class AchievementAllDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27422
-     * Obf: BMJFIOKJEMJ
-     * </pre>
-     *
      * Protobuf type {@code AchievementAllDataNotify}
      */
     public static final class Builder extends
@@ -477,14 +467,14 @@ public final class AchievementAllDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        rewardTakenGoalIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (achievementListBuilder_ == null) {
           achievementList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           achievementListBuilder_.clear();
         }
+        rewardTakenGoalIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -512,20 +502,20 @@ public final class AchievementAllDataNotifyOuterClass {
       public emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify buildPartial() {
         emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify result = new emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify(this);
         int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          rewardTakenGoalIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.rewardTakenGoalIdList_ = rewardTakenGoalIdList_;
         if (achievementListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.achievementList_ = achievementList_;
         } else {
           result.achievementList_ = achievementListBuilder_.build();
         }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          rewardTakenGoalIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.rewardTakenGoalIdList_ = rewardTakenGoalIdList_;
         onBuilt();
         return result;
       }
@@ -574,21 +564,11 @@ public final class AchievementAllDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify other) {
         if (other == emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.getDefaultInstance()) return this;
-        if (!other.rewardTakenGoalIdList_.isEmpty()) {
-          if (rewardTakenGoalIdList_.isEmpty()) {
-            rewardTakenGoalIdList_ = other.rewardTakenGoalIdList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureRewardTakenGoalIdListIsMutable();
-            rewardTakenGoalIdList_.addAll(other.rewardTakenGoalIdList_);
-          }
-          onChanged();
-        }
         if (achievementListBuilder_ == null) {
           if (!other.achievementList_.isEmpty()) {
             if (achievementList_.isEmpty()) {
               achievementList_ = other.achievementList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureAchievementListIsMutable();
               achievementList_.addAll(other.achievementList_);
@@ -601,7 +581,7 @@ public final class AchievementAllDataNotifyOuterClass {
               achievementListBuilder_.dispose();
               achievementListBuilder_ = null;
               achievementList_ = other.achievementList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               achievementListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAchievementListFieldBuilder() : null;
@@ -610,6 +590,16 @@ public final class AchievementAllDataNotifyOuterClass {
             }
           }
         }
+        if (!other.rewardTakenGoalIdList_.isEmpty()) {
+          if (rewardTakenGoalIdList_.isEmpty()) {
+            rewardTakenGoalIdList_ = other.rewardTakenGoalIdList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureRewardTakenGoalIdListIsMutable();
+            rewardTakenGoalIdList_.addAll(other.rewardTakenGoalIdList_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -640,91 +630,12 @@ public final class AchievementAllDataNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList rewardTakenGoalIdList_ = emptyIntList();
-      private void ensureRewardTakenGoalIdListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          rewardTakenGoalIdList_ = mutableCopy(rewardTakenGoalIdList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @return A list containing the rewardTakenGoalIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getRewardTakenGoalIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(rewardTakenGoalIdList_) : rewardTakenGoalIdList_;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @return The count of rewardTakenGoalIdList.
-       */
-      public int getRewardTakenGoalIdListCount() {
-        return rewardTakenGoalIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param index The index of the element to return.
-       * @return The rewardTakenGoalIdList at the given index.
-       */
-      public int getRewardTakenGoalIdList(int index) {
-        return rewardTakenGoalIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param index The index to set the value at.
-       * @param value The rewardTakenGoalIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRewardTakenGoalIdList(
-          int index, int value) {
-        ensureRewardTakenGoalIdListIsMutable();
-        rewardTakenGoalIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param value The rewardTakenGoalIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addRewardTakenGoalIdList(int value) {
-        ensureRewardTakenGoalIdListIsMutable();
-        rewardTakenGoalIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param values The rewardTakenGoalIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllRewardTakenGoalIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureRewardTakenGoalIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, rewardTakenGoalIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRewardTakenGoalIdList() {
-        rewardTakenGoalIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_ =
         java.util.Collections.emptyList();
       private void ensureAchievementListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>(achievementList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -732,7 +643,7 @@ public final class AchievementAllDataNotifyOuterClass {
           emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> achievementListBuilder_;
 
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
         if (achievementListBuilder_ == null) {
@@ -742,7 +653,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public int getAchievementListCount() {
         if (achievementListBuilder_ == null) {
@@ -752,7 +663,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
         if (achievementListBuilder_ == null) {
@@ -762,7 +673,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder setAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
@@ -779,7 +690,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder setAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -793,7 +704,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
         if (achievementListBuilder_ == null) {
@@ -809,7 +720,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
@@ -826,7 +737,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(
           emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -840,7 +751,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -854,7 +765,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAllAchievementList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AchievementOuterClass.Achievement> values) {
@@ -869,12 +780,12 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder clearAchievementList() {
         if (achievementListBuilder_ == null) {
           achievementList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           achievementListBuilder_.clear();
@@ -882,7 +793,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder removeAchievementList(int index) {
         if (achievementListBuilder_ == null) {
@@ -895,14 +806,14 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder getAchievementListBuilder(
           int index) {
         return getAchievementListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
           int index) {
@@ -912,7 +823,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
            getAchievementListOrBuilderList() {
@@ -923,14 +834,14 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder() {
         return getAchievementListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance());
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder(
           int index) {
@@ -938,7 +849,7 @@ public final class AchievementAllDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance());
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder> 
            getAchievementListBuilderList() {
@@ -951,13 +862,92 @@ public final class AchievementAllDataNotifyOuterClass {
           achievementListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder>(
                   achievementList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           achievementList_ = null;
         }
         return achievementListBuilder_;
       }
+
+      private com.google.protobuf.Internal.IntList rewardTakenGoalIdList_ = emptyIntList();
+      private void ensureRewardTakenGoalIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          rewardTakenGoalIdList_ = mutableCopy(rewardTakenGoalIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @return A list containing the rewardTakenGoalIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getRewardTakenGoalIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(rewardTakenGoalIdList_) : rewardTakenGoalIdList_;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @return The count of rewardTakenGoalIdList.
+       */
+      public int getRewardTakenGoalIdListCount() {
+        return rewardTakenGoalIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param index The index of the element to return.
+       * @return The rewardTakenGoalIdList at the given index.
+       */
+      public int getRewardTakenGoalIdList(int index) {
+        return rewardTakenGoalIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param index The index to set the value at.
+       * @param value The rewardTakenGoalIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRewardTakenGoalIdList(
+          int index, int value) {
+        ensureRewardTakenGoalIdListIsMutable();
+        rewardTakenGoalIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param value The rewardTakenGoalIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRewardTakenGoalIdList(int value) {
+        ensureRewardTakenGoalIdListIsMutable();
+        rewardTakenGoalIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param values The rewardTakenGoalIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRewardTakenGoalIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRewardTakenGoalIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, rewardTakenGoalIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRewardTakenGoalIdList() {
+        rewardTakenGoalIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1027,8 +1017,8 @@ public final class AchievementAllDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036AchievementAllDataNotify.proto\032\021Achiev" +
       "ement.proto\"e\n\030AchievementAllDataNotify\022" +
-      "!\n\031reward_taken_goal_id_list\030\004 \003(\r\022&\n\020ac" +
+      "&\n\020achievement_list\030\010 \003(\0132\014.Achievement\022" +
-      "hievement_list\030\t \003(\0132\014.AchievementB\033\n\031em" +
+      "!\n\031reward_taken_goal_id_list\030\017 \003(\rB\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1041,7 +1031,7 @@ public final class AchievementAllDataNotifyOuterClass {
     internal_static_AchievementAllDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AchievementAllDataNotify_descriptor,
-        new java.lang.String[] { "RewardTakenGoalIdList", "AchievementList", });
+        new java.lang.String[] { "AchievementList", "RewardTakenGoalIdList", });
     emu.grasscutter.net.proto.AchievementOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java

@@ -19,21 +19,10 @@ public final class AchievementOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 finish_timestamp = 15;</code>
+     * <code>uint32 cur_progress = 3;</code>
-     * @return The finishTimestamp.
+     * @return The curProgress.
      */
-    int getFinishTimestamp();
+    int getCurProgress();
-
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The enum numeric value on the wire for status.
-     */
-    int getStatusValue();
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The status.
-     */
-    emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus();
 
     /**
      * <code>uint32 total_progress = 4;</code>
@@ -42,22 +31,29 @@ public final class AchievementOuterClass {
     int getTotalProgress();
 
     /**
-     * <code>uint32 cur_progress = 14;</code>
+     * <code>uint32 finish_timestamp = 8;</code>
-     * @return The curProgress.
+     * @return The finishTimestamp.
      */
-    int getCurProgress();
+    int getFinishTimestamp();
 
     /**
-     * <code>uint32 id = 5;</code>
+     * <code>.Achievement.Status status = 9;</code>
+     * @return The enum numeric value on the wire for status.
+     */
+    int getStatusValue();
+    /**
+     * <code>.Achievement.Status status = 9;</code>
+     * @return The status.
+     */
+    emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus();
+
+    /**
+     * <code>uint32 id = 15;</code>
      * @return The id.
      */
     int getId();
   }
   /**
-   * <pre>
-   * Obf: NJOHADFBICH
-   * </pre>
-   *
    * Protobuf type {@code Achievement}
    */
   public static final class Achievement extends
@@ -103,30 +99,30 @@ public final class AchievementOuterClass {
             case 0:
               done = true;
               break;
+            case 24: {
+
+              curProgress_ = input.readUInt32();
+              break;
+            }
             case 32: {
 
               totalProgress_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 64: {
 
-              id_ = input.readUInt32();
+              finishTimestamp_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 72: {
               int rawValue = input.readEnum();
 
               status_ = rawValue;
               break;
             }
-            case 112: {
-
-              curProgress_ = input.readUInt32();
-              break;
-            }
             case 120: {
 
-              finishTimestamp_ = input.readUInt32();
+              id_ = input.readUInt32();
               break;
             }
             default: {
@@ -287,34 +283,15 @@ public final class AchievementOuterClass {
       // @@protoc_insertion_point(enum_scope:Achievement.Status)
     }
 
-    public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 15;
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 3;
-    private int finishTimestamp_;
+    private int curProgress_;
     /**
-     * <code>uint32 finish_timestamp = 15;</code>
+     * <code>uint32 cur_progress = 3;</code>
-     * @return The finishTimestamp.
+     * @return The curProgress.
      */
     @java.lang.Override
-    public int getFinishTimestamp() {
+    public int getCurProgress() {
-      return finishTimestamp_;
+      return curProgress_;
-    }
-
-    public static final int STATUS_FIELD_NUMBER = 10;
-    private int status_;
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The enum numeric value on the wire for status.
-     */
-    @java.lang.Override public int getStatusValue() {
-      return status_;
-    }
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The status.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
-      return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
     }
 
     public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
@@ -328,21 +305,40 @@ public final class AchievementOuterClass {
       return totalProgress_;
     }
 
-    public static final int CUR_PROGRESS_FIELD_NUMBER = 14;
+    public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 8;
-    private int curProgress_;
+    private int finishTimestamp_;
     /**
-     * <code>uint32 cur_progress = 14;</code>
+     * <code>uint32 finish_timestamp = 8;</code>
-     * @return The curProgress.
+     * @return The finishTimestamp.
      */
     @java.lang.Override
-    public int getCurProgress() {
+    public int getFinishTimestamp() {
-      return curProgress_;
+      return finishTimestamp_;
     }
 
-    public static final int ID_FIELD_NUMBER = 5;
+    public static final int STATUS_FIELD_NUMBER = 9;
+    private int status_;
+    /**
+     * <code>.Achievement.Status status = 9;</code>
+     * @return The enum numeric value on the wire for status.
+     */
+    @java.lang.Override public int getStatusValue() {
+      return status_;
+    }
+    /**
+     * <code>.Achievement.Status status = 9;</code>
+     * @return The status.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
+      return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
+    }
+
+    public static final int ID_FIELD_NUMBER = 15;
     private int id_;
     /**
-     * <code>uint32 id = 5;</code>
+     * <code>uint32 id = 15;</code>
      * @return The id.
      */
     @java.lang.Override
@@ -364,20 +360,20 @@ public final class AchievementOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (curProgress_ != 0) {
+        output.writeUInt32(3, curProgress_);
+      }
       if (totalProgress_ != 0) {
         output.writeUInt32(4, totalProgress_);
       }
-      if (id_ != 0) {
+      if (finishTimestamp_ != 0) {
-        output.writeUInt32(5, id_);
+        output.writeUInt32(8, finishTimestamp_);
       }
       if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
-        output.writeEnum(10, status_);
+        output.writeEnum(9, status_);
       }
-      if (curProgress_ != 0) {
+      if (id_ != 0) {
-        output.writeUInt32(14, curProgress_);
+        output.writeUInt32(15, id_);
-      }
-      if (finishTimestamp_ != 0) {
-        output.writeUInt32(15, finishTimestamp_);
       }
       unknownFields.writeTo(output);
     }
@@ -388,25 +384,25 @@ public final class AchievementOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (curProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, curProgress_);
+      }
       if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(4, totalProgress_);
       }
-      if (id_ != 0) {
+      if (finishTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, id_);
+          .computeUInt32Size(8, finishTimestamp_);
       }
       if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, status_);
+          .computeEnumSize(9, status_);
       }
-      if (curProgress_ != 0) {
+      if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, curProgress_);
+          .computeUInt32Size(15, id_);
-      }
-      if (finishTimestamp_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, finishTimestamp_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -423,13 +419,13 @@ public final class AchievementOuterClass {
       }
       emu.grasscutter.net.proto.AchievementOuterClass.Achievement other = (emu.grasscutter.net.proto.AchievementOuterClass.Achievement) obj;
 
+      if (getCurProgress()
+          != other.getCurProgress()) return false;
+      if (getTotalProgress()
+          != other.getTotalProgress()) return false;
       if (getFinishTimestamp()
           != other.getFinishTimestamp()) return false;
       if (status_ != other.status_) return false;
-      if (getTotalProgress()
-          != other.getTotalProgress()) return false;
-      if (getCurProgress()
-          != other.getCurProgress()) return false;
       if (getId()
           != other.getId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -443,14 +439,14 @@ public final class AchievementOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getCurProgress();
+      hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getTotalProgress();
       hash = (37 * hash) + FINISH_TIMESTAMP_FIELD_NUMBER;
       hash = (53 * hash) + getFinishTimestamp();
       hash = (37 * hash) + STATUS_FIELD_NUMBER;
       hash = (53 * hash) + status_;
-      hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getTotalProgress();
-      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getCurProgress();
       hash = (37 * hash) + ID_FIELD_NUMBER;
       hash = (53 * hash) + getId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -549,10 +545,6 @@ public final class AchievementOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NJOHADFBICH
-     * </pre>
-     *
      * Protobuf type {@code Achievement}
      */
     public static final class Builder extends
@@ -590,13 +582,13 @@ public final class AchievementOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        finishTimestamp_ = 0;
+        curProgress_ = 0;
-
-        status_ = 0;
 
         totalProgress_ = 0;
 
-        curProgress_ = 0;
+        finishTimestamp_ = 0;
+
+        status_ = 0;
 
         id_ = 0;
 
@@ -626,10 +618,10 @@ public final class AchievementOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement buildPartial() {
         emu.grasscutter.net.proto.AchievementOuterClass.Achievement result = new emu.grasscutter.net.proto.AchievementOuterClass.Achievement(this);
+        result.curProgress_ = curProgress_;
+        result.totalProgress_ = totalProgress_;
         result.finishTimestamp_ = finishTimestamp_;
         result.status_ = status_;
-        result.totalProgress_ = totalProgress_;
-        result.curProgress_ = curProgress_;
         result.id_ = id_;
         onBuilt();
         return result;
@@ -679,18 +671,18 @@ public final class AchievementOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AchievementOuterClass.Achievement other) {
         if (other == emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance()) return this;
+        if (other.getCurProgress() != 0) {
+          setCurProgress(other.getCurProgress());
+        }
+        if (other.getTotalProgress() != 0) {
+          setTotalProgress(other.getTotalProgress());
+        }
         if (other.getFinishTimestamp() != 0) {
           setFinishTimestamp(other.getFinishTimestamp());
         }
         if (other.status_ != 0) {
           setStatusValue(other.getStatusValue());
         }
-        if (other.getTotalProgress() != 0) {
-          setTotalProgress(other.getTotalProgress());
-        }
-        if (other.getCurProgress() != 0) {
-          setCurProgress(other.getCurProgress());
-        }
         if (other.getId() != 0) {
           setId(other.getId());
         }
@@ -723,87 +715,33 @@ public final class AchievementOuterClass {
         return this;
       }
 
-      private int finishTimestamp_ ;
+      private int curProgress_ ;
       /**
-       * <code>uint32 finish_timestamp = 15;</code>
+       * <code>uint32 cur_progress = 3;</code>
-       * @return The finishTimestamp.
+       * @return The curProgress.
        */
       @java.lang.Override
-      public int getFinishTimestamp() {
+      public int getCurProgress() {
-        return finishTimestamp_;
+        return curProgress_;
       }
       /**
-       * <code>uint32 finish_timestamp = 15;</code>
+       * <code>uint32 cur_progress = 3;</code>
-       * @param value The finishTimestamp to set.
+       * @param value The curProgress to set.
        * @return This builder for chaining.
        */
-      public Builder setFinishTimestamp(int value) {
+      public Builder setCurProgress(int value) {
         
-        finishTimestamp_ = value;
+        curProgress_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 finish_timestamp = 15;</code>
+       * <code>uint32 cur_progress = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFinishTimestamp() {
+      public Builder clearCurProgress() {
         
-        finishTimestamp_ = 0;
+        curProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int status_ = 0;
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @return The enum numeric value on the wire for status.
-       */
-      @java.lang.Override public int getStatusValue() {
-        return status_;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @param value The enum numeric value on the wire for status to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStatusValue(int value) {
-        
-        status_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @return The status.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
-        return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @param value The status to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        status_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearStatus() {
-        
-        status_ = 0;
         onChanged();
         return this;
       }
@@ -839,40 +777,94 @@ public final class AchievementOuterClass {
         return this;
       }
 
-      private int curProgress_ ;
+      private int finishTimestamp_ ;
       /**
-       * <code>uint32 cur_progress = 14;</code>
+       * <code>uint32 finish_timestamp = 8;</code>
-       * @return The curProgress.
+       * @return The finishTimestamp.
        */
       @java.lang.Override
-      public int getCurProgress() {
+      public int getFinishTimestamp() {
-        return curProgress_;
+        return finishTimestamp_;
       }
       /**
-       * <code>uint32 cur_progress = 14;</code>
+       * <code>uint32 finish_timestamp = 8;</code>
-       * @param value The curProgress to set.
+       * @param value The finishTimestamp to set.
        * @return This builder for chaining.
        */
-      public Builder setCurProgress(int value) {
+      public Builder setFinishTimestamp(int value) {
         
-        curProgress_ = value;
+        finishTimestamp_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 cur_progress = 14;</code>
+       * <code>uint32 finish_timestamp = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurProgress() {
+      public Builder clearFinishTimestamp() {
         
-        curProgress_ = 0;
+        finishTimestamp_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int status_ = 0;
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @return The enum numeric value on the wire for status.
+       */
+      @java.lang.Override public int getStatusValue() {
+        return status_;
+      }
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @param value The enum numeric value on the wire for status to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStatusValue(int value) {
+        
+        status_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @return The status.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
+        return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @param value The status to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        status_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearStatus() {
+        
+        status_ = 0;
         onChanged();
         return this;
       }
 
       private int id_ ;
       /**
-       * <code>uint32 id = 5;</code>
+       * <code>uint32 id = 15;</code>
        * @return The id.
        */
       @java.lang.Override
@@ -880,7 +872,7 @@ public final class AchievementOuterClass {
         return id_;
       }
       /**
-       * <code>uint32 id = 5;</code>
+       * <code>uint32 id = 15;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
@@ -891,7 +883,7 @@ public final class AchievementOuterClass {
         return this;
       }
       /**
-       * <code>uint32 id = 5;</code>
+       * <code>uint32 id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
@@ -967,10 +959,10 @@ public final class AchievementOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021Achievement.proto\"\351\001\n\013Achievement\022\030\n\020f" +
+      "\n\021Achievement.proto\"\351\001\n\013Achievement\022\024\n\014c" +
-      "inish_timestamp\030\017 \001(\r\022#\n\006status\030\n \001(\0162\023." +
+      "ur_progress\030\003 \001(\r\022\026\n\016total_progress\030\004 \001(" +
-      "Achievement.Status\022\026\n\016total_progress\030\004 \001" +
+      "\r\022\030\n\020finish_timestamp\030\010 \001(\r\022#\n\006status\030\t " +
-      "(\r\022\024\n\014cur_progress\030\016 \001(\r\022\n\n\002id\030\005 \001(\r\"a\n\006" +
+      "\001(\0162\023.Achievement.Status\022\n\n\002id\030\017 \001(\r\"a\n\006" +
       "Status\022\022\n\016STATUS_INVALID\020\000\022\025\n\021STATUS_UNF" +
       "INISHED\020\001\022\023\n\017STATUS_FINISHED\020\002\022\027\n\023STATUS" +
       "_REWARD_TAKEN\020\003B\033\n\031emu.grasscutter.net.p" +
@@ -985,7 +977,7 @@ public final class AchievementOuterClass {
     internal_static_Achievement_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Achievement_descriptor,
-        new java.lang.String[] { "FinishTimestamp", "Status", "TotalProgress", "CurProgress", "Id", });
+        new java.lang.String[] { "CurProgress", "TotalProgress", "FinishTimestamp", "Status", "Id", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoNotifyOuterClass.java

@@ -19,26 +19,21 @@ public final class ActivityInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return Whether the activityInfo field is set.
      */
     boolean hasActivityInfo();
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return The activityInfo.
      */
     emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfo();
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      */
     emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 1246
-   * Obf: JADBHEGBGIO
-   * </pre>
-   *
    * Protobuf type {@code ActivityInfoNotify}
    */
   public static final class ActivityInfoNotify extends
@@ -83,7 +78,7 @@ public final class ActivityInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 50: {
               emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder subBuilder = null;
               if (activityInfo_ != null) {
                 subBuilder = activityInfo_.toBuilder();
@@ -128,10 +123,10 @@ public final class ActivityInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityInfoNotifyOuterClass.ActivityInfoNotify.class, emu.grasscutter.net.proto.ActivityInfoNotifyOuterClass.ActivityInfoNotify.Builder.class);
     }
 
-    public static final int ACTIVITY_INFO_FIELD_NUMBER = 3;
+    public static final int ACTIVITY_INFO_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo activityInfo_;
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return Whether the activityInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class ActivityInfoNotifyOuterClass {
       return activityInfo_ != null;
     }
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return The activityInfo.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class ActivityInfoNotifyOuterClass {
       return activityInfo_ == null ? emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.getDefaultInstance() : activityInfo_;
     }
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoOrBuilder() {
@@ -169,7 +164,7 @@ public final class ActivityInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (activityInfo_ != null) {
-        output.writeMessage(3, getActivityInfo());
+        output.writeMessage(6, getActivityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class ActivityInfoNotifyOuterClass {
       size = 0;
       if (activityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getActivityInfo());
+          .computeMessageSize(6, getActivityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class ActivityInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1246
-     * Obf: JADBHEGBGIO
-     * </pre>
-     *
      * Protobuf type {@code ActivityInfoNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class ActivityInfoNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> activityInfoBuilder_;
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        * @return Whether the activityInfo field is set.
        */
       public boolean hasActivityInfo() {
         return activityInfoBuilder_ != null || activityInfo_ != null;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        * @return The activityInfo.
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfo() {
@@ -496,7 +486,7 @@ public final class ActivityInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder setActivityInfo(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) {
         if (activityInfoBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder setActivityInfo(
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder mergeActivityInfo(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) {
         if (activityInfoBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder clearActivityInfo() {
         if (activityInfoBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder getActivityInfoBuilder() {
         
@@ -566,7 +556,7 @@ public final class ActivityInfoNotifyOuterClass {
         return getActivityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoOrBuilder() {
         if (activityInfoBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class ActivityInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> 
@@ -661,7 +651,7 @@ public final class ActivityInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030ActivityInfoNotify.proto\032\022ActivityInfo" +
       ".proto\":\n\022ActivityInfoNotify\022$\n\ractivity" +
-      "_info\030\003 \001(\0132\r.ActivityInfoB\033\n\031emu.grassc" +
+      "_info\030\006 \001(\0132\r.ActivityInfoB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsDataOuterClass.java

@@ -19,27 +19,23 @@ public final class ActivityPushTipsDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 activity_push_tips_id = 13;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
-     * @return The activityPushTipsId.
-     */
-    int getActivityPushTipsId();
-
-    /**
-     * <code>.ActivityPushTipsState state = 6;</code>
      * @return The enum numeric value on the wire for state.
      */
     int getStateValue();
     /**
-     * <code>.ActivityPushTipsState state = 6;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
      * @return The state.
      */
     emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState getState();
+
+    /**
+     * <code>uint32 activity_push_tips_id = 7;</code>
+     * @return The activityPushTipsId.
+     */
+    int getActivityPushTipsId();
   }
   /**
-   * <pre>
-   * Obf: IBNKKJGBKML
-   * </pre>
-   *
    * Protobuf type {@code ActivityPushTipsData}
    */
   public static final class ActivityPushTipsData extends
@@ -85,13 +81,13 @@ public final class ActivityPushTipsDataOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 24: {
               int rawValue = input.readEnum();
 
               state_ = rawValue;
               break;
             }
-            case 104: {
+            case 56: {
 
               activityPushTipsId_ = input.readUInt32();
               break;
@@ -128,28 +124,17 @@ public final class ActivityPushTipsDataOuterClass {
               emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.class, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder.class);
     }
 
-    public static final int ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER = 13;
+    public static final int STATE_FIELD_NUMBER = 3;
-    private int activityPushTipsId_;
-    /**
-     * <code>uint32 activity_push_tips_id = 13;</code>
-     * @return The activityPushTipsId.
-     */
-    @java.lang.Override
-    public int getActivityPushTipsId() {
-      return activityPushTipsId_;
-    }
-
-    public static final int STATE_FIELD_NUMBER = 6;
     private int state_;
     /**
-     * <code>.ActivityPushTipsState state = 6;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
      * @return The enum numeric value on the wire for state.
      */
     @java.lang.Override public int getStateValue() {
       return state_;
     }
     /**
-     * <code>.ActivityPushTipsState state = 6;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
      * @return The state.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState getState() {
@@ -158,6 +143,17 @@ public final class ActivityPushTipsDataOuterClass {
       return result == null ? emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.UNRECOGNIZED : result;
     }
 
+    public static final int ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER = 7;
+    private int activityPushTipsId_;
+    /**
+     * <code>uint32 activity_push_tips_id = 7;</code>
+     * @return The activityPushTipsId.
+     */
+    @java.lang.Override
+    public int getActivityPushTipsId() {
+      return activityPushTipsId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -172,11 +168,11 @@ public final class ActivityPushTipsDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ACTIVITY_PUSH_TIPS_STATE_NONE.getNumber()) {
+      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ActivityPushTipsState_NONE.getNumber()) {
-        output.writeEnum(6, state_);
+        output.writeEnum(3, state_);
       }
       if (activityPushTipsId_ != 0) {
-        output.writeUInt32(13, activityPushTipsId_);
+        output.writeUInt32(7, activityPushTipsId_);
       }
       unknownFields.writeTo(output);
     }
@@ -187,13 +183,13 @@ public final class ActivityPushTipsDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ACTIVITY_PUSH_TIPS_STATE_NONE.getNumber()) {
+      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ActivityPushTipsState_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, state_);
+          .computeEnumSize(3, state_);
       }
       if (activityPushTipsId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, activityPushTipsId_);
+          .computeUInt32Size(7, activityPushTipsId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -210,9 +206,9 @@ public final class ActivityPushTipsDataOuterClass {
       }
       emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData other = (emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData) obj;
 
+      if (state_ != other.state_) return false;
       if (getActivityPushTipsId()
           != other.getActivityPushTipsId()) return false;
-      if (state_ != other.state_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -224,10 +220,10 @@ public final class ActivityPushTipsDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityPushTipsId();
       hash = (37 * hash) + STATE_FIELD_NUMBER;
       hash = (53 * hash) + state_;
+      hash = (37 * hash) + ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityPushTipsId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -324,10 +320,6 @@ public final class ActivityPushTipsDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: IBNKKJGBKML
-     * </pre>
-     *
      * Protobuf type {@code ActivityPushTipsData}
      */
     public static final class Builder extends
@@ -365,10 +357,10 @@ public final class ActivityPushTipsDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        activityPushTipsId_ = 0;
-
         state_ = 0;
 
+        activityPushTipsId_ = 0;
+
         return this;
       }
 
@@ -395,8 +387,8 @@ public final class ActivityPushTipsDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData buildPartial() {
         emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData result = new emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData(this);
-        result.activityPushTipsId_ = activityPushTipsId_;
         result.state_ = state_;
+        result.activityPushTipsId_ = activityPushTipsId_;
         onBuilt();
         return result;
       }
@@ -445,12 +437,12 @@ public final class ActivityPushTipsDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData other) {
         if (other == emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.getDefaultInstance()) return this;
-        if (other.getActivityPushTipsId() != 0) {
-          setActivityPushTipsId(other.getActivityPushTipsId());
-        }
         if (other.state_ != 0) {
           setStateValue(other.getStateValue());
         }
+        if (other.getActivityPushTipsId() != 0) {
+          setActivityPushTipsId(other.getActivityPushTipsId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -480,47 +472,16 @@ public final class ActivityPushTipsDataOuterClass {
         return this;
       }
 
-      private int activityPushTipsId_ ;
-      /**
-       * <code>uint32 activity_push_tips_id = 13;</code>
-       * @return The activityPushTipsId.
-       */
-      @java.lang.Override
-      public int getActivityPushTipsId() {
-        return activityPushTipsId_;
-      }
-      /**
-       * <code>uint32 activity_push_tips_id = 13;</code>
-       * @param value The activityPushTipsId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityPushTipsId(int value) {
-        
-        activityPushTipsId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_push_tips_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityPushTipsId() {
-        
-        activityPushTipsId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int state_ = 0;
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @return The enum numeric value on the wire for state.
        */
       @java.lang.Override public int getStateValue() {
         return state_;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @param value The enum numeric value on the wire for state to set.
        * @return This builder for chaining.
        */
@@ -531,7 +492,7 @@ public final class ActivityPushTipsDataOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @return The state.
        */
       @java.lang.Override
@@ -541,7 +502,7 @@ public final class ActivityPushTipsDataOuterClass {
         return result == null ? emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @param value The state to set.
        * @return This builder for chaining.
        */
@@ -555,7 +516,7 @@ public final class ActivityPushTipsDataOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearState() {
@@ -564,6 +525,37 @@ public final class ActivityPushTipsDataOuterClass {
         onChanged();
         return this;
       }
+
+      private int activityPushTipsId_ ;
+      /**
+       * <code>uint32 activity_push_tips_id = 7;</code>
+       * @return The activityPushTipsId.
+       */
+      @java.lang.Override
+      public int getActivityPushTipsId() {
+        return activityPushTipsId_;
+      }
+      /**
+       * <code>uint32 activity_push_tips_id = 7;</code>
+       * @param value The activityPushTipsId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityPushTipsId(int value) {
+        
+        activityPushTipsId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_push_tips_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityPushTipsId() {
+        
+        activityPushTipsId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -633,8 +625,8 @@ public final class ActivityPushTipsDataOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032ActivityPushTipsData.proto\032\033ActivityPu" +
       "shTipsState.proto\"\\\n\024ActivityPushTipsDat" +
-      "a\022\035\n\025activity_push_tips_id\030\r \001(\r\022%\n\005stat" +
+      "a\022%\n\005state\030\003 \001(\0162\026.ActivityPushTipsState" +
-      "e\030\006 \001(\0162\026.ActivityPushTipsStateB\033\n\031emu.g" +
+      "\022\035\n\025activity_push_tips_id\030\007 \001(\rB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -647,7 +639,7 @@ public final class ActivityPushTipsDataOuterClass {
     internal_static_ActivityPushTipsData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityPushTipsData_descriptor,
-        new java.lang.String[] { "ActivityPushTipsId", "State", });
+        new java.lang.String[] { "State", "ActivityPushTipsId", });
     emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsStateOuterClass.java

@@ -15,41 +15,37 @@ public final class ActivityPushTipsStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: DKHCNPIKCHO
-   * </pre>
-   *
    * Protobuf enum {@code ActivityPushTipsState}
    */
   public enum ActivityPushTipsState
       implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_NONE = 0;</code>
+     * <code>ActivityPushTipsState_NONE = 0;</code>
      */
-    ACTIVITY_PUSH_TIPS_STATE_NONE(0),
+    ActivityPushTipsState_NONE(0),
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_START = 1;</code>
+     * <code>ActivityPushTipsState_START = 1;</code>
      */
-    ACTIVITY_PUSH_TIPS_STATE_START(1),
+    ActivityPushTipsState_START(1),
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_READ = 2;</code>
+     * <code>ActivityPushTipsState_READ = 2;</code>
      */
-    ACTIVITY_PUSH_TIPS_STATE_READ(2),
+    ActivityPushTipsState_READ(2),
     UNRECOGNIZED(-1),
     ;
 
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_NONE = 0;</code>
+     * <code>ActivityPushTipsState_NONE = 0;</code>
      */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_NONE_VALUE = 0;
+    public static final int ActivityPushTipsState_NONE_VALUE = 0;
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_START = 1;</code>
+     * <code>ActivityPushTipsState_START = 1;</code>
      */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_START_VALUE = 1;
+    public static final int ActivityPushTipsState_START_VALUE = 1;
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_READ = 2;</code>
+     * <code>ActivityPushTipsState_READ = 2;</code>
      */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_READ_VALUE = 2;
+    public static final int ActivityPushTipsState_READ_VALUE = 2;
 
 
     public final int getNumber() {
@@ -76,9 +72,9 @@ public final class ActivityPushTipsStateOuterClass {
      */
     public static ActivityPushTipsState forNumber(int value) {
       switch (value) {
-        case 0: return ACTIVITY_PUSH_TIPS_STATE_NONE;
+        case 0: return ActivityPushTipsState_NONE;
-        case 1: return ACTIVITY_PUSH_TIPS_STATE_START;
+        case 1: return ActivityPushTipsState_START;
-        case 2: return ACTIVITY_PUSH_TIPS_STATE_READ;
+        case 2: return ActivityPushTipsState_READ;
         default: return null;
       }
     }
@@ -144,11 +140,11 @@ public final class ActivityPushTipsStateOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033ActivityPushTipsState.proto*\201\001\n\025Activi" +
+      "\n\033ActivityPushTipsState.proto*x\n\025Activit" +
-      "tyPushTipsState\022!\n\035ACTIVITY_PUSH_TIPS_ST" +
+      "yPushTipsState\022\036\n\032ActivityPushTipsState_" +
-      "ATE_NONE\020\000\022\"\n\036ACTIVITY_PUSH_TIPS_STATE_S" +
+      "NONE\020\000\022\037\n\033ActivityPushTipsState_START\020\001\022" +
-      "TART\020\001\022!\n\035ACTIVITY_PUSH_TIPS_STATE_READ\020" +
+      "\036\n\032ActivityPushTipsState_READ\020\002B\033\n\031emu.g" +
-      "\002B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoNotifyOuterClass.java

@@ -19,41 +19,36 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    int getRemainFlySeaLampNum();
+
+    /**
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> 
         getActivityScheduleListList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index);
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     int getActivityScheduleListCount();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
         getActivityScheduleListOrBuilderList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
         int index);
-
-    /**
-     * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    int getRemainFlySeaLampNum();
   }
   /**
-   * <pre>
-   * CmdId: 23970
-   * Obf: HGICHODDHDN
-   * </pre>
-   *
    * Protobuf type {@code ActivityScheduleInfoNotify}
    */
   public static final class ActivityScheduleInfoNotify extends
@@ -100,12 +95,12 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 8: {
 
               remainFlySeaLampNum_ = input.readUInt32();
               break;
             }
-            case 90: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 activityScheduleList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -149,17 +144,28 @@ public final class ActivityScheduleInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.class, emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.Builder.class);
     }
 
-    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 11;
+    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 1;
+    private int remainFlySeaLampNum_;
+    /**
+     * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    @java.lang.Override
+    public int getRemainFlySeaLampNum() {
+      return remainFlySeaLampNum_;
+    }
+
+    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_;
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
@@ -167,21 +173,21 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public int getActivityScheduleListCount() {
       return activityScheduleList_.size();
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
       return activityScheduleList_.get(index);
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
@@ -189,17 +195,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return activityScheduleList_.get(index);
     }
 
-    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 10;
-    private int remainFlySeaLampNum_;
-    /**
-     * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    @java.lang.Override
-    public int getRemainFlySeaLampNum() {
-      return remainFlySeaLampNum_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -215,10 +210,10 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (remainFlySeaLampNum_ != 0) {
-        output.writeUInt32(10, remainFlySeaLampNum_);
+        output.writeUInt32(1, remainFlySeaLampNum_);
       }
       for (int i = 0; i < activityScheduleList_.size(); i++) {
-        output.writeMessage(11, activityScheduleList_.get(i));
+        output.writeMessage(12, activityScheduleList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -231,11 +226,11 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       size = 0;
       if (remainFlySeaLampNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, remainFlySeaLampNum_);
+          .computeUInt32Size(1, remainFlySeaLampNum_);
       }
       for (int i = 0; i < activityScheduleList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, activityScheduleList_.get(i));
+          .computeMessageSize(12, activityScheduleList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify other = (emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify) obj;
 
-      if (!getActivityScheduleListList()
-          .equals(other.getActivityScheduleListList())) return false;
       if (getRemainFlySeaLampNum()
           != other.getRemainFlySeaLampNum()) return false;
+      if (!getActivityScheduleListList()
+          .equals(other.getActivityScheduleListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getRemainFlySeaLampNum();
       if (getActivityScheduleListCount() > 0) {
         hash = (37 * hash) + ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivityScheduleListList().hashCode();
       }
-      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getRemainFlySeaLampNum();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23970
-     * Obf: HGICHODDHDN
-     * </pre>
-     *
      * Protobuf type {@code ActivityScheduleInfoNotify}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        remainFlySeaLampNum_ = 0;
+
         if (activityScheduleListBuilder_ == null) {
           activityScheduleList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           activityScheduleListBuilder_.clear();
         }
-        remainFlySeaLampNum_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       public emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify buildPartial() {
         emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify result = new emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify(this);
         int from_bitField0_ = bitField0_;
+        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         if (activityScheduleListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             activityScheduleList_ = java.util.Collections.unmodifiableList(activityScheduleList_);
@@ -456,7 +447,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         } else {
           result.activityScheduleList_ = activityScheduleListBuilder_.build();
         }
-        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify other) {
         if (other == emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.getDefaultInstance()) return this;
+        if (other.getRemainFlySeaLampNum() != 0) {
+          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
+        }
         if (activityScheduleListBuilder_ == null) {
           if (!other.activityScheduleList_.isEmpty()) {
             if (activityScheduleList_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             }
           }
         }
-        if (other.getRemainFlySeaLampNum() != 0) {
-          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       private int bitField0_;
 
+      private int remainFlySeaLampNum_ ;
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+       * @return The remainFlySeaLampNum.
+       */
+      @java.lang.Override
+      public int getRemainFlySeaLampNum() {
+        return remainFlySeaLampNum_;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+       * @param value The remainFlySeaLampNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRemainFlySeaLampNum(int value) {
+        
+        remainFlySeaLampNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRemainFlySeaLampNum() {
+        
+        remainFlySeaLampNum_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_ =
         java.util.Collections.emptyList();
       private void ensureActivityScheduleListIsMutable() {
@@ -577,7 +598,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> activityScheduleListBuilder_;
 
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
         if (activityScheduleListBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public int getActivityScheduleListCount() {
         if (activityScheduleListBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -624,7 +645,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
         if (activityScheduleListBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -671,7 +692,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addAllActivityScheduleList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> values) {
@@ -714,7 +735,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder clearActivityScheduleList() {
         if (activityScheduleListBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder removeActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder getActivityScheduleListBuilder(
           int index) {
         return getActivityScheduleListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
            getActivityScheduleListOrBuilderList() {
@@ -768,14 +789,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder() {
         return getActivityScheduleListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder> 
            getActivityScheduleListBuilderList() {
@@ -803,37 +824,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
         return activityScheduleListBuilder_;
       }
-
-      private int remainFlySeaLampNum_ ;
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-       * @return The remainFlySeaLampNum.
-       */
-      @java.lang.Override
-      public int getRemainFlySeaLampNum() {
-        return remainFlySeaLampNum_;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-       * @param value The remainFlySeaLampNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRemainFlySeaLampNum(int value) {
-        
-        remainFlySeaLampNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRemainFlySeaLampNum() {
-        
-        remainFlySeaLampNum_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -903,9 +893,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n ActivityScheduleInfoNotify.proto\032\032Acti" +
       "vityScheduleInfo.proto\"t\n\032ActivitySchedu" +
-      "leInfoNotify\0225\n\026activity_schedule_list\030\013" +
+      "leInfoNotify\022\037\n\027remain_fly_sea_lamp_num\030" +
-      " \003(\0132\025.ActivityScheduleInfo\022\037\n\027remain_fl" +
+      "\001 \001(\r\0225\n\026activity_schedule_list\030\014 \003(\0132\025." +
-      "y_sea_lamp_num\030\n \001(\rB\033\n\031emu.grasscutter." +
+      "ActivityScheduleInfoB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -918,7 +908,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     internal_static_ActivityScheduleInfoNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityScheduleInfoNotify_descriptor,
-        new java.lang.String[] { "ActivityScheduleList", "RemainFlySeaLampNum", });
+        new java.lang.String[] { "RemainFlySeaLampNum", "ActivityScheduleList", });
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoOuterClass.java

@@ -19,40 +19,36 @@ public final class ActivityScheduleInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_open = 6;</code>
+     * <code>uint32 begin_time = 6;</code>
-     * @return The isOpen.
-     */
-    boolean getIsOpen();
-
-    /**
-     * <code>uint32 begin_time = 7;</code>
      * @return The beginTime.
      */
     int getBeginTime();
 
     /**
-     * <code>uint32 end_time = 8;</code>
+     * <code>uint32 activity_id = 7;</code>
+     * @return The activityId.
+     */
+    int getActivityId();
+
+    /**
+     * <code>bool is_open = 9;</code>
+     * @return The isOpen.
+     */
+    boolean getIsOpen();
+
+    /**
+     * <code>uint32 end_time = 13;</code>
      * @return The endTime.
      */
     int getEndTime();
 
     /**
-     * <code>uint32 schedule_id = 4;</code>
+     * <code>uint32 schedule_id = 14;</code>
      * @return The scheduleId.
      */
     int getScheduleId();
-
-    /**
-     * <code>uint32 activity_id = 1;</code>
-     * @return The activityId.
-     */
-    int getActivityId();
   }
   /**
-   * <pre>
-   * Obf: MJEHIMOOCNJ
-   * </pre>
-   *
    * Protobuf type {@code ActivityScheduleInfo}
    */
   public static final class ActivityScheduleInfo extends
@@ -97,31 +93,31 @@ public final class ActivityScheduleInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              activityId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-
-              scheduleId_ = input.readUInt32();
-              break;
-            }
             case 48: {
 
-              isOpen_ = input.readBool();
-              break;
-            }
-            case 56: {
-
               beginTime_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 56: {
+
+              activityId_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              isOpen_ = input.readBool();
+              break;
+            }
+            case 104: {
 
               endTime_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              scheduleId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,21 +150,10 @@ public final class ActivityScheduleInfoOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.class, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder.class);
     }
 
-    public static final int IS_OPEN_FIELD_NUMBER = 6;
+    public static final int BEGIN_TIME_FIELD_NUMBER = 6;
-    private boolean isOpen_;
-    /**
-     * <code>bool is_open = 6;</code>
-     * @return The isOpen.
-     */
-    @java.lang.Override
-    public boolean getIsOpen() {
-      return isOpen_;
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 7;
     private int beginTime_;
     /**
-     * <code>uint32 begin_time = 7;</code>
+     * <code>uint32 begin_time = 6;</code>
      * @return The beginTime.
      */
     @java.lang.Override
@@ -176,10 +161,32 @@ public final class ActivityScheduleInfoOuterClass {
       return beginTime_;
     }
 
-    public static final int END_TIME_FIELD_NUMBER = 8;
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 7;
+    private int activityId_;
+    /**
+     * <code>uint32 activity_id = 7;</code>
+     * @return The activityId.
+     */
+    @java.lang.Override
+    public int getActivityId() {
+      return activityId_;
+    }
+
+    public static final int IS_OPEN_FIELD_NUMBER = 9;
+    private boolean isOpen_;
+    /**
+     * <code>bool is_open = 9;</code>
+     * @return The isOpen.
+     */
+    @java.lang.Override
+    public boolean getIsOpen() {
+      return isOpen_;
+    }
+
+    public static final int END_TIME_FIELD_NUMBER = 13;
     private int endTime_;
     /**
-     * <code>uint32 end_time = 8;</code>
+     * <code>uint32 end_time = 13;</code>
      * @return The endTime.
      */
     @java.lang.Override
@@ -187,10 +194,10 @@ public final class ActivityScheduleInfoOuterClass {
       return endTime_;
     }
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 4;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 14;
     private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 4;</code>
+     * <code>uint32 schedule_id = 14;</code>
      * @return The scheduleId.
      */
     @java.lang.Override
@@ -198,17 +205,6 @@ public final class ActivityScheduleInfoOuterClass {
       return scheduleId_;
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 1;
-    private int activityId_;
-    /**
-     * <code>uint32 activity_id = 1;</code>
-     * @return The activityId.
-     */
-    @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -223,20 +219,20 @@ public final class ActivityScheduleInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (activityId_ != 0) {
+      if (beginTime_ != 0) {
-        output.writeUInt32(1, activityId_);
+        output.writeUInt32(6, beginTime_);
       }
-      if (scheduleId_ != 0) {
+      if (activityId_ != 0) {
-        output.writeUInt32(4, scheduleId_);
+        output.writeUInt32(7, activityId_);
       }
       if (isOpen_ != false) {
-        output.writeBool(6, isOpen_);
+        output.writeBool(9, isOpen_);
-      }
-      if (beginTime_ != 0) {
-        output.writeUInt32(7, beginTime_);
       }
       if (endTime_ != 0) {
-        output.writeUInt32(8, endTime_);
+        output.writeUInt32(13, endTime_);
+      }
+      if (scheduleId_ != 0) {
+        output.writeUInt32(14, scheduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -247,25 +243,25 @@ public final class ActivityScheduleInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (beginTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, beginTime_);
+      }
       if (activityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, activityId_);
+          .computeUInt32Size(7, activityId_);
-      }
-      if (scheduleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, scheduleId_);
       }
       if (isOpen_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isOpen_);
+          .computeBoolSize(9, isOpen_);
-      }
-      if (beginTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, beginTime_);
       }
       if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, endTime_);
+          .computeUInt32Size(13, endTime_);
+      }
+      if (scheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, scheduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -282,16 +278,16 @@ public final class ActivityScheduleInfoOuterClass {
       }
       emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo other = (emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo) obj;
 
-      if (getIsOpen()
-          != other.getIsOpen()) return false;
       if (getBeginTime()
           != other.getBeginTime()) return false;
+      if (getActivityId()
+          != other.getActivityId()) return false;
+      if (getIsOpen()
+          != other.getIsOpen()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
       if (getScheduleId()
           != other.getScheduleId()) return false;
-      if (getActivityId()
-          != other.getActivityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -303,17 +299,17 @@ public final class ActivityScheduleInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getBeginTime();
+      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityId();
       hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsOpen());
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
       hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getScheduleId();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -410,10 +406,6 @@ public final class ActivityScheduleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MJEHIMOOCNJ
-     * </pre>
-     *
      * Protobuf type {@code ActivityScheduleInfo}
      */
     public static final class Builder extends
@@ -451,16 +443,16 @@ public final class ActivityScheduleInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isOpen_ = false;
-
         beginTime_ = 0;
 
+        activityId_ = 0;
+
+        isOpen_ = false;
+
         endTime_ = 0;
 
         scheduleId_ = 0;
 
-        activityId_ = 0;
-
         return this;
       }
 
@@ -487,11 +479,11 @@ public final class ActivityScheduleInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo buildPartial() {
         emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo result = new emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo(this);
-        result.isOpen_ = isOpen_;
         result.beginTime_ = beginTime_;
+        result.activityId_ = activityId_;
+        result.isOpen_ = isOpen_;
         result.endTime_ = endTime_;
         result.scheduleId_ = scheduleId_;
-        result.activityId_ = activityId_;
         onBuilt();
         return result;
       }
@@ -540,21 +532,21 @@ public final class ActivityScheduleInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo other) {
         if (other == emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance()) return this;
-        if (other.getIsOpen() != false) {
-          setIsOpen(other.getIsOpen());
-        }
         if (other.getBeginTime() != 0) {
           setBeginTime(other.getBeginTime());
         }
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
+        }
+        if (other.getIsOpen() != false) {
+          setIsOpen(other.getIsOpen());
+        }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
         }
         if (other.getScheduleId() != 0) {
           setScheduleId(other.getScheduleId());
         }
-        if (other.getActivityId() != 0) {
-          setActivityId(other.getActivityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -584,40 +576,9 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
 
-      private boolean isOpen_ ;
-      /**
-       * <code>bool is_open = 6;</code>
-       * @return The isOpen.
-       */
-      @java.lang.Override
-      public boolean getIsOpen() {
-        return isOpen_;
-      }
-      /**
-       * <code>bool is_open = 6;</code>
-       * @param value The isOpen to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsOpen(boolean value) {
-        
-        isOpen_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_open = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsOpen() {
-        
-        isOpen_ = false;
-        onChanged();
-        return this;
-      }
-
       private int beginTime_ ;
       /**
-       * <code>uint32 begin_time = 7;</code>
+       * <code>uint32 begin_time = 6;</code>
        * @return The beginTime.
        */
       @java.lang.Override
@@ -625,7 +586,7 @@ public final class ActivityScheduleInfoOuterClass {
         return beginTime_;
       }
       /**
-       * <code>uint32 begin_time = 7;</code>
+       * <code>uint32 begin_time = 6;</code>
        * @param value The beginTime to set.
        * @return This builder for chaining.
        */
@@ -636,7 +597,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 begin_time = 7;</code>
+       * <code>uint32 begin_time = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearBeginTime() {
@@ -646,9 +607,71 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
 
+      private int activityId_ ;
+      /**
+       * <code>uint32 activity_id = 7;</code>
+       * @return The activityId.
+       */
+      @java.lang.Override
+      public int getActivityId() {
+        return activityId_;
+      }
+      /**
+       * <code>uint32 activity_id = 7;</code>
+       * @param value The activityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityId(int value) {
+        
+        activityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityId() {
+        
+        activityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isOpen_ ;
+      /**
+       * <code>bool is_open = 9;</code>
+       * @return The isOpen.
+       */
+      @java.lang.Override
+      public boolean getIsOpen() {
+        return isOpen_;
+      }
+      /**
+       * <code>bool is_open = 9;</code>
+       * @param value The isOpen to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsOpen(boolean value) {
+        
+        isOpen_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_open = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsOpen() {
+        
+        isOpen_ = false;
+        onChanged();
+        return this;
+      }
+
       private int endTime_ ;
       /**
-       * <code>uint32 end_time = 8;</code>
+       * <code>uint32 end_time = 13;</code>
        * @return The endTime.
        */
       @java.lang.Override
@@ -656,7 +679,7 @@ public final class ActivityScheduleInfoOuterClass {
         return endTime_;
       }
       /**
-       * <code>uint32 end_time = 8;</code>
+       * <code>uint32 end_time = 13;</code>
        * @param value The endTime to set.
        * @return This builder for chaining.
        */
@@ -667,7 +690,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 end_time = 8;</code>
+       * <code>uint32 end_time = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearEndTime() {
@@ -679,7 +702,7 @@ public final class ActivityScheduleInfoOuterClass {
 
       private int scheduleId_ ;
       /**
-       * <code>uint32 schedule_id = 4;</code>
+       * <code>uint32 schedule_id = 14;</code>
        * @return The scheduleId.
        */
       @java.lang.Override
@@ -687,7 +710,7 @@ public final class ActivityScheduleInfoOuterClass {
         return scheduleId_;
       }
       /**
-       * <code>uint32 schedule_id = 4;</code>
+       * <code>uint32 schedule_id = 14;</code>
        * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
@@ -698,7 +721,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 4;</code>
+       * <code>uint32 schedule_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearScheduleId() {
@@ -707,37 +730,6 @@ public final class ActivityScheduleInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private int activityId_ ;
-      /**
-       * <code>uint32 activity_id = 1;</code>
-       * @return The activityId.
-       */
-      @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
-      }
-      /**
-       * <code>uint32 activity_id = 1;</code>
-       * @param value The activityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityId(int value) {
-        
-        activityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityId() {
-        
-        activityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -806,9 +798,9 @@ public final class ActivityScheduleInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032ActivityScheduleInfo.proto\"w\n\024Activity" +
-      "ScheduleInfo\022\017\n\007is_open\030\006 \001(\010\022\022\n\nbegin_t" +
+      "ScheduleInfo\022\022\n\nbegin_time\030\006 \001(\r\022\023\n\013acti" +
-      "ime\030\007 \001(\r\022\020\n\010end_time\030\010 \001(\r\022\023\n\013schedule_" +
+      "vity_id\030\007 \001(\r\022\017\n\007is_open\030\t \001(\010\022\020\n\010end_ti" +
-      "id\030\004 \001(\r\022\023\n\013activity_id\030\001 \001(\rB\033\n\031emu.gra" +
+      "me\030\r \001(\r\022\023\n\013schedule_id\030\016 \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -820,7 +812,7 @@ public final class ActivityScheduleInfoOuterClass {
     internal_static_ActivityScheduleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityScheduleInfo_descriptor,
-        new java.lang.String[] { "IsOpen", "BeginTime", "EndTime", "ScheduleId", "ActivityId", });
+        new java.lang.String[] { "BeginTime", "ActivityId", "IsOpen", "EndTime", "ScheduleId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/ActivityWatcherInfoOuterClass.java

@@ -19,34 +19,30 @@ public final class ActivityWatcherInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 total_progress = 14;</code>
+     * <code>uint32 total_progress = 7;</code>
      * @return The totalProgress.
      */
     int getTotalProgress();
 
     /**
-     * <code>uint32 watcher_id = 13;</code>
+     * <code>uint32 cur_progress = 8;</code>
-     * @return The watcherId.
+     * @return The curProgress.
      */
-    int getWatcherId();
+    int getCurProgress();
 
     /**
-     * <code>bool is_taken_reward = 8;</code>
+     * <code>bool is_taken_reward = 9;</code>
      * @return The isTakenReward.
      */
     boolean getIsTakenReward();
 
     /**
-     * <code>uint32 cur_progress = 15;</code>
+     * <code>uint32 watcher_id = 11;</code>
-     * @return The curProgress.
+     * @return The watcherId.
      */
-    int getCurProgress();
+    int getWatcherId();
   }
   /**
-   * <pre>
-   * Obf: MCEOHOILHEH
-   * </pre>
-   *
    * Protobuf type {@code ActivityWatcherInfo}
    */
   public static final class ActivityWatcherInfo extends
@@ -91,26 +87,26 @@ public final class ActivityWatcherInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 56: {
-
-              isTakenReward_ = input.readBool();
-              break;
-            }
-            case 104: {
-
-              watcherId_ = input.readUInt32();
-              break;
-            }
-            case 112: {
 
               totalProgress_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
               curProgress_ = input.readUInt32();
               break;
             }
+            case 72: {
+
+              isTakenReward_ = input.readBool();
+              break;
+            }
+            case 88: {
+
+              watcherId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -143,10 +139,10 @@ public final class ActivityWatcherInfoOuterClass {
               emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.class, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder.class);
     }
 
-    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 14;
+    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 7;
     private int totalProgress_;
     /**
-     * <code>uint32 total_progress = 14;</code>
+     * <code>uint32 total_progress = 7;</code>
      * @return The totalProgress.
      */
     @java.lang.Override
@@ -154,21 +150,21 @@ public final class ActivityWatcherInfoOuterClass {
       return totalProgress_;
     }
 
-    public static final int WATCHER_ID_FIELD_NUMBER = 13;
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 8;
-    private int watcherId_;
+    private int curProgress_;
     /**
-     * <code>uint32 watcher_id = 13;</code>
+     * <code>uint32 cur_progress = 8;</code>
-     * @return The watcherId.
+     * @return The curProgress.
      */
     @java.lang.Override
-    public int getWatcherId() {
+    public int getCurProgress() {
-      return watcherId_;
+      return curProgress_;
     }
 
-    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 8;
+    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 9;
     private boolean isTakenReward_;
     /**
-     * <code>bool is_taken_reward = 8;</code>
+     * <code>bool is_taken_reward = 9;</code>
      * @return The isTakenReward.
      */
     @java.lang.Override
@@ -176,15 +172,15 @@ public final class ActivityWatcherInfoOuterClass {
       return isTakenReward_;
     }
 
-    public static final int CUR_PROGRESS_FIELD_NUMBER = 15;
+    public static final int WATCHER_ID_FIELD_NUMBER = 11;
-    private int curProgress_;
+    private int watcherId_;
     /**
-     * <code>uint32 cur_progress = 15;</code>
+     * <code>uint32 watcher_id = 11;</code>
-     * @return The curProgress.
+     * @return The watcherId.
      */
     @java.lang.Override
-    public int getCurProgress() {
+    public int getWatcherId() {
-      return curProgress_;
+      return watcherId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -201,17 +197,17 @@ public final class ActivityWatcherInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isTakenReward_ != false) {
-        output.writeBool(8, isTakenReward_);
-      }
-      if (watcherId_ != 0) {
-        output.writeUInt32(13, watcherId_);
-      }
       if (totalProgress_ != 0) {
-        output.writeUInt32(14, totalProgress_);
+        output.writeUInt32(7, totalProgress_);
       }
       if (curProgress_ != 0) {
-        output.writeUInt32(15, curProgress_);
+        output.writeUInt32(8, curProgress_);
+      }
+      if (isTakenReward_ != false) {
+        output.writeBool(9, isTakenReward_);
+      }
+      if (watcherId_ != 0) {
+        output.writeUInt32(11, watcherId_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,21 +218,21 @@ public final class ActivityWatcherInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isTakenReward_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isTakenReward_);
-      }
-      if (watcherId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, watcherId_);
-      }
       if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, totalProgress_);
+          .computeUInt32Size(7, totalProgress_);
       }
       if (curProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, curProgress_);
+          .computeUInt32Size(8, curProgress_);
+      }
+      if (isTakenReward_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(9, isTakenReward_);
+      }
+      if (watcherId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, watcherId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -255,12 +251,12 @@ public final class ActivityWatcherInfoOuterClass {
 
       if (getTotalProgress()
           != other.getTotalProgress()) return false;
-      if (getWatcherId()
-          != other.getWatcherId()) return false;
-      if (getIsTakenReward()
-          != other.getIsTakenReward()) return false;
       if (getCurProgress()
           != other.getCurProgress()) return false;
+      if (getIsTakenReward()
+          != other.getIsTakenReward()) return false;
+      if (getWatcherId()
+          != other.getWatcherId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -274,13 +270,13 @@ public final class ActivityWatcherInfoOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getTotalProgress();
-      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
+      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getWatcherId();
+      hash = (53 * hash) + getCurProgress();
       hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsTakenReward());
-      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
+      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCurProgress();
+      hash = (53 * hash) + getWatcherId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,10 +373,6 @@ public final class ActivityWatcherInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MCEOHOILHEH
-     * </pre>
-     *
      * Protobuf type {@code ActivityWatcherInfo}
      */
     public static final class Builder extends
@@ -420,11 +412,11 @@ public final class ActivityWatcherInfoOuterClass {
         super.clear();
         totalProgress_ = 0;
 
-        watcherId_ = 0;
+        curProgress_ = 0;
 
         isTakenReward_ = false;
 
-        curProgress_ = 0;
+        watcherId_ = 0;
 
         return this;
       }
@@ -453,9 +445,9 @@ public final class ActivityWatcherInfoOuterClass {
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo buildPartial() {
         emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo result = new emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo(this);
         result.totalProgress_ = totalProgress_;
-        result.watcherId_ = watcherId_;
-        result.isTakenReward_ = isTakenReward_;
         result.curProgress_ = curProgress_;
+        result.isTakenReward_ = isTakenReward_;
+        result.watcherId_ = watcherId_;
         onBuilt();
         return result;
       }
@@ -507,14 +499,14 @@ public final class ActivityWatcherInfoOuterClass {
         if (other.getTotalProgress() != 0) {
           setTotalProgress(other.getTotalProgress());
         }
-        if (other.getWatcherId() != 0) {
+        if (other.getCurProgress() != 0) {
-          setWatcherId(other.getWatcherId());
+          setCurProgress(other.getCurProgress());
         }
         if (other.getIsTakenReward() != false) {
           setIsTakenReward(other.getIsTakenReward());
         }
-        if (other.getCurProgress() != 0) {
+        if (other.getWatcherId() != 0) {
-          setCurProgress(other.getCurProgress());
+          setWatcherId(other.getWatcherId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -547,7 +539,7 @@ public final class ActivityWatcherInfoOuterClass {
 
       private int totalProgress_ ;
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 7;</code>
        * @return The totalProgress.
        */
       @java.lang.Override
@@ -555,7 +547,7 @@ public final class ActivityWatcherInfoOuterClass {
         return totalProgress_;
       }
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 7;</code>
        * @param value The totalProgress to set.
        * @return This builder for chaining.
        */
@@ -566,7 +558,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTotalProgress() {
@@ -576,71 +568,9 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
 
-      private int watcherId_ ;
-      /**
-       * <code>uint32 watcher_id = 13;</code>
-       * @return The watcherId.
-       */
-      @java.lang.Override
-      public int getWatcherId() {
-        return watcherId_;
-      }
-      /**
-       * <code>uint32 watcher_id = 13;</code>
-       * @param value The watcherId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWatcherId(int value) {
-        
-        watcherId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 watcher_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWatcherId() {
-        
-        watcherId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isTakenReward_ ;
-      /**
-       * <code>bool is_taken_reward = 8;</code>
-       * @return The isTakenReward.
-       */
-      @java.lang.Override
-      public boolean getIsTakenReward() {
-        return isTakenReward_;
-      }
-      /**
-       * <code>bool is_taken_reward = 8;</code>
-       * @param value The isTakenReward to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsTakenReward(boolean value) {
-        
-        isTakenReward_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_taken_reward = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsTakenReward() {
-        
-        isTakenReward_ = false;
-        onChanged();
-        return this;
-      }
-
       private int curProgress_ ;
       /**
-       * <code>uint32 cur_progress = 15;</code>
+       * <code>uint32 cur_progress = 8;</code>
        * @return The curProgress.
        */
       @java.lang.Override
@@ -648,7 +578,7 @@ public final class ActivityWatcherInfoOuterClass {
         return curProgress_;
       }
       /**
-       * <code>uint32 cur_progress = 15;</code>
+       * <code>uint32 cur_progress = 8;</code>
        * @param value The curProgress to set.
        * @return This builder for chaining.
        */
@@ -659,7 +589,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cur_progress = 15;</code>
+       * <code>uint32 cur_progress = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurProgress() {
@@ -668,6 +598,68 @@ public final class ActivityWatcherInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isTakenReward_ ;
+      /**
+       * <code>bool is_taken_reward = 9;</code>
+       * @return The isTakenReward.
+       */
+      @java.lang.Override
+      public boolean getIsTakenReward() {
+        return isTakenReward_;
+      }
+      /**
+       * <code>bool is_taken_reward = 9;</code>
+       * @param value The isTakenReward to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsTakenReward(boolean value) {
+        
+        isTakenReward_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_taken_reward = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsTakenReward() {
+        
+        isTakenReward_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int watcherId_ ;
+      /**
+       * <code>uint32 watcher_id = 11;</code>
+       * @return The watcherId.
+       */
+      @java.lang.Override
+      public int getWatcherId() {
+        return watcherId_;
+      }
+      /**
+       * <code>uint32 watcher_id = 11;</code>
+       * @param value The watcherId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWatcherId(int value) {
+        
+        watcherId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 watcher_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWatcherId() {
+        
+        watcherId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -736,9 +728,9 @@ public final class ActivityWatcherInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031ActivityWatcherInfo.proto\"p\n\023ActivityW" +
-      "atcherInfo\022\026\n\016total_progress\030\016 \001(\r\022\022\n\nwa" +
+      "atcherInfo\022\026\n\016total_progress\030\007 \001(\r\022\024\n\014cu" +
-      "tcher_id\030\r \001(\r\022\027\n\017is_taken_reward\030\010 \001(\010\022" +
+      "r_progress\030\010 \001(\r\022\027\n\017is_taken_reward\030\t \001(" +
-      "\024\n\014cur_progress\030\017 \001(\rB\033\n\031emu.grasscutter" +
+      "\010\022\022\n\nwatcher_id\030\013 \001(\rB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +742,7 @@ public final class ActivityWatcherInfoOuterClass {
     internal_static_ActivityWatcherInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityWatcherInfo_descriptor,
-        new java.lang.String[] { "TotalProgress", "WatcherId", "IsTakenReward", "CurProgress", });
+        new java.lang.String[] { "TotalProgress", "CurProgress", "IsTakenReward", "WatcherId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamReqOuterClass.java

@@ -20,8 +20,7 @@ public final class AddBackupAvatarTeamReqOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 22083
+   * CmdId: 23418
-   * Obf: PDKOLMGNNBP
    * </pre>
    *
    * Protobuf type {@code AddBackupAvatarTeamReq}
@@ -246,8 +245,7 @@ public final class AddBackupAvatarTeamReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 22083
+     * CmdId: 23418
-     * Obf: PDKOLMGNNBP
      * </pre>
      *
      * Protobuf type {@code AddBackupAvatarTeamReq}

src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java

@@ -19,15 +19,14 @@ public final class AddBackupAvatarTeamRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 7930
+   * CmdId: 7660
-   * Obf: GDMKNCBFCEH
    * </pre>
    *
    * Protobuf type {@code AddBackupAvatarTeamRsp}
@@ -74,7 +73,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +110,10 @@ public final class AddBackupAvatarTeamRspOuterClass {
               emu.grasscutter.net.proto.AddBackupAvatarTeamRspOuterClass.AddBackupAvatarTeamRsp.class, emu.grasscutter.net.proto.AddBackupAvatarTeamRspOuterClass.AddBackupAvatarTeamRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +136,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
+        output.writeInt32(5, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +149,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +278,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 7930
+     * CmdId: 7660
-     * Obf: GDMKNCBFCEH
      * </pre>
      *
      * Protobuf type {@code AddBackupAvatarTeamRsp}
@@ -431,7 +429,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +437,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +448,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +525,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AddBackupAvatarTeamRsp.proto\")\n\026AddBac" +
-      "kupAvatarTeamRsp\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu" +
+      "kupAvatarTeamRsp\022\017\n\007retcode\030\005 \001(\005B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AddFriendNotifyOuterClass.java

@@ -19,32 +19,27 @@ public final class AddFriendNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 11;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     boolean hasTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return The targetFriendBrief.
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 2626
-   * Obf: EHIPCHBKFKE
-   * </pre>
-   *
    * Protobuf type {@code AddFriendNotify}
    */
   public static final class AddFriendNotify extends
@@ -89,12 +84,12 @@ public final class AddFriendNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 88: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 50: {
+            case 98: {
               emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder subBuilder = null;
               if (targetFriendBrief_ != null) {
                 subBuilder = targetFriendBrief_.toBuilder();
@@ -139,10 +134,10 @@ public final class AddFriendNotifyOuterClass {
               emu.grasscutter.net.proto.AddFriendNotifyOuterClass.AddFriendNotify.class, emu.grasscutter.net.proto.AddFriendNotifyOuterClass.AddFriendNotify.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 4;
+    public static final int TARGET_UID_FIELD_NUMBER = 11;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 11;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -150,10 +145,10 @@ public final class AddFriendNotifyOuterClass {
       return targetUid_;
     }
 
-    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 6;
+    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     @java.lang.Override
@@ -161,7 +156,7 @@ public final class AddFriendNotifyOuterClass {
       return targetFriendBrief_ != null;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return The targetFriendBrief.
      */
     @java.lang.Override
@@ -169,7 +164,7 @@ public final class AddFriendNotifyOuterClass {
       return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
@@ -191,10 +186,10 @@ public final class AddFriendNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(4, targetUid_);
+        output.writeUInt32(11, targetUid_);
       }
       if (targetFriendBrief_ != null) {
-        output.writeMessage(6, getTargetFriendBrief());
+        output.writeMessage(12, getTargetFriendBrief());
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class AddFriendNotifyOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, targetUid_);
+          .computeUInt32Size(11, targetUid_);
       }
       if (targetFriendBrief_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getTargetFriendBrief());
+          .computeMessageSize(12, getTargetFriendBrief());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,11 +343,6 @@ public final class AddFriendNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2626
-     * Obf: EHIPCHBKFKE
-     * </pre>
-     *
      * Protobuf type {@code AddFriendNotify}
      */
     public static final class Builder extends
@@ -515,7 +505,7 @@ public final class AddFriendNotifyOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 11;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -523,7 +513,7 @@ public final class AddFriendNotifyOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 11;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -534,7 +524,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -548,14 +538,14 @@ public final class AddFriendNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        * @return Whether the targetFriendBrief field is set.
        */
       public boolean hasTargetFriendBrief() {
         return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        * @return The targetFriendBrief.
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
@@ -566,7 +556,7 @@ public final class AddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -582,7 +572,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder setTargetFriendBrief(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -596,7 +586,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -614,7 +604,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder clearTargetFriendBrief() {
         if (targetFriendBriefBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
         
@@ -636,7 +626,7 @@ public final class AddFriendNotifyOuterClass {
         return getTargetFriendBriefFieldBuilder().getBuilder();
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
         if (targetFriendBriefBuilder_ != null) {
@@ -647,7 +637,7 @@ public final class AddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -730,8 +720,8 @@ public final class AddFriendNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AddFriendNotify.proto\032\021FriendBrief.pro" +
-      "to\"P\n\017AddFriendNotify\022\022\n\ntarget_uid\030\004 \001(" +
+      "to\"P\n\017AddFriendNotify\022\022\n\ntarget_uid\030\013 \001(" +
-      "\r\022)\n\023target_friend_brief\030\006 \001(\0132\014.FriendB" +
+      "\r\022)\n\023target_friend_brief\030\014 \001(\0132\014.FriendB" +
       "riefB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java

@@ -19,28 +19,24 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 count = 1;</code>
+     * <code>uint32 count = 3;</code>
      * @return The count.
      */
     int getCount();
 
     /**
-     * <code>uint32 item_id = 15;</code>
+     * <code>uint32 item_id = 6;</code>
      * @return The itemId.
      */
     int getItemId();
 
     /**
-     * <code>bool is_new = 13;</code>
+     * <code>bool is_new = 11;</code>
      * @return The isNew.
      */
     boolean getIsNew();
   }
   /**
-   * <pre>
-   * Obf: APPDFAFBKIM
-   * </pre>
-   *
    * Protobuf type {@code AddNoGachaAvatarCardTransferItem}
    */
   public static final class AddNoGachaAvatarCardTransferItem extends
@@ -85,21 +81,21 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
 
               count_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 48: {
-
-              isNew_ = input.readBool();
-              break;
-            }
-            case 120: {
 
               itemId_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              isNew_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -132,10 +128,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
               emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.class, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder.class);
     }
 
-    public static final int COUNT_FIELD_NUMBER = 1;
+    public static final int COUNT_FIELD_NUMBER = 3;
     private int count_;
     /**
-     * <code>uint32 count = 1;</code>
+     * <code>uint32 count = 3;</code>
      * @return The count.
      */
     @java.lang.Override
@@ -143,10 +139,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       return count_;
     }
 
-    public static final int ITEM_ID_FIELD_NUMBER = 15;
+    public static final int ITEM_ID_FIELD_NUMBER = 6;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 15;</code>
+     * <code>uint32 item_id = 6;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -154,10 +150,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       return itemId_;
     }
 
-    public static final int IS_NEW_FIELD_NUMBER = 13;
+    public static final int IS_NEW_FIELD_NUMBER = 11;
     private boolean isNew_;
     /**
-     * <code>bool is_new = 13;</code>
+     * <code>bool is_new = 11;</code>
      * @return The isNew.
      */
     @java.lang.Override
@@ -180,13 +176,13 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (count_ != 0) {
-        output.writeUInt32(1, count_);
+        output.writeUInt32(3, count_);
-      }
-      if (isNew_ != false) {
-        output.writeBool(13, isNew_);
       }
       if (itemId_ != 0) {
-        output.writeUInt32(15, itemId_);
+        output.writeUInt32(6, itemId_);
+      }
+      if (isNew_ != false) {
+        output.writeBool(11, isNew_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +195,15 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       size = 0;
       if (count_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, count_);
+          .computeUInt32Size(3, count_);
-      }
-      if (isNew_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isNew_);
       }
       if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, itemId_);
+          .computeUInt32Size(6, itemId_);
+      }
+      if (isNew_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isNew_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -344,10 +340,6 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: APPDFAFBKIM
-     * </pre>
-     *
      * Protobuf type {@code AddNoGachaAvatarCardTransferItem}
      */
     public static final class Builder extends
@@ -508,7 +500,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
 
       private int count_ ;
       /**
-       * <code>uint32 count = 1;</code>
+       * <code>uint32 count = 3;</code>
        * @return The count.
        */
       @java.lang.Override
@@ -516,7 +508,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return count_;
       }
       /**
-       * <code>uint32 count = 1;</code>
+       * <code>uint32 count = 3;</code>
        * @param value The count to set.
        * @return This builder for chaining.
        */
@@ -527,7 +519,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>uint32 count = 1;</code>
+       * <code>uint32 count = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearCount() {
@@ -539,7 +531,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
 
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 15;</code>
+       * <code>uint32 item_id = 6;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -547,7 +539,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 15;</code>
+       * <code>uint32 item_id = 6;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -558,7 +550,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_id = 15;</code>
+       * <code>uint32 item_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -570,7 +562,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
 
       private boolean isNew_ ;
       /**
-       * <code>bool is_new = 13;</code>
+       * <code>bool is_new = 11;</code>
        * @return The isNew.
        */
       @java.lang.Override
@@ -578,7 +570,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return isNew_;
       }
       /**
-       * <code>bool is_new = 13;</code>
+       * <code>bool is_new = 11;</code>
        * @param value The isNew to set.
        * @return This builder for chaining.
        */
@@ -589,7 +581,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>bool is_new = 13;</code>
+       * <code>bool is_new = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsNew() {
@@ -667,7 +659,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
     java.lang.String[] descriptorData = {
       "\n&AddNoGachaAvatarCardTransferItem.proto" +
       "\"R\n AddNoGachaAvatarCardTransferItem\022\r\n\005" +
-      "count\030\001 \001(\r\022\017\n\007item_id\030\017 \001(\r\022\016\n\006is_new\030\r" +
+      "count\030\003 \001(\r\022\017\n\007item_id\030\006 \001(\r\022\016\n\006is_new\030\013" +
       " \001(\010B\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java

@@ -19,29 +19,24 @@ public final class AddQuestContentProgressReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 add_progress = 7;</code>
+     * <code>uint32 content_type = 7;</code>
-     * @return The addProgress.
-     */
-    int getAddProgress();
-
-    /**
-     * <code>uint32 content_type = 1;</code>
      * @return The contentType.
      */
     int getContentType();
 
     /**
-     * <code>uint32 param = 6;</code>
+     * <code>uint32 param = 11;</code>
      * @return The param.
      */
     int getParam();
+
+    /**
+     * <code>uint32 add_progress = 15;</code>
+     * @return The addProgress.
+     */
+    int getAddProgress();
   }
   /**
-   * <pre>
-   * CmdId: 3824
-   * Obf: AIJHHIHHOHI
-   * </pre>
-   *
    * Protobuf type {@code AddQuestContentProgressReq}
    */
   public static final class AddQuestContentProgressReq extends
@@ -86,17 +81,17 @@ public final class AddQuestContentProgressReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 56: {
 
               contentType_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 88: {
 
               param_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 120: {
 
               addProgress_ = input.readUInt32();
               break;
@@ -133,21 +128,10 @@ public final class AddQuestContentProgressReqOuterClass {
               emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.class, emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.Builder.class);
     }
 
-    public static final int ADD_PROGRESS_FIELD_NUMBER = 7;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 7;
-    private int addProgress_;
-    /**
-     * <code>uint32 add_progress = 7;</code>
-     * @return The addProgress.
-     */
-    @java.lang.Override
-    public int getAddProgress() {
-      return addProgress_;
-    }
-
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 1;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 1;</code>
+     * <code>uint32 content_type = 7;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -155,10 +139,10 @@ public final class AddQuestContentProgressReqOuterClass {
       return contentType_;
     }
 
-    public static final int PARAM_FIELD_NUMBER = 6;
+    public static final int PARAM_FIELD_NUMBER = 11;
     private int param_;
     /**
-     * <code>uint32 param = 6;</code>
+     * <code>uint32 param = 11;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class AddQuestContentProgressReqOuterClass {
       return param_;
     }
 
+    public static final int ADD_PROGRESS_FIELD_NUMBER = 15;
+    private int addProgress_;
+    /**
+     * <code>uint32 add_progress = 15;</code>
+     * @return The addProgress.
+     */
+    @java.lang.Override
+    public int getAddProgress() {
+      return addProgress_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -181,13 +176,13 @@ public final class AddQuestContentProgressReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (contentType_ != 0) {
-        output.writeUInt32(1, contentType_);
+        output.writeUInt32(7, contentType_);
       }
       if (param_ != 0) {
-        output.writeUInt32(6, param_);
+        output.writeUInt32(11, param_);
       }
       if (addProgress_ != 0) {
-        output.writeUInt32(7, addProgress_);
+        output.writeUInt32(15, addProgress_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class AddQuestContentProgressReqOuterClass {
       size = 0;
       if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, contentType_);
+          .computeUInt32Size(7, contentType_);
       }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, param_);
+          .computeUInt32Size(11, param_);
       }
       if (addProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, addProgress_);
+          .computeUInt32Size(15, addProgress_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class AddQuestContentProgressReqOuterClass {
       }
       emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other = (emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq) obj;
 
-      if (getAddProgress()
-          != other.getAddProgress()) return false;
       if (getContentType()
           != other.getContentType()) return false;
       if (getParam()
           != other.getParam()) return false;
+      if (getAddProgress()
+          != other.getAddProgress()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class AddQuestContentProgressReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ADD_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getAddProgress();
       hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getContentType();
       hash = (37 * hash) + PARAM_FIELD_NUMBER;
       hash = (53 * hash) + getParam();
+      hash = (37 * hash) + ADD_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getAddProgress();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class AddQuestContentProgressReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3824
-     * Obf: AIJHHIHHOHI
-     * </pre>
-     *
      * Protobuf type {@code AddQuestContentProgressReq}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class AddQuestContentProgressReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        addProgress_ = 0;
-
         contentType_ = 0;
 
         param_ = 0;
 
+        addProgress_ = 0;
+
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class AddQuestContentProgressReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq buildPartial() {
         emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq result = new emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq(this);
-        result.addProgress_ = addProgress_;
         result.contentType_ = contentType_;
         result.param_ = param_;
+        result.addProgress_ = addProgress_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class AddQuestContentProgressReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other) {
         if (other == emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.getDefaultInstance()) return this;
-        if (other.getAddProgress() != 0) {
-          setAddProgress(other.getAddProgress());
-        }
         if (other.getContentType() != 0) {
           setContentType(other.getContentType());
         }
         if (other.getParam() != 0) {
           setParam(other.getParam());
         }
+        if (other.getAddProgress() != 0) {
+          setAddProgress(other.getAddProgress());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,40 +497,9 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
 
-      private int addProgress_ ;
-      /**
-       * <code>uint32 add_progress = 7;</code>
-       * @return The addProgress.
-       */
-      @java.lang.Override
-      public int getAddProgress() {
-        return addProgress_;
-      }
-      /**
-       * <code>uint32 add_progress = 7;</code>
-       * @param value The addProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAddProgress(int value) {
-        
-        addProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 add_progress = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAddProgress() {
-        
-        addProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 1;</code>
+       * <code>uint32 content_type = 7;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -548,7 +507,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 1;</code>
+       * <code>uint32 content_type = 7;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -559,7 +518,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 content_type = 1;</code>
+       * <code>uint32 content_type = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -571,7 +530,7 @@ public final class AddQuestContentProgressReqOuterClass {
 
       private int param_ ;
       /**
-       * <code>uint32 param = 6;</code>
+       * <code>uint32 param = 11;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 6;</code>
+       * <code>uint32 param = 11;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 6;</code>
+       * <code>uint32 param = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -599,6 +558,37 @@ public final class AddQuestContentProgressReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int addProgress_ ;
+      /**
+       * <code>uint32 add_progress = 15;</code>
+       * @return The addProgress.
+       */
+      @java.lang.Override
+      public int getAddProgress() {
+        return addProgress_;
+      }
+      /**
+       * <code>uint32 add_progress = 15;</code>
+       * @param value The addProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAddProgress(int value) {
+        
+        addProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 add_progress = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAddProgress() {
+        
+        addProgress_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class AddQuestContentProgressReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressReq.proto\"W\n\032Ad" +
-      "dQuestContentProgressReq\022\024\n\014add_progress" +
+      "dQuestContentProgressReq\022\024\n\014content_type" +
-      "\030\007 \001(\r\022\024\n\014content_type\030\001 \001(\r\022\r\n\005param\030\006 " +
+      "\030\007 \001(\r\022\r\n\005param\030\013 \001(\r\022\024\n\014add_progress\030\017 " +
       "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class AddQuestContentProgressReqOuterClass {
     internal_static_AddQuestContentProgressReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddQuestContentProgressReq_descriptor,
-        new java.lang.String[] { "AddProgress", "ContentType", "Param", });
+        new java.lang.String[] { "ContentType", "Param", "AddProgress", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java

@@ -19,23 +19,18 @@ public final class AddQuestContentProgressRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>uint32 content_type = 12;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 content_type = 10;</code>
      * @return The contentType.
      */
     int getContentType();
+
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 5514
-   * Obf: FGGNCOHIPDL
-   * </pre>
-   *
    * Protobuf type {@code AddQuestContentProgressRsp}
    */
   public static final class AddQuestContentProgressRsp extends
@@ -80,12 +75,12 @@ public final class AddQuestContentProgressRspOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 96: {
 
               contentType_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 120: {
 
               retcode_ = input.readInt32();
               break;
@@ -122,21 +117,10 @@ public final class AddQuestContentProgressRspOuterClass {
               emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.class, emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 12;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 12;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 10;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 10;</code>
+     * <code>uint32 content_type = 12;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class AddQuestContentProgressRspOuterClass {
       return contentType_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class AddQuestContentProgressRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (contentType_ != 0) {
-        output.writeUInt32(10, contentType_);
+        output.writeUInt32(12, contentType_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class AddQuestContentProgressRspOuterClass {
       size = 0;
       if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, contentType_);
+          .computeUInt32Size(12, contentType_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class AddQuestContentProgressRspOuterClass {
       }
       emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp other = (emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getContentType()
           != other.getContentType()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class AddQuestContentProgressRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getContentType();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class AddQuestContentProgressRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5514
-     * Obf: FGGNCOHIPDL
-     * </pre>
-     *
      * Protobuf type {@code AddQuestContentProgressRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class AddQuestContentProgressRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         contentType_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class AddQuestContentProgressRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp buildPartial() {
         emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp result = new emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp(this);
-        result.retcode_ = retcode_;
         result.contentType_ = contentType_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class AddQuestContentProgressRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp other) {
         if (other == emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getContentType() != 0) {
           setContentType(other.getContentType());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class AddQuestContentProgressRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 12;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 12;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 10;</code>
+       * <code>uint32 content_type = 12;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 10;</code>
+       * <code>uint32 content_type = 12;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 content_type = 10;</code>
+       * <code>uint32 content_type = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -529,6 +488,37 @@ public final class AddQuestContentProgressRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class AddQuestContentProgressRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressRsp.proto\"C\n\032Ad" +
-      "dQuestContentProgressRsp\022\017\n\007retcode\030\014 \001(" +
+      "dQuestContentProgressRsp\022\024\n\014content_type" +
-      "\005\022\024\n\014content_type\030\n \001(\rB\033\n\031emu.grasscutt" +
+      "\030\014 \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class AddQuestContentProgressRspOuterClass {
     internal_static_AddQuestContentProgressRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddQuestContentProgressRsp_descriptor,
-        new java.lang.String[] { "Retcode", "ContentType", });
+        new java.lang.String[] { "ContentType", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AdjustWorldLevelRspOuterClass.java

@@ -19,13 +19,7 @@ public final class AdjustWorldLevelRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cd_over_time = 3;</code>
+     * <code>uint32 after_world_level = 3;</code>
-     * @return The cdOverTime.
-     */
-    int getCdOverTime();
-
-    /**
-     * <code>uint32 after_world_level = 15;</code>
      * @return The afterWorldLevel.
      */
     int getAfterWorldLevel();
@@ -35,11 +29,16 @@ public final class AdjustWorldLevelRspOuterClass {
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 cd_over_time = 8;</code>
+     * @return The cdOverTime.
+     */
+    int getCdOverTime();
   }
   /**
    * <pre>
-   * CmdId: 29945
+   * CmdId: 29530
-   * Obf: IDFOMBDLFNJ
    * </pre>
    *
    * Protobuf type {@code AdjustWorldLevelRsp}
@@ -88,7 +87,7 @@ public final class AdjustWorldLevelRspOuterClass {
               break;
             case 24: {
 
-              cdOverTime_ = input.readUInt32();
+              afterWorldLevel_ = input.readUInt32();
               break;
             }
             case 48: {
@@ -96,9 +95,9 @@ public final class AdjustWorldLevelRspOuterClass {
               retcode_ = input.readInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
-              afterWorldLevel_ = input.readUInt32();
+              cdOverTime_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,21 +132,10 @@ public final class AdjustWorldLevelRspOuterClass {
               emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp.class, emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp.Builder.class);
     }
 
-    public static final int CD_OVER_TIME_FIELD_NUMBER = 3;
+    public static final int AFTER_WORLD_LEVEL_FIELD_NUMBER = 3;
-    private int cdOverTime_;
-    /**
-     * <code>uint32 cd_over_time = 3;</code>
-     * @return The cdOverTime.
-     */
-    @java.lang.Override
-    public int getCdOverTime() {
-      return cdOverTime_;
-    }
-
-    public static final int AFTER_WORLD_LEVEL_FIELD_NUMBER = 15;
     private int afterWorldLevel_;
     /**
-     * <code>uint32 after_world_level = 15;</code>
+     * <code>uint32 after_world_level = 3;</code>
      * @return The afterWorldLevel.
      */
     @java.lang.Override
@@ -166,6 +154,17 @@ public final class AdjustWorldLevelRspOuterClass {
       return retcode_;
     }
 
+    public static final int CD_OVER_TIME_FIELD_NUMBER = 8;
+    private int cdOverTime_;
+    /**
+     * <code>uint32 cd_over_time = 8;</code>
+     * @return The cdOverTime.
+     */
+    @java.lang.Override
+    public int getCdOverTime() {
+      return cdOverTime_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +179,14 @@ public final class AdjustWorldLevelRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (cdOverTime_ != 0) {
+      if (afterWorldLevel_ != 0) {
-        output.writeUInt32(3, cdOverTime_);
+        output.writeUInt32(3, afterWorldLevel_);
       }
       if (retcode_ != 0) {
         output.writeInt32(6, retcode_);
       }
-      if (afterWorldLevel_ != 0) {
+      if (cdOverTime_ != 0) {
-        output.writeUInt32(15, afterWorldLevel_);
+        output.writeUInt32(8, cdOverTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +197,17 @@ public final class AdjustWorldLevelRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (cdOverTime_ != 0) {
+      if (afterWorldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, cdOverTime_);
+          .computeUInt32Size(3, afterWorldLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(6, retcode_);
       }
-      if (afterWorldLevel_ != 0) {
+      if (cdOverTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, afterWorldLevel_);
+          .computeUInt32Size(8, cdOverTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +224,12 @@ public final class AdjustWorldLevelRspOuterClass {
       }
       emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp other = (emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp) obj;
 
-      if (getCdOverTime()
-          != other.getCdOverTime()) return false;
       if (getAfterWorldLevel()
           != other.getAfterWorldLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getCdOverTime()
+          != other.getCdOverTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +241,12 @@ public final class AdjustWorldLevelRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CD_OVER_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getCdOverTime();
       hash = (37 * hash) + AFTER_WORLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getAfterWorldLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CD_OVER_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCdOverTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,8 +344,7 @@ public final class AdjustWorldLevelRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 29945
+     * CmdId: 29530
-     * Obf: IDFOMBDLFNJ
      * </pre>
      *
      * Protobuf type {@code AdjustWorldLevelRsp}
@@ -386,12 +384,12 @@ public final class AdjustWorldLevelRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        cdOverTime_ = 0;
-
         afterWorldLevel_ = 0;
 
         retcode_ = 0;
 
+        cdOverTime_ = 0;
+
         return this;
       }
 
@@ -418,9 +416,9 @@ public final class AdjustWorldLevelRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp buildPartial() {
         emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp result = new emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp(this);
-        result.cdOverTime_ = cdOverTime_;
         result.afterWorldLevel_ = afterWorldLevel_;
         result.retcode_ = retcode_;
+        result.cdOverTime_ = cdOverTime_;
         onBuilt();
         return result;
       }
@@ -469,15 +467,15 @@ public final class AdjustWorldLevelRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp other) {
         if (other == emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp.getDefaultInstance()) return this;
-        if (other.getCdOverTime() != 0) {
-          setCdOverTime(other.getCdOverTime());
-        }
         if (other.getAfterWorldLevel() != 0) {
           setAfterWorldLevel(other.getAfterWorldLevel());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getCdOverTime() != 0) {
+          setCdOverTime(other.getCdOverTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,40 +505,9 @@ public final class AdjustWorldLevelRspOuterClass {
         return this;
       }
 
-      private int cdOverTime_ ;
-      /**
-       * <code>uint32 cd_over_time = 3;</code>
-       * @return The cdOverTime.
-       */
-      @java.lang.Override
-      public int getCdOverTime() {
-        return cdOverTime_;
-      }
-      /**
-       * <code>uint32 cd_over_time = 3;</code>
-       * @param value The cdOverTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCdOverTime(int value) {
-        
-        cdOverTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cd_over_time = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCdOverTime() {
-        
-        cdOverTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int afterWorldLevel_ ;
       /**
-       * <code>uint32 after_world_level = 15;</code>
+       * <code>uint32 after_world_level = 3;</code>
        * @return The afterWorldLevel.
        */
       @java.lang.Override
@@ -548,7 +515,7 @@ public final class AdjustWorldLevelRspOuterClass {
         return afterWorldLevel_;
       }
       /**
-       * <code>uint32 after_world_level = 15;</code>
+       * <code>uint32 after_world_level = 3;</code>
        * @param value The afterWorldLevel to set.
        * @return This builder for chaining.
        */
@@ -559,7 +526,7 @@ public final class AdjustWorldLevelRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 after_world_level = 15;</code>
+       * <code>uint32 after_world_level = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearAfterWorldLevel() {
@@ -599,6 +566,37 @@ public final class AdjustWorldLevelRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int cdOverTime_ ;
+      /**
+       * <code>uint32 cd_over_time = 8;</code>
+       * @return The cdOverTime.
+       */
+      @java.lang.Override
+      public int getCdOverTime() {
+        return cdOverTime_;
+      }
+      /**
+       * <code>uint32 cd_over_time = 8;</code>
+       * @param value The cdOverTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCdOverTime(int value) {
+        
+        cdOverTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cd_over_time = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCdOverTime() {
+        
+        cdOverTime_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +665,8 @@ public final class AdjustWorldLevelRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031AdjustWorldLevelRsp.proto\"W\n\023AdjustWor" +
-      "ldLevelRsp\022\024\n\014cd_over_time\030\003 \001(\r\022\031\n\021afte" +
+      "ldLevelRsp\022\031\n\021after_world_level\030\003 \001(\r\022\017\n" +
-      "r_world_level\030\017 \001(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031" +
+      "\007retcode\030\006 \001(\005\022\024\n\014cd_over_time\030\010 \001(\rB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +678,7 @@ public final class AdjustWorldLevelRspOuterClass {
     internal_static_AdjustWorldLevelRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AdjustWorldLevelRsp_descriptor,
-        new java.lang.String[] { "CdOverTime", "AfterWorldLevel", "Retcode", });
+        new java.lang.String[] { "AfterWorldLevel", "Retcode", "CdOverTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AiSkillCdInfoOuterClass.java

@@ -19,45 +19,11 @@ public final class AiSkillCdInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
-     */
-    int getSkillCdMapCount();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    boolean containsSkillCdMap(
-        int key);
-    /**
-     * Use {@link #getSkillCdMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillCdMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillCdMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-
-    int getSkillCdMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-
-    int getSkillCdMapOrThrow(
-        int key);
-
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
      */
     int getSkillGroupCdMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     boolean containsSkillGroupCdMap(
         int key);
@@ -68,29 +34,59 @@ public final class AiSkillCdInfoOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getSkillGroupCdMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getSkillGroupCdMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
 
     int getSkillGroupCdMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
 
     int getSkillGroupCdMapOrThrow(
         int key);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    int getSkillCdMapCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    boolean containsSkillCdMap(
+        int key);
+    /**
+     * Use {@link #getSkillCdMapMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getSkillCdMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getSkillCdMapMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+
+    int getSkillCdMapOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+
+    int getSkillCdMapOrThrow(
+        int key);
   }
   /**
-   * <pre>
-   * Obf: AJLFKACFMII
-   * </pre>
-   *
    * Protobuf type {@code AiSkillCdInfo}
    */
   public static final class AiSkillCdInfo extends
@@ -136,24 +132,11 @@ public final class AiSkillCdInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                skillCdMap_ = com.google.protobuf.MapField.newMapField(
-                    SkillCdMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              skillCdMap__ = input.readMessage(
-                  SkillCdMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              skillCdMap_.getMutableMap().put(
-                  skillCdMap__.getKey(), skillCdMap__.getValue());
-              break;
-            }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
                     SkillGroupCdMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
               skillGroupCdMap__ = input.readMessage(
@@ -162,6 +145,19 @@ public final class AiSkillCdInfoOuterClass {
                   skillGroupCdMap__.getKey(), skillGroupCdMap__.getValue());
               break;
             }
+            case 114: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                skillCdMap_ = com.google.protobuf.MapField.newMapField(
+                    SkillCdMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              skillCdMap__ = input.readMessage(
+                  SkillCdMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              skillCdMap_.getMutableMap().put(
+                  skillCdMap__.getKey(), skillCdMap__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -191,10 +187,10 @@ public final class AiSkillCdInfoOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 6:
+        case 12:
-          return internalGetSkillCdMap();
-        case 11:
           return internalGetSkillGroupCdMap();
+        case 14:
+          return internalGetSkillCdMap();
         default:
           throw new RuntimeException(
               "Invalid map field number: " + number);
@@ -208,88 +204,7 @@ public final class AiSkillCdInfoOuterClass {
               emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.class, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.Builder.class);
     }
 
-    public static final int SKILL_CD_MAP_FIELD_NUMBER = 6;
+    public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 12;
-    private static final class SkillCdMapDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<
-          java.lang.Integer, java.lang.Integer> defaultEntry =
-              com.google.protobuf.MapEntry
-              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-                  emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor, 
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0,
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0);
-    }
-    private com.google.protobuf.MapField<
-        java.lang.Integer, java.lang.Integer> skillCdMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetSkillCdMap() {
-      if (skillCdMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            SkillCdMapDefaultEntryHolder.defaultEntry);
-      }
-      return skillCdMap_;
-    }
-
-    public int getSkillCdMapCount() {
-      return internalGetSkillCdMap().getMap().size();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsSkillCdMap(
-        int key) {
-      
-      return internalGetSkillCdMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getSkillCdMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
-      return getSkillCdMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
-      return internalGetSkillCdMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public int getSkillCdMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillCdMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public int getSkillCdMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillCdMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
-    public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 11;
     private static final class SkillGroupCdMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -316,7 +231,7 @@ public final class AiSkillCdInfoOuterClass {
       return internalGetSkillGroupCdMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
 
     @java.lang.Override
@@ -334,7 +249,7 @@ public final class AiSkillCdInfoOuterClass {
       return getSkillGroupCdMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     @java.lang.Override
 
@@ -342,7 +257,7 @@ public final class AiSkillCdInfoOuterClass {
       return internalGetSkillGroupCdMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     @java.lang.Override
 
@@ -355,7 +270,7 @@ public final class AiSkillCdInfoOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     @java.lang.Override
 
@@ -370,6 +285,87 @@ public final class AiSkillCdInfoOuterClass {
       return map.get(key);
     }
 
+    public static final int SKILL_CD_MAP_FIELD_NUMBER = 14;
+    private static final class SkillCdMapDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
+    }
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> skillCdMap_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetSkillCdMap() {
+      if (skillCdMap_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            SkillCdMapDefaultEntryHolder.defaultEntry);
+      }
+      return skillCdMap_;
+    }
+
+    public int getSkillCdMapCount() {
+      return internalGetSkillCdMap().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsSkillCdMap(
+        int key) {
+      
+      return internalGetSkillCdMap().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getSkillCdMapMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
+      return getSkillCdMapMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
+      return internalGetSkillCdMap().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    @java.lang.Override
+
+    public int getSkillCdMapOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetSkillCdMap().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    @java.lang.Override
+
+    public int getSkillCdMapOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetSkillCdMap().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -387,15 +383,15 @@ public final class AiSkillCdInfoOuterClass {
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
-          internalGetSkillCdMap(),
+          internalGetSkillGroupCdMap(),
-          SkillCdMapDefaultEntryHolder.defaultEntry,
+          SkillGroupCdMapDefaultEntryHolder.defaultEntry,
-          6);
+          12);
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
-          internalGetSkillGroupCdMap(),
+          internalGetSkillCdMap(),
-          SkillGroupCdMapDefaultEntryHolder.defaultEntry,
+          SkillCdMapDefaultEntryHolder.defaultEntry,
-          11);
+          14);
       unknownFields.writeTo(output);
     }
 
@@ -405,16 +401,6 @@ public final class AiSkillCdInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetSkillCdMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        skillCdMap__ = SkillCdMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(6, skillCdMap__);
-      }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
            : internalGetSkillGroupCdMap().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
@@ -423,7 +409,17 @@ public final class AiSkillCdInfoOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(11, skillGroupCdMap__);
+            .computeMessageSize(12, skillGroupCdMap__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetSkillCdMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        skillCdMap__ = SkillCdMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(14, skillCdMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -440,10 +436,10 @@ public final class AiSkillCdInfoOuterClass {
       }
       emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other = (emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo) obj;
 
-      if (!internalGetSkillCdMap().equals(
-          other.internalGetSkillCdMap())) return false;
       if (!internalGetSkillGroupCdMap().equals(
           other.internalGetSkillGroupCdMap())) return false;
+      if (!internalGetSkillCdMap().equals(
+          other.internalGetSkillCdMap())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -455,14 +451,14 @@ public final class AiSkillCdInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (!internalGetSkillCdMap().getMap().isEmpty()) {
-        hash = (37 * hash) + SKILL_CD_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetSkillCdMap().hashCode();
-      }
       if (!internalGetSkillGroupCdMap().getMap().isEmpty()) {
         hash = (37 * hash) + SKILL_GROUP_CD_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetSkillGroupCdMap().hashCode();
       }
+      if (!internalGetSkillCdMap().getMap().isEmpty()) {
+        hash = (37 * hash) + SKILL_CD_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetSkillCdMap().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -559,10 +555,6 @@ public final class AiSkillCdInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AJLFKACFMII
-     * </pre>
-     *
      * Protobuf type {@code AiSkillCdInfo}
      */
     public static final class Builder extends
@@ -578,10 +570,10 @@ public final class AiSkillCdInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 6:
+          case 12:
-            return internalGetSkillCdMap();
-          case 11:
             return internalGetSkillGroupCdMap();
+          case 14:
+            return internalGetSkillCdMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -591,10 +583,10 @@ public final class AiSkillCdInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 6:
+          case 12:
-            return internalGetMutableSkillCdMap();
-          case 11:
             return internalGetMutableSkillGroupCdMap();
+          case 14:
+            return internalGetMutableSkillCdMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -626,8 +618,8 @@ public final class AiSkillCdInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        internalGetMutableSkillCdMap().clear();
         internalGetMutableSkillGroupCdMap().clear();
+        internalGetMutableSkillCdMap().clear();
         return this;
       }
 
@@ -655,10 +647,10 @@ public final class AiSkillCdInfoOuterClass {
       public emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo buildPartial() {
         emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo result = new emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo(this);
         int from_bitField0_ = bitField0_;
-        result.skillCdMap_ = internalGetSkillCdMap();
-        result.skillCdMap_.makeImmutable();
         result.skillGroupCdMap_ = internalGetSkillGroupCdMap();
         result.skillGroupCdMap_.makeImmutable();
+        result.skillCdMap_ = internalGetSkillCdMap();
+        result.skillCdMap_.makeImmutable();
         onBuilt();
         return result;
       }
@@ -707,10 +699,10 @@ public final class AiSkillCdInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other) {
         if (other == emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.getDefaultInstance()) return this;
-        internalGetMutableSkillCdMap().mergeFrom(
-            other.internalGetSkillCdMap());
         internalGetMutableSkillGroupCdMap().mergeFrom(
             other.internalGetSkillGroupCdMap());
+        internalGetMutableSkillCdMap().mergeFrom(
+            other.internalGetSkillCdMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -741,134 +733,6 @@ public final class AiSkillCdInfoOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> skillCdMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetSkillCdMap() {
-        if (skillCdMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              SkillCdMapDefaultEntryHolder.defaultEntry);
-        }
-        return skillCdMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableSkillCdMap() {
-        onChanged();;
-        if (skillCdMap_ == null) {
-          skillCdMap_ = com.google.protobuf.MapField.newMapField(
-              SkillCdMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!skillCdMap_.isMutable()) {
-          skillCdMap_ = skillCdMap_.copy();
-        }
-        return skillCdMap_;
-      }
-
-      public int getSkillCdMapCount() {
-        return internalGetSkillCdMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsSkillCdMap(
-          int key) {
-        
-        return internalGetSkillCdMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getSkillCdMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
-        return getSkillCdMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
-        return internalGetSkillCdMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public int getSkillCdMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillCdMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public int getSkillCdMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillCdMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearSkillCdMap() {
-        internalGetMutableSkillCdMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-
-      public Builder removeSkillCdMap(
-          int key) {
-        
-        internalGetMutableSkillCdMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableSkillCdMap() {
-        return internalGetMutableSkillCdMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      public Builder putSkillCdMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableSkillCdMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-
-      public Builder putAllSkillCdMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableSkillCdMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Integer> skillGroupCdMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -896,7 +760,7 @@ public final class AiSkillCdInfoOuterClass {
         return internalGetSkillGroupCdMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
 
       @java.lang.Override
@@ -914,7 +778,7 @@ public final class AiSkillCdInfoOuterClass {
         return getSkillGroupCdMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       @java.lang.Override
 
@@ -922,7 +786,7 @@ public final class AiSkillCdInfoOuterClass {
         return internalGetSkillGroupCdMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       @java.lang.Override
 
@@ -935,7 +799,7 @@ public final class AiSkillCdInfoOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       @java.lang.Override
 
@@ -956,7 +820,7 @@ public final class AiSkillCdInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
 
       public Builder removeSkillGroupCdMap(
@@ -975,7 +839,7 @@ public final class AiSkillCdInfoOuterClass {
         return internalGetMutableSkillGroupCdMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       public Builder putSkillGroupCdMap(
           int key,
@@ -987,7 +851,7 @@ public final class AiSkillCdInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
 
       public Builder putAllSkillGroupCdMap(
@@ -996,6 +860,134 @@ public final class AiSkillCdInfoOuterClass {
             .putAll(values);
         return this;
       }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> skillCdMap_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetSkillCdMap() {
+        if (skillCdMap_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              SkillCdMapDefaultEntryHolder.defaultEntry);
+        }
+        return skillCdMap_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableSkillCdMap() {
+        onChanged();;
+        if (skillCdMap_ == null) {
+          skillCdMap_ = com.google.protobuf.MapField.newMapField(
+              SkillCdMapDefaultEntryHolder.defaultEntry);
+        }
+        if (!skillCdMap_.isMutable()) {
+          skillCdMap_ = skillCdMap_.copy();
+        }
+        return skillCdMap_;
+      }
+
+      public int getSkillCdMapCount() {
+        return internalGetSkillCdMap().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsSkillCdMap(
+          int key) {
+        
+        return internalGetSkillCdMap().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getSkillCdMapMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
+        return getSkillCdMapMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
+        return internalGetSkillCdMap().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillCdMapOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillCdMap().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillCdMapOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillCdMap().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearSkillCdMap() {
+        internalGetMutableSkillCdMap().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+
+      public Builder removeSkillCdMap(
+          int key) {
+        
+        internalGetMutableSkillCdMap().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableSkillCdMap() {
+        return internalGetMutableSkillCdMap().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      public Builder putSkillCdMap(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableSkillCdMap().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+
+      public Builder putAllSkillCdMap(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableSkillCdMap().getMutableMap()
+            .putAll(values);
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1054,16 +1046,16 @@ public final class AiSkillCdInfoOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AiSkillCdInfo_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1074,11 +1066,11 @@ public final class AiSkillCdInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023AiSkillCdInfo.proto\"\361\001\n\rAiSkillCdInfo\022" +
-      "4\n\014skill_cd_map\030\006 \003(\0132\036.AiSkillCdInfo.Sk" +
+      "?\n\022skill_group_cd_map\030\014 \003(\0132#.AiSkillCdI" +
-      "illCdMapEntry\022?\n\022skill_group_cd_map\030\013 \003(" +
+      "nfo.SkillGroupCdMapEntry\0224\n\014skill_cd_map" +
-      "\0132#.AiSkillCdInfo.SkillGroupCdMapEntry\0321" +
+      "\030\016 \003(\0132\036.AiSkillCdInfo.SkillCdMapEntry\0326" +
-      "\n\017SkillCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
+      "\n\024SkillGroupCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v" +
-      "\002 \001(\r:\0028\001\0326\n\024SkillGroupCdMapEntry\022\013\n\003key" +
+      "alue\030\002 \001(\r:\0028\001\0321\n\017SkillCdMapEntry\022\013\n\003key" +
       "\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
@@ -1091,19 +1083,19 @@ public final class AiSkillCdInfoOuterClass {
     internal_static_AiSkillCdInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AiSkillCdInfo_descriptor,
-        new java.lang.String[] { "SkillCdMap", "SkillGroupCdMap", });
+        new java.lang.String[] { "SkillGroupCdMap", "SkillCdMap", });
-    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor =
-      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
-    internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
     internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor =
-      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
+      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
     internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
+    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor =
+      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
+    internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AllMarkPointNotifyOuterClass.java

@@ -19,35 +19,30 @@ public final class AllMarkPointNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> 
         getMarkListList();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index);
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     int getMarkListCount();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
         getMarkListOrBuilderList();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 2766
-   * Obf: KCCLLAGEBMD
-   * </pre>
-   *
    * Protobuf type {@code AllMarkPointNotify}
    */
   public static final class AllMarkPointNotify extends
@@ -94,7 +89,7 @@ public final class AllMarkPointNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 markList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class AllMarkPointNotifyOuterClass {
               emu.grasscutter.net.proto.AllMarkPointNotifyOuterClass.AllMarkPointNotify.class, emu.grasscutter.net.proto.AllMarkPointNotifyOuterClass.AllMarkPointNotify.Builder.class);
     }
 
-    public static final int MARK_LIST_FIELD_NUMBER = 4;
+    public static final int MARK_LIST_FIELD_NUMBER = 3;
     private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_;
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
       return markList_;
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
@@ -156,21 +151,21 @@ public final class AllMarkPointNotifyOuterClass {
       return markList_;
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public int getMarkListCount() {
       return markList_.size();
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
       return markList_.get(index);
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
@@ -193,7 +188,7 @@ public final class AllMarkPointNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < markList_.size(); i++) {
-        output.writeMessage(4, markList_.get(i));
+        output.writeMessage(3, markList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class AllMarkPointNotifyOuterClass {
       size = 0;
       for (int i = 0; i < markList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, markList_.get(i));
+          .computeMessageSize(3, markList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class AllMarkPointNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2766
-     * Obf: KCCLLAGEBMD
-     * </pre>
-     *
      * Protobuf type {@code AllMarkPointNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class AllMarkPointNotifyOuterClass {
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> markListBuilder_;
 
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
         if (markListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public int getMarkListCount() {
         if (markListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
         if (markListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder setMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
@@ -585,7 +575,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder setMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (markListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
@@ -632,7 +622,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addAllMarkList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> values) {
@@ -675,7 +665,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder clearMarkList() {
         if (markListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder removeMarkList(int index) {
         if (markListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getMarkListBuilder(
           int index) {
         return getMarkListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
            getMarkListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder() {
         return getMarkListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class AllMarkPointNotifyOuterClass {
             index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder> 
            getMarkListBuilderList() {
@@ -833,7 +823,7 @@ public final class AllMarkPointNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030AllMarkPointNotify.proto\032\022MapMarkPoint" +
       ".proto\"6\n\022AllMarkPointNotify\022 \n\tmark_lis" +
-      "t\030\004 \003(\0132\r.MapMarkPointB\033\n\031emu.grasscutte" +
+      "t\030\003 \003(\0132\r.MapMarkPointB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoOuterClass.java

@@ -61,7 +61,7 @@ public final class AnimatorParameterValueInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: IGGDJDFNMAG
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code AnimatorParameterValueInfo}
@@ -497,7 +497,7 @@ public final class AnimatorParameterValueInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: IGGDJDFNMAG
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code AnimatorParameterValueInfo}

src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoPairOuterClass.java

@@ -40,10 +40,6 @@ public final class AnimatorParameterValueInfoPairOuterClass {
     emu.grasscutter.net.proto.AnimatorParameterValueInfoOuterClass.AnimatorParameterValueInfoOrBuilder getAnimatorParaOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: CABIAHBAEHD
-   * </pre>
-   *
    * Protobuf type {@code AnimatorParameterValueInfoPair}
    */
   public static final class AnimatorParameterValueInfoPair extends
@@ -347,10 +343,6 @@ public final class AnimatorParameterValueInfoPairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CABIAHBAEHD
-     * </pre>
-     *
      * Protobuf type {@code AnimatorParameterValueInfoPair}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendNotifyOuterClass.java

@@ -19,32 +19,27 @@ public final class AskAddFriendNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 3;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
-     * @return The targetUid.
-     */
-    int getTargetUid();
-
-    /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     boolean hasTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      * @return The targetFriendBrief.
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder();
+
+    /**
+     * <code>uint32 target_uid = 14;</code>
+     * @return The targetUid.
+     */
+    int getTargetUid();
   }
   /**
-   * <pre>
-   * CmdId: 27323
-   * Obf: NADOGBCLNJI
-   * </pre>
-   *
    * Protobuf type {@code AskAddFriendNotify}
    */
   public static final class AskAddFriendNotify extends
@@ -89,12 +84,7 @@ public final class AskAddFriendNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 42: {
-
-              targetUid_ = input.readUInt32();
-              break;
-            }
-            case 58: {
               emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder subBuilder = null;
               if (targetFriendBrief_ != null) {
                 subBuilder = targetFriendBrief_.toBuilder();
@@ -107,6 +97,11 @@ public final class AskAddFriendNotifyOuterClass {
 
               break;
             }
+            case 112: {
+
+              targetUid_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,21 +134,10 @@ public final class AskAddFriendNotifyOuterClass {
               emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.class, emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 3;
+    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 5;
-    private int targetUid_;
-    /**
-     * <code>uint32 target_uid = 3;</code>
-     * @return The targetUid.
-     */
-    @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
-    }
-
-    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     @java.lang.Override
@@ -161,7 +145,7 @@ public final class AskAddFriendNotifyOuterClass {
       return targetFriendBrief_ != null;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      * @return The targetFriendBrief.
      */
     @java.lang.Override
@@ -169,13 +153,24 @@ public final class AskAddFriendNotifyOuterClass {
       return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
       return getTargetFriendBrief();
     }
 
+    public static final int TARGET_UID_FIELD_NUMBER = 14;
+    private int targetUid_;
+    /**
+     * <code>uint32 target_uid = 14;</code>
+     * @return The targetUid.
+     */
+    @java.lang.Override
+    public int getTargetUid() {
+      return targetUid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,11 +185,11 @@ public final class AskAddFriendNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (targetUid_ != 0) {
-        output.writeUInt32(3, targetUid_);
-      }
       if (targetFriendBrief_ != null) {
-        output.writeMessage(7, getTargetFriendBrief());
+        output.writeMessage(5, getTargetFriendBrief());
+      }
+      if (targetUid_ != 0) {
+        output.writeUInt32(14, targetUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +200,13 @@ public final class AskAddFriendNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (targetUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, targetUid_);
-      }
       if (targetFriendBrief_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getTargetFriendBrief());
+          .computeMessageSize(5, getTargetFriendBrief());
+      }
+      if (targetUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, targetUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class AskAddFriendNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other = (emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify) obj;
 
-      if (getTargetUid()
-          != other.getTargetUid()) return false;
       if (hasTargetFriendBrief() != other.hasTargetFriendBrief()) return false;
       if (hasTargetFriendBrief()) {
         if (!getTargetFriendBrief()
             .equals(other.getTargetFriendBrief())) return false;
       }
+      if (getTargetUid()
+          != other.getTargetUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class AskAddFriendNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetUid();
       if (hasTargetFriendBrief()) {
         hash = (37 * hash) + TARGET_FRIEND_BRIEF_FIELD_NUMBER;
         hash = (53 * hash) + getTargetFriendBrief().hashCode();
       }
+      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class AskAddFriendNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27323
-     * Obf: NADOGBCLNJI
-     * </pre>
-     *
      * Protobuf type {@code AskAddFriendNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class AskAddFriendNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        targetUid_ = 0;
-
         if (targetFriendBriefBuilder_ == null) {
           targetFriendBrief_ = null;
         } else {
           targetFriendBrief_ = null;
           targetFriendBriefBuilder_ = null;
         }
+        targetUid_ = 0;
+
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class AskAddFriendNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify buildPartial() {
         emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify result = new emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify(this);
-        result.targetUid_ = targetUid_;
         if (targetFriendBriefBuilder_ == null) {
           result.targetFriendBrief_ = targetFriendBrief_;
         } else {
           result.targetFriendBrief_ = targetFriendBriefBuilder_.build();
         }
+        result.targetUid_ = targetUid_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class AskAddFriendNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other) {
         if (other == emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.getDefaultInstance()) return this;
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
         if (other.hasTargetFriendBrief()) {
           mergeTargetFriendBrief(other.getTargetFriendBrief());
         }
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,49 +503,18 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
 
-      private int targetUid_ ;
-      /**
-       * <code>uint32 target_uid = 3;</code>
-       * @return The targetUid.
-       */
-      @java.lang.Override
-      public int getTargetUid() {
-        return targetUid_;
-      }
-      /**
-       * <code>uint32 target_uid = 3;</code>
-       * @param value The targetUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetUid(int value) {
-        
-        targetUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 target_uid = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetUid() {
-        
-        targetUid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        * @return Whether the targetFriendBrief field is set.
        */
       public boolean hasTargetFriendBrief() {
         return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        * @return The targetFriendBrief.
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
@@ -566,7 +525,7 @@ public final class AskAddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -582,7 +541,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder setTargetFriendBrief(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -596,7 +555,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -614,7 +573,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder clearTargetFriendBrief() {
         if (targetFriendBriefBuilder_ == null) {
@@ -628,7 +587,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
         
@@ -636,7 +595,7 @@ public final class AskAddFriendNotifyOuterClass {
         return getTargetFriendBriefFieldBuilder().getBuilder();
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
         if (targetFriendBriefBuilder_ != null) {
@@ -647,7 +606,7 @@ public final class AskAddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -662,6 +621,37 @@ public final class AskAddFriendNotifyOuterClass {
         }
         return targetFriendBriefBuilder_;
       }
+
+      private int targetUid_ ;
+      /**
+       * <code>uint32 target_uid = 14;</code>
+       * @return The targetUid.
+       */
+      @java.lang.Override
+      public int getTargetUid() {
+        return targetUid_;
+      }
+      /**
+       * <code>uint32 target_uid = 14;</code>
+       * @param value The targetUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetUid(int value) {
+        
+        targetUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 target_uid = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetUid() {
+        
+        targetUid_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +720,9 @@ public final class AskAddFriendNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030AskAddFriendNotify.proto\032\021FriendBrief." +
-      "proto\"S\n\022AskAddFriendNotify\022\022\n\ntarget_ui" +
+      "proto\"S\n\022AskAddFriendNotify\022)\n\023target_fr" +
-      "d\030\003 \001(\r\022)\n\023target_friend_brief\030\007 \001(\0132\014.F" +
+      "iend_brief\030\005 \001(\0132\014.FriendBrief\022\022\n\ntarget" +
-      "riendBriefB\033\n\031emu.grasscutter.net.protob" +
+      "_uid\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +735,7 @@ public final class AskAddFriendNotifyOuterClass {
     internal_static_AskAddFriendNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AskAddFriendNotify_descriptor,
-        new java.lang.String[] { "TargetUid", "TargetFriendBrief", });
+        new java.lang.String[] { "TargetFriendBrief", "TargetUid", });
     emu.grasscutter.net.proto.FriendBriefOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendReqOuterClass.java

@@ -19,17 +19,12 @@ public final class AskAddFriendReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 8;</code>
+     * <code>uint32 target_uid = 10;</code>
      * @return The targetUid.
      */
     int getTargetUid();
   }
   /**
-   * <pre>
-   * CmdId: 9257
-   * Obf: DHLNDCPMCPG
-   * </pre>
-   *
    * Protobuf type {@code AskAddFriendReq}
    */
   public static final class AskAddFriendReq extends
@@ -74,7 +69,7 @@ public final class AskAddFriendReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 80: {
 
               targetUid_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class AskAddFriendReqOuterClass {
               emu.grasscutter.net.proto.AskAddFriendReqOuterClass.AskAddFriendReq.class, emu.grasscutter.net.proto.AskAddFriendReqOuterClass.AskAddFriendReq.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 8;
+    public static final int TARGET_UID_FIELD_NUMBER = 10;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 8;</code>
+     * <code>uint32 target_uid = 10;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AskAddFriendReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(8, targetUid_);
+        output.writeUInt32(10, targetUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AskAddFriendReqOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, targetUid_);
+          .computeUInt32Size(10, targetUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class AskAddFriendReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9257
-     * Obf: DHLNDCPMCPG
-     * </pre>
-     *
      * Protobuf type {@code AskAddFriendReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class AskAddFriendReqOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class AskAddFriendReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class AskAddFriendReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -527,7 +517,7 @@ public final class AskAddFriendReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AskAddFriendReq.proto\"%\n\017AskAddFriendR" +
-      "eq\022\022\n\ntarget_uid\030\010 \001(\rB\033\n\031emu.grasscutte" +
+      "eq\022\022\n\ntarget_uid\030\n \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AttackHitEffectResultOuterClass.java

@@ -19,46 +19,42 @@ public final class AttackHitEffectResultOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 PPEJOCMAFFH = 11;</code>
+     * <code>uint32 KIHHJKCGGCC = 3;</code>
-     * @return The pPEJOCMAFFH.
+     * @return The kIHHJKCGGCC.
      */
-    int getPPEJOCMAFFH();
+    int getKIHHJKCGGCC();
 
     /**
-     * <code>float HLMGLLLLEIJ = 7;</code>
+     * <code>float HFHKMEOPFBI = 5;</code>
-     * @return The hLMGLLLLEIJ.
+     * @return The hFHKMEOPFBI.
      */
-    float getHLMGLLLLEIJ();
+    float getHFHKMEOPFBI();
 
     /**
-     * <code>uint32 POCHAAAEPMH = 2;</code>
+     * <code>uint32 ECBDDJLPPMK = 6;</code>
-     * @return The pOCHAAAEPMH.
+     * @return The eCBDDJLPPMK.
      */
-    int getPOCHAAAEPMH();
+    int getECBDDJLPPMK();
 
     /**
-     * <code>float NMMAGALAPME = 13;</code>
+     * <code>float DADJPJBELMO = 8;</code>
-     * @return The nMMAGALAPME.
+     * @return The dADJPJBELMO.
      */
-    float getNMMAGALAPME();
+    float getDADJPJBELMO();
 
     /**
-     * <code>float DPMHMPLKOEK = 1;</code>
+     * <code>float HDJALIDKDPN = 10;</code>
-     * @return The dPMHMPLKOEK.
+     * @return The hDJALIDKDPN.
      */
-    float getDPMHMPLKOEK();
+    float getHDJALIDKDPN();
 
     /**
-     * <code>float LOHBEFJPFHA = 5;</code>
+     * <code>float CCLCOGCLHKO = 13;</code>
-     * @return The lOHBEFJPFHA.
+     * @return The cCLCOGCLHKO.
      */
-    float getLOHBEFJPFHA();
+    float getCCLCOGCLHKO();
   }
   /**
-   * <pre>
-   * Obf: LEKHHDAJFPK
-   * </pre>
-   *
    * Protobuf type {@code AttackHitEffectResult}
    */
   public static final class AttackHitEffectResult extends
@@ -103,34 +99,34 @@ public final class AttackHitEffectResultOuterClass {
             case 0:
               done = true;
               break;
-            case 13: {
+            case 24: {
 
-              dPMHMPLKOEK_ = input.readFloat();
+              kIHHJKCGGCC_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-
-              pOCHAAAEPMH_ = input.readUInt32();
               break;
             }
             case 45: {
 
-              lOHBEFJPFHA_ = input.readFloat();
+              hFHKMEOPFBI_ = input.readFloat();
               break;
             }
-            case 61: {
+            case 48: {
 
-              hLMGLLLLEIJ_ = input.readFloat();
+              eCBDDJLPPMK_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 69: {
 
-              pPEJOCMAFFH_ = input.readUInt32();
+              dADJPJBELMO_ = input.readFloat();
+              break;
+            }
+            case 85: {
+
+              hDJALIDKDPN_ = input.readFloat();
               break;
             }
             case 109: {
 
-              nMMAGALAPME_ = input.readFloat();
+              cCLCOGCLHKO_ = input.readFloat();
               break;
             }
             default: {
@@ -165,70 +161,70 @@ public final class AttackHitEffectResultOuterClass {
               emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.class, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder.class);
     }
 
-    public static final int PPEJOCMAFFH_FIELD_NUMBER = 11;
+    public static final int KIHHJKCGGCC_FIELD_NUMBER = 3;
-    private int pPEJOCMAFFH_;
+    private int kIHHJKCGGCC_;
     /**
-     * <code>uint32 PPEJOCMAFFH = 11;</code>
+     * <code>uint32 KIHHJKCGGCC = 3;</code>
-     * @return The pPEJOCMAFFH.
+     * @return The kIHHJKCGGCC.
      */
     @java.lang.Override
-    public int getPPEJOCMAFFH() {
+    public int getKIHHJKCGGCC() {
-      return pPEJOCMAFFH_;
+      return kIHHJKCGGCC_;
     }
 
-    public static final int HLMGLLLLEIJ_FIELD_NUMBER = 7;
+    public static final int HFHKMEOPFBI_FIELD_NUMBER = 5;
-    private float hLMGLLLLEIJ_;
+    private float hFHKMEOPFBI_;
     /**
-     * <code>float HLMGLLLLEIJ = 7;</code>
+     * <code>float HFHKMEOPFBI = 5;</code>
-     * @return The hLMGLLLLEIJ.
+     * @return The hFHKMEOPFBI.
      */
     @java.lang.Override
-    public float getHLMGLLLLEIJ() {
+    public float getHFHKMEOPFBI() {
-      return hLMGLLLLEIJ_;
+      return hFHKMEOPFBI_;
     }
 
-    public static final int POCHAAAEPMH_FIELD_NUMBER = 2;
+    public static final int ECBDDJLPPMK_FIELD_NUMBER = 6;
-    private int pOCHAAAEPMH_;
+    private int eCBDDJLPPMK_;
     /**
-     * <code>uint32 POCHAAAEPMH = 2;</code>
+     * <code>uint32 ECBDDJLPPMK = 6;</code>
-     * @return The pOCHAAAEPMH.
+     * @return The eCBDDJLPPMK.
      */
     @java.lang.Override
-    public int getPOCHAAAEPMH() {
+    public int getECBDDJLPPMK() {
-      return pOCHAAAEPMH_;
+      return eCBDDJLPPMK_;
     }
 
-    public static final int NMMAGALAPME_FIELD_NUMBER = 13;
+    public static final int DADJPJBELMO_FIELD_NUMBER = 8;
-    private float nMMAGALAPME_;
+    private float dADJPJBELMO_;
     /**
-     * <code>float NMMAGALAPME = 13;</code>
+     * <code>float DADJPJBELMO = 8;</code>
-     * @return The nMMAGALAPME.
+     * @return The dADJPJBELMO.
      */
     @java.lang.Override
-    public float getNMMAGALAPME() {
+    public float getDADJPJBELMO() {
-      return nMMAGALAPME_;
+      return dADJPJBELMO_;
     }
 
-    public static final int DPMHMPLKOEK_FIELD_NUMBER = 1;
+    public static final int HDJALIDKDPN_FIELD_NUMBER = 10;
-    private float dPMHMPLKOEK_;
+    private float hDJALIDKDPN_;
     /**
-     * <code>float DPMHMPLKOEK = 1;</code>
+     * <code>float HDJALIDKDPN = 10;</code>
-     * @return The dPMHMPLKOEK.
+     * @return The hDJALIDKDPN.
      */
     @java.lang.Override
-    public float getDPMHMPLKOEK() {
+    public float getHDJALIDKDPN() {
-      return dPMHMPLKOEK_;
+      return hDJALIDKDPN_;
     }
 
-    public static final int LOHBEFJPFHA_FIELD_NUMBER = 5;
+    public static final int CCLCOGCLHKO_FIELD_NUMBER = 13;
-    private float lOHBEFJPFHA_;
+    private float cCLCOGCLHKO_;
     /**
-     * <code>float LOHBEFJPFHA = 5;</code>
+     * <code>float CCLCOGCLHKO = 13;</code>
-     * @return The lOHBEFJPFHA.
+     * @return The cCLCOGCLHKO.
      */
     @java.lang.Override
-    public float getLOHBEFJPFHA() {
+    public float getCCLCOGCLHKO() {
-      return lOHBEFJPFHA_;
+      return cCLCOGCLHKO_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -245,23 +241,23 @@ public final class AttackHitEffectResultOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (dPMHMPLKOEK_ != 0F) {
+      if (kIHHJKCGGCC_ != 0) {
-        output.writeFloat(1, dPMHMPLKOEK_);
+        output.writeUInt32(3, kIHHJKCGGCC_);
       }
-      if (pOCHAAAEPMH_ != 0) {
+      if (hFHKMEOPFBI_ != 0F) {
-        output.writeUInt32(2, pOCHAAAEPMH_);
+        output.writeFloat(5, hFHKMEOPFBI_);
       }
-      if (lOHBEFJPFHA_ != 0F) {
+      if (eCBDDJLPPMK_ != 0) {
-        output.writeFloat(5, lOHBEFJPFHA_);
+        output.writeUInt32(6, eCBDDJLPPMK_);
       }
-      if (hLMGLLLLEIJ_ != 0F) {
+      if (dADJPJBELMO_ != 0F) {
-        output.writeFloat(7, hLMGLLLLEIJ_);
+        output.writeFloat(8, dADJPJBELMO_);
       }
-      if (pPEJOCMAFFH_ != 0) {
+      if (hDJALIDKDPN_ != 0F) {
-        output.writeUInt32(11, pPEJOCMAFFH_);
+        output.writeFloat(10, hDJALIDKDPN_);
       }
-      if (nMMAGALAPME_ != 0F) {
+      if (cCLCOGCLHKO_ != 0F) {
-        output.writeFloat(13, nMMAGALAPME_);
+        output.writeFloat(13, cCLCOGCLHKO_);
       }
       unknownFields.writeTo(output);
     }
@@ -272,29 +268,29 @@ public final class AttackHitEffectResultOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dPMHMPLKOEK_ != 0F) {
+      if (kIHHJKCGGCC_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1, dPMHMPLKOEK_);
+          .computeUInt32Size(3, kIHHJKCGGCC_);
       }
-      if (pOCHAAAEPMH_ != 0) {
+      if (hFHKMEOPFBI_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, pOCHAAAEPMH_);
+          .computeFloatSize(5, hFHKMEOPFBI_);
       }
-      if (lOHBEFJPFHA_ != 0F) {
+      if (eCBDDJLPPMK_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(5, lOHBEFJPFHA_);
+          .computeUInt32Size(6, eCBDDJLPPMK_);
       }
-      if (hLMGLLLLEIJ_ != 0F) {
+      if (dADJPJBELMO_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(7, hLMGLLLLEIJ_);
+          .computeFloatSize(8, dADJPJBELMO_);
       }
-      if (pPEJOCMAFFH_ != 0) {
+      if (hDJALIDKDPN_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, pPEJOCMAFFH_);
+          .computeFloatSize(10, hDJALIDKDPN_);
       }
-      if (nMMAGALAPME_ != 0F) {
+      if (cCLCOGCLHKO_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(13, nMMAGALAPME_);
+          .computeFloatSize(13, cCLCOGCLHKO_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,22 +307,22 @@ public final class AttackHitEffectResultOuterClass {
       }
       emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult other = (emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult) obj;
 
-      if (getPPEJOCMAFFH()
+      if (getKIHHJKCGGCC()
-          != other.getPPEJOCMAFFH()) return false;
+          != other.getKIHHJKCGGCC()) return false;
-      if (java.lang.Float.floatToIntBits(getHLMGLLLLEIJ())
+      if (java.lang.Float.floatToIntBits(getHFHKMEOPFBI())
           != java.lang.Float.floatToIntBits(
-              other.getHLMGLLLLEIJ())) return false;
+              other.getHFHKMEOPFBI())) return false;
-      if (getPOCHAAAEPMH()
+      if (getECBDDJLPPMK()
-          != other.getPOCHAAAEPMH()) return false;
+          != other.getECBDDJLPPMK()) return false;
-      if (java.lang.Float.floatToIntBits(getNMMAGALAPME())
+      if (java.lang.Float.floatToIntBits(getDADJPJBELMO())
           != java.lang.Float.floatToIntBits(
-              other.getNMMAGALAPME())) return false;
+              other.getDADJPJBELMO())) return false;
-      if (java.lang.Float.floatToIntBits(getDPMHMPLKOEK())
+      if (java.lang.Float.floatToIntBits(getHDJALIDKDPN())
           != java.lang.Float.floatToIntBits(
-              other.getDPMHMPLKOEK())) return false;
+              other.getHDJALIDKDPN())) return false;
-      if (java.lang.Float.floatToIntBits(getLOHBEFJPFHA())
+      if (java.lang.Float.floatToIntBits(getCCLCOGCLHKO())
           != java.lang.Float.floatToIntBits(
-              other.getLOHBEFJPFHA())) return false;
+              other.getCCLCOGCLHKO())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -338,22 +334,22 @@ public final class AttackHitEffectResultOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PPEJOCMAFFH_FIELD_NUMBER;
+      hash = (37 * hash) + KIHHJKCGGCC_FIELD_NUMBER;
-      hash = (53 * hash) + getPPEJOCMAFFH();
+      hash = (53 * hash) + getKIHHJKCGGCC();
-      hash = (37 * hash) + HLMGLLLLEIJ_FIELD_NUMBER;
+      hash = (37 * hash) + HFHKMEOPFBI_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getHLMGLLLLEIJ());
+          getHFHKMEOPFBI());
-      hash = (37 * hash) + POCHAAAEPMH_FIELD_NUMBER;
+      hash = (37 * hash) + ECBDDJLPPMK_FIELD_NUMBER;
-      hash = (53 * hash) + getPOCHAAAEPMH();
+      hash = (53 * hash) + getECBDDJLPPMK();
-      hash = (37 * hash) + NMMAGALAPME_FIELD_NUMBER;
+      hash = (37 * hash) + DADJPJBELMO_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getNMMAGALAPME());
+          getDADJPJBELMO());
-      hash = (37 * hash) + DPMHMPLKOEK_FIELD_NUMBER;
+      hash = (37 * hash) + HDJALIDKDPN_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getDPMHMPLKOEK());
+          getHDJALIDKDPN());
-      hash = (37 * hash) + LOHBEFJPFHA_FIELD_NUMBER;
+      hash = (37 * hash) + CCLCOGCLHKO_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getLOHBEFJPFHA());
+          getCCLCOGCLHKO());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -450,10 +446,6 @@ public final class AttackHitEffectResultOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LEKHHDAJFPK
-     * </pre>
-     *
      * Protobuf type {@code AttackHitEffectResult}
      */
     public static final class Builder extends
@@ -491,17 +483,17 @@ public final class AttackHitEffectResultOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pPEJOCMAFFH_ = 0;
+        kIHHJKCGGCC_ = 0;
 
-        hLMGLLLLEIJ_ = 0F;
+        hFHKMEOPFBI_ = 0F;
 
-        pOCHAAAEPMH_ = 0;
+        eCBDDJLPPMK_ = 0;
 
-        nMMAGALAPME_ = 0F;
+        dADJPJBELMO_ = 0F;
 
-        dPMHMPLKOEK_ = 0F;
+        hDJALIDKDPN_ = 0F;
 
-        lOHBEFJPFHA_ = 0F;
+        cCLCOGCLHKO_ = 0F;
 
         return this;
       }
@@ -529,12 +521,12 @@ public final class AttackHitEffectResultOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult buildPartial() {
         emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult result = new emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult(this);
-        result.pPEJOCMAFFH_ = pPEJOCMAFFH_;
+        result.kIHHJKCGGCC_ = kIHHJKCGGCC_;
-        result.hLMGLLLLEIJ_ = hLMGLLLLEIJ_;
+        result.hFHKMEOPFBI_ = hFHKMEOPFBI_;
-        result.pOCHAAAEPMH_ = pOCHAAAEPMH_;
+        result.eCBDDJLPPMK_ = eCBDDJLPPMK_;
-        result.nMMAGALAPME_ = nMMAGALAPME_;
+        result.dADJPJBELMO_ = dADJPJBELMO_;
-        result.dPMHMPLKOEK_ = dPMHMPLKOEK_;
+        result.hDJALIDKDPN_ = hDJALIDKDPN_;
-        result.lOHBEFJPFHA_ = lOHBEFJPFHA_;
+        result.cCLCOGCLHKO_ = cCLCOGCLHKO_;
         onBuilt();
         return result;
       }
@@ -583,23 +575,23 @@ public final class AttackHitEffectResultOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult other) {
         if (other == emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance()) return this;
-        if (other.getPPEJOCMAFFH() != 0) {
+        if (other.getKIHHJKCGGCC() != 0) {
-          setPPEJOCMAFFH(other.getPPEJOCMAFFH());
+          setKIHHJKCGGCC(other.getKIHHJKCGGCC());
         }
-        if (other.getHLMGLLLLEIJ() != 0F) {
+        if (other.getHFHKMEOPFBI() != 0F) {
-          setHLMGLLLLEIJ(other.getHLMGLLLLEIJ());
+          setHFHKMEOPFBI(other.getHFHKMEOPFBI());
         }
-        if (other.getPOCHAAAEPMH() != 0) {
+        if (other.getECBDDJLPPMK() != 0) {
-          setPOCHAAAEPMH(other.getPOCHAAAEPMH());
+          setECBDDJLPPMK(other.getECBDDJLPPMK());
         }
-        if (other.getNMMAGALAPME() != 0F) {
+        if (other.getDADJPJBELMO() != 0F) {
-          setNMMAGALAPME(other.getNMMAGALAPME());
+          setDADJPJBELMO(other.getDADJPJBELMO());
         }
-        if (other.getDPMHMPLKOEK() != 0F) {
+        if (other.getHDJALIDKDPN() != 0F) {
-          setDPMHMPLKOEK(other.getDPMHMPLKOEK());
+          setHDJALIDKDPN(other.getHDJALIDKDPN());
         }
-        if (other.getLOHBEFJPFHA() != 0F) {
+        if (other.getCCLCOGCLHKO() != 0F) {
-          setLOHBEFJPFHA(other.getLOHBEFJPFHA());
+          setCCLCOGCLHKO(other.getCCLCOGCLHKO());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -630,188 +622,188 @@ public final class AttackHitEffectResultOuterClass {
         return this;
       }
 
-      private int pPEJOCMAFFH_ ;
+      private int kIHHJKCGGCC_ ;
       /**
-       * <code>uint32 PPEJOCMAFFH = 11;</code>
+       * <code>uint32 KIHHJKCGGCC = 3;</code>
-       * @return The pPEJOCMAFFH.
+       * @return The kIHHJKCGGCC.
        */
       @java.lang.Override
-      public int getPPEJOCMAFFH() {
+      public int getKIHHJKCGGCC() {
-        return pPEJOCMAFFH_;
+        return kIHHJKCGGCC_;
       }
       /**
-       * <code>uint32 PPEJOCMAFFH = 11;</code>
+       * <code>uint32 KIHHJKCGGCC = 3;</code>
-       * @param value The pPEJOCMAFFH to set.
+       * @param value The kIHHJKCGGCC to set.
        * @return This builder for chaining.
        */
-      public Builder setPPEJOCMAFFH(int value) {
+      public Builder setKIHHJKCGGCC(int value) {
         
-        pPEJOCMAFFH_ = value;
+        kIHHJKCGGCC_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 PPEJOCMAFFH = 11;</code>
+       * <code>uint32 KIHHJKCGGCC = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPPEJOCMAFFH() {
+      public Builder clearKIHHJKCGGCC() {
         
-        pPEJOCMAFFH_ = 0;
+        kIHHJKCGGCC_ = 0;
         onChanged();
         return this;
       }
 
-      private float hLMGLLLLEIJ_ ;
+      private float hFHKMEOPFBI_ ;
       /**
-       * <code>float HLMGLLLLEIJ = 7;</code>
+       * <code>float HFHKMEOPFBI = 5;</code>
-       * @return The hLMGLLLLEIJ.
+       * @return The hFHKMEOPFBI.
        */
       @java.lang.Override
-      public float getHLMGLLLLEIJ() {
+      public float getHFHKMEOPFBI() {
-        return hLMGLLLLEIJ_;
+        return hFHKMEOPFBI_;
       }
       /**
-       * <code>float HLMGLLLLEIJ = 7;</code>
+       * <code>float HFHKMEOPFBI = 5;</code>
-       * @param value The hLMGLLLLEIJ to set.
+       * @param value The hFHKMEOPFBI to set.
        * @return This builder for chaining.
        */
-      public Builder setHLMGLLLLEIJ(float value) {
+      public Builder setHFHKMEOPFBI(float value) {
         
-        hLMGLLLLEIJ_ = value;
+        hFHKMEOPFBI_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float HLMGLLLLEIJ = 7;</code>
+       * <code>float HFHKMEOPFBI = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHLMGLLLLEIJ() {
+      public Builder clearHFHKMEOPFBI() {
         
-        hLMGLLLLEIJ_ = 0F;
+        hFHKMEOPFBI_ = 0F;
         onChanged();
         return this;
       }
 
-      private int pOCHAAAEPMH_ ;
+      private int eCBDDJLPPMK_ ;
       /**
-       * <code>uint32 POCHAAAEPMH = 2;</code>
+       * <code>uint32 ECBDDJLPPMK = 6;</code>
-       * @return The pOCHAAAEPMH.
+       * @return The eCBDDJLPPMK.
        */
       @java.lang.Override
-      public int getPOCHAAAEPMH() {
+      public int getECBDDJLPPMK() {
-        return pOCHAAAEPMH_;
+        return eCBDDJLPPMK_;
       }
       /**
-       * <code>uint32 POCHAAAEPMH = 2;</code>
+       * <code>uint32 ECBDDJLPPMK = 6;</code>
-       * @param value The pOCHAAAEPMH to set.
+       * @param value The eCBDDJLPPMK to set.
        * @return This builder for chaining.
        */
-      public Builder setPOCHAAAEPMH(int value) {
+      public Builder setECBDDJLPPMK(int value) {
         
-        pOCHAAAEPMH_ = value;
+        eCBDDJLPPMK_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 POCHAAAEPMH = 2;</code>
+       * <code>uint32 ECBDDJLPPMK = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPOCHAAAEPMH() {
+      public Builder clearECBDDJLPPMK() {
         
-        pOCHAAAEPMH_ = 0;
+        eCBDDJLPPMK_ = 0;
         onChanged();
         return this;
       }
 
-      private float nMMAGALAPME_ ;
+      private float dADJPJBELMO_ ;
       /**
-       * <code>float NMMAGALAPME = 13;</code>
+       * <code>float DADJPJBELMO = 8;</code>
-       * @return The nMMAGALAPME.
+       * @return The dADJPJBELMO.
        */
       @java.lang.Override
-      public float getNMMAGALAPME() {
+      public float getDADJPJBELMO() {
-        return nMMAGALAPME_;
+        return dADJPJBELMO_;
       }
       /**
-       * <code>float NMMAGALAPME = 13;</code>
+       * <code>float DADJPJBELMO = 8;</code>
-       * @param value The nMMAGALAPME to set.
+       * @param value The dADJPJBELMO to set.
        * @return This builder for chaining.
        */
-      public Builder setNMMAGALAPME(float value) {
+      public Builder setDADJPJBELMO(float value) {
         
-        nMMAGALAPME_ = value;
+        dADJPJBELMO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float NMMAGALAPME = 13;</code>
+       * <code>float DADJPJBELMO = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNMMAGALAPME() {
+      public Builder clearDADJPJBELMO() {
         
-        nMMAGALAPME_ = 0F;
+        dADJPJBELMO_ = 0F;
         onChanged();
         return this;
       }
 
-      private float dPMHMPLKOEK_ ;
+      private float hDJALIDKDPN_ ;
       /**
-       * <code>float DPMHMPLKOEK = 1;</code>
+       * <code>float HDJALIDKDPN = 10;</code>
-       * @return The dPMHMPLKOEK.
+       * @return The hDJALIDKDPN.
        */
       @java.lang.Override
-      public float getDPMHMPLKOEK() {
+      public float getHDJALIDKDPN() {
-        return dPMHMPLKOEK_;
+        return hDJALIDKDPN_;
       }
       /**
-       * <code>float DPMHMPLKOEK = 1;</code>
+       * <code>float HDJALIDKDPN = 10;</code>
-       * @param value The dPMHMPLKOEK to set.
+       * @param value The hDJALIDKDPN to set.
        * @return This builder for chaining.
        */
-      public Builder setDPMHMPLKOEK(float value) {
+      public Builder setHDJALIDKDPN(float value) {
         
-        dPMHMPLKOEK_ = value;
+        hDJALIDKDPN_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float DPMHMPLKOEK = 1;</code>
+       * <code>float HDJALIDKDPN = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDPMHMPLKOEK() {
+      public Builder clearHDJALIDKDPN() {
         
-        dPMHMPLKOEK_ = 0F;
+        hDJALIDKDPN_ = 0F;
         onChanged();
         return this;
       }
 
-      private float lOHBEFJPFHA_ ;
+      private float cCLCOGCLHKO_ ;
       /**
-       * <code>float LOHBEFJPFHA = 5;</code>
+       * <code>float CCLCOGCLHKO = 13;</code>
-       * @return The lOHBEFJPFHA.
+       * @return The cCLCOGCLHKO.
        */
       @java.lang.Override
-      public float getLOHBEFJPFHA() {
+      public float getCCLCOGCLHKO() {
-        return lOHBEFJPFHA_;
+        return cCLCOGCLHKO_;
       }
       /**
-       * <code>float LOHBEFJPFHA = 5;</code>
+       * <code>float CCLCOGCLHKO = 13;</code>
-       * @param value The lOHBEFJPFHA to set.
+       * @param value The cCLCOGCLHKO to set.
        * @return This builder for chaining.
        */
-      public Builder setLOHBEFJPFHA(float value) {
+      public Builder setCCLCOGCLHKO(float value) {
         
-        lOHBEFJPFHA_ = value;
+        cCLCOGCLHKO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float LOHBEFJPFHA = 5;</code>
+       * <code>float CCLCOGCLHKO = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLOHBEFJPFHA() {
+      public Builder clearCCLCOGCLHKO() {
         
-        lOHBEFJPFHA_ = 0F;
+        cCLCOGCLHKO_ = 0F;
         onChanged();
         return this;
       }
@@ -883,10 +875,10 @@ public final class AttackHitEffectResultOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AttackHitEffectResult.proto\"\225\001\n\025Attack" +
-      "HitEffectResult\022\023\n\013PPEJOCMAFFH\030\013 \001(\r\022\023\n\013" +
+      "HitEffectResult\022\023\n\013KIHHJKCGGCC\030\003 \001(\r\022\023\n\013" +
-      "HLMGLLLLEIJ\030\007 \001(\002\022\023\n\013POCHAAAEPMH\030\002 \001(\r\022\023" +
+      "HFHKMEOPFBI\030\005 \001(\002\022\023\n\013ECBDDJLPPMK\030\006 \001(\r\022\023" +
-      "\n\013NMMAGALAPME\030\r \001(\002\022\023\n\013DPMHMPLKOEK\030\001 \001(\002" +
+      "\n\013DADJPJBELMO\030\010 \001(\002\022\023\n\013HDJALIDKDPN\030\n \001(\002" +
-      "\022\023\n\013LOHBEFJPFHA\030\005 \001(\002B\033\n\031emu.grasscutter" +
+      "\022\023\n\013CCLCOGCLHKO\030\r \001(\002B\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -898,7 +890,7 @@ public final class AttackHitEffectResultOuterClass {
     internal_static_AttackHitEffectResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AttackHitEffectResult_descriptor,
-        new java.lang.String[] { "PPEJOCMAFFH", "HLMGLLLLEIJ", "POCHAAAEPMH", "NMMAGALAPME", "DPMHMPLKOEK", "LOHBEFJPFHA", });
+        new java.lang.String[] { "KIHHJKCGGCC", "HFHKMEOPFBI", "ECBDDJLPPMK", "DADJPJBELMO", "HDJALIDKDPN", "CCLCOGCLHKO", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AuthorityChangeOuterClass.java

@@ -19,37 +19,33 @@ public final class AuthorityChangeOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+     * <code>uint32 authority_peer_id = 7;</code>
-     * @return Whether the entityAuthorityInfo field is set.
-     */
-    boolean hasEntityAuthorityInfo();
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     * @return The entityAuthorityInfo.
-     */
-    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo();
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     */
-    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder();
-
-    /**
-     * <code>uint32 authority_peer_id = 9;</code>
      * @return The authorityPeerId.
      */
     int getAuthorityPeerId();
 
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint32 entity_id = 11;</code>
      * @return The entityId.
      */
     int getEntityId();
+
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return Whether the entityAuthorityInfo field is set.
+     */
+    boolean hasEntityAuthorityInfo();
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return The entityAuthorityInfo.
+     */
+    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo();
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     */
+    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: MBOKNLKIPFI
-   * </pre>
-   *
    * Protobuf type {@code AuthorityChange}
    */
   public static final class AuthorityChange extends
@@ -94,17 +90,17 @@ public final class AuthorityChangeOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 56: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
 
               authorityPeerId_ = input.readUInt32();
               break;
             }
-            case 82: {
+            case 88: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder subBuilder = null;
               if (entityAuthorityInfo_ != null) {
                 subBuilder = entityAuthorityInfo_.toBuilder();
@@ -149,36 +145,10 @@ public final class AuthorityChangeOuterClass {
               emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.class, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder.class);
     }
 
-    public static final int ENTITY_AUTHORITY_INFO_FIELD_NUMBER = 10;
+    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo entityAuthorityInfo_;
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     * @return Whether the entityAuthorityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEntityAuthorityInfo() {
-      return entityAuthorityInfo_ != null;
-    }
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     * @return The entityAuthorityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo() {
-      return entityAuthorityInfo_ == null ? emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.getDefaultInstance() : entityAuthorityInfo_;
-    }
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder() {
-      return getEntityAuthorityInfo();
-    }
-
-    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 9;
     private int authorityPeerId_;
     /**
-     * <code>uint32 authority_peer_id = 9;</code>
+     * <code>uint32 authority_peer_id = 7;</code>
      * @return The authorityPeerId.
      */
     @java.lang.Override
@@ -186,10 +156,10 @@ public final class AuthorityChangeOuterClass {
       return authorityPeerId_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 1;
+    public static final int ENTITY_ID_FIELD_NUMBER = 11;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint32 entity_id = 11;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -197,6 +167,32 @@ public final class AuthorityChangeOuterClass {
       return entityId_;
     }
 
+    public static final int ENTITY_AUTHORITY_INFO_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo entityAuthorityInfo_;
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return Whether the entityAuthorityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasEntityAuthorityInfo() {
+      return entityAuthorityInfo_ != null;
+    }
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return The entityAuthorityInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo() {
+      return entityAuthorityInfo_ == null ? emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.getDefaultInstance() : entityAuthorityInfo_;
+    }
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder() {
+      return getEntityAuthorityInfo();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -211,14 +207,14 @@ public final class AuthorityChangeOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (entityId_ != 0) {
-        output.writeUInt32(1, entityId_);
-      }
       if (authorityPeerId_ != 0) {
-        output.writeUInt32(9, authorityPeerId_);
+        output.writeUInt32(7, authorityPeerId_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(11, entityId_);
       }
       if (entityAuthorityInfo_ != null) {
-        output.writeMessage(10, getEntityAuthorityInfo());
+        output.writeMessage(12, getEntityAuthorityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -229,17 +225,17 @@ public final class AuthorityChangeOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, entityId_);
-      }
       if (authorityPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, authorityPeerId_);
+          .computeUInt32Size(7, authorityPeerId_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, entityId_);
       }
       if (entityAuthorityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getEntityAuthorityInfo());
+          .computeMessageSize(12, getEntityAuthorityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,15 +252,15 @@ public final class AuthorityChangeOuterClass {
       }
       emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange other = (emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange) obj;
 
+      if (getAuthorityPeerId()
+          != other.getAuthorityPeerId()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (hasEntityAuthorityInfo() != other.hasEntityAuthorityInfo()) return false;
       if (hasEntityAuthorityInfo()) {
         if (!getEntityAuthorityInfo()
             .equals(other.getEntityAuthorityInfo())) return false;
       }
-      if (getAuthorityPeerId()
-          != other.getAuthorityPeerId()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -276,14 +272,14 @@ public final class AuthorityChangeOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasEntityAuthorityInfo()) {
-        hash = (37 * hash) + ENTITY_AUTHORITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getEntityAuthorityInfo().hashCode();
-      }
       hash = (37 * hash) + AUTHORITY_PEER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAuthorityPeerId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      if (hasEntityAuthorityInfo()) {
+        hash = (37 * hash) + ENTITY_AUTHORITY_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getEntityAuthorityInfo().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -380,10 +376,6 @@ public final class AuthorityChangeOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MBOKNLKIPFI
-     * </pre>
-     *
      * Protobuf type {@code AuthorityChange}
      */
     public static final class Builder extends
@@ -421,16 +413,16 @@ public final class AuthorityChangeOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        authorityPeerId_ = 0;
+
+        entityId_ = 0;
+
         if (entityAuthorityInfoBuilder_ == null) {
           entityAuthorityInfo_ = null;
         } else {
           entityAuthorityInfo_ = null;
           entityAuthorityInfoBuilder_ = null;
         }
-        authorityPeerId_ = 0;
-
-        entityId_ = 0;
-
         return this;
       }
 
@@ -457,13 +449,13 @@ public final class AuthorityChangeOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange buildPartial() {
         emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange result = new emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange(this);
+        result.authorityPeerId_ = authorityPeerId_;
+        result.entityId_ = entityId_;
         if (entityAuthorityInfoBuilder_ == null) {
           result.entityAuthorityInfo_ = entityAuthorityInfo_;
         } else {
           result.entityAuthorityInfo_ = entityAuthorityInfoBuilder_.build();
         }
-        result.authorityPeerId_ = authorityPeerId_;
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -512,15 +504,15 @@ public final class AuthorityChangeOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange other) {
         if (other == emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.getDefaultInstance()) return this;
-        if (other.hasEntityAuthorityInfo()) {
-          mergeEntityAuthorityInfo(other.getEntityAuthorityInfo());
-        }
         if (other.getAuthorityPeerId() != 0) {
           setAuthorityPeerId(other.getAuthorityPeerId());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.hasEntityAuthorityInfo()) {
+          mergeEntityAuthorityInfo(other.getEntityAuthorityInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -550,18 +542,80 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
 
+      private int authorityPeerId_ ;
+      /**
+       * <code>uint32 authority_peer_id = 7;</code>
+       * @return The authorityPeerId.
+       */
+      @java.lang.Override
+      public int getAuthorityPeerId() {
+        return authorityPeerId_;
+      }
+      /**
+       * <code>uint32 authority_peer_id = 7;</code>
+       * @param value The authorityPeerId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAuthorityPeerId(int value) {
+        
+        authorityPeerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 authority_peer_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAuthorityPeerId() {
+        
+        authorityPeerId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 11;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 11;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 entity_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo entityAuthorityInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder> entityAuthorityInfoBuilder_;
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        * @return Whether the entityAuthorityInfo field is set.
        */
       public boolean hasEntityAuthorityInfo() {
         return entityAuthorityInfoBuilder_ != null || entityAuthorityInfo_ != null;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        * @return The entityAuthorityInfo.
        */
       public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo() {
@@ -572,7 +626,7 @@ public final class AuthorityChangeOuterClass {
         }
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder setEntityAuthorityInfo(emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo value) {
         if (entityAuthorityInfoBuilder_ == null) {
@@ -588,7 +642,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder setEntityAuthorityInfo(
           emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder builderForValue) {
@@ -602,7 +656,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder mergeEntityAuthorityInfo(emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo value) {
         if (entityAuthorityInfoBuilder_ == null) {
@@ -620,7 +674,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder clearEntityAuthorityInfo() {
         if (entityAuthorityInfoBuilder_ == null) {
@@ -634,7 +688,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder getEntityAuthorityInfoBuilder() {
         
@@ -642,7 +696,7 @@ public final class AuthorityChangeOuterClass {
         return getEntityAuthorityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder() {
         if (entityAuthorityInfoBuilder_ != null) {
@@ -653,7 +707,7 @@ public final class AuthorityChangeOuterClass {
         }
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder> 
@@ -668,68 +722,6 @@ public final class AuthorityChangeOuterClass {
         }
         return entityAuthorityInfoBuilder_;
       }
-
-      private int authorityPeerId_ ;
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @return The authorityPeerId.
-       */
-      @java.lang.Override
-      public int getAuthorityPeerId() {
-        return authorityPeerId_;
-      }
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @param value The authorityPeerId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAuthorityPeerId(int value) {
-        
-        authorityPeerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAuthorityPeerId() {
-        
-        authorityPeerId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -798,10 +790,10 @@ public final class AuthorityChangeOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AuthorityChange.proto\032\031EntityAuthority" +
-      "Info.proto\"t\n\017AuthorityChange\0223\n\025entity_" +
+      "Info.proto\"t\n\017AuthorityChange\022\031\n\021authori" +
-      "authority_info\030\n \001(\0132\024.EntityAuthorityIn" +
+      "ty_peer_id\030\007 \001(\r\022\021\n\tentity_id\030\013 \001(\r\0223\n\025e" +
-      "fo\022\031\n\021authority_peer_id\030\t \001(\r\022\021\n\tentity_" +
+      "ntity_authority_info\030\014 \001(\0132\024.EntityAutho" +
-      "id\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "rityInfoB\033\n\031emu.grasscutter.net.protob\006p" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -814,7 +806,7 @@ public final class AuthorityChangeOuterClass {
     internal_static_AuthorityChange_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AuthorityChange_descriptor,
-        new java.lang.String[] { "EntityAuthorityInfo", "AuthorityPeerId", "EntityId", });
+        new java.lang.String[] { "AuthorityPeerId", "EntityId", "EntityAuthorityInfo", });
     emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java

@@ -19,32 +19,27 @@ public final class AvatarAddNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_in_team = 12;</code>
+     * <code>bool is_in_team = 3;</code>
      * @return The isInTeam.
      */
     boolean getIsInTeam();
 
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return Whether the avatar field is set.
      */
     boolean hasAvatar();
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return The avatar.
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar();
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 7458
-   * Obf: MLOIBCFBPKN
-   * </pre>
-   *
    * Protobuf type {@code AvatarAddNotify}
    */
   public static final class AvatarAddNotify extends
@@ -89,12 +84,12 @@ public final class AvatarAddNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 24: {
 
               isInTeam_ = input.readBool();
               break;
             }
-            case 114: {
+            case 98: {
               emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null;
               if (avatar_ != null) {
                 subBuilder = avatar_.toBuilder();
@@ -139,10 +134,10 @@ public final class AvatarAddNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.class, emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.Builder.class);
     }
 
-    public static final int IS_IN_TEAM_FIELD_NUMBER = 12;
+    public static final int IS_IN_TEAM_FIELD_NUMBER = 3;
     private boolean isInTeam_;
     /**
-     * <code>bool is_in_team = 12;</code>
+     * <code>bool is_in_team = 3;</code>
      * @return The isInTeam.
      */
     @java.lang.Override
@@ -150,10 +145,10 @@ public final class AvatarAddNotifyOuterClass {
       return isInTeam_;
     }
 
-    public static final int AVATAR_FIELD_NUMBER = 14;
+    public static final int AVATAR_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_;
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return Whether the avatar field is set.
      */
     @java.lang.Override
@@ -161,7 +156,7 @@ public final class AvatarAddNotifyOuterClass {
       return avatar_ != null;
     }
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return The avatar.
      */
     @java.lang.Override
@@ -169,7 +164,7 @@ public final class AvatarAddNotifyOuterClass {
       return avatar_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatar_;
     }
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
@@ -191,10 +186,10 @@ public final class AvatarAddNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isInTeam_ != false) {
-        output.writeBool(12, isInTeam_);
+        output.writeBool(3, isInTeam_);
       }
       if (avatar_ != null) {
-        output.writeMessage(14, getAvatar());
+        output.writeMessage(12, getAvatar());
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class AvatarAddNotifyOuterClass {
       size = 0;
       if (isInTeam_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isInTeam_);
+          .computeBoolSize(3, isInTeam_);
       }
       if (avatar_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getAvatar());
+          .computeMessageSize(12, getAvatar());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -349,11 +344,6 @@ public final class AvatarAddNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7458
-     * Obf: MLOIBCFBPKN
-     * </pre>
-     *
      * Protobuf type {@code AvatarAddNotify}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class AvatarAddNotifyOuterClass {
 
       private boolean isInTeam_ ;
       /**
-       * <code>bool is_in_team = 12;</code>
+       * <code>bool is_in_team = 3;</code>
        * @return The isInTeam.
        */
       @java.lang.Override
@@ -524,7 +514,7 @@ public final class AvatarAddNotifyOuterClass {
         return isInTeam_;
       }
       /**
-       * <code>bool is_in_team = 12;</code>
+       * <code>bool is_in_team = 3;</code>
        * @param value The isInTeam to set.
        * @return This builder for chaining.
        */
@@ -535,7 +525,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_in_team = 12;</code>
+       * <code>bool is_in_team = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsInTeam() {
@@ -549,14 +539,14 @@ public final class AvatarAddNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarBuilder_;
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        * @return Whether the avatar field is set.
        */
       public boolean hasAvatar() {
         return avatarBuilder_ != null || avatar_ != null;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        * @return The avatar.
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar() {
@@ -567,7 +557,7 @@ public final class AvatarAddNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder setAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarBuilder_ == null) {
@@ -583,7 +573,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder setAvatar(
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -597,7 +587,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder mergeAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder clearAvatar() {
         if (avatarBuilder_ == null) {
@@ -629,7 +619,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarBuilder() {
         
@@ -637,7 +627,7 @@ public final class AvatarAddNotifyOuterClass {
         return getAvatarFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
         if (avatarBuilder_ != null) {
@@ -648,7 +638,7 @@ public final class AvatarAddNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
@@ -731,8 +721,8 @@ public final class AvatarAddNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AvatarAddNotify.proto\032\020AvatarInfo.prot" +
-      "o\"B\n\017AvatarAddNotify\022\022\n\nis_in_team\030\014 \001(\010" +
+      "o\"B\n\017AvatarAddNotify\022\022\n\nis_in_team\030\003 \001(\010" +
-      "\022\033\n\006avatar\030\016 \001(\0132\013.AvatarInfoB\033\n\031emu.gra" +
+      "\022\033\n\006avatar\030\014 \001(\0132\013.AvatarInfoB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeNotifyOuterClass.java

@@ -34,11 +34,6 @@ public final class AvatarChangeCostumeNotifyOuterClass {
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 22376
-   * Obf: MMGGANDHHFL
-   * </pre>
-   *
    * Protobuf type {@code AvatarChangeCostumeNotify}
    */
   public static final class AvatarChangeCostumeNotify extends
@@ -315,11 +310,6 @@ public final class AvatarChangeCostumeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22376
-     * Obf: MMGGANDHHFL
-     * </pre>
-     *
      * Protobuf type {@code AvatarChangeCostumeNotify}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeReqOuterClass.java

@@ -19,23 +19,18 @@ public final class AvatarChangeCostumeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 13;</code>
+     * <code>uint32 costume_id = 13;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 costume_id = 5;</code>
      * @return The costumeId.
      */
     int getCostumeId();
+
+    /**
+     * <code>uint64 avatar_guid = 10;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 8840
-   * Obf: IMDCBJNFILE
-   * </pre>
-   *
    * Protobuf type {@code AvatarChangeCostumeReq}
    */
   public static final class AvatarChangeCostumeReq extends
@@ -80,14 +75,14 @@ public final class AvatarChangeCostumeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 80: {
 
-              costumeId_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
             case 104: {
 
-              avatarGuid_ = input.readUInt64();
+              costumeId_ = input.readUInt32();
               break;
             }
             default: {
@@ -122,21 +117,10 @@ public final class AvatarChangeCostumeReqOuterClass {
               emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.class, emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 13;
+    public static final int COSTUME_ID_FIELD_NUMBER = 13;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 13;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int COSTUME_ID_FIELD_NUMBER = 5;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 5;</code>
+     * <code>uint32 costume_id = 13;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class AvatarChangeCostumeReqOuterClass {
       return costumeId_;
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 10;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class AvatarChangeCostumeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (costumeId_ != 0) {
-        output.writeUInt32(5, costumeId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(13, avatarGuid_);
+        output.writeUInt64(10, avatarGuid_);
+      }
+      if (costumeId_ != 0) {
+        output.writeUInt32(13, costumeId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class AvatarChangeCostumeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (costumeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, costumeId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, avatarGuid_);
+          .computeUInt64Size(10, avatarGuid_);
+      }
+      if (costumeId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, costumeId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class AvatarChangeCostumeReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq other = (emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +206,11 @@ public final class AvatarChangeCostumeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCostumeId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCostumeId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,11 +307,6 @@ public final class AvatarChangeCostumeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8840
-     * Obf: IMDCBJNFILE
-     * </pre>
-     *
      * Protobuf type {@code AvatarChangeCostumeReq}
      */
     public static final class Builder extends
@@ -354,10 +344,10 @@ public final class AvatarChangeCostumeReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarGuid_ = 0L;
-
         costumeId_ = 0;
 
+        avatarGuid_ = 0L;
+
         return this;
       }
 
@@ -384,8 +374,8 @@ public final class AvatarChangeCostumeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq buildPartial() {
         emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq result = new emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq(this);
-        result.avatarGuid_ = avatarGuid_;
         result.costumeId_ = costumeId_;
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -434,12 +424,12 @@ public final class AvatarChangeCostumeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq other) {
         if (other == emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.getDefaultInstance()) return this;
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +459,9 @@ public final class AvatarChangeCostumeReqOuterClass {
         return this;
       }
 
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 13;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 13;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 5;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -510,7 +469,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 5;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -521,7 +480,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 5;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -530,6 +489,37 @@ public final class AvatarChangeCostumeReqOuterClass {
         onChanged();
         return this;
       }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 10;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 10;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 avatar_guid = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -598,8 +588,8 @@ public final class AvatarChangeCostumeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AvatarChangeCostumeReq.proto\"A\n\026Avatar" +
-      "ChangeCostumeReq\022\023\n\013avatar_guid\030\r \001(\004\022\022\n" +
+      "ChangeCostumeReq\022\022\n\ncostume_id\030\r \001(\r\022\023\n\013" +
-      "\ncostume_id\030\005 \001(\rB\033\n\031emu.grasscutter.net" +
+      "avatar_guid\030\n \001(\004B\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +601,7 @@ public final class AvatarChangeCostumeReqOuterClass {
     internal_static_AvatarChangeCostumeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarChangeCostumeReq_descriptor,
-        new java.lang.String[] { "AvatarGuid", "CostumeId", });
+        new java.lang.String[] { "CostumeId", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java

@@ -24,24 +24,19 @@ public final class AvatarChangeCostumeRspOuterClass {
      */
     long getAvatarGuid();
 
-    /**
-     * <code>int32 retcode = 1;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
     /**
      * <code>uint32 costume_id = 9;</code>
      * @return The costumeId.
      */
     int getCostumeId();
+
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 9148
-   * Obf: KGBMPCNCLNC
-   * </pre>
-   *
    * Protobuf type {@code AvatarChangeCostumeRsp}
    */
   public static final class AvatarChangeCostumeRsp extends
@@ -86,11 +81,6 @@ public final class AvatarChangeCostumeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             case 32: {
 
               avatarGuid_ = input.readUInt64();
@@ -101,6 +91,11 @@ public final class AvatarChangeCostumeRspOuterClass {
               costumeId_ = input.readUInt32();
               break;
             }
+            case 120: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -144,17 +139,6 @@ public final class AvatarChangeCostumeRspOuterClass {
       return avatarGuid_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 1;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 1;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
     public static final int COSTUME_ID_FIELD_NUMBER = 9;
     private int costumeId_;
     /**
@@ -166,6 +150,17 @@ public final class AvatarChangeCostumeRspOuterClass {
       return costumeId_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,15 +175,15 @@ public final class AvatarChangeCostumeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
-      }
       if (avatarGuid_ != 0L) {
         output.writeUInt64(4, avatarGuid_);
       }
       if (costumeId_ != 0) {
         output.writeUInt32(9, costumeId_);
       }
+      if (retcode_ != 0) {
+        output.writeInt32(15, retcode_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -198,10 +193,6 @@ public final class AvatarChangeCostumeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(4, avatarGuid_);
@@ -210,6 +201,10 @@ public final class AvatarChangeCostumeRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(9, costumeId_);
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, retcode_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -227,10 +222,10 @@ public final class AvatarChangeCostumeRspOuterClass {
 
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -245,10 +240,10 @@ public final class AvatarChangeCostumeRspOuterClass {
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCostumeId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,11 +340,6 @@ public final class AvatarChangeCostumeRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9148
-     * Obf: KGBMPCNCLNC
-     * </pre>
-     *
      * Protobuf type {@code AvatarChangeCostumeRsp}
      */
     public static final class Builder extends
@@ -389,10 +379,10 @@ public final class AvatarChangeCostumeRspOuterClass {
         super.clear();
         avatarGuid_ = 0L;
 
-        retcode_ = 0;
-
         costumeId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -420,8 +410,8 @@ public final class AvatarChangeCostumeRspOuterClass {
       public emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp result = new emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp(this);
         result.avatarGuid_ = avatarGuid_;
-        result.retcode_ = retcode_;
         result.costumeId_ = costumeId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -473,12 +463,12 @@ public final class AvatarChangeCostumeRspOuterClass {
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -539,37 +529,6 @@ public final class AvatarChangeCostumeRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 1;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 1;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int costumeId_ ;
       /**
        * <code>uint32 costume_id = 9;</code>
@@ -600,6 +559,37 @@ public final class AvatarChangeCostumeRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,8 +658,8 @@ public final class AvatarChangeCostumeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AvatarChangeCostumeRsp.proto\"R\n\026Avatar" +
-      "ChangeCostumeRsp\022\023\n\013avatar_guid\030\004 \001(\004\022\017\n" +
+      "ChangeCostumeRsp\022\023\n\013avatar_guid\030\004 \001(\004\022\022\n" +
-      "\007retcode\030\001 \001(\005\022\022\n\ncostume_id\030\t \001(\rB\033\n\031em" +
+      "\ncostume_id\030\t \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarChangeCostumeRspOuterClass {
     internal_static_AvatarChangeCostumeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarChangeCostumeRsp_descriptor,
-        new java.lang.String[] { "AvatarGuid", "Retcode", "CostumeId", });
+        new java.lang.String[] { "AvatarGuid", "CostumeId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeTraceEffectReqOuterClass.java

@@ -0,0 +1,608 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: AvatarChangeTraceEffectReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class AvatarChangeTraceEffectReqOuterClass {
+  private AvatarChangeTraceEffectReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface AvatarChangeTraceEffectReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:AvatarChangeTraceEffectReq)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint64 avatar_guid = 13;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint32 trace_effect_id = 6;</code>
+     * @return The traceEffectId.
+     */
+    int getTraceEffectId();
+  }
+  /**
+   * Protobuf type {@code AvatarChangeTraceEffectReq}
+   */
+  public static final class AvatarChangeTraceEffectReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:AvatarChangeTraceEffectReq)
+      AvatarChangeTraceEffectReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use AvatarChangeTraceEffectReq.newBuilder() to construct.
+    private AvatarChangeTraceEffectReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private AvatarChangeTraceEffectReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new AvatarChangeTraceEffectReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AvatarChangeTraceEffectReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 48: {
+
+              traceEffectId_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.class, emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.Builder.class);
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 13;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 13;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int TRACE_EFFECT_ID_FIELD_NUMBER = 6;
+    private int traceEffectId_;
+    /**
+     * <code>uint32 trace_effect_id = 6;</code>
+     * @return The traceEffectId.
+     */
+    @java.lang.Override
+    public int getTraceEffectId() {
+      return traceEffectId_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (traceEffectId_ != 0) {
+        output.writeUInt32(6, traceEffectId_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(13, avatarGuid_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (traceEffectId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, traceEffectId_);
+      }
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(13, avatarGuid_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq other = (emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq) obj;
+
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
+      if (getTraceEffectId()
+          != other.getTraceEffectId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
+      hash = (37 * hash) + TRACE_EFFECT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTraceEffectId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code AvatarChangeTraceEffectReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:AvatarChangeTraceEffectReq)
+        emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.class, emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        avatarGuid_ = 0L;
+
+        traceEffectId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq build() {
+        emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq buildPartial() {
+        emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq result = new emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq(this);
+        result.avatarGuid_ = avatarGuid_;
+        result.traceEffectId_ = traceEffectId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq) {
+          return mergeFrom((emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq other) {
+        if (other == emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.getDefaultInstance()) return this;
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
+        if (other.getTraceEffectId() != 0) {
+          setTraceEffectId(other.getTraceEffectId());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 13;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 13;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 avatar_guid = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int traceEffectId_ ;
+      /**
+       * <code>uint32 trace_effect_id = 6;</code>
+       * @return The traceEffectId.
+       */
+      @java.lang.Override
+      public int getTraceEffectId() {
+        return traceEffectId_;
+      }
+      /**
+       * <code>uint32 trace_effect_id = 6;</code>
+       * @param value The traceEffectId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTraceEffectId(int value) {
+        
+        traceEffectId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 trace_effect_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTraceEffectId() {
+        
+        traceEffectId_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:AvatarChangeTraceEffectReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:AvatarChangeTraceEffectReq)
+    private static final emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq();
+    }
+
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<AvatarChangeTraceEffectReq>
+        PARSER = new com.google.protobuf.AbstractParser<AvatarChangeTraceEffectReq>() {
+      @java.lang.Override
+      public AvatarChangeTraceEffectReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AvatarChangeTraceEffectReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<AvatarChangeTraceEffectReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AvatarChangeTraceEffectReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AvatarChangeTraceEffectReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n AvatarChangeTraceEffectReq.proto\"J\n\032Av" +
+      "atarChangeTraceEffectReq\022\023\n\013avatar_guid\030" +
+      "\r \001(\004\022\027\n\017trace_effect_id\030\006 \001(\rB\033\n\031emu.gr" +
+      "asscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_AvatarChangeTraceEffectReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AvatarChangeTraceEffectReq_descriptor,
+        new java.lang.String[] { "AvatarGuid", "TraceEffectId", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java

@@ -19,38 +19,33 @@ public final class AvatarDieAnimationEndReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 skill_id = 9;</code>
+     * <code>.Vector reborn_pos = 13;</code>
-     * @return The skillId.
+     * @return Whether the rebornPos field is set.
      */
-    int getSkillId();
+    boolean hasRebornPos();
+    /**
+     * <code>.Vector reborn_pos = 13;</code>
+     * @return The rebornPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos();
+    /**
+     * <code>.Vector reborn_pos = 13;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder();
 
     /**
-     * <code>uint64 die_guid = 8;</code>
+     * <code>uint64 die_guid = 12;</code>
      * @return The dieGuid.
      */
     long getDieGuid();
 
     /**
-     * <code>.Vector reborn_pos = 14;</code>
+     * <code>uint32 skill_id = 7;</code>
-     * @return Whether the rebornPos field is set.
+     * @return The skillId.
      */
-    boolean hasRebornPos();
+    int getSkillId();
-    /**
-     * <code>.Vector reborn_pos = 14;</code>
-     * @return The rebornPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos();
-    /**
-     * <code>.Vector reborn_pos = 14;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 4506
-   * Obf: HPOMJHEAICH
-   * </pre>
-   *
    * Protobuf type {@code AvatarDieAnimationEndReq}
    */
   public static final class AvatarDieAnimationEndReq extends
@@ -95,17 +90,17 @@ public final class AvatarDieAnimationEndReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 56: {
-
-              dieGuid_ = input.readUInt64();
-              break;
-            }
-            case 72: {
 
               skillId_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 96: {
+
+              dieGuid_ = input.readUInt64();
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rebornPos_ != null) {
                 subBuilder = rebornPos_.toBuilder();
@@ -150,32 +145,10 @@ public final class AvatarDieAnimationEndReqOuterClass {
               emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.class, emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.Builder.class);
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 9;
+    public static final int REBORN_POS_FIELD_NUMBER = 13;
-    private int skillId_;
-    /**
-     * <code>uint32 skill_id = 9;</code>
-     * @return The skillId.
-     */
-    @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
-    }
-
-    public static final int DIE_GUID_FIELD_NUMBER = 8;
-    private long dieGuid_;
-    /**
-     * <code>uint64 die_guid = 8;</code>
-     * @return The dieGuid.
-     */
-    @java.lang.Override
-    public long getDieGuid() {
-      return dieGuid_;
-    }
-
-    public static final int REBORN_POS_FIELD_NUMBER = 14;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rebornPos_;
     /**
-     * <code>.Vector reborn_pos = 14;</code>
+     * <code>.Vector reborn_pos = 13;</code>
      * @return Whether the rebornPos field is set.
      */
     @java.lang.Override
@@ -183,7 +156,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return rebornPos_ != null;
     }
     /**
-     * <code>.Vector reborn_pos = 14;</code>
+     * <code>.Vector reborn_pos = 13;</code>
      * @return The rebornPos.
      */
     @java.lang.Override
@@ -191,13 +164,35 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return rebornPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rebornPos_;
     }
     /**
-     * <code>.Vector reborn_pos = 14;</code>
+     * <code>.Vector reborn_pos = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
       return getRebornPos();
     }
 
+    public static final int DIE_GUID_FIELD_NUMBER = 12;
+    private long dieGuid_;
+    /**
+     * <code>uint64 die_guid = 12;</code>
+     * @return The dieGuid.
+     */
+    @java.lang.Override
+    public long getDieGuid() {
+      return dieGuid_;
+    }
+
+    public static final int SKILL_ID_FIELD_NUMBER = 7;
+    private int skillId_;
+    /**
+     * <code>uint32 skill_id = 7;</code>
+     * @return The skillId.
+     */
+    @java.lang.Override
+    public int getSkillId() {
+      return skillId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -212,14 +207,14 @@ public final class AvatarDieAnimationEndReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (dieGuid_ != 0L) {
-        output.writeUInt64(8, dieGuid_);
-      }
       if (skillId_ != 0) {
-        output.writeUInt32(9, skillId_);
+        output.writeUInt32(7, skillId_);
+      }
+      if (dieGuid_ != 0L) {
+        output.writeUInt64(12, dieGuid_);
       }
       if (rebornPos_ != null) {
-        output.writeMessage(14, getRebornPos());
+        output.writeMessage(13, getRebornPos());
       }
       unknownFields.writeTo(output);
     }
@@ -230,17 +225,17 @@ public final class AvatarDieAnimationEndReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dieGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(8, dieGuid_);
-      }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, skillId_);
+          .computeUInt32Size(7, skillId_);
+      }
+      if (dieGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(12, dieGuid_);
       }
       if (rebornPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getRebornPos());
+          .computeMessageSize(13, getRebornPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,15 +252,15 @@ public final class AvatarDieAnimationEndReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq other = (emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq) obj;
 
-      if (getSkillId()
-          != other.getSkillId()) return false;
-      if (getDieGuid()
-          != other.getDieGuid()) return false;
       if (hasRebornPos() != other.hasRebornPos()) return false;
       if (hasRebornPos()) {
         if (!getRebornPos()
             .equals(other.getRebornPos())) return false;
       }
+      if (getDieGuid()
+          != other.getDieGuid()) return false;
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -277,15 +272,15 @@ public final class AvatarDieAnimationEndReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
-      hash = (37 * hash) + DIE_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getDieGuid());
       if (hasRebornPos()) {
         hash = (37 * hash) + REBORN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getRebornPos().hashCode();
       }
+      hash = (37 * hash) + DIE_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getDieGuid());
+      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -382,11 +377,6 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4506
-     * Obf: HPOMJHEAICH
-     * </pre>
-     *
      * Protobuf type {@code AvatarDieAnimationEndReq}
      */
     public static final class Builder extends
@@ -424,16 +414,16 @@ public final class AvatarDieAnimationEndReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        skillId_ = 0;
-
-        dieGuid_ = 0L;
-
         if (rebornPosBuilder_ == null) {
           rebornPos_ = null;
         } else {
           rebornPos_ = null;
           rebornPosBuilder_ = null;
         }
+        dieGuid_ = 0L;
+
+        skillId_ = 0;
+
         return this;
       }
 
@@ -460,13 +450,13 @@ public final class AvatarDieAnimationEndReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq buildPartial() {
         emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq result = new emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq(this);
-        result.skillId_ = skillId_;
-        result.dieGuid_ = dieGuid_;
         if (rebornPosBuilder_ == null) {
           result.rebornPos_ = rebornPos_;
         } else {
           result.rebornPos_ = rebornPosBuilder_.build();
         }
+        result.dieGuid_ = dieGuid_;
+        result.skillId_ = skillId_;
         onBuilt();
         return result;
       }
@@ -515,14 +505,14 @@ public final class AvatarDieAnimationEndReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq other) {
         if (other == emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.getDefaultInstance()) return this;
-        if (other.getSkillId() != 0) {
+        if (other.hasRebornPos()) {
-          setSkillId(other.getSkillId());
+          mergeRebornPos(other.getRebornPos());
         }
         if (other.getDieGuid() != 0L) {
           setDieGuid(other.getDieGuid());
         }
-        if (other.hasRebornPos()) {
+        if (other.getSkillId() != 0) {
-          mergeRebornPos(other.getRebornPos());
+          setSkillId(other.getSkillId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -553,80 +543,18 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
 
-      private int skillId_ ;
-      /**
-       * <code>uint32 skill_id = 9;</code>
-       * @return The skillId.
-       */
-      @java.lang.Override
-      public int getSkillId() {
-        return skillId_;
-      }
-      /**
-       * <code>uint32 skill_id = 9;</code>
-       * @param value The skillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillId(int value) {
-        
-        skillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillId() {
-        
-        skillId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long dieGuid_ ;
-      /**
-       * <code>uint64 die_guid = 8;</code>
-       * @return The dieGuid.
-       */
-      @java.lang.Override
-      public long getDieGuid() {
-        return dieGuid_;
-      }
-      /**
-       * <code>uint64 die_guid = 8;</code>
-       * @param value The dieGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieGuid(long value) {
-        
-        dieGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 die_guid = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieGuid() {
-        
-        dieGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector rebornPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rebornPosBuilder_;
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        * @return Whether the rebornPos field is set.
        */
       public boolean hasRebornPos() {
         return rebornPosBuilder_ != null || rebornPos_ != null;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        * @return The rebornPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos() {
@@ -637,7 +565,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder setRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -653,7 +581,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder setRebornPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -667,7 +595,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder mergeRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -685,7 +613,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder clearRebornPos() {
         if (rebornPosBuilder_ == null) {
@@ -699,7 +627,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRebornPosBuilder() {
         
@@ -707,7 +635,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return getRebornPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
         if (rebornPosBuilder_ != null) {
@@ -718,7 +646,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -733,6 +661,68 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
         return rebornPosBuilder_;
       }
+
+      private long dieGuid_ ;
+      /**
+       * <code>uint64 die_guid = 12;</code>
+       * @return The dieGuid.
+       */
+      @java.lang.Override
+      public long getDieGuid() {
+        return dieGuid_;
+      }
+      /**
+       * <code>uint64 die_guid = 12;</code>
+       * @param value The dieGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieGuid(long value) {
+        
+        dieGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 die_guid = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieGuid() {
+        
+        dieGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int skillId_ ;
+      /**
+       * <code>uint32 skill_id = 7;</code>
+       * @return The skillId.
+       */
+      @java.lang.Override
+      public int getSkillId() {
+        return skillId_;
+      }
+      /**
+       * <code>uint32 skill_id = 7;</code>
+       * @param value The skillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSkillId(int value) {
+        
+        skillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 skill_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSkillId() {
+        
+        skillId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -801,9 +791,9 @@ public final class AvatarDieAnimationEndReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndReq.proto\032\014Vector" +
-      ".proto\"[\n\030AvatarDieAnimationEndReq\022\020\n\010sk" +
+      ".proto\"[\n\030AvatarDieAnimationEndReq\022\033\n\nre" +
-      "ill_id\030\t \001(\r\022\020\n\010die_guid\030\010 \001(\004\022\033\n\nreborn" +
+      "born_pos\030\r \001(\0132\007.Vector\022\020\n\010die_guid\030\014 \001(" +
-      "_pos\030\016 \001(\0132\007.VectorB\033\n\031emu.grasscutter.n" +
+      "\004\022\020\n\010skill_id\030\007 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -816,7 +806,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
     internal_static_AvatarDieAnimationEndReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDieAnimationEndReq_descriptor,
-        new java.lang.String[] { "SkillId", "DieGuid", "RebornPos", });
+        new java.lang.String[] { "RebornPos", "DieGuid", "SkillId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java

@@ -19,29 +19,24 @@ public final class AvatarDieAnimationEndRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
+    /**
+     * <code>uint64 die_guid = 11;</code>
+     * @return The dieGuid.
+     */
+    long getDieGuid();
+
     /**
      * <code>uint32 skill_id = 13;</code>
      * @return The skillId.
      */
     int getSkillId();
-
-    /**
-     * <code>uint64 die_guid = 5;</code>
-     * @return The dieGuid.
-     */
-    long getDieGuid();
   }
   /**
-   * <pre>
-   * CmdId: 24745
-   * Obf: LPNGCMDGKEM
-   * </pre>
-   *
    * Protobuf type {@code AvatarDieAnimationEndRsp}
    */
   public static final class AvatarDieAnimationEndRsp extends
@@ -86,12 +81,12 @@ public final class AvatarDieAnimationEndRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 48: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 40: {
+            case 88: {
 
               dieGuid_ = input.readUInt64();
               break;
@@ -133,10 +128,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
               emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.class, emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +139,17 @@ public final class AvatarDieAnimationEndRspOuterClass {
       return retcode_;
     }
 
+    public static final int DIE_GUID_FIELD_NUMBER = 11;
+    private long dieGuid_;
+    /**
+     * <code>uint64 die_guid = 11;</code>
+     * @return The dieGuid.
+     */
+    @java.lang.Override
+    public long getDieGuid() {
+      return dieGuid_;
+    }
+
     public static final int SKILL_ID_FIELD_NUMBER = 13;
     private int skillId_;
     /**
@@ -155,17 +161,6 @@ public final class AvatarDieAnimationEndRspOuterClass {
       return skillId_;
     }
 
-    public static final int DIE_GUID_FIELD_NUMBER = 5;
-    private long dieGuid_;
-    /**
-     * <code>uint64 die_guid = 5;</code>
-     * @return The dieGuid.
-     */
-    @java.lang.Override
-    public long getDieGuid() {
-      return dieGuid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -181,10 +176,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(6, retcode_);
       }
       if (dieGuid_ != 0L) {
-        output.writeUInt64(5, dieGuid_);
+        output.writeUInt64(11, dieGuid_);
       }
       if (skillId_ != 0) {
         output.writeUInt32(13, skillId_);
@@ -200,11 +195,11 @@ public final class AvatarDieAnimationEndRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(6, retcode_);
       }
       if (dieGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, dieGuid_);
+          .computeUInt64Size(11, dieGuid_);
       }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -227,10 +222,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
 
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getSkillId()
-          != other.getSkillId()) return false;
       if (getDieGuid()
           != other.getDieGuid()) return false;
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,11 +239,11 @@ public final class AvatarDieAnimationEndRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
       hash = (37 * hash) + DIE_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getDieGuid());
+      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,11 +340,6 @@ public final class AvatarDieAnimationEndRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24745
-     * Obf: LPNGCMDGKEM
-     * </pre>
-     *
      * Protobuf type {@code AvatarDieAnimationEndRsp}
      */
     public static final class Builder extends
@@ -389,10 +379,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
         super.clear();
         retcode_ = 0;
 
-        skillId_ = 0;
-
         dieGuid_ = 0L;
 
+        skillId_ = 0;
+
         return this;
       }
 
@@ -420,8 +410,8 @@ public final class AvatarDieAnimationEndRspOuterClass {
       public emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp result = new emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp(this);
         result.retcode_ = retcode_;
-        result.skillId_ = skillId_;
         result.dieGuid_ = dieGuid_;
+        result.skillId_ = skillId_;
         onBuilt();
         return result;
       }
@@ -473,12 +463,12 @@ public final class AvatarDieAnimationEndRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getSkillId() != 0) {
-          setSkillId(other.getSkillId());
-        }
         if (other.getDieGuid() != 0L) {
           setDieGuid(other.getDieGuid());
         }
+        if (other.getSkillId() != 0) {
+          setSkillId(other.getSkillId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -510,7 +500,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -518,7 +508,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -529,7 +519,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -539,6 +529,37 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return this;
       }
 
+      private long dieGuid_ ;
+      /**
+       * <code>uint64 die_guid = 11;</code>
+       * @return The dieGuid.
+       */
+      @java.lang.Override
+      public long getDieGuid() {
+        return dieGuid_;
+      }
+      /**
+       * <code>uint64 die_guid = 11;</code>
+       * @param value The dieGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieGuid(long value) {
+        
+        dieGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 die_guid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieGuid() {
+        
+        dieGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int skillId_ ;
       /**
        * <code>uint32 skill_id = 13;</code>
@@ -569,37 +590,6 @@ public final class AvatarDieAnimationEndRspOuterClass {
         onChanged();
         return this;
       }
-
-      private long dieGuid_ ;
-      /**
-       * <code>uint64 die_guid = 5;</code>
-       * @return The dieGuid.
-       */
-      @java.lang.Override
-      public long getDieGuid() {
-        return dieGuid_;
-      }
-      /**
-       * <code>uint64 die_guid = 5;</code>
-       * @param value The dieGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieGuid(long value) {
-        
-        dieGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 die_guid = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieGuid() {
-        
-        dieGuid_ = 0L;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,8 +658,8 @@ public final class AvatarDieAnimationEndRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndRsp.proto\"O\n\030Avat" +
-      "arDieAnimationEndRsp\022\017\n\007retcode\030\004 \001(\005\022\020\n" +
+      "arDieAnimationEndRsp\022\017\n\007retcode\030\006 \001(\005\022\020\n" +
-      "\010skill_id\030\r \001(\r\022\020\n\010die_guid\030\005 \001(\004B\033\n\031emu" +
+      "\010die_guid\030\013 \001(\004\022\020\n\010skill_id\030\r \001(\rB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
     internal_static_AvatarDieAnimationEndRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDieAnimationEndRsp_descriptor,
-        new java.lang.String[] { "Retcode", "SkillId", "DieGuid", });
+        new java.lang.String[] { "Retcode", "DieGuid", "SkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterElementView.java

@@ -0,0 +1,616 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: AvatarEnterElementView.proto
+
+package emu.grasscutter.net.proto;
+
+public final class AvatarEnterElementView {
+  private AvatarEnterElementView() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface AvatarEnterElementViewNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:AvatarEnterElementViewNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool is_triggerd = 14;</code>
+     * @return The isTriggerd.
+     */
+    boolean getIsTriggerd();
+
+    /**
+     * <code>uint32 avatar_entity_id = 11;</code>
+     * @return The avatarEntityId.
+     */
+    int getAvatarEntityId();
+  }
+  /**
+   * <pre>
+   * CmdId: 88
+   * </pre>
+   *
+   * Protobuf type {@code AvatarEnterElementViewNotify}
+   */
+  public static final class AvatarEnterElementViewNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:AvatarEnterElementViewNotify)
+      AvatarEnterElementViewNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use AvatarEnterElementViewNotify.newBuilder() to construct.
+    private AvatarEnterElementViewNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private AvatarEnterElementViewNotify() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new AvatarEnterElementViewNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AvatarEnterElementViewNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 88: {
+
+              avatarEntityId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              isTriggerd_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.class, emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.Builder.class);
+    }
+
+    public static final int IS_TRIGGERD_FIELD_NUMBER = 14;
+    private boolean isTriggerd_;
+    /**
+     * <code>bool is_triggerd = 14;</code>
+     * @return The isTriggerd.
+     */
+    @java.lang.Override
+    public boolean getIsTriggerd() {
+      return isTriggerd_;
+    }
+
+    public static final int AVATAR_ENTITY_ID_FIELD_NUMBER = 11;
+    private int avatarEntityId_;
+    /**
+     * <code>uint32 avatar_entity_id = 11;</code>
+     * @return The avatarEntityId.
+     */
+    @java.lang.Override
+    public int getAvatarEntityId() {
+      return avatarEntityId_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (avatarEntityId_ != 0) {
+        output.writeUInt32(11, avatarEntityId_);
+      }
+      if (isTriggerd_ != false) {
+        output.writeBool(14, isTriggerd_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (avatarEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, avatarEntityId_);
+      }
+      if (isTriggerd_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, isTriggerd_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify other = (emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify) obj;
+
+      if (getIsTriggerd()
+          != other.getIsTriggerd()) return false;
+      if (getAvatarEntityId()
+          != other.getAvatarEntityId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_TRIGGERD_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsTriggerd());
+      hash = (37 * hash) + AVATAR_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarEntityId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 88
+     * </pre>
+     *
+     * Protobuf type {@code AvatarEnterElementViewNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:AvatarEnterElementViewNotify)
+        emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.class, emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        isTriggerd_ = false;
+
+        avatarEntityId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify build() {
+        emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify buildPartial() {
+        emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify result = new emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify(this);
+        result.isTriggerd_ = isTriggerd_;
+        result.avatarEntityId_ = avatarEntityId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify other) {
+        if (other == emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.getDefaultInstance()) return this;
+        if (other.getIsTriggerd() != false) {
+          setIsTriggerd(other.getIsTriggerd());
+        }
+        if (other.getAvatarEntityId() != 0) {
+          setAvatarEntityId(other.getAvatarEntityId());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private boolean isTriggerd_ ;
+      /**
+       * <code>bool is_triggerd = 14;</code>
+       * @return The isTriggerd.
+       */
+      @java.lang.Override
+      public boolean getIsTriggerd() {
+        return isTriggerd_;
+      }
+      /**
+       * <code>bool is_triggerd = 14;</code>
+       * @param value The isTriggerd to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsTriggerd(boolean value) {
+        
+        isTriggerd_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_triggerd = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsTriggerd() {
+        
+        isTriggerd_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int avatarEntityId_ ;
+      /**
+       * <code>uint32 avatar_entity_id = 11;</code>
+       * @return The avatarEntityId.
+       */
+      @java.lang.Override
+      public int getAvatarEntityId() {
+        return avatarEntityId_;
+      }
+      /**
+       * <code>uint32 avatar_entity_id = 11;</code>
+       * @param value The avatarEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarEntityId(int value) {
+        
+        avatarEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 avatar_entity_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarEntityId() {
+        
+        avatarEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:AvatarEnterElementViewNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:AvatarEnterElementViewNotify)
+    private static final emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify();
+    }
+
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<AvatarEnterElementViewNotify>
+        PARSER = new com.google.protobuf.AbstractParser<AvatarEnterElementViewNotify>() {
+      @java.lang.Override
+      public AvatarEnterElementViewNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AvatarEnterElementViewNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<AvatarEnterElementViewNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AvatarEnterElementViewNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AvatarEnterElementViewNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AvatarEnterElementViewNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\034AvatarEnterElementView.proto\"M\n\034Avatar" +
+      "EnterElementViewNotify\022\023\n\013is_triggerd\030\016 " +
+      "\001(\010\022\030\n\020avatar_entity_id\030\013 \001(\rB\033\n\031emu.gra" +
+      "sscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_AvatarEnterElementViewNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_AvatarEnterElementViewNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AvatarEnterElementViewNotify_descriptor,
+        new java.lang.String[] { "IsTriggerd", "AvatarEntityId", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixInfoOuterClass.java

@@ -31,10 +31,6 @@ public final class AvatarEquipAffixInfoOuterClass {
     int getLeftCdTime();
   }
   /**
-   * <pre>
-   * Obf: CFINPAOKBJN
-   * </pre>
-   *
    * Protobuf type {@code AvatarEquipAffixInfo}
    */
   public static final class AvatarEquipAffixInfo extends
@@ -310,10 +306,6 @@ public final class AvatarEquipAffixInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CFINPAOKBJN
-     * </pre>
-     *
      * Protobuf type {@code AvatarEquipAffixInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixStartNotifyOuterClass.java

@@ -19,30 +19,29 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return Whether the equipAffixInfo field is set.
      */
     boolean hasEquipAffixInfo();
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return The equipAffixInfo.
      */
     emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo();
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder();
 
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 21354
+   * CmdId: 8492
-   * Obf: CNGHGKIPNBB
    * </pre>
    *
    * Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -89,7 +88,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 18: {
               emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder subBuilder = null;
               if (equipAffixInfo_ != null) {
                 subBuilder = equipAffixInfo_.toBuilder();
@@ -102,7 +101,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
 
               break;
             }
-            case 96: {
+            case 80: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -139,10 +138,10 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.class, emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.Builder.class);
     }
 
-    public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 5;
+    public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return Whether the equipAffixInfo field is set.
      */
     @java.lang.Override
@@ -150,7 +149,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       return equipAffixInfo_ != null;
     }
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return The equipAffixInfo.
      */
     @java.lang.Override
@@ -158,17 +157,17 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       return equipAffixInfo_ == null ? emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
     }
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
       return getEquipAffixInfo();
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -191,10 +190,10 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (equipAffixInfo_ != null) {
-        output.writeMessage(5, getEquipAffixInfo());
+        output.writeMessage(2, getEquipAffixInfo());
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(12, avatarGuid_);
+        output.writeUInt64(10, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +206,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       size = 0;
       if (equipAffixInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getEquipAffixInfo());
+          .computeMessageSize(2, getEquipAffixInfo());
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, avatarGuid_);
+          .computeUInt64Size(10, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -350,8 +349,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 21354
+     * CmdId: 8492
-     * Obf: CNGHGKIPNBB
      * </pre>
      *
      * Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -518,14 +516,14 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> equipAffixInfoBuilder_;
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        * @return Whether the equipAffixInfo field is set.
        */
       public boolean hasEquipAffixInfo() {
         return equipAffixInfoBuilder_ != null || equipAffixInfo_ != null;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        * @return The equipAffixInfo.
        */
       public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo() {
@@ -536,7 +534,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder setEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
         if (equipAffixInfoBuilder_ == null) {
@@ -552,7 +550,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder setEquipAffixInfo(
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder builderForValue) {
@@ -566,7 +564,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder mergeEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
         if (equipAffixInfoBuilder_ == null) {
@@ -584,7 +582,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder clearEquipAffixInfo() {
         if (equipAffixInfoBuilder_ == null) {
@@ -598,7 +596,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder getEquipAffixInfoBuilder() {
         
@@ -606,7 +604,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return getEquipAffixInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
         if (equipAffixInfoBuilder_ != null) {
@@ -617,7 +615,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> 
@@ -635,7 +633,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -643,7 +641,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -654,7 +652,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -732,8 +730,8 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!AvatarEquipAffixStartNotify.proto\032\032Ava" +
       "tarEquipAffixInfo.proto\"c\n\033AvatarEquipAf" +
-      "fixStartNotify\022/\n\020equip_affix_info\030\005 \001(\013" +
+      "fixStartNotify\022/\n\020equip_affix_info\030\002 \001(\013" +
-      "2\025.AvatarEquipAffixInfo\022\023\n\013avatar_guid\030\014" +
+      "2\025.AvatarEquipAffixInfo\022\023\n\013avatar_guid\030\n" +
       " \001(\004B\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AvatarExcelInfoOuterClass.java

@@ -49,10 +49,6 @@ public final class AvatarExcelInfoOuterClass {
     long getCombatConfigHash();
   }
   /**
-   * <pre>
-   * Obf: HGHGOIMIAMF
-   * </pre>
-   *
    * Protobuf type {@code AvatarExcelInfo}
    */
   public static final class AvatarExcelInfo extends
@@ -414,10 +410,6 @@ public final class AvatarExcelInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HGHGOIMIAMF
-     * </pre>
-     *
      * Protobuf type {@code AvatarExcelInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionDataNotifyOuterClass.java

@@ -19,11 +19,11 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     int getExpeditionInfoMapCount();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     boolean containsExpeditionInfoMap(
         long key);
@@ -34,30 +34,25 @@ public final class AvatarExpeditionDataNotifyOuterClass {
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
     getExpeditionInfoMap();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
     getExpeditionInfoMapMap();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
 
     emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrDefault(
         long key,
         emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo defaultValue);
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
 
     emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
         long key);
   }
   /**
-   * <pre>
-   * CmdId: 26803
-   * Obf: FCCLNDJAANA
-   * </pre>
-   *
    * Protobuf type {@code AvatarExpeditionDataNotify}
    */
   public static final class AvatarExpeditionDataNotify extends
@@ -103,7 +98,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
                     ExpeditionInfoMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +140,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 4:
+        case 3:
           return internalGetExpeditionInfoMap();
         default:
           throw new RuntimeException(
@@ -160,7 +155,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarExpeditionDataNotifyOuterClass.AvatarExpeditionDataNotify.class, emu.grasscutter.net.proto.AvatarExpeditionDataNotifyOuterClass.AvatarExpeditionDataNotify.Builder.class);
     }
 
-    public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 4;
+    public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 3;
     private static final class ExpeditionInfoMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> defaultEntry =
@@ -187,7 +182,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return internalGetExpeditionInfoMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
 
     @java.lang.Override
@@ -205,7 +200,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return getExpeditionInfoMapMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     @java.lang.Override
 
@@ -213,7 +208,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return internalGetExpeditionInfoMap().getMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     @java.lang.Override
 
@@ -226,7 +221,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     @java.lang.Override
 
@@ -260,7 +255,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
           output,
           internalGetExpeditionInfoMap(),
           ExpeditionInfoMapDefaultEntryHolder.defaultEntry,
-          4);
+          3);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +273,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, expeditionInfoMap__);
+            .computeMessageSize(3, expeditionInfoMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,11 +403,6 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26803
-     * Obf: FCCLNDJAANA
-     * </pre>
-     *
      * Protobuf type {@code AvatarExpeditionDataNotify}
      */
     public static final class Builder extends
@@ -428,7 +418,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 3:
             return internalGetExpeditionInfoMap();
           default:
             throw new RuntimeException(
@@ -439,7 +429,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 3:
             return internalGetMutableExpeditionInfoMap();
           default:
             throw new RuntimeException(
@@ -609,7 +599,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return internalGetExpeditionInfoMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
 
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return getExpeditionInfoMapMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       @java.lang.Override
 
@@ -635,7 +625,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return internalGetExpeditionInfoMap().getMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       @java.lang.Override
 
@@ -648,7 +638,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       @java.lang.Override
 
@@ -669,7 +659,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
 
       public Builder removeExpeditionInfoMap(
@@ -688,7 +678,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return internalGetMutableExpeditionInfoMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       public Builder putExpeditionInfoMap(
           long key,
@@ -700,7 +690,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
 
       public Builder putAllExpeditionInfoMap(
@@ -783,7 +773,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n AvatarExpeditionDataNotify.proto\032\032Avat" +
       "arExpeditionInfo.proto\"\276\001\n\032AvatarExpedit" +
-      "ionDataNotify\022O\n\023expedition_info_map\030\004 \003" +
+      "ionDataNotify\022O\n\023expedition_info_map\030\003 \003" +
       "(\01322.AvatarExpeditionDataNotify.Expediti" +
       "onInfoMapEntry\032O\n\026ExpeditionInfoMapEntry" +
       "\022\013\n\003key\030\001 \001(\004\022$\n\005value\030\002 \001(\0132\025.AvatarExp" +

src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionInfoOuterClass.java

@@ -54,10 +54,6 @@ public final class AvatarExpeditionInfoOuterClass {
     float getShortenRatio();
   }
   /**
-   * <pre>
-   * Obf: MBBNGLKDKFD
-   * </pre>
-   *
    * Protobuf type {@code AvatarExpeditionInfo}
    */
   public static final class AvatarExpeditionInfo extends
@@ -425,10 +421,6 @@ public final class AvatarExpeditionInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MBBNGLKDKFD
-     * </pre>
-     *
      * Protobuf type {@code AvatarExpeditionInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionStateOuterClass.java

@@ -15,10 +15,6 @@ public final class AvatarExpeditionStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: OJBIHADNECN
-   * </pre>
-   *
    * Protobuf enum {@code AvatarExpeditionState}
    */
   public enum AvatarExpeditionState

src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java

@@ -19,11 +19,11 @@ public final class AvatarFetterDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     int getFetterInfoMapCount();
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     boolean containsFetterInfoMap(
         long key);
@@ -34,19 +34,19 @@ public final class AvatarFetterDataNotifyOuterClass {
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
     getFetterInfoMap();
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
     getFetterInfoMapMap();
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrDefault(
         long key,
         emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo defaultValue);
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrThrow(
@@ -54,8 +54,7 @@ public final class AvatarFetterDataNotifyOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 29004
+   * CmdId: 4274
-   * Obf: JKPPLBNFEGM
    * </pre>
    *
    * Protobuf type {@code AvatarFetterDataNotify}
@@ -103,7 +102,7 @@ public final class AvatarFetterDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 66: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fetterInfoMap_ = com.google.protobuf.MapField.newMapField(
                     FetterInfoMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +144,7 @@ public final class AvatarFetterDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 8:
+        case 12:
           return internalGetFetterInfoMap();
         default:
           throw new RuntimeException(
@@ -160,7 +159,7 @@ public final class AvatarFetterDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.class, emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.Builder.class);
     }
 
-    public static final int FETTER_INFO_MAP_FIELD_NUMBER = 8;
+    public static final int FETTER_INFO_MAP_FIELD_NUMBER = 12;
     private static final class FetterInfoMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo> defaultEntry =
@@ -187,7 +186,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return internalGetFetterInfoMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
 
     @java.lang.Override
@@ -205,7 +204,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return getFetterInfoMapMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     @java.lang.Override
 
@@ -213,7 +212,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return internalGetFetterInfoMap().getMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     @java.lang.Override
 
@@ -226,7 +225,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     @java.lang.Override
 
@@ -260,7 +259,7 @@ public final class AvatarFetterDataNotifyOuterClass {
           output,
           internalGetFetterInfoMap(),
           FetterInfoMapDefaultEntryHolder.defaultEntry,
-          8);
+          12);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +277,7 @@ public final class AvatarFetterDataNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(8, fetterInfoMap__);
+            .computeMessageSize(12, fetterInfoMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -409,8 +408,7 @@ public final class AvatarFetterDataNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 29004
+     * CmdId: 4274
-     * Obf: JKPPLBNFEGM
      * </pre>
      *
      * Protobuf type {@code AvatarFetterDataNotify}
@@ -428,7 +426,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 12:
             return internalGetFetterInfoMap();
           default:
             throw new RuntimeException(
@@ -439,7 +437,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 12:
             return internalGetMutableFetterInfoMap();
           default:
             throw new RuntimeException(
@@ -609,7 +607,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return internalGetFetterInfoMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
 
       @java.lang.Override
@@ -627,7 +625,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return getFetterInfoMapMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       @java.lang.Override
 
@@ -635,7 +633,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return internalGetFetterInfoMap().getMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       @java.lang.Override
 
@@ -648,7 +646,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       @java.lang.Override
 
@@ -669,7 +667,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
 
       public Builder removeFetterInfoMap(
@@ -688,7 +686,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return internalGetMutableFetterInfoMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       public Builder putFetterInfoMap(
           long key,
@@ -700,7 +698,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
 
       public Builder putAllFetterInfoMap(
@@ -783,7 +781,7 @@ public final class AvatarFetterDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AvatarFetterDataNotify.proto\032\026AvatarFe" +
       "tterInfo.proto\"\246\001\n\026AvatarFetterDataNotif" +
-      "y\022C\n\017fetter_info_map\030\010 \003(\0132*.AvatarFette" +
+      "y\022C\n\017fetter_info_map\030\014 \003(\0132*.AvatarFette" +
       "rDataNotify.FetterInfoMapEntry\032G\n\022Fetter" +
       "InfoMapEntry\022\013\n\003key\030\001 \001(\004\022 \n\005value\030\002 \001(\013" +
       "2\021.AvatarFetterInfo:\0028\001B\033\n\031emu.grasscutt" +

src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterInfoOuterClass.java

@@ -106,10 +106,6 @@ public final class AvatarFetterInfoOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Obf: BJIGILJGKAI
-   * </pre>
-   *
    * Protobuf type {@code AvatarFetterInfo}
    */
   public static final class AvatarFetterInfo extends
@@ -693,10 +689,6 @@ public final class AvatarFetterInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BJIGILJGKAI
-     * </pre>
-     *
      * Protobuf type {@code AvatarFetterInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java

@@ -19,21 +19,20 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 14;</code>
+     * <code>uint32 fetter_level = 8;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 fetter_level = 9;</code>
      * @return The fetterLevel.
      */
     int getFetterLevel();
+
+    /**
+     * <code>uint64 avatar_guid = 1;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 28996
+   * CmdId: 7455
-   * Obf: NAEEPLALPHF
    * </pre>
    *
    * Protobuf type {@code AvatarFetterLevelRewardReq}
@@ -80,16 +79,16 @@ public final class AvatarFetterLevelRewardReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 8: {
-
-              fetterLevel_ = input.readUInt32();
-              break;
-            }
-            case 112: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 64: {
+
+              fetterLevel_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +121,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
               emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.class, emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 14;
+    public static final int FETTER_LEVEL_FIELD_NUMBER = 8;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 14;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int FETTER_LEVEL_FIELD_NUMBER = 9;
     private int fetterLevel_;
     /**
-     * <code>uint32 fetter_level = 9;</code>
+     * <code>uint32 fetter_level = 8;</code>
      * @return The fetterLevel.
      */
     @java.lang.Override
@@ -144,6 +132,17 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       return fetterLevel_;
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 1;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +157,11 @@ public final class AvatarFetterLevelRewardReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (fetterLevel_ != 0) {
-        output.writeUInt32(9, fetterLevel_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(14, avatarGuid_);
+        output.writeUInt64(1, avatarGuid_);
+      }
+      if (fetterLevel_ != 0) {
+        output.writeUInt32(8, fetterLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +172,13 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (fetterLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, fetterLevel_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(14, avatarGuid_);
+          .computeUInt64Size(1, avatarGuid_);
+      }
+      if (fetterLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, fetterLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +195,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq other = (emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getFetterLevel()
           != other.getFetterLevel()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +210,11 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getFetterLevel();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getFetterLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -313,8 +312,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 28996
+     * CmdId: 7455
-     * Obf: NAEEPLALPHF
      * </pre>
      *
      * Protobuf type {@code AvatarFetterLevelRewardReq}
@@ -354,10 +352,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarGuid_ = 0L;
-
         fetterLevel_ = 0;
 
+        avatarGuid_ = 0L;
+
         return this;
       }
 
@@ -384,8 +382,8 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq buildPartial() {
         emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq result = new emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq(this);
-        result.avatarGuid_ = avatarGuid_;
         result.fetterLevel_ = fetterLevel_;
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -434,12 +432,12 @@ public final class AvatarFetterLevelRewardReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq other) {
         if (other == emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.getDefaultInstance()) return this;
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         if (other.getFetterLevel() != 0) {
           setFetterLevel(other.getFetterLevel());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +467,9 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         return this;
       }
 
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 14;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 14;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int fetterLevel_ ;
       /**
-       * <code>uint32 fetter_level = 9;</code>
+       * <code>uint32 fetter_level = 8;</code>
        * @return The fetterLevel.
        */
       @java.lang.Override
@@ -510,7 +477,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         return fetterLevel_;
       }
       /**
-       * <code>uint32 fetter_level = 9;</code>
+       * <code>uint32 fetter_level = 8;</code>
        * @param value The fetterLevel to set.
        * @return This builder for chaining.
        */
@@ -521,7 +488,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 fetter_level = 9;</code>
+       * <code>uint32 fetter_level = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearFetterLevel() {
@@ -530,6 +497,37 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         onChanged();
         return this;
       }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 1;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 1;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 avatar_guid = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -598,8 +596,8 @@ public final class AvatarFetterLevelRewardReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AvatarFetterLevelRewardReq.proto\"G\n\032Av" +
-      "atarFetterLevelRewardReq\022\023\n\013avatar_guid\030" +
+      "atarFetterLevelRewardReq\022\024\n\014fetter_level" +
-      "\016 \001(\004\022\024\n\014fetter_level\030\t \001(\rB\033\n\031emu.grass" +
+      "\030\010 \001(\r\022\023\n\013avatar_guid\030\001 \001(\004B\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +609,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
     internal_static_AvatarFetterLevelRewardReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarFetterLevelRewardReq_descriptor,
-        new java.lang.String[] { "AvatarGuid", "FetterLevel", });
+        new java.lang.String[] { "FetterLevel", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java

@@ -18,18 +18,6 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       // @@protoc_insertion_point(interface_extends:AvatarFetterLevelRewardRsp)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 fetter_level = 12;</code>
-     * @return The fetterLevel.
-     */
-    int getFetterLevel();
-
-    /**
-     * <code>uint32 reward_id = 7;</code>
-     * @return The rewardId.
-     */
-    int getRewardId();
-
     /**
      * <code>int32 retcode = 5;</code>
      * @return The retcode.
@@ -37,15 +25,26 @@ public final class AvatarFetterLevelRewardRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint64 avatar_guid = 11;</code>
+     * <code>uint32 fetter_level = 7;</code>
+     * @return The fetterLevel.
+     */
+    int getFetterLevel();
+
+    /**
+     * <code>uint64 avatar_guid = 12;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 reward_id = 14;</code>
+     * @return The rewardId.
+     */
+    int getRewardId();
   }
   /**
    * <pre>
-   * CmdId: 3975
+   * CmdId: 21750
-   * Obf: MEJJHABMCID
    * </pre>
    *
    * Protobuf type {@code AvatarFetterLevelRewardRsp}
@@ -99,17 +98,17 @@ public final class AvatarFetterLevelRewardRspOuterClass {
             }
             case 56: {
 
-              rewardId_ = input.readUInt32();
+              fetterLevel_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              avatarGuid_ = input.readUInt64();
               break;
             }
             case 96: {
 
-              fetterLevel_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 112: {
+
+              rewardId_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,28 +143,6 @@ public final class AvatarFetterLevelRewardRspOuterClass {
               emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp.class, emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp.Builder.class);
     }
 
-    public static final int FETTER_LEVEL_FIELD_NUMBER = 12;
-    private int fetterLevel_;
-    /**
-     * <code>uint32 fetter_level = 12;</code>
-     * @return The fetterLevel.
-     */
-    @java.lang.Override
-    public int getFetterLevel() {
-      return fetterLevel_;
-    }
-
-    public static final int REWARD_ID_FIELD_NUMBER = 7;
-    private int rewardId_;
-    /**
-     * <code>uint32 reward_id = 7;</code>
-     * @return The rewardId.
-     */
-    @java.lang.Override
-    public int getRewardId() {
-      return rewardId_;
-    }
-
     public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
@@ -177,10 +154,21 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
+    public static final int FETTER_LEVEL_FIELD_NUMBER = 7;
+    private int fetterLevel_;
+    /**
+     * <code>uint32 fetter_level = 7;</code>
+     * @return The fetterLevel.
+     */
+    @java.lang.Override
+    public int getFetterLevel() {
+      return fetterLevel_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 11;</code>
+     * <code>uint64 avatar_guid = 12;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -188,6 +176,17 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       return avatarGuid_;
     }
 
+    public static final int REWARD_ID_FIELD_NUMBER = 14;
+    private int rewardId_;
+    /**
+     * <code>uint32 reward_id = 14;</code>
+     * @return The rewardId.
+     */
+    @java.lang.Override
+    public int getRewardId() {
+      return rewardId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -205,14 +204,14 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       if (retcode_ != 0) {
         output.writeInt32(5, retcode_);
       }
-      if (rewardId_ != 0) {
+      if (fetterLevel_ != 0) {
-        output.writeUInt32(7, rewardId_);
+        output.writeUInt32(7, fetterLevel_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(11, avatarGuid_);
+        output.writeUInt64(12, avatarGuid_);
       }
-      if (fetterLevel_ != 0) {
+      if (rewardId_ != 0) {
-        output.writeUInt32(12, fetterLevel_);
+        output.writeUInt32(14, rewardId_);
       }
       unknownFields.writeTo(output);
     }
@@ -227,17 +226,17 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(5, retcode_);
       }
-      if (rewardId_ != 0) {
+      if (fetterLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, rewardId_);
+          .computeUInt32Size(7, fetterLevel_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, avatarGuid_);
+          .computeUInt64Size(12, avatarGuid_);
       }
-      if (fetterLevel_ != 0) {
+      if (rewardId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, fetterLevel_);
+          .computeUInt32Size(14, rewardId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,14 +253,14 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp other = (emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp) obj;
 
-      if (getFetterLevel()
-          != other.getFetterLevel()) return false;
-      if (getRewardId()
-          != other.getRewardId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getFetterLevel()
+          != other.getFetterLevel()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getRewardId()
+          != other.getRewardId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -273,15 +272,15 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getFetterLevel();
-      hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getRewardId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getFetterLevel();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getRewardId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -379,8 +378,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3975
+     * CmdId: 21750
-     * Obf: MEJJHABMCID
      * </pre>
      *
      * Protobuf type {@code AvatarFetterLevelRewardRsp}
@@ -420,14 +418,14 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        fetterLevel_ = 0;
-
-        rewardId_ = 0;
-
         retcode_ = 0;
 
+        fetterLevel_ = 0;
+
         avatarGuid_ = 0L;
 
+        rewardId_ = 0;
+
         return this;
       }
 
@@ -454,10 +452,10 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp result = new emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp(this);
-        result.fetterLevel_ = fetterLevel_;
-        result.rewardId_ = rewardId_;
         result.retcode_ = retcode_;
+        result.fetterLevel_ = fetterLevel_;
         result.avatarGuid_ = avatarGuid_;
+        result.rewardId_ = rewardId_;
         onBuilt();
         return result;
       }
@@ -506,18 +504,18 @@ public final class AvatarFetterLevelRewardRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp.getDefaultInstance()) return this;
-        if (other.getFetterLevel() != 0) {
-          setFetterLevel(other.getFetterLevel());
-        }
-        if (other.getRewardId() != 0) {
-          setRewardId(other.getRewardId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getFetterLevel() != 0) {
+          setFetterLevel(other.getFetterLevel());
+        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getRewardId() != 0) {
+          setRewardId(other.getRewardId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,68 +545,6 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return this;
       }
 
-      private int fetterLevel_ ;
-      /**
-       * <code>uint32 fetter_level = 12;</code>
-       * @return The fetterLevel.
-       */
-      @java.lang.Override
-      public int getFetterLevel() {
-        return fetterLevel_;
-      }
-      /**
-       * <code>uint32 fetter_level = 12;</code>
-       * @param value The fetterLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFetterLevel(int value) {
-        
-        fetterLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 fetter_level = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFetterLevel() {
-        
-        fetterLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int rewardId_ ;
-      /**
-       * <code>uint32 reward_id = 7;</code>
-       * @return The rewardId.
-       */
-      @java.lang.Override
-      public int getRewardId() {
-        return rewardId_;
-      }
-      /**
-       * <code>uint32 reward_id = 7;</code>
-       * @param value The rewardId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRewardId(int value) {
-        
-        rewardId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reward_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRewardId() {
-        
-        rewardId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
        * <code>int32 retcode = 5;</code>
@@ -640,9 +576,40 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return this;
       }
 
+      private int fetterLevel_ ;
+      /**
+       * <code>uint32 fetter_level = 7;</code>
+       * @return The fetterLevel.
+       */
+      @java.lang.Override
+      public int getFetterLevel() {
+        return fetterLevel_;
+      }
+      /**
+       * <code>uint32 fetter_level = 7;</code>
+       * @param value The fetterLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFetterLevel(int value) {
+        
+        fetterLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 fetter_level = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFetterLevel() {
+        
+        fetterLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 11;</code>
+       * <code>uint64 avatar_guid = 12;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -650,7 +617,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 11;</code>
+       * <code>uint64 avatar_guid = 12;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -661,7 +628,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 11;</code>
+       * <code>uint64 avatar_guid = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -670,6 +637,37 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int rewardId_ ;
+      /**
+       * <code>uint32 reward_id = 14;</code>
+       * @return The rewardId.
+       */
+      @java.lang.Override
+      public int getRewardId() {
+        return rewardId_;
+      }
+      /**
+       * <code>uint32 reward_id = 14;</code>
+       * @param value The rewardId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRewardId(int value) {
+        
+        rewardId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reward_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRewardId() {
+        
+        rewardId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -738,9 +736,9 @@ public final class AvatarFetterLevelRewardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AvatarFetterLevelRewardRsp.proto\"k\n\032Av" +
-      "atarFetterLevelRewardRsp\022\024\n\014fetter_level" +
+      "atarFetterLevelRewardRsp\022\017\n\007retcode\030\005 \001(" +
-      "\030\014 \001(\r\022\021\n\treward_id\030\007 \001(\r\022\017\n\007retcode\030\005 \001" +
+      "\005\022\024\n\014fetter_level\030\007 \001(\r\022\023\n\013avatar_guid\030\014" +
-      "(\005\022\023\n\013avatar_guid\030\013 \001(\004B\033\n\031emu.grasscutt" +
+      " \001(\004\022\021\n\treward_id\030\016 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +750,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
     internal_static_AvatarFetterLevelRewardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarFetterLevelRewardRsp_descriptor,
-        new java.lang.String[] { "FetterLevel", "RewardId", "Retcode", "AvatarGuid", });
+        new java.lang.String[] { "Retcode", "FetterLevel", "AvatarGuid", "RewardId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java

@@ -19,17 +19,11 @@ public final class AvatarFightPropNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
     int getFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     boolean containsFightPropMap(
         int key);
@@ -40,28 +34,33 @@ public final class AvatarFightPropNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrThrow(
         int key);
+
+    /**
+     * <code>uint64 avatar_guid = 11;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 20455
+   * CmdId: 287
-   * Obf: DPKAGLDONFP
    * </pre>
    *
    * Protobuf type {@code AvatarFightPropNotify}
@@ -109,7 +108,7 @@ public final class AvatarFightPropNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fightPropMap_ = com.google.protobuf.MapField.newMapField(
                     FightPropMapDefaultEntryHolder.defaultEntry);
@@ -122,7 +121,7 @@ public final class AvatarFightPropNotifyOuterClass {
                   fightPropMap__.getKey(), fightPropMap__.getValue());
               break;
             }
-            case 56: {
+            case 88: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -156,7 +155,7 @@ public final class AvatarFightPropNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 3:
+        case 7:
           return internalGetFightPropMap();
         default:
           throw new RuntimeException(
@@ -171,18 +170,7 @@ public final class AvatarFightPropNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify.class, emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
+    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 7;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 7;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 3;
     private static final class FightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -209,7 +197,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return internalGetFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     @java.lang.Override
@@ -227,7 +215,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return getFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -235,7 +223,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return internalGetFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -248,7 +236,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -263,6 +251,17 @@ public final class AvatarFightPropNotifyOuterClass {
       return map.get(key);
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 11;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -282,9 +281,9 @@ public final class AvatarFightPropNotifyOuterClass {
           output,
           internalGetFightPropMap(),
           FightPropMapDefaultEntryHolder.defaultEntry,
-          3);
+          7);
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(7, avatarGuid_);
+        output.writeUInt64(11, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -303,11 +302,11 @@ public final class AvatarFightPropNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(3, fightPropMap__);
+            .computeMessageSize(7, fightPropMap__);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, avatarGuid_);
+          .computeUInt64Size(11, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -324,10 +323,10 @@ public final class AvatarFightPropNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify other = (emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (!internalGetFightPropMap().equals(
           other.internalGetFightPropMap())) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -339,13 +338,13 @@ public final class AvatarFightPropNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
       if (!internalGetFightPropMap().getMap().isEmpty()) {
         hash = (37 * hash) + FIGHT_PROP_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetFightPropMap().hashCode();
       }
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -443,8 +442,7 @@ public final class AvatarFightPropNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 20455
+     * CmdId: 287
-     * Obf: DPKAGLDONFP
      * </pre>
      *
      * Protobuf type {@code AvatarFightPropNotify}
@@ -462,7 +460,7 @@ public final class AvatarFightPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 7:
             return internalGetFightPropMap();
           default:
             throw new RuntimeException(
@@ -473,7 +471,7 @@ public final class AvatarFightPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 7:
             return internalGetMutableFightPropMap();
           default:
             throw new RuntimeException(
@@ -506,9 +504,9 @@ public final class AvatarFightPropNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutableFightPropMap().clear();
         avatarGuid_ = 0L;
 
-        internalGetMutableFightPropMap().clear();
         return this;
       }
 
@@ -536,9 +534,9 @@ public final class AvatarFightPropNotifyOuterClass {
       public emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify result = new emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify(this);
         int from_bitField0_ = bitField0_;
-        result.avatarGuid_ = avatarGuid_;
         result.fightPropMap_ = internalGetFightPropMap();
         result.fightPropMap_.makeImmutable();
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -587,11 +585,11 @@ public final class AvatarFightPropNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify.getDefaultInstance()) return this;
+        internalGetMutableFightPropMap().mergeFrom(
+            other.internalGetFightPropMap());
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        internalGetMutableFightPropMap().mergeFrom(
-            other.internalGetFightPropMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -622,37 +620,6 @@ public final class AvatarFightPropNotifyOuterClass {
       }
       private int bitField0_;
 
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 7;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 7;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Float> fightPropMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
@@ -680,7 +647,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return internalGetFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       @java.lang.Override
@@ -698,7 +665,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return getFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -706,7 +673,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return internalGetFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -719,7 +686,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -740,7 +707,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder removeFightPropMap(
@@ -759,7 +726,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return internalGetMutableFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       public Builder putFightPropMap(
           int key,
@@ -771,7 +738,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder putAllFightPropMap(
@@ -780,6 +747,37 @@ public final class AvatarFightPropNotifyOuterClass {
             .putAll(values);
         return this;
       }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 11;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 11;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 avatar_guid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -853,9 +851,9 @@ public final class AvatarFightPropNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarFightPropNotify.proto\"\243\001\n\025Avatar" +
-      "FightPropNotify\022\023\n\013avatar_guid\030\007 \001(\004\022@\n\016" +
+      "FightPropNotify\022@\n\016fight_prop_map\030\007 \003(\0132" +
-      "fight_prop_map\030\003 \003(\0132(.AvatarFightPropNo" +
+      "(.AvatarFightPropNotify.FightPropMapEntr" +
-      "tify.FightPropMapEntry\0323\n\021FightPropMapEn" +
+      "y\022\023\n\013avatar_guid\030\013 \001(\004\0323\n\021FightPropMapEn" +
       "try\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
@@ -868,7 +866,7 @@ public final class AvatarFightPropNotifyOuterClass {
     internal_static_AvatarFightPropNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarFightPropNotify_descriptor,
-        new java.lang.String[] { "AvatarGuid", "FightPropMap", });
+        new java.lang.String[] { "FightPropMap", "AvatarGuid", });
     internal_static_AvatarFightPropNotify_FightPropMapEntry_descriptor =
       internal_static_AvatarFightPropNotify_descriptor.getNestedTypes().get(0);
     internal_static_AvatarFightPropNotify_FightPropMapEntry_fieldAccessorTable = new

src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java

@@ -19,17 +19,17 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 2;</code>
+     * <code>uint64 avatar_guid = 3;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     int getFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     boolean containsFightPropMap(
         int key);
@@ -40,19 +40,19 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrThrow(
@@ -60,8 +60,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 21000
+   * CmdId: 20328
-   * Obf: CHDLCNDEHEB
    * </pre>
    *
    * Protobuf type {@code AvatarFightPropUpdateNotify}
@@ -109,12 +108,12 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 34: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fightPropMap_ = com.google.protobuf.MapField.newMapField(
                     FightPropMapDefaultEntryHolder.defaultEntry);
@@ -156,7 +155,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 4:
+        case 7:
           return internalGetFightPropMap();
         default:
           throw new RuntimeException(
@@ -171,10 +170,10 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.class, emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 2;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 2;</code>
+     * <code>uint64 avatar_guid = 3;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -182,7 +181,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return avatarGuid_;
     }
 
-    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 4;
+    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 7;
     private static final class FightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -209,7 +208,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return internalGetFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     @java.lang.Override
@@ -227,7 +226,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return getFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -235,7 +234,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return internalGetFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -248,7 +247,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -278,14 +277,14 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(2, avatarGuid_);
+        output.writeUInt64(3, avatarGuid_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetFightPropMap(),
           FightPropMapDefaultEntryHolder.defaultEntry,
-          4);
+          7);
       unknownFields.writeTo(output);
     }
 
@@ -297,7 +296,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, avatarGuid_);
+          .computeUInt64Size(3, avatarGuid_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
            : internalGetFightPropMap().getMap().entrySet()) {
@@ -307,7 +306,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, fightPropMap__);
+            .computeMessageSize(7, fightPropMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -443,8 +442,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 21000
+     * CmdId: 20328
-     * Obf: CHDLCNDEHEB
      * </pre>
      *
      * Protobuf type {@code AvatarFightPropUpdateNotify}
@@ -462,7 +460,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 7:
             return internalGetFightPropMap();
           default:
             throw new RuntimeException(
@@ -473,7 +471,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 7:
             return internalGetMutableFightPropMap();
           default:
             throw new RuntimeException(
@@ -624,7 +622,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 3;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -632,7 +630,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 3;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -643,7 +641,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -680,7 +678,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return internalGetFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       @java.lang.Override
@@ -698,7 +696,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return getFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -706,7 +704,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return internalGetFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -719,7 +717,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -740,7 +738,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder removeFightPropMap(
@@ -759,7 +757,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return internalGetMutableFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       public Builder putFightPropMap(
           int key,
@@ -771,7 +769,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder putAllFightPropMap(
@@ -854,7 +852,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!AvatarFightPropUpdateNotify.proto\"\257\001\n\033" +
       "AvatarFightPropUpdateNotify\022\023\n\013avatar_gu" +
-      "id\030\002 \001(\004\022F\n\016fight_prop_map\030\004 \003(\0132..Avata" +
+      "id\030\003 \001(\004\022F\n\016fight_prop_map\030\007 \003(\0132..Avata" +
       "rFightPropUpdateNotify.FightPropMapEntry" +
       "\0323\n\021FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005va" +
       "lue\030\002 \001(\002:\0028\001B\033\n\031emu.grasscutter.net.pro" +

src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java

@@ -19,23 +19,18 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 flycloak_id = 2;</code>
+     * <code>uint32 flycloak_id = 4;</code>
      * @return The flycloakId.
      */
     int getFlycloakId();
 
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23578
-   * Obf: GHNNAHDIIKE
-   * </pre>
-   *
    * Protobuf type {@code AvatarFlycloakChangeNotify}
    */
   public static final class AvatarFlycloakChangeNotify extends
@@ -80,12 +75,12 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 32: {
 
               flycloakId_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 80: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -122,10 +117,10 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.class, emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.Builder.class);
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 2;
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 4;
     private int flycloakId_;
     /**
-     * <code>uint32 flycloak_id = 2;</code>
+     * <code>uint32 flycloak_id = 4;</code>
      * @return The flycloakId.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       return flycloakId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -159,10 +154,10 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (flycloakId_ != 0) {
-        output.writeUInt32(2, flycloakId_);
+        output.writeUInt32(4, flycloakId_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
+        output.writeUInt64(10, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       size = 0;
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, flycloakId_);
+          .computeUInt32Size(4, flycloakId_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
+          .computeUInt64Size(10, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,11 +307,6 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23578
-     * Obf: GHNNAHDIIKE
-     * </pre>
-     *
      * Protobuf type {@code AvatarFlycloakChangeNotify}
      */
     public static final class Builder extends
@@ -471,7 +461,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
 
       private int flycloakId_ ;
       /**
-       * <code>uint32 flycloak_id = 2;</code>
+       * <code>uint32 flycloak_id = 4;</code>
        * @return The flycloakId.
        */
       @java.lang.Override
@@ -479,7 +469,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return flycloakId_;
       }
       /**
-       * <code>uint32 flycloak_id = 2;</code>
+       * <code>uint32 flycloak_id = 4;</code>
        * @param value The flycloakId to set.
        * @return This builder for chaining.
        */
@@ -490,7 +480,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 flycloak_id = 2;</code>
+       * <code>uint32 flycloak_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearFlycloakId() {
@@ -502,7 +492,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -510,7 +500,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -521,7 +511,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -599,7 +589,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n AvatarFlycloakChangeNotify.proto\"F\n\032Av" +
       "atarFlycloakChangeNotify\022\023\n\013flycloak_id\030" +
-      "\002 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031emu.grassc" +
+      "\004 \001(\r\022\023\n\013avatar_guid\030\n \001(\004B\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarGainCostumeNotifyOuterClass.java

@@ -19,17 +19,12 @@ public final class AvatarGainCostumeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 costume_id = 6;</code>
+     * <code>uint32 costume_id = 2;</code>
      * @return The costumeId.
      */
     int getCostumeId();
   }
   /**
-   * <pre>
-   * CmdId: 24251
-   * Obf: CMOIAGEGIOJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarGainCostumeNotify}
    */
   public static final class AvatarGainCostumeNotify extends
@@ -74,7 +69,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 16: {
 
               costumeId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class AvatarGainCostumeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarGainCostumeNotifyOuterClass.AvatarGainCostumeNotify.class, emu.grasscutter.net.proto.AvatarGainCostumeNotifyOuterClass.AvatarGainCostumeNotify.Builder.class);
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 6;
+    public static final int COSTUME_ID_FIELD_NUMBER = 2;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 6;</code>
+     * <code>uint32 costume_id = 2;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (costumeId_ != 0) {
-        output.writeUInt32(6, costumeId_);
+        output.writeUInt32(2, costumeId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
       size = 0;
       if (costumeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, costumeId_);
+          .computeUInt32Size(2, costumeId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class AvatarGainCostumeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24251
-     * Obf: CMOIAGEGIOJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarGainCostumeNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
 
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 6;</code>
+       * <code>uint32 costume_id = 2;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 6;</code>
+       * <code>uint32 costume_id = 2;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 6;</code>
+       * <code>uint32 costume_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -527,7 +517,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarGainCostumeNotify.proto\"-\n\027Avata" +
-      "rGainCostumeNotify\022\022\n\ncostume_id\030\006 \001(\rB\033" +
+      "rGainCostumeNotify\022\022\n\ncostume_id\030\002 \001(\rB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java

@@ -19,17 +19,12 @@ public final class AvatarGainFlycloakNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 13;</code>
      * @return The flycloakId.
      */
     int getFlycloakId();
   }
   /**
-   * <pre>
-   * CmdId: 29528
-   * Obf: LOFNLHIBOBB
-   * </pre>
-   *
    * Protobuf type {@code AvatarGainFlycloakNotify}
    */
   public static final class AvatarGainFlycloakNotify extends
@@ -74,7 +69,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 104: {
 
               flycloakId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class AvatarGainFlycloakNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.class, emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.Builder.class);
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 6;
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 13;
     private int flycloakId_;
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 13;</code>
      * @return The flycloakId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (flycloakId_ != 0) {
-        output.writeUInt32(6, flycloakId_);
+        output.writeUInt32(13, flycloakId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
       size = 0;
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, flycloakId_);
+          .computeUInt32Size(13, flycloakId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class AvatarGainFlycloakNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29528
-     * Obf: LOFNLHIBOBB
-     * </pre>
-     *
      * Protobuf type {@code AvatarGainFlycloakNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
 
       private int flycloakId_ ;
       /**
-       * <code>uint32 flycloak_id = 6;</code>
+       * <code>uint32 flycloak_id = 13;</code>
        * @return The flycloakId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
         return flycloakId_;
       }
       /**
-       * <code>uint32 flycloak_id = 6;</code>
+       * <code>uint32 flycloak_id = 13;</code>
        * @param value The flycloakId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 flycloak_id = 6;</code>
+       * <code>uint32 flycloak_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearFlycloakId() {
@@ -527,7 +517,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarGainFlycloakNotify.proto\"/\n\030Avat" +
-      "arGainFlycloakNotify\022\023\n\013flycloak_id\030\006 \001(" +
+      "arGainFlycloakNotify\022\023\n\013flycloak_id\030\r \001(" +
       "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarInfoOuterClass.java

@@ -420,31 +420,28 @@ public final class AvatarInfoOuterClass {
     int getAnimHash();
 
     /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
+     * <pre>
-     * @return Whether the pDGKJIIEPIO field is set.
+     *JNHGJAIIMGJ PINDEGAFOAE = 28;
+     * </pre>
+     *
+     * <code>uint32 ABLFJPMKKDA = 29;</code>
+     * @return The aBLFJPMKKDA.
      */
-    boolean hasPDGKJIIEPIO();
+    int getABLFJPMKKDA();
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     * @return The pDGKJIIEPIO.
-     */
-    emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI getPDGKJIIEPIO();
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     */
-    emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder getPDGKJIIEPIOOrBuilder();
 
     /**
-     * <code>uint32 GJFKDCJENJE = 29;</code>
+     * <code>uint32 GCHGLANNHMC = 30;</code>
-     * @return The gJFKDCJENJE.
+     * @return The gCHGLANNHMC.
      */
-    int getGJFKDCJENJE();
+    int getGCHGLANNHMC();
+
+    /**
+     * <code>uint32 KCINBOMOIGL = 31;</code>
+     * @return The kCINBOMOIGL.
+     */
+    int getKCINBOMOIGL();
   }
   /**
-   * <pre>
-   * Obf: FHPLJBCPFFF
-   * </pre>
-   *
    * Protobuf type {@code AvatarInfo}
    */
   public static final class AvatarInfo extends
@@ -776,22 +773,19 @@ public final class AvatarInfoOuterClass {
               animHash_ = input.readUInt32();
               break;
             }
-            case 226: {
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder subBuilder = null;
-              if (pDGKJIIEPIO_ != null) {
-                subBuilder = pDGKJIIEPIO_.toBuilder();
-              }
-              pDGKJIIEPIO_ = input.readMessage(emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pDGKJIIEPIO_);
-                pDGKJIIEPIO_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
             case 232: {
 
-              gJFKDCJENJE_ = input.readUInt32();
+              aBLFJPMKKDA_ = input.readUInt32();
+              break;
+            }
+            case 240: {
+
+              gCHGLANNHMC_ = input.readUInt32();
+              break;
+            }
+            case 248: {
+
+              kCINBOMOIGL_ = input.readUInt32();
               break;
             }
             default: {
@@ -1667,41 +1661,41 @@ public final class AvatarInfoOuterClass {
       return animHash_;
     }
 
-    public static final int PDGKJIIEPIO_FIELD_NUMBER = 28;
+    public static final int ABLFJPMKKDA_FIELD_NUMBER = 29;
-    private emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI pDGKJIIEPIO_;
+    private int aBLFJPMKKDA_;
     /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
+     * <pre>
-     * @return Whether the pDGKJIIEPIO field is set.
+     *JNHGJAIIMGJ PINDEGAFOAE = 28;
+     * </pre>
+     *
+     * <code>uint32 ABLFJPMKKDA = 29;</code>
+     * @return The aBLFJPMKKDA.
      */
     @java.lang.Override
-    public boolean hasPDGKJIIEPIO() {
+    public int getABLFJPMKKDA() {
-      return pDGKJIIEPIO_ != null;
+      return aBLFJPMKKDA_;
-    }
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     * @return The pDGKJIIEPIO.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI getPDGKJIIEPIO() {
-      return pDGKJIIEPIO_ == null ? emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.getDefaultInstance() : pDGKJIIEPIO_;
-    }
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder getPDGKJIIEPIOOrBuilder() {
-      return getPDGKJIIEPIO();
     }
 
-    public static final int GJFKDCJENJE_FIELD_NUMBER = 29;
+    public static final int GCHGLANNHMC_FIELD_NUMBER = 30;
-    private int gJFKDCJENJE_;
+    private int gCHGLANNHMC_;
     /**
-     * <code>uint32 GJFKDCJENJE = 29;</code>
+     * <code>uint32 GCHGLANNHMC = 30;</code>
-     * @return The gJFKDCJENJE.
+     * @return The gCHGLANNHMC.
      */
     @java.lang.Override
-    public int getGJFKDCJENJE() {
+    public int getGCHGLANNHMC() {
-      return gJFKDCJENJE_;
+      return gCHGLANNHMC_;
+    }
+
+    public static final int KCINBOMOIGL_FIELD_NUMBER = 31;
+    private int kCINBOMOIGL_;
+    /**
+     * <code>uint32 KCINBOMOIGL = 31;</code>
+     * @return The kCINBOMOIGL.
+     */
+    @java.lang.Override
+    public int getKCINBOMOIGL() {
+      return kCINBOMOIGL_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1832,11 +1826,14 @@ public final class AvatarInfoOuterClass {
       if (animHash_ != 0) {
         output.writeUInt32(27, animHash_);
       }
-      if (pDGKJIIEPIO_ != null) {
+      if (aBLFJPMKKDA_ != 0) {
-        output.writeMessage(28, getPDGKJIIEPIO());
+        output.writeUInt32(29, aBLFJPMKKDA_);
       }
-      if (gJFKDCJENJE_ != 0) {
+      if (gCHGLANNHMC_ != 0) {
-        output.writeUInt32(29, gJFKDCJENJE_);
+        output.writeUInt32(30, gCHGLANNHMC_);
+      }
+      if (kCINBOMOIGL_ != 0) {
+        output.writeUInt32(31, kCINBOMOIGL_);
       }
       unknownFields.writeTo(output);
     }
@@ -2031,13 +2028,17 @@ public final class AvatarInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(27, animHash_);
       }
-      if (pDGKJIIEPIO_ != null) {
+      if (aBLFJPMKKDA_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(28, getPDGKJIIEPIO());
+          .computeUInt32Size(29, aBLFJPMKKDA_);
       }
-      if (gJFKDCJENJE_ != 0) {
+      if (gCHGLANNHMC_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(29, gJFKDCJENJE_);
+          .computeUInt32Size(30, gCHGLANNHMC_);
+      }
+      if (kCINBOMOIGL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(31, kCINBOMOIGL_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -2114,13 +2115,12 @@ public final class AvatarInfoOuterClass {
       }
       if (getAnimHash()
           != other.getAnimHash()) return false;
-      if (hasPDGKJIIEPIO() != other.hasPDGKJIIEPIO()) return false;
+      if (getABLFJPMKKDA()
-      if (hasPDGKJIIEPIO()) {
+          != other.getABLFJPMKKDA()) return false;
-        if (!getPDGKJIIEPIO()
+      if (getGCHGLANNHMC()
-            .equals(other.getPDGKJIIEPIO())) return false;
+          != other.getGCHGLANNHMC()) return false;
-      }
+      if (getKCINBOMOIGL()
-      if (getGJFKDCJENJE()
+          != other.getKCINBOMOIGL()) return false;
-          != other.getGJFKDCJENJE()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -2214,12 +2214,12 @@ public final class AvatarInfoOuterClass {
       }
       hash = (37 * hash) + ANIM_HASH_FIELD_NUMBER;
       hash = (53 * hash) + getAnimHash();
-      if (hasPDGKJIIEPIO()) {
+      hash = (37 * hash) + ABLFJPMKKDA_FIELD_NUMBER;
-        hash = (37 * hash) + PDGKJIIEPIO_FIELD_NUMBER;
+      hash = (53 * hash) + getABLFJPMKKDA();
-        hash = (53 * hash) + getPDGKJIIEPIO().hashCode();
+      hash = (37 * hash) + GCHGLANNHMC_FIELD_NUMBER;
-      }
+      hash = (53 * hash) + getGCHGLANNHMC();
-      hash = (37 * hash) + GJFKDCJENJE_FIELD_NUMBER;
+      hash = (37 * hash) + KCINBOMOIGL_FIELD_NUMBER;
-      hash = (53 * hash) + getGJFKDCJENJE();
+      hash = (53 * hash) + getKCINBOMOIGL();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2316,10 +2316,6 @@ public final class AvatarInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FHPLJBCPFFF
-     * </pre>
-     *
      * Protobuf type {@code AvatarInfo}
      */
     public static final class Builder extends
@@ -2459,13 +2455,11 @@ public final class AvatarInfoOuterClass {
         }
         animHash_ = 0;
 
-        if (pDGKJIIEPIOBuilder_ == null) {
+        aBLFJPMKKDA_ = 0;
-          pDGKJIIEPIO_ = null;
+
-        } else {
+        gCHGLANNHMC_ = 0;
-          pDGKJIIEPIO_ = null;
+
-          pDGKJIIEPIOBuilder_ = null;
+        kCINBOMOIGL_ = 0;
-        }
-        gJFKDCJENJE_ = 0;
 
         return this;
       }
@@ -2565,12 +2559,9 @@ public final class AvatarInfoOuterClass {
           result.excelInfo_ = excelInfoBuilder_.build();
         }
         result.animHash_ = animHash_;
-        if (pDGKJIIEPIOBuilder_ == null) {
+        result.aBLFJPMKKDA_ = aBLFJPMKKDA_;
-          result.pDGKJIIEPIO_ = pDGKJIIEPIO_;
+        result.gCHGLANNHMC_ = gCHGLANNHMC_;
-        } else {
+        result.kCINBOMOIGL_ = kCINBOMOIGL_;
-          result.pDGKJIIEPIO_ = pDGKJIIEPIOBuilder_.build();
-        }
-        result.gJFKDCJENJE_ = gJFKDCJENJE_;
         onBuilt();
         return result;
       }
@@ -2750,11 +2741,14 @@ public final class AvatarInfoOuterClass {
         if (other.getAnimHash() != 0) {
           setAnimHash(other.getAnimHash());
         }
-        if (other.hasPDGKJIIEPIO()) {
+        if (other.getABLFJPMKKDA() != 0) {
-          mergePDGKJIIEPIO(other.getPDGKJIIEPIO());
+          setABLFJPMKKDA(other.getABLFJPMKKDA());
         }
-        if (other.getGJFKDCJENJE() != 0) {
+        if (other.getGCHGLANNHMC() != 0) {
-          setGJFKDCJENJE(other.getGJFKDCJENJE());
+          setGCHGLANNHMC(other.getGCHGLANNHMC());
+        }
+        if (other.getKCINBOMOIGL() != 0) {
+          setKCINBOMOIGL(other.getKCINBOMOIGL());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -4813,152 +4807,107 @@ public final class AvatarInfoOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI pDGKJIIEPIO_;
+      private int aBLFJPMKKDA_ ;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder> pDGKJIIEPIOBuilder_;
       /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
+       * <pre>
-       * @return Whether the pDGKJIIEPIO field is set.
+       *JNHGJAIIMGJ PINDEGAFOAE = 28;
-       */
+       * </pre>
-      public boolean hasPDGKJIIEPIO() {
+       *
-        return pDGKJIIEPIOBuilder_ != null || pDGKJIIEPIO_ != null;
+       * <code>uint32 ABLFJPMKKDA = 29;</code>
-      }
+       * @return The aBLFJPMKKDA.
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       * @return The pDGKJIIEPIO.
-       */
-      public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI getPDGKJIIEPIO() {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          return pDGKJIIEPIO_ == null ? emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.getDefaultInstance() : pDGKJIIEPIO_;
-        } else {
-          return pDGKJIIEPIOBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder setPDGKJIIEPIO(emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI value) {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pDGKJIIEPIO_ = value;
-          onChanged();
-        } else {
-          pDGKJIIEPIOBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder setPDGKJIIEPIO(
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder builderForValue) {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          pDGKJIIEPIO_ = builderForValue.build();
-          onChanged();
-        } else {
-          pDGKJIIEPIOBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder mergePDGKJIIEPIO(emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI value) {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          if (pDGKJIIEPIO_ != null) {
-            pDGKJIIEPIO_ =
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.newBuilder(pDGKJIIEPIO_).mergeFrom(value).buildPartial();
-          } else {
-            pDGKJIIEPIO_ = value;
-          }
-          onChanged();
-        } else {
-          pDGKJIIEPIOBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder clearPDGKJIIEPIO() {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          pDGKJIIEPIO_ = null;
-          onChanged();
-        } else {
-          pDGKJIIEPIO_ = null;
-          pDGKJIIEPIOBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder getPDGKJIIEPIOBuilder() {
-        
-        onChanged();
-        return getPDGKJIIEPIOFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder getPDGKJIIEPIOOrBuilder() {
-        if (pDGKJIIEPIOBuilder_ != null) {
-          return pDGKJIIEPIOBuilder_.getMessageOrBuilder();
-        } else {
-          return pDGKJIIEPIO_ == null ?
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.getDefaultInstance() : pDGKJIIEPIO_;
-        }
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder> 
-          getPDGKJIIEPIOFieldBuilder() {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          pDGKJIIEPIOBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder>(
-                  getPDGKJIIEPIO(),
-                  getParentForChildren(),
-                  isClean());
-          pDGKJIIEPIO_ = null;
-        }
-        return pDGKJIIEPIOBuilder_;
-      }
-
-      private int gJFKDCJENJE_ ;
-      /**
-       * <code>uint32 GJFKDCJENJE = 29;</code>
-       * @return The gJFKDCJENJE.
        */
       @java.lang.Override
-      public int getGJFKDCJENJE() {
+      public int getABLFJPMKKDA() {
-        return gJFKDCJENJE_;
+        return aBLFJPMKKDA_;
       }
       /**
-       * <code>uint32 GJFKDCJENJE = 29;</code>
+       * <pre>
-       * @param value The gJFKDCJENJE to set.
+       *JNHGJAIIMGJ PINDEGAFOAE = 28;
+       * </pre>
+       *
+       * <code>uint32 ABLFJPMKKDA = 29;</code>
+       * @param value The aBLFJPMKKDA to set.
        * @return This builder for chaining.
        */
-      public Builder setGJFKDCJENJE(int value) {
+      public Builder setABLFJPMKKDA(int value) {
         
-        gJFKDCJENJE_ = value;
+        aBLFJPMKKDA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 GJFKDCJENJE = 29;</code>
+       * <pre>
+       *JNHGJAIIMGJ PINDEGAFOAE = 28;
+       * </pre>
+       *
+       * <code>uint32 ABLFJPMKKDA = 29;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGJFKDCJENJE() {
+      public Builder clearABLFJPMKKDA() {
         
-        gJFKDCJENJE_ = 0;
+        aBLFJPMKKDA_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gCHGLANNHMC_ ;
+      /**
+       * <code>uint32 GCHGLANNHMC = 30;</code>
+       * @return The gCHGLANNHMC.
+       */
+      @java.lang.Override
+      public int getGCHGLANNHMC() {
+        return gCHGLANNHMC_;
+      }
+      /**
+       * <code>uint32 GCHGLANNHMC = 30;</code>
+       * @param value The gCHGLANNHMC to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGCHGLANNHMC(int value) {
+        
+        gCHGLANNHMC_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 GCHGLANNHMC = 30;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGCHGLANNHMC() {
+        
+        gCHGLANNHMC_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int kCINBOMOIGL_ ;
+      /**
+       * <code>uint32 KCINBOMOIGL = 31;</code>
+       * @return The kCINBOMOIGL.
+       */
+      @java.lang.Override
+      public int getKCINBOMOIGL() {
+        return kCINBOMOIGL_;
+      }
+      /**
+       * <code>uint32 KCINBOMOIGL = 31;</code>
+       * @param value The kCINBOMOIGL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKCINBOMOIGL(int value) {
+        
+        kCINBOMOIGL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KCINBOMOIGL = 31;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKCINBOMOIGL() {
+        
+        kCINBOMOIGL_ = 0;
         onChanged();
         return this;
       }
@@ -5054,63 +5003,62 @@ public final class AvatarInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020AvatarInfo.proto\032\017PropValue.proto\032\025Tri" +
+      "\n\020AvatarInfo.proto\032\017PropValue.proto\032\025Ava" +
-      "alAvatarInfo.proto\032\025AvatarSkillInfo.prot" +
+      "tarSkillInfo.proto\032\025TrialAvatarInfo.prot" +
       "o\032\026AvatarFetterInfo.proto\032\033AvatarExpedit" +
       "ionState.proto\032\032AvatarEquipAffixInfo.pro" +
-      "to\032\025AvatarExcelInfo.proto\032\021JCDPOCOOGCI.p" +
+      "to\032\025AvatarExcelInfo.proto\"\355\t\n\nAvatarInfo" +
-      "roto\"\346\t\n\nAvatarInfo\022\021\n\tavatar_id\030\001 \001(\r\022\014" +
+      "\022\021\n\tavatar_id\030\001 \001(\r\022\014\n\004guid\030\002 \001(\004\022*\n\010pro" +
-      "\n\004guid\030\002 \001(\004\022*\n\010prop_map\030\003 \003(\0132\030.AvatarI" +
+      "p_map\030\003 \003(\0132\030.AvatarInfo.PropMapEntry\022\022\n" +
-      "nfo.PropMapEntry\022\022\n\nlife_state\030\004 \001(\r\022\027\n\017" +
+      "\nlife_state\030\004 \001(\r\022\027\n\017equip_guid_list\030\005 \003" +
-      "equip_guid_list\030\005 \003(\004\022\026\n\016talent_id_list\030" +
+      "(\004\022\026\n\016talent_id_list\030\006 \003(\r\0225\n\016fight_prop" +
-      "\006 \003(\r\0225\n\016fight_prop_map\030\007 \003(\0132\035.AvatarIn" +
+      "_map\030\007 \003(\0132\035.AvatarInfo.FightPropMapEntr" +
-      "fo.FightPropMapEntry\022+\n\021trial_avatar_inf" +
+      "y\022+\n\021trial_avatar_info\030\t \001(\0132\020.TrialAvat" +
-      "o\030\t \001(\0132\020.TrialAvatarInfo\022,\n\tskill_map\030\n" +
+      "arInfo\022,\n\tskill_map\030\n \003(\0132\031.AvatarInfo.S" +
-      " \003(\0132\031.AvatarInfo.SkillMapEntry\022\026\n\016skill" +
+      "killMapEntry\022\026\n\016skill_depot_id\030\013 \001(\r\022&\n\013" +
-      "_depot_id\030\013 \001(\r\022&\n\013fetter_info\030\014 \001(\0132\021.A" +
+      "fetter_info\030\014 \001(\0132\021.AvatarFetterInfo\022\036\n\026" +
-      "vatarFetterInfo\022\036\n\026core_proud_skill_leve" +
+      "core_proud_skill_level\030\r \001(\r\022!\n\031inherent" +
-      "l\030\r \001(\r\022!\n\031inherent_proud_skill_list\030\016 \003" +
+      "_proud_skill_list\030\016 \003(\r\0227\n\017skill_level_m" +
-      "(\r\0227\n\017skill_level_map\030\017 \003(\0132\036.AvatarInfo" +
+      "ap\030\017 \003(\0132\036.AvatarInfo.SkillLevelMapEntry" +
-      ".SkillLevelMapEntry\0220\n\020expedition_state\030" +
+      "\0220\n\020expedition_state\030\020 \001(\0162\026.AvatarExped" +
-      "\020 \001(\0162\026.AvatarExpeditionState\022M\n\033proud_s" +
+      "itionState\022M\n\033proud_skill_extra_level_ma" +
-      "kill_extra_level_map\030\021 \003(\0132(.AvatarInfo." +
+      "p\030\021 \003(\0132(.AvatarInfo.ProudSkillExtraLeve" +
-      "ProudSkillExtraLevelMapEntry\022\020\n\010is_focus" +
+      "lMapEntry\022\020\n\010is_focus\030\022 \001(\010\022\023\n\013avatar_ty" +
-      "\030\022 \001(\010\022\023\n\013avatar_type\030\023 \001(\r\022\033\n\023team_reso" +
+      "pe\030\023 \001(\r\022\033\n\023team_resonance_list\030\024 \003(\r\022\033\n" +
-      "nance_list\030\024 \003(\r\022\033\n\023wearing_flycloak_id\030" +
+      "\023wearing_flycloak_id\030\025 \001(\r\022/\n\020equip_affi" +
-      "\025 \001(\r\022/\n\020equip_affix_list\030\026 \003(\0132\025.Avatar" +
+      "x_list\030\026 \003(\0132\025.AvatarEquipAffixInfo\022\021\n\tb" +
-      "EquipAffixInfo\022\021\n\tborn_time\030\027 \001(\r\022#\n\033pen" +
+      "orn_time\030\027 \001(\r\022#\n\033pending_promote_reward" +
-      "ding_promote_reward_list\030\030 \003(\r\022\022\n\ncostum" +
+      "_list\030\030 \003(\r\022\022\n\ncostume_id\030\031 \001(\r\022$\n\nexcel" +
-      "e_id\030\031 \001(\r\022$\n\nexcel_info\030\032 \001(\0132\020.AvatarE" +
+      "_info\030\032 \001(\0132\020.AvatarExcelInfo\022\021\n\tanim_ha" +
-      "xcelInfo\022\021\n\tanim_hash\030\033 \001(\r\022!\n\013PDGKJIIEP" +
+      "sh\030\033 \001(\r\022\023\n\013ABLFJPMKKDA\030\035 \001(\r\022\023\n\013GCHGLAN" +
-      "IO\030\034 \001(\0132\014.JCDPOCOOGCI\022\023\n\013GJFKDCJENJE\030\035 " +
+      "NHMC\030\036 \001(\r\022\023\n\013KCINBOMOIGL\030\037 \001(\r\032:\n\014PropM" +
-      "\001(\r\032:\n\014PropMapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005valu" +
+      "apEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 \001(\0132\n.Pr" +
-      "e\030\002 \001(\0132\n.PropValue:\0028\001\0323\n\021FightPropMapE" +
+      "opValue:\0028\001\0323\n\021FightPropMapEntry\022\013\n\003key\030" +
-      "ntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\032A\n\r" +
+      "\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\032A\n\rSkillMapEntr" +
-      "SkillMapEntry\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(" +
+      "y\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(\0132\020.AvatarSk" +
-      "\0132\020.AvatarSkillInfo:\0028\001\0324\n\022SkillLevelMap" +
+      "illInfo:\0028\001\0324\n\022SkillLevelMapEntry\022\013\n\003key" +
-      "Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032>\n" +
+      "\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032>\n\034ProudSkillE" +
-      "\034ProudSkillExtraLevelMapEntry\022\013\n\003key\030\001 \001" +
+      "xtraLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
-      "(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter" +
+      "\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006" +
-      ".net.protob\006proto3"
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarExpeditionStateOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarExcelInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.getDescriptor(),
         });
     internal_static_AvatarInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_AvatarInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarInfo_descriptor,
-        new java.lang.String[] { "AvatarId", "Guid", "PropMap", "LifeState", "EquipGuidList", "TalentIdList", "FightPropMap", "TrialAvatarInfo", "SkillMap", "SkillDepotId", "FetterInfo", "CoreProudSkillLevel", "InherentProudSkillList", "SkillLevelMap", "ExpeditionState", "ProudSkillExtraLevelMap", "IsFocus", "AvatarType", "TeamResonanceList", "WearingFlycloakId", "EquipAffixList", "BornTime", "PendingPromoteRewardList", "CostumeId", "ExcelInfo", "AnimHash", "PDGKJIIEPIO", "GJFKDCJENJE", });
+        new java.lang.String[] { "AvatarId", "Guid", "PropMap", "LifeState", "EquipGuidList", "TalentIdList", "FightPropMap", "TrialAvatarInfo", "SkillMap", "SkillDepotId", "FetterInfo", "CoreProudSkillLevel", "InherentProudSkillList", "SkillLevelMap", "ExpeditionState", "ProudSkillExtraLevelMap", "IsFocus", "AvatarType", "TeamResonanceList", "WearingFlycloakId", "EquipAffixList", "BornTime", "PendingPromoteRewardList", "CostumeId", "ExcelInfo", "AnimHash", "ABLFJPMKKDA", "GCHGLANNHMC", "KCINBOMOIGL", });
     internal_static_AvatarInfo_PropMapEntry_descriptor =
       internal_static_AvatarInfo_descriptor.getNestedTypes().get(0);
     internal_static_AvatarInfo_PropMapEntry_fieldAccessorTable = new
@@ -5142,13 +5090,12 @@ public final class AvatarInfoOuterClass {
         internal_static_AvatarInfo_ProudSkillExtraLevelMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarExpeditionStateOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarExcelInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteGetRewardRspOuterClass.java

@@ -19,17 +19,11 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 reward_id = 11;</code>
+     * <code>uint32 reward_id = 4;</code>
      * @return The rewardId.
      */
     int getRewardId();
 
-    /**
-     * <code>uint32 promote_level = 10;</code>
-     * @return The promoteLevel.
-     */
-    int getPromoteLevel();
-
     /**
      * <code>int32 retcode = 5;</code>
      * @return The retcode.
@@ -37,17 +31,18 @@ public final class AvatarPromoteGetRewardRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 7;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 promote_level = 14;</code>
+     * @return The promoteLevel.
+     */
+    int getPromoteLevel();
   }
   /**
-   * <pre>
-   * CmdId: 7336
-   * Obf: KMMIMMNJBJN
-   * </pre>
-   *
    * Protobuf type {@code AvatarPromoteGetRewardRsp}
    */
   public static final class AvatarPromoteGetRewardRsp extends
@@ -92,26 +87,26 @@ public final class AvatarPromoteGetRewardRspOuterClass {
             case 0:
               done = true;
               break;
+            case 32: {
+
+              rewardId_ = input.readUInt32();
+              break;
+            }
             case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
+            case 56: {
-
-              promoteLevel_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              rewardId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 112: {
+
+              promoteLevel_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -144,10 +139,10 @@ public final class AvatarPromoteGetRewardRspOuterClass {
               emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp.class, emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp.Builder.class);
     }
 
-    public static final int REWARD_ID_FIELD_NUMBER = 11;
+    public static final int REWARD_ID_FIELD_NUMBER = 4;
     private int rewardId_;
     /**
-     * <code>uint32 reward_id = 11;</code>
+     * <code>uint32 reward_id = 4;</code>
      * @return The rewardId.
      */
     @java.lang.Override
@@ -155,17 +150,6 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return rewardId_;
     }
 
-    public static final int PROMOTE_LEVEL_FIELD_NUMBER = 10;
-    private int promoteLevel_;
-    /**
-     * <code>uint32 promote_level = 10;</code>
-     * @return The promoteLevel.
-     */
-    @java.lang.Override
-    public int getPromoteLevel() {
-      return promoteLevel_;
-    }
-
     public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
@@ -177,10 +161,10 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 7;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -188,6 +172,17 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return avatarGuid_;
     }
 
+    public static final int PROMOTE_LEVEL_FIELD_NUMBER = 14;
+    private int promoteLevel_;
+    /**
+     * <code>uint32 promote_level = 14;</code>
+     * @return The promoteLevel.
+     */
+    @java.lang.Override
+    public int getPromoteLevel() {
+      return promoteLevel_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,17 +197,17 @@ public final class AvatarPromoteGetRewardRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (rewardId_ != 0) {
+        output.writeUInt32(4, rewardId_);
+      }
       if (retcode_ != 0) {
         output.writeInt32(5, retcode_);
       }
-      if (promoteLevel_ != 0) {
-        output.writeUInt32(10, promoteLevel_);
-      }
-      if (rewardId_ != 0) {
-        output.writeUInt32(11, rewardId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(12, avatarGuid_);
+        output.writeUInt64(7, avatarGuid_);
+      }
+      if (promoteLevel_ != 0) {
+        output.writeUInt32(14, promoteLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +218,21 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (rewardId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, rewardId_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(5, retcode_);
       }
-      if (promoteLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, promoteLevel_);
-      }
-      if (rewardId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, rewardId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, avatarGuid_);
+          .computeUInt64Size(7, avatarGuid_);
+      }
+      if (promoteLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, promoteLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,12 +251,12 @@ public final class AvatarPromoteGetRewardRspOuterClass {
 
       if (getRewardId()
           != other.getRewardId()) return false;
-      if (getPromoteLevel()
-          != other.getPromoteLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getPromoteLevel()
+          != other.getPromoteLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,13 +270,13 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRewardId();
-      hash = (37 * hash) + PROMOTE_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getPromoteLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getPromoteLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +373,6 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7336
-     * Obf: KMMIMMNJBJN
-     * </pre>
-     *
      * Protobuf type {@code AvatarPromoteGetRewardRsp}
      */
     public static final class Builder extends
@@ -422,12 +412,12 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         super.clear();
         rewardId_ = 0;
 
-        promoteLevel_ = 0;
-
         retcode_ = 0;
 
         avatarGuid_ = 0L;
 
+        promoteLevel_ = 0;
+
         return this;
       }
 
@@ -455,9 +445,9 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       public emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp result = new emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp(this);
         result.rewardId_ = rewardId_;
-        result.promoteLevel_ = promoteLevel_;
         result.retcode_ = retcode_;
         result.avatarGuid_ = avatarGuid_;
+        result.promoteLevel_ = promoteLevel_;
         onBuilt();
         return result;
       }
@@ -509,15 +499,15 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         if (other.getRewardId() != 0) {
           setRewardId(other.getRewardId());
         }
-        if (other.getPromoteLevel() != 0) {
-          setPromoteLevel(other.getPromoteLevel());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getPromoteLevel() != 0) {
+          setPromoteLevel(other.getPromoteLevel());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -549,7 +539,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
 
       private int rewardId_ ;
       /**
-       * <code>uint32 reward_id = 11;</code>
+       * <code>uint32 reward_id = 4;</code>
        * @return The rewardId.
        */
       @java.lang.Override
@@ -557,7 +547,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return rewardId_;
       }
       /**
-       * <code>uint32 reward_id = 11;</code>
+       * <code>uint32 reward_id = 4;</code>
        * @param value The rewardId to set.
        * @return This builder for chaining.
        */
@@ -568,7 +558,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 reward_id = 11;</code>
+       * <code>uint32 reward_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearRewardId() {
@@ -578,37 +568,6 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return this;
       }
 
-      private int promoteLevel_ ;
-      /**
-       * <code>uint32 promote_level = 10;</code>
-       * @return The promoteLevel.
-       */
-      @java.lang.Override
-      public int getPromoteLevel() {
-        return promoteLevel_;
-      }
-      /**
-       * <code>uint32 promote_level = 10;</code>
-       * @param value The promoteLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPromoteLevel(int value) {
-        
-        promoteLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 promote_level = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPromoteLevel() {
-        
-        promoteLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
        * <code>int32 retcode = 5;</code>
@@ -642,7 +601,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 7;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -650,7 +609,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 7;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -661,7 +620,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -670,6 +629,37 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int promoteLevel_ ;
+      /**
+       * <code>uint32 promote_level = 14;</code>
+       * @return The promoteLevel.
+       */
+      @java.lang.Override
+      public int getPromoteLevel() {
+        return promoteLevel_;
+      }
+      /**
+       * <code>uint32 promote_level = 14;</code>
+       * @param value The promoteLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPromoteLevel(int value) {
+        
+        promoteLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 promote_level = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPromoteLevel() {
+        
+        promoteLevel_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -738,9 +728,9 @@ public final class AvatarPromoteGetRewardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037AvatarPromoteGetRewardRsp.proto\"k\n\031Ava" +
-      "tarPromoteGetRewardRsp\022\021\n\treward_id\030\013 \001(" +
+      "tarPromoteGetRewardRsp\022\021\n\treward_id\030\004 \001(" +
-      "\r\022\025\n\rpromote_level\030\n \001(\r\022\017\n\007retcode\030\005 \001(" +
+      "\r\022\017\n\007retcode\030\005 \001(\005\022\023\n\013avatar_guid\030\007 \001(\004\022" +
-      "\005\022\023\n\013avatar_guid\030\014 \001(\004B\033\n\031emu.grasscutte" +
+      "\025\n\rpromote_level\030\016 \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +742,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
     internal_static_AvatarPromoteGetRewardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarPromoteGetRewardRsp_descriptor,
-        new java.lang.String[] { "RewardId", "PromoteLevel", "Retcode", "AvatarGuid", });
+        new java.lang.String[] { "RewardId", "Retcode", "AvatarGuid", "PromoteLevel", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java

@@ -19,17 +19,12 @@ public final class AvatarPromoteReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 guid = 5;</code>
+     * <code>uint64 guid = 8;</code>
      * @return The guid.
      */
     long getGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23288
-   * Obf: MLDPIPBFIKB
-   * </pre>
-   *
    * Protobuf type {@code AvatarPromoteReq}
    */
   public static final class AvatarPromoteReq extends
@@ -74,7 +69,7 @@ public final class AvatarPromoteReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 64: {
 
               guid_ = input.readUInt64();
               break;
@@ -111,10 +106,10 @@ public final class AvatarPromoteReqOuterClass {
               emu.grasscutter.net.proto.AvatarPromoteReqOuterClass.AvatarPromoteReq.class, emu.grasscutter.net.proto.AvatarPromoteReqOuterClass.AvatarPromoteReq.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 5;
+    public static final int GUID_FIELD_NUMBER = 8;
     private long guid_;
     /**
-     * <code>uint64 guid = 5;</code>
+     * <code>uint64 guid = 8;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AvatarPromoteReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (guid_ != 0L) {
-        output.writeUInt64(5, guid_);
+        output.writeUInt64(8, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AvatarPromoteReqOuterClass {
       size = 0;
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, guid_);
+          .computeUInt64Size(8, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class AvatarPromoteReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23288
-     * Obf: MLDPIPBFIKB
-     * </pre>
-     *
      * Protobuf type {@code AvatarPromoteReq}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class AvatarPromoteReqOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 5;</code>
+       * <code>uint64 guid = 8;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class AvatarPromoteReqOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 5;</code>
+       * <code>uint64 guid = 8;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class AvatarPromoteReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 5;</code>
+       * <code>uint64 guid = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -528,7 +518,7 @@ public final class AvatarPromoteReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarPromoteReq.proto\" \n\020AvatarPromot" +
-      "eReq\022\014\n\004guid\030\005 \001(\004B\033\n\031emu.grasscutter.ne" +
+      "eReq\022\014\n\004guid\030\010 \001(\004B\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java

@@ -19,7 +19,7 @@ public final class AvatarPromoteRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 guid = 7;</code>
+     * <code>uint64 guid = 2;</code>
      * @return The guid.
      */
     long getGuid();
@@ -31,11 +31,6 @@ public final class AvatarPromoteRspOuterClass {
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 8592
-   * Obf: BLNOILBHJIJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarPromoteRsp}
    */
   public static final class AvatarPromoteRsp extends
@@ -80,7 +75,7 @@ public final class AvatarPromoteRspOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 16: {
 
               guid_ = input.readUInt64();
               break;
@@ -122,10 +117,10 @@ public final class AvatarPromoteRspOuterClass {
               emu.grasscutter.net.proto.AvatarPromoteRspOuterClass.AvatarPromoteRsp.class, emu.grasscutter.net.proto.AvatarPromoteRspOuterClass.AvatarPromoteRsp.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 7;
+    public static final int GUID_FIELD_NUMBER = 2;
     private long guid_;
     /**
-     * <code>uint64 guid = 7;</code>
+     * <code>uint64 guid = 2;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -159,7 +154,7 @@ public final class AvatarPromoteRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (guid_ != 0L) {
-        output.writeUInt64(7, guid_);
+        output.writeUInt64(2, guid_);
       }
       if (retcode_ != 0) {
         output.writeInt32(12, retcode_);
@@ -175,7 +170,7 @@ public final class AvatarPromoteRspOuterClass {
       size = 0;
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, guid_);
+          .computeUInt64Size(2, guid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -312,11 +307,6 @@ public final class AvatarPromoteRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8592
-     * Obf: BLNOILBHJIJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarPromoteRsp}
      */
     public static final class Builder extends
@@ -471,7 +461,7 @@ public final class AvatarPromoteRspOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 7;</code>
+       * <code>uint64 guid = 2;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -479,7 +469,7 @@ public final class AvatarPromoteRspOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 7;</code>
+       * <code>uint64 guid = 2;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -490,7 +480,7 @@ public final class AvatarPromoteRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 7;</code>
+       * <code>uint64 guid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -598,7 +588,7 @@ public final class AvatarPromoteRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarPromoteRsp.proto\"1\n\020AvatarPromot" +
-      "eRsp\022\014\n\004guid\030\007 \001(\004\022\017\n\007retcode\030\014 \001(\005B\033\n\031e" +
+      "eRsp\022\014\n\004guid\030\002 \001(\004\022\017\n\007retcode\030\014 \001(\005B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarPropChangeReasonNotifyOuterClass.java

@@ -19,44 +19,43 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>float old_value = 2;</code>
+     * @return The oldValue.
+     */
+    float getOldValue();
+
+    /**
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The reason.
      */
     emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason();
 
     /**
-     * <code>uint32 prop_type = 7;</code>
+     * <code>uint64 avatar_guid = 7;</code>
-     * @return The propType.
-     */
-    int getPropType();
-
-    /**
-     * <code>float cur_value = 1;</code>
-     * @return The curValue.
-     */
-    float getCurValue();
-
-    /**
-     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>float old_value = 14;</code>
+     * <code>uint32 prop_type = 10;</code>
-     * @return The oldValue.
+     * @return The propType.
      */
-    float getOldValue();
+    int getPropType();
+
+    /**
+     * <code>float cur_value = 12;</code>
+     * @return The curValue.
+     */
+    float getCurValue();
   }
   /**
    * <pre>
-   * CmdId: 3637
+   * CmdId: 24920
-   * Obf: LKDNAGGMHGL
    * </pre>
    *
    * Protobuf type {@code AvatarPropChangeReasonNotify}
@@ -104,12 +103,12 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 13: {
+            case 21: {
 
-              curValue_ = input.readFloat();
+              oldValue_ = input.readFloat();
               break;
             }
-            case 16: {
+            case 40: {
               int rawValue = input.readEnum();
 
               reason_ = rawValue;
@@ -117,17 +116,17 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
             }
             case 56: {
 
-              propType_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 117: {
+            case 80: {
 
-              oldValue_ = input.readFloat();
+              propType_ = input.readUInt32();
+              break;
+            }
+            case 101: {
+
+              curValue_ = input.readFloat();
               break;
             }
             default: {
@@ -162,17 +161,28 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify.class, emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify.Builder.class);
     }
 
-    public static final int REASON_FIELD_NUMBER = 2;
+    public static final int OLD_VALUE_FIELD_NUMBER = 2;
+    private float oldValue_;
+    /**
+     * <code>float old_value = 2;</code>
+     * @return The oldValue.
+     */
+    @java.lang.Override
+    public float getOldValue() {
+      return oldValue_;
+    }
+
+    public static final int REASON_FIELD_NUMBER = 5;
     private int reason_;
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The reason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason() {
@@ -181,32 +191,10 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
     }
 
-    public static final int PROP_TYPE_FIELD_NUMBER = 7;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
-    private int propType_;
-    /**
-     * <code>uint32 prop_type = 7;</code>
-     * @return The propType.
-     */
-    @java.lang.Override
-    public int getPropType() {
-      return propType_;
-    }
-
-    public static final int CUR_VALUE_FIELD_NUMBER = 1;
-    private float curValue_;
-    /**
-     * <code>float cur_value = 1;</code>
-     * @return The curValue.
-     */
-    @java.lang.Override
-    public float getCurValue() {
-      return curValue_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 11;</code>
+     * <code>uint64 avatar_guid = 7;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -214,15 +202,26 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       return avatarGuid_;
     }
 
-    public static final int OLD_VALUE_FIELD_NUMBER = 14;
+    public static final int PROP_TYPE_FIELD_NUMBER = 10;
-    private float oldValue_;
+    private int propType_;
     /**
-     * <code>float old_value = 14;</code>
+     * <code>uint32 prop_type = 10;</code>
-     * @return The oldValue.
+     * @return The propType.
      */
     @java.lang.Override
-    public float getOldValue() {
+    public int getPropType() {
-      return oldValue_;
+      return propType_;
+    }
+
+    public static final int CUR_VALUE_FIELD_NUMBER = 12;
+    private float curValue_;
+    /**
+     * <code>float cur_value = 12;</code>
+     * @return The curValue.
+     */
+    @java.lang.Override
+    public float getCurValue() {
+      return curValue_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -239,20 +238,20 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curValue_ != 0F) {
+      if (oldValue_ != 0F) {
-        output.writeFloat(1, curValue_);
+        output.writeFloat(2, oldValue_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
-        output.writeEnum(2, reason_);
+        output.writeEnum(5, reason_);
-      }
-      if (propType_ != 0) {
-        output.writeUInt32(7, propType_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(11, avatarGuid_);
+        output.writeUInt64(7, avatarGuid_);
       }
-      if (oldValue_ != 0F) {
+      if (propType_ != 0) {
-        output.writeFloat(14, oldValue_);
+        output.writeUInt32(10, propType_);
+      }
+      if (curValue_ != 0F) {
+        output.writeFloat(12, curValue_);
       }
       unknownFields.writeTo(output);
     }
@@ -263,25 +262,25 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curValue_ != 0F) {
+      if (oldValue_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1, curValue_);
+          .computeFloatSize(2, oldValue_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, reason_);
+          .computeEnumSize(5, reason_);
-      }
-      if (propType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, propType_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, avatarGuid_);
+          .computeUInt64Size(7, avatarGuid_);
       }
-      if (oldValue_ != 0F) {
+      if (propType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(14, oldValue_);
+          .computeUInt32Size(10, propType_);
+      }
+      if (curValue_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(12, curValue_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -298,17 +297,17 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify other = (emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify) obj;
 
+      if (java.lang.Float.floatToIntBits(getOldValue())
+          != java.lang.Float.floatToIntBits(
+              other.getOldValue())) return false;
       if (reason_ != other.reason_) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getPropType()
           != other.getPropType()) return false;
       if (java.lang.Float.floatToIntBits(getCurValue())
           != java.lang.Float.floatToIntBits(
               other.getCurValue())) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
-      if (java.lang.Float.floatToIntBits(getOldValue())
-          != java.lang.Float.floatToIntBits(
-              other.getOldValue())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -320,19 +319,19 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + OLD_VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getOldValue());
       hash = (37 * hash) + REASON_FIELD_NUMBER;
       hash = (53 * hash) + reason_;
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
       hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getPropType();
       hash = (37 * hash) + CUR_VALUE_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getCurValue());
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
-      hash = (37 * hash) + OLD_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getOldValue());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -430,8 +429,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3637
+     * CmdId: 24920
-     * Obf: LKDNAGGMHGL
      * </pre>
      *
      * Protobuf type {@code AvatarPropChangeReasonNotify}
@@ -471,16 +469,16 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        oldValue_ = 0F;
+
         reason_ = 0;
 
+        avatarGuid_ = 0L;
+
         propType_ = 0;
 
         curValue_ = 0F;
 
-        avatarGuid_ = 0L;
-
-        oldValue_ = 0F;
-
         return this;
       }
 
@@ -507,11 +505,11 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify result = new emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify(this);
+        result.oldValue_ = oldValue_;
         result.reason_ = reason_;
+        result.avatarGuid_ = avatarGuid_;
         result.propType_ = propType_;
         result.curValue_ = curValue_;
-        result.avatarGuid_ = avatarGuid_;
-        result.oldValue_ = oldValue_;
         onBuilt();
         return result;
       }
@@ -560,21 +558,21 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify.getDefaultInstance()) return this;
+        if (other.getOldValue() != 0F) {
+          setOldValue(other.getOldValue());
+        }
         if (other.reason_ != 0) {
           setReasonValue(other.getReasonValue());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         if (other.getPropType() != 0) {
           setPropType(other.getPropType());
         }
         if (other.getCurValue() != 0F) {
           setCurValue(other.getCurValue());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
-        if (other.getOldValue() != 0F) {
-          setOldValue(other.getOldValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -604,16 +602,47 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
 
+      private float oldValue_ ;
+      /**
+       * <code>float old_value = 2;</code>
+       * @return The oldValue.
+       */
+      @java.lang.Override
+      public float getOldValue() {
+        return oldValue_;
+      }
+      /**
+       * <code>float old_value = 2;</code>
+       * @param value The oldValue to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldValue(float value) {
+        
+        oldValue_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float old_value = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldValue() {
+        
+        oldValue_ = 0F;
+        onChanged();
+        return this;
+      }
+
       private int reason_ = 0;
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @return The enum numeric value on the wire for reason.
        */
       @java.lang.Override public int getReasonValue() {
         return reason_;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
@@ -624,7 +653,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @return The reason.
        */
       @java.lang.Override
@@ -634,7 +663,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
        */
@@ -648,7 +677,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearReason() {
@@ -658,9 +687,40 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
 
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 7;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 7;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 avatar_guid = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int propType_ ;
       /**
-       * <code>uint32 prop_type = 7;</code>
+       * <code>uint32 prop_type = 10;</code>
        * @return The propType.
        */
       @java.lang.Override
@@ -668,7 +728,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return propType_;
       }
       /**
-       * <code>uint32 prop_type = 7;</code>
+       * <code>uint32 prop_type = 10;</code>
        * @param value The propType to set.
        * @return This builder for chaining.
        */
@@ -679,7 +739,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 prop_type = 7;</code>
+       * <code>uint32 prop_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearPropType() {
@@ -691,7 +751,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
 
       private float curValue_ ;
       /**
-       * <code>float cur_value = 1;</code>
+       * <code>float cur_value = 12;</code>
        * @return The curValue.
        */
       @java.lang.Override
@@ -699,7 +759,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return curValue_;
       }
       /**
-       * <code>float cur_value = 1;</code>
+       * <code>float cur_value = 12;</code>
        * @param value The curValue to set.
        * @return This builder for chaining.
        */
@@ -710,7 +770,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>float cur_value = 1;</code>
+       * <code>float cur_value = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurValue() {
@@ -719,68 +779,6 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 11;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 11;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private float oldValue_ ;
-      /**
-       * <code>float old_value = 14;</code>
-       * @return The oldValue.
-       */
-      @java.lang.Override
-      public float getOldValue() {
-        return oldValue_;
-      }
-      /**
-       * <code>float old_value = 14;</code>
-       * @param value The oldValue to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldValue(float value) {
-        
-        oldValue_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float old_value = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldValue() {
-        
-        oldValue_ = 0F;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -850,10 +848,10 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"AvatarPropChangeReasonNotify.proto\032\026Pr" +
       "opChangeReason.proto\"\217\001\n\034AvatarPropChang" +
-      "eReasonNotify\022!\n\006reason\030\002 \001(\0162\021.PropChan" +
+      "eReasonNotify\022\021\n\told_value\030\002 \001(\002\022!\n\006reas" +
-      "geReason\022\021\n\tprop_type\030\007 \001(\r\022\021\n\tcur_value" +
+      "on\030\005 \001(\0162\021.PropChangeReason\022\023\n\013avatar_gu" +
-      "\030\001 \001(\002\022\023\n\013avatar_guid\030\013 \001(\004\022\021\n\told_value" +
+      "id\030\007 \001(\004\022\021\n\tprop_type\030\n \001(\r\022\021\n\tcur_value" +
-      "\030\016 \001(\002B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "\030\014 \001(\002B\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -866,7 +864,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     internal_static_AvatarPropChangeReasonNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarPropChangeReasonNotify_descriptor,
-        new java.lang.String[] { "Reason", "PropType", "CurValue", "AvatarGuid", "OldValue", });
+        new java.lang.String[] { "OldValue", "Reason", "AvatarGuid", "PropType", "CurValue", });
     emu.grasscutter.net.proto.PropChangeReasonOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java

@@ -19,7 +19,7 @@ public final class AvatarPropNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
@@ -59,11 +59,6 @@ public final class AvatarPropNotifyOuterClass {
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 5355
-   * Obf: KGKHNJBJKOJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarPropNotify}
    */
   public static final class AvatarPropNotify extends
@@ -109,7 +104,7 @@ public final class AvatarPropNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 48: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -171,10 +166,10 @@ public final class AvatarPropNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.class, emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -278,7 +273,7 @@ public final class AvatarPropNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(4, avatarGuid_);
+        output.writeUInt64(6, avatarGuid_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
@@ -297,7 +292,7 @@ public final class AvatarPropNotifyOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, avatarGuid_);
+          .computeUInt64Size(6, avatarGuid_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Long> entry
            : internalGetPropMap().getMap().entrySet()) {
@@ -442,11 +437,6 @@ public final class AvatarPropNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5355
-     * Obf: KGKHNJBJKOJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarPropNotify}
      */
     public static final class Builder extends
@@ -624,7 +614,7 @@ public final class AvatarPropNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -632,7 +622,7 @@ public final class AvatarPropNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -643,7 +633,7 @@ public final class AvatarPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -853,7 +843,7 @@ public final class AvatarPropNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarPropNotify.proto\"\211\001\n\020AvatarPropN" +
-      "otify\022\023\n\013avatar_guid\030\004 \001(\004\0220\n\010prop_map\030\010" +
+      "otify\022\023\n\013avatar_guid\030\006 \001(\004\0220\n\010prop_map\030\010" +
       " \003(\0132\036.AvatarPropNotify.PropMapEntry\032.\n\014" +
       "PropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\003" +
       ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" +

src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoNotifyOuterClass.java

@@ -19,33 +19,32 @@ public final class AvatarRenameInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> 
         getAvatarRenameListList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index);
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     int getAvatarRenameListCount();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
         getAvatarRenameListOrBuilderList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 26468
+   * CmdId: 6549
-   * Obf: MEDFBIJCAGF
    * </pre>
    *
    * Protobuf type {@code AvatarRenameInfoNotify}
@@ -94,7 +93,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 66: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarRenameList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +137,17 @@ public final class AvatarRenameInfoNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarRenameInfoNotifyOuterClass.AvatarRenameInfoNotify.class, emu.grasscutter.net.proto.AvatarRenameInfoNotifyOuterClass.AvatarRenameInfoNotify.Builder.class);
     }
 
-    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 8;
+    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> avatarRenameList_;
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
@@ -156,21 +155,21 @@ public final class AvatarRenameInfoNotifyOuterClass {
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public int getAvatarRenameListCount() {
       return avatarRenameList_.size();
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
       return avatarRenameList_.get(index);
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
@@ -193,7 +192,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < avatarRenameList_.size(); i++) {
-        output.writeMessage(8, avatarRenameList_.get(i));
+        output.writeMessage(2, avatarRenameList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +205,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
       size = 0;
       for (int i = 0; i < avatarRenameList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, avatarRenameList_.get(i));
+          .computeMessageSize(2, avatarRenameList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -337,8 +336,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 26468
+     * CmdId: 6549
-     * Obf: MEDFBIJCAGF
      * </pre>
      *
      * Protobuf type {@code AvatarRenameInfoNotify}
@@ -538,7 +536,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
           emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> avatarRenameListBuilder_;
 
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
         if (avatarRenameListBuilder_ == null) {
@@ -548,7 +546,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public int getAvatarRenameListCount() {
         if (avatarRenameListBuilder_ == null) {
@@ -558,7 +556,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -568,7 +566,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -585,7 +583,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -599,7 +597,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
         if (avatarRenameListBuilder_ == null) {
@@ -615,7 +613,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -632,7 +630,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(
           emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -646,7 +644,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -660,7 +658,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAllAvatarRenameList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> values) {
@@ -675,7 +673,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder clearAvatarRenameList() {
         if (avatarRenameListBuilder_ == null) {
@@ -688,7 +686,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder removeAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -701,14 +699,14 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder getAvatarRenameListBuilder(
           int index) {
         return getAvatarRenameListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
           int index) {
@@ -718,7 +716,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
            getAvatarRenameListOrBuilderList() {
@@ -729,14 +727,14 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder addAvatarRenameListBuilder() {
         return getAvatarRenameListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder addAvatarRenameListBuilder(
           int index) {
@@ -744,7 +742,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder> 
            getAvatarRenameListBuilderList() {
@@ -833,7 +831,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AvatarRenameInfoNotify.proto\032\026AvatarRe" +
       "nameInfo.proto\"G\n\026AvatarRenameInfoNotify" +
-      "\022-\n\022avatar_rename_list\030\010 \003(\0132\021.AvatarRen" +
+      "\022-\n\022avatar_rename_list\030\002 \003(\0132\021.AvatarRen" +
       "ameInfoB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java

@@ -18,29 +18,25 @@ public final class AvatarRenameInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:AvatarRenameInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>string avatar_name = 1;</code>
-     * @return The avatarName.
-     */
-    java.lang.String getAvatarName();
-    /**
-     * <code>string avatar_name = 1;</code>
-     * @return The bytes for avatarName.
-     */
-    com.google.protobuf.ByteString
-        getAvatarNameBytes();
-
     /**
      * <code>uint32 avatar_id = 13;</code>
      * @return The avatarId.
      */
     int getAvatarId();
+
+    /**
+     * <code>string avatar_name = 15;</code>
+     * @return The avatarName.
+     */
+    java.lang.String getAvatarName();
+    /**
+     * <code>string avatar_name = 15;</code>
+     * @return The bytes for avatarName.
+     */
+    com.google.protobuf.ByteString
+        getAvatarNameBytes();
   }
   /**
-   * <pre>
-   * Obf: NNBEINLIFPB
-   * </pre>
-   *
    * Protobuf type {@code AvatarRenameInfo}
    */
   public static final class AvatarRenameInfo extends
@@ -86,17 +82,17 @@ public final class AvatarRenameInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              avatarName_ = s;
-              break;
-            }
             case 104: {
 
               avatarId_ = input.readUInt32();
               break;
             }
+            case 122: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              avatarName_ = s;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -129,10 +125,21 @@ public final class AvatarRenameInfoOuterClass {
               emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.class, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder.class);
     }
 
-    public static final int AVATAR_NAME_FIELD_NUMBER = 1;
+    public static final int AVATAR_ID_FIELD_NUMBER = 13;
+    private int avatarId_;
+    /**
+     * <code>uint32 avatar_id = 13;</code>
+     * @return The avatarId.
+     */
+    @java.lang.Override
+    public int getAvatarId() {
+      return avatarId_;
+    }
+
+    public static final int AVATAR_NAME_FIELD_NUMBER = 15;
     private volatile java.lang.Object avatarName_;
     /**
-     * <code>string avatar_name = 1;</code>
+     * <code>string avatar_name = 15;</code>
      * @return The avatarName.
      */
     @java.lang.Override
@@ -149,7 +156,7 @@ public final class AvatarRenameInfoOuterClass {
       }
     }
     /**
-     * <code>string avatar_name = 1;</code>
+     * <code>string avatar_name = 15;</code>
      * @return The bytes for avatarName.
      */
     @java.lang.Override
@@ -167,17 +174,6 @@ public final class AvatarRenameInfoOuterClass {
       }
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 13;
-    private int avatarId_;
-    /**
-     * <code>uint32 avatar_id = 13;</code>
-     * @return The avatarId.
-     */
-    @java.lang.Override
-    public int getAvatarId() {
-      return avatarId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -192,12 +188,12 @@ public final class AvatarRenameInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, avatarName_);
-      }
       if (avatarId_ != 0) {
         output.writeUInt32(13, avatarId_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, avatarName_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -207,13 +203,13 @@ public final class AvatarRenameInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, avatarName_);
-      }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(13, avatarId_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, avatarName_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -229,10 +225,10 @@ public final class AvatarRenameInfoOuterClass {
       }
       emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other = (emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo) obj;
 
-      if (!getAvatarName()
-          .equals(other.getAvatarName())) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
+      if (!getAvatarName()
+          .equals(other.getAvatarName())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +240,10 @@ public final class AvatarRenameInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarName().hashCode();
       hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarId();
+      hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarName().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,10 +340,6 @@ public final class AvatarRenameInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NNBEINLIFPB
-     * </pre>
-     *
      * Protobuf type {@code AvatarRenameInfo}
      */
     public static final class Builder extends
@@ -385,10 +377,10 @@ public final class AvatarRenameInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarName_ = "";
-
         avatarId_ = 0;
 
+        avatarName_ = "";
+
         return this;
       }
 
@@ -415,8 +407,8 @@ public final class AvatarRenameInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo buildPartial() {
         emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo result = new emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo(this);
-        result.avatarName_ = avatarName_;
         result.avatarId_ = avatarId_;
+        result.avatarName_ = avatarName_;
         onBuilt();
         return result;
       }
@@ -465,13 +457,13 @@ public final class AvatarRenameInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other) {
         if (other == emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance()) return this;
+        if (other.getAvatarId() != 0) {
+          setAvatarId(other.getAvatarId());
+        }
         if (!other.getAvatarName().isEmpty()) {
           avatarName_ = other.avatarName_;
           onChanged();
         }
-        if (other.getAvatarId() != 0) {
-          setAvatarId(other.getAvatarId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -501,82 +493,6 @@ public final class AvatarRenameInfoOuterClass {
         return this;
       }
 
-      private java.lang.Object avatarName_ = "";
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @return The avatarName.
-       */
-      public java.lang.String getAvatarName() {
-        java.lang.Object ref = avatarName_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          avatarName_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @return The bytes for avatarName.
-       */
-      public com.google.protobuf.ByteString
-          getAvatarNameBytes() {
-        java.lang.Object ref = avatarName_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          avatarName_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @param value The avatarName to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        avatarName_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarName() {
-        
-        avatarName_ = getDefaultInstance().getAvatarName();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @param value The bytes for avatarName to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarNameBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        avatarName_ = value;
-        onChanged();
-        return this;
-      }
-
       private int avatarId_ ;
       /**
        * <code>uint32 avatar_id = 13;</code>
@@ -607,6 +523,82 @@ public final class AvatarRenameInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private java.lang.Object avatarName_ = "";
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @return The avatarName.
+       */
+      public java.lang.String getAvatarName() {
+        java.lang.Object ref = avatarName_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          avatarName_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @return The bytes for avatarName.
+       */
+      public com.google.protobuf.ByteString
+          getAvatarNameBytes() {
+        java.lang.Object ref = avatarName_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          avatarName_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @param value The avatarName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        avatarName_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarName() {
+        
+        avatarName_ = getDefaultInstance().getAvatarName();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @param value The bytes for avatarName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        avatarName_ = value;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -675,8 +667,8 @@ public final class AvatarRenameInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarRenameInfo.proto\":\n\020AvatarRename" +
-      "Info\022\023\n\013avatar_name\030\001 \001(\t\022\021\n\tavatar_id\030\r" +
+      "Info\022\021\n\tavatar_id\030\r \001(\r\022\023\n\013avatar_name\030\017" +
-      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
+      " \001(\tB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -688,7 +680,7 @@ public final class AvatarRenameInfoOuterClass {
     internal_static_AvatarRenameInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarRenameInfo_descriptor,
-        new java.lang.String[] { "AvatarName", "AvatarId", });
+        new java.lang.String[] { "AvatarId", "AvatarName", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java

@@ -19,33 +19,32 @@ public final class AvatarSatiationDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> 
         getSatiationDataListList();
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData getSatiationDataList(int index);
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     int getSatiationDataListCount();
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> 
         getSatiationDataListOrBuilderList();
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder getSatiationDataListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 704
+   * CmdId: 4982
-   * Obf: EBKOHKKPGDN
    * </pre>
    *
    * Protobuf type {@code AvatarSatiationDataNotify}
@@ -94,7 +93,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 satiationDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +137,17 @@ public final class AvatarSatiationDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSatiationDataNotifyOuterClass.AvatarSatiationDataNotify.class, emu.grasscutter.net.proto.AvatarSatiationDataNotifyOuterClass.AvatarSatiationDataNotify.Builder.class);
     }
 
-    public static final int SATIATION_DATA_LIST_FIELD_NUMBER = 15;
+    public static final int SATIATION_DATA_LIST_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> satiationDataList_;
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> getSatiationDataListList() {
       return satiationDataList_;
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> 
@@ -156,21 +155,21 @@ public final class AvatarSatiationDataNotifyOuterClass {
       return satiationDataList_;
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public int getSatiationDataListCount() {
       return satiationDataList_.size();
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData getSatiationDataList(int index) {
       return satiationDataList_.get(index);
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder getSatiationDataListOrBuilder(
@@ -193,7 +192,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < satiationDataList_.size(); i++) {
-        output.writeMessage(15, satiationDataList_.get(i));
+        output.writeMessage(7, satiationDataList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +205,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
       size = 0;
       for (int i = 0; i < satiationDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, satiationDataList_.get(i));
+          .computeMessageSize(7, satiationDataList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -337,8 +336,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 704
+     * CmdId: 4982
-     * Obf: EBKOHKKPGDN
      * </pre>
      *
      * Protobuf type {@code AvatarSatiationDataNotify}
@@ -538,7 +536,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
           emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> satiationDataListBuilder_;
 
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> getSatiationDataListList() {
         if (satiationDataListBuilder_ == null) {
@@ -548,7 +546,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public int getSatiationDataListCount() {
         if (satiationDataListBuilder_ == null) {
@@ -558,7 +556,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData getSatiationDataList(int index) {
         if (satiationDataListBuilder_ == null) {
@@ -568,7 +566,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder setSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData value) {
@@ -585,7 +583,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder setSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder builderForValue) {
@@ -599,7 +597,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData value) {
         if (satiationDataListBuilder_ == null) {
@@ -615,7 +613,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData value) {
@@ -632,7 +630,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(
           emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder builderForValue) {
@@ -646,7 +644,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder builderForValue) {
@@ -660,7 +658,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addAllSatiationDataList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> values) {
@@ -675,7 +673,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder clearSatiationDataList() {
         if (satiationDataListBuilder_ == null) {
@@ -688,7 +686,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder removeSatiationDataList(int index) {
         if (satiationDataListBuilder_ == null) {
@@ -701,14 +699,14 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder getSatiationDataListBuilder(
           int index) {
         return getSatiationDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder getSatiationDataListOrBuilder(
           int index) {
@@ -718,7 +716,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> 
            getSatiationDataListOrBuilderList() {
@@ -729,14 +727,14 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder addSatiationDataListBuilder() {
         return getSatiationDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder addSatiationDataListBuilder(
           int index) {
@@ -744,7 +742,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder> 
            getSatiationDataListBuilderList() {
@@ -833,7 +831,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037AvatarSatiationDataNotify.proto\032\031Avata" +
       "rSatiationData.proto\"N\n\031AvatarSatiationD" +
-      "ataNotify\0221\n\023satiation_data_list\030\017 \003(\0132\024" +
+      "ataNotify\0221\n\023satiation_data_list\030\007 \003(\0132\024" +
       ".AvatarSatiationDataB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java

@@ -19,28 +19,24 @@ public final class AvatarSatiationDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float penalty_finish_time = 1;</code>
+     * <code>uint64 avatar_guid = 5;</code>
-     * @return The penaltyFinishTime.
-     */
-    float getPenaltyFinishTime();
-
-    /**
-     * <code>uint64 avatar_guid = 4;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>float finish_time = 9;</code>
+     * <code>float penalty_finish_time = 7;</code>
+     * @return The penaltyFinishTime.
+     */
+    float getPenaltyFinishTime();
+
+    /**
+     * <code>float finish_time = 10;</code>
      * @return The finishTime.
      */
     float getFinishTime();
   }
   /**
-   * <pre>
-   * Obf: PNGEFKDMGGI
-   * </pre>
-   *
    * Protobuf type {@code AvatarSatiationData}
    */
   public static final class AvatarSatiationData extends
@@ -85,17 +81,17 @@ public final class AvatarSatiationDataOuterClass {
             case 0:
               done = true;
               break;
-            case 13: {
+            case 40: {
-
-              penaltyFinishTime_ = input.readFloat();
-              break;
-            }
-            case 32: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 77: {
+            case 61: {
+
+              penaltyFinishTime_ = input.readFloat();
+              break;
+            }
+            case 85: {
 
               finishTime_ = input.readFloat();
               break;
@@ -132,21 +128,10 @@ public final class AvatarSatiationDataOuterClass {
               emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.class, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder.class);
     }
 
-    public static final int PENALTY_FINISH_TIME_FIELD_NUMBER = 1;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 5;
-    private float penaltyFinishTime_;
-    /**
-     * <code>float penalty_finish_time = 1;</code>
-     * @return The penaltyFinishTime.
-     */
-    @java.lang.Override
-    public float getPenaltyFinishTime() {
-      return penaltyFinishTime_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 5;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -154,10 +139,21 @@ public final class AvatarSatiationDataOuterClass {
       return avatarGuid_;
     }
 
-    public static final int FINISH_TIME_FIELD_NUMBER = 9;
+    public static final int PENALTY_FINISH_TIME_FIELD_NUMBER = 7;
+    private float penaltyFinishTime_;
+    /**
+     * <code>float penalty_finish_time = 7;</code>
+     * @return The penaltyFinishTime.
+     */
+    @java.lang.Override
+    public float getPenaltyFinishTime() {
+      return penaltyFinishTime_;
+    }
+
+    public static final int FINISH_TIME_FIELD_NUMBER = 10;
     private float finishTime_;
     /**
-     * <code>float finish_time = 9;</code>
+     * <code>float finish_time = 10;</code>
      * @return The finishTime.
      */
     @java.lang.Override
@@ -179,14 +175,14 @@ public final class AvatarSatiationDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (penaltyFinishTime_ != 0F) {
-        output.writeFloat(1, penaltyFinishTime_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(4, avatarGuid_);
+        output.writeUInt64(5, avatarGuid_);
+      }
+      if (penaltyFinishTime_ != 0F) {
+        output.writeFloat(7, penaltyFinishTime_);
       }
       if (finishTime_ != 0F) {
-        output.writeFloat(9, finishTime_);
+        output.writeFloat(10, finishTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +193,17 @@ public final class AvatarSatiationDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (penaltyFinishTime_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1, penaltyFinishTime_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, avatarGuid_);
+          .computeUInt64Size(5, avatarGuid_);
+      }
+      if (penaltyFinishTime_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(7, penaltyFinishTime_);
       }
       if (finishTime_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(9, finishTime_);
+          .computeFloatSize(10, finishTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,11 +220,11 @@ public final class AvatarSatiationDataOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData other = (emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData) obj;
 
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (java.lang.Float.floatToIntBits(getPenaltyFinishTime())
           != java.lang.Float.floatToIntBits(
               other.getPenaltyFinishTime())) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (java.lang.Float.floatToIntBits(getFinishTime())
           != java.lang.Float.floatToIntBits(
               other.getFinishTime())) return false;
@@ -243,12 +239,12 @@ public final class AvatarSatiationDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PENALTY_FINISH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getPenaltyFinishTime());
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + PENALTY_FINISH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getPenaltyFinishTime());
       hash = (37 * hash) + FINISH_TIME_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getFinishTime());
@@ -348,10 +344,6 @@ public final class AvatarSatiationDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PNGEFKDMGGI
-     * </pre>
-     *
      * Protobuf type {@code AvatarSatiationData}
      */
     public static final class Builder extends
@@ -389,10 +381,10 @@ public final class AvatarSatiationDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        penaltyFinishTime_ = 0F;
-
         avatarGuid_ = 0L;
 
+        penaltyFinishTime_ = 0F;
+
         finishTime_ = 0F;
 
         return this;
@@ -421,8 +413,8 @@ public final class AvatarSatiationDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData buildPartial() {
         emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData result = new emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData(this);
-        result.penaltyFinishTime_ = penaltyFinishTime_;
         result.avatarGuid_ = avatarGuid_;
+        result.penaltyFinishTime_ = penaltyFinishTime_;
         result.finishTime_ = finishTime_;
         onBuilt();
         return result;
@@ -472,12 +464,12 @@ public final class AvatarSatiationDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData other) {
         if (other == emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.getDefaultInstance()) return this;
-        if (other.getPenaltyFinishTime() != 0F) {
-          setPenaltyFinishTime(other.getPenaltyFinishTime());
-        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getPenaltyFinishTime() != 0F) {
+          setPenaltyFinishTime(other.getPenaltyFinishTime());
+        }
         if (other.getFinishTime() != 0F) {
           setFinishTime(other.getFinishTime());
         }
@@ -510,40 +502,9 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
 
-      private float penaltyFinishTime_ ;
-      /**
-       * <code>float penalty_finish_time = 1;</code>
-       * @return The penaltyFinishTime.
-       */
-      @java.lang.Override
-      public float getPenaltyFinishTime() {
-        return penaltyFinishTime_;
-      }
-      /**
-       * <code>float penalty_finish_time = 1;</code>
-       * @param value The penaltyFinishTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPenaltyFinishTime(float value) {
-        
-        penaltyFinishTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float penalty_finish_time = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPenaltyFinishTime() {
-        
-        penaltyFinishTime_ = 0F;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 5;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -551,7 +512,7 @@ public final class AvatarSatiationDataOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 5;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -562,7 +523,7 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -572,9 +533,40 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
 
+      private float penaltyFinishTime_ ;
+      /**
+       * <code>float penalty_finish_time = 7;</code>
+       * @return The penaltyFinishTime.
+       */
+      @java.lang.Override
+      public float getPenaltyFinishTime() {
+        return penaltyFinishTime_;
+      }
+      /**
+       * <code>float penalty_finish_time = 7;</code>
+       * @param value The penaltyFinishTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPenaltyFinishTime(float value) {
+        
+        penaltyFinishTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float penalty_finish_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPenaltyFinishTime() {
+        
+        penaltyFinishTime_ = 0F;
+        onChanged();
+        return this;
+      }
+
       private float finishTime_ ;
       /**
-       * <code>float finish_time = 9;</code>
+       * <code>float finish_time = 10;</code>
        * @return The finishTime.
        */
       @java.lang.Override
@@ -582,7 +574,7 @@ public final class AvatarSatiationDataOuterClass {
         return finishTime_;
       }
       /**
-       * <code>float finish_time = 9;</code>
+       * <code>float finish_time = 10;</code>
        * @param value The finishTime to set.
        * @return This builder for chaining.
        */
@@ -593,7 +585,7 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
       /**
-       * <code>float finish_time = 9;</code>
+       * <code>float finish_time = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishTime() {
@@ -670,8 +662,8 @@ public final class AvatarSatiationDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031AvatarSatiationData.proto\"\\\n\023AvatarSat" +
-      "iationData\022\033\n\023penalty_finish_time\030\001 \001(\002\022" +
+      "iationData\022\023\n\013avatar_guid\030\005 \001(\004\022\033\n\023penal" +
-      "\023\n\013avatar_guid\030\004 \001(\004\022\023\n\013finish_time\030\t \001(" +
+      "ty_finish_time\030\007 \001(\002\022\023\n\013finish_time\030\n \001(" +
       "\002B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -683,7 +675,7 @@ public final class AvatarSatiationDataOuterClass {
     internal_static_AvatarSatiationData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSatiationData_descriptor,
-        new java.lang.String[] { "PenaltyFinishTime", "AvatarGuid", "FinishTime", });
+        new java.lang.String[] { "AvatarGuid", "PenaltyFinishTime", "FinishTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java

@@ -19,45 +19,44 @@ public final class AvatarSkillChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 skill_depot_id = 2;</code>
+     * <code>uint32 cur_level = 3;</code>
-     * @return The skillDepotId.
-     */
-    int getSkillDepotId();
-
-    /**
-     * <code>uint32 entity_id = 6;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 cur_level = 7;</code>
      * @return The curLevel.
      */
     int getCurLevel();
 
     /**
-     * <code>uint32 avatar_skill_id = 10;</code>
+     * <code>uint32 skill_depot_id = 6;</code>
-     * @return The avatarSkillId.
+     * @return The skillDepotId.
      */
-    int getAvatarSkillId();
+    int getSkillDepotId();
 
     /**
-     * <code>uint32 old_level = 12;</code>
+     * <code>uint32 old_level = 9;</code>
      * @return The oldLevel.
      */
     int getOldLevel();
+
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>uint64 avatar_guid = 14;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint32 avatar_skill_id = 15;</code>
+     * @return The avatarSkillId.
+     */
+    int getAvatarSkillId();
   }
   /**
    * <pre>
-   * CmdId: 20893
+   * CmdId: 4410
-   * Obf: KHLDKNNHLFE
    * </pre>
    *
    * Protobuf type {@code AvatarSkillChangeNotify}
@@ -104,36 +103,36 @@ public final class AvatarSkillChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
-
-              skillDepotId_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 48: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
 
               curLevel_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 48: {
 
-              avatarSkillId_ = input.readUInt32();
+              skillDepotId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 72: {
 
               oldLevel_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 120: {
+
+              avatarSkillId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -166,43 +165,10 @@ public final class AvatarSkillChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify.class, emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify.Builder.class);
     }
 
-    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 2;
+    public static final int CUR_LEVEL_FIELD_NUMBER = 3;
-    private int skillDepotId_;
-    /**
-     * <code>uint32 skill_depot_id = 2;</code>
-     * @return The skillDepotId.
-     */
-    @java.lang.Override
-    public int getSkillDepotId() {
-      return skillDepotId_;
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 6;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 6;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 5;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int CUR_LEVEL_FIELD_NUMBER = 7;
     private int curLevel_;
     /**
-     * <code>uint32 cur_level = 7;</code>
+     * <code>uint32 cur_level = 3;</code>
      * @return The curLevel.
      */
     @java.lang.Override
@@ -210,21 +176,21 @@ public final class AvatarSkillChangeNotifyOuterClass {
       return curLevel_;
     }
 
-    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 10;
+    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 6;
-    private int avatarSkillId_;
+    private int skillDepotId_;
     /**
-     * <code>uint32 avatar_skill_id = 10;</code>
+     * <code>uint32 skill_depot_id = 6;</code>
-     * @return The avatarSkillId.
+     * @return The skillDepotId.
      */
     @java.lang.Override
-    public int getAvatarSkillId() {
+    public int getSkillDepotId() {
-      return avatarSkillId_;
+      return skillDepotId_;
     }
 
-    public static final int OLD_LEVEL_FIELD_NUMBER = 12;
+    public static final int OLD_LEVEL_FIELD_NUMBER = 9;
     private int oldLevel_;
     /**
-     * <code>uint32 old_level = 12;</code>
+     * <code>uint32 old_level = 9;</code>
      * @return The oldLevel.
      */
     @java.lang.Override
@@ -232,6 +198,39 @@ public final class AvatarSkillChangeNotifyOuterClass {
       return oldLevel_;
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 11;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 14;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 14;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 15;
+    private int avatarSkillId_;
+    /**
+     * <code>uint32 avatar_skill_id = 15;</code>
+     * @return The avatarSkillId.
+     */
+    @java.lang.Override
+    public int getAvatarSkillId() {
+      return avatarSkillId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -246,23 +245,23 @@ public final class AvatarSkillChangeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (skillDepotId_ != 0) {
-        output.writeUInt32(2, skillDepotId_);
-      }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(5, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(6, entityId_);
-      }
       if (curLevel_ != 0) {
-        output.writeUInt32(7, curLevel_);
+        output.writeUInt32(3, curLevel_);
       }
-      if (avatarSkillId_ != 0) {
+      if (skillDepotId_ != 0) {
-        output.writeUInt32(10, avatarSkillId_);
+        output.writeUInt32(6, skillDepotId_);
       }
       if (oldLevel_ != 0) {
-        output.writeUInt32(12, oldLevel_);
+        output.writeUInt32(9, oldLevel_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(11, entityId_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(14, avatarGuid_);
+      }
+      if (avatarSkillId_ != 0) {
+        output.writeUInt32(15, avatarSkillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -273,29 +272,29 @@ public final class AvatarSkillChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (skillDepotId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, skillDepotId_);
-      }
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, entityId_);
-      }
       if (curLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, curLevel_);
+          .computeUInt32Size(3, curLevel_);
       }
-      if (avatarSkillId_ != 0) {
+      if (skillDepotId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, avatarSkillId_);
+          .computeUInt32Size(6, skillDepotId_);
       }
       if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, oldLevel_);
+          .computeUInt32Size(9, oldLevel_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, entityId_);
+      }
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(14, avatarGuid_);
+      }
+      if (avatarSkillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, avatarSkillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,18 +311,18 @@ public final class AvatarSkillChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify other = (emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify) obj;
 
+      if (getCurLevel()
+          != other.getCurLevel()) return false;
       if (getSkillDepotId()
           != other.getSkillDepotId()) return false;
+      if (getOldLevel()
+          != other.getOldLevel()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (getCurLevel()
-          != other.getCurLevel()) return false;
       if (getAvatarSkillId()
           != other.getAvatarSkillId()) return false;
-      if (getOldLevel()
-          != other.getOldLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -335,19 +334,19 @@ public final class AvatarSkillChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSkillDepotId();
+      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOldLevel();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarSkillId();
-      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getOldLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -445,8 +444,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 20893
+     * CmdId: 4410
-     * Obf: KHLDKNNHLFE
      * </pre>
      *
      * Protobuf type {@code AvatarSkillChangeNotify}
@@ -486,18 +484,18 @@ public final class AvatarSkillChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        curLevel_ = 0;
+
         skillDepotId_ = 0;
 
+        oldLevel_ = 0;
+
         entityId_ = 0;
 
         avatarGuid_ = 0L;
 
-        curLevel_ = 0;
-
         avatarSkillId_ = 0;
 
-        oldLevel_ = 0;
-
         return this;
       }
 
@@ -524,12 +522,12 @@ public final class AvatarSkillChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify result = new emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify(this);
+        result.curLevel_ = curLevel_;
         result.skillDepotId_ = skillDepotId_;
+        result.oldLevel_ = oldLevel_;
         result.entityId_ = entityId_;
         result.avatarGuid_ = avatarGuid_;
-        result.curLevel_ = curLevel_;
         result.avatarSkillId_ = avatarSkillId_;
-        result.oldLevel_ = oldLevel_;
         onBuilt();
         return result;
       }
@@ -578,24 +576,24 @@ public final class AvatarSkillChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify.getDefaultInstance()) return this;
+        if (other.getCurLevel() != 0) {
+          setCurLevel(other.getCurLevel());
+        }
         if (other.getSkillDepotId() != 0) {
           setSkillDepotId(other.getSkillDepotId());
         }
+        if (other.getOldLevel() != 0) {
+          setOldLevel(other.getOldLevel());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getCurLevel() != 0) {
-          setCurLevel(other.getCurLevel());
-        }
         if (other.getAvatarSkillId() != 0) {
           setAvatarSkillId(other.getAvatarSkillId());
         }
-        if (other.getOldLevel() != 0) {
-          setOldLevel(other.getOldLevel());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -625,9 +623,40 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
 
+      private int curLevel_ ;
+      /**
+       * <code>uint32 cur_level = 3;</code>
+       * @return The curLevel.
+       */
+      @java.lang.Override
+      public int getCurLevel() {
+        return curLevel_;
+      }
+      /**
+       * <code>uint32 cur_level = 3;</code>
+       * @param value The curLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurLevel(int value) {
+        
+        curLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_level = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurLevel() {
+        
+        curLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int skillDepotId_ ;
       /**
-       * <code>uint32 skill_depot_id = 2;</code>
+       * <code>uint32 skill_depot_id = 6;</code>
        * @return The skillDepotId.
        */
       @java.lang.Override
@@ -635,7 +664,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return skillDepotId_;
       }
       /**
-       * <code>uint32 skill_depot_id = 2;</code>
+       * <code>uint32 skill_depot_id = 6;</code>
        * @param value The skillDepotId to set.
        * @return This builder for chaining.
        */
@@ -646,7 +675,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_depot_id = 2;</code>
+       * <code>uint32 skill_depot_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillDepotId() {
@@ -656,9 +685,40 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
 
+      private int oldLevel_ ;
+      /**
+       * <code>uint32 old_level = 9;</code>
+       * @return The oldLevel.
+       */
+      @java.lang.Override
+      public int getOldLevel() {
+        return oldLevel_;
+      }
+      /**
+       * <code>uint32 old_level = 9;</code>
+       * @param value The oldLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldLevel(int value) {
+        
+        oldLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 old_level = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldLevel() {
+        
+        oldLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 11;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -666,7 +726,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 11;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -677,7 +737,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -689,7 +749,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 5;</code>
+       * <code>uint64 avatar_guid = 14;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -697,7 +757,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 5;</code>
+       * <code>uint64 avatar_guid = 14;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -708,7 +768,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 5;</code>
+       * <code>uint64 avatar_guid = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -718,40 +778,9 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
 
-      private int curLevel_ ;
-      /**
-       * <code>uint32 cur_level = 7;</code>
-       * @return The curLevel.
-       */
-      @java.lang.Override
-      public int getCurLevel() {
-        return curLevel_;
-      }
-      /**
-       * <code>uint32 cur_level = 7;</code>
-       * @param value The curLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurLevel(int value) {
-        
-        curLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_level = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurLevel() {
-        
-        curLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int avatarSkillId_ ;
       /**
-       * <code>uint32 avatar_skill_id = 10;</code>
+       * <code>uint32 avatar_skill_id = 15;</code>
        * @return The avatarSkillId.
        */
       @java.lang.Override
@@ -759,7 +788,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return avatarSkillId_;
       }
       /**
-       * <code>uint32 avatar_skill_id = 10;</code>
+       * <code>uint32 avatar_skill_id = 15;</code>
        * @param value The avatarSkillId to set.
        * @return This builder for chaining.
        */
@@ -770,7 +799,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_skill_id = 10;</code>
+       * <code>uint32 avatar_skill_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarSkillId() {
@@ -779,37 +808,6 @@ public final class AvatarSkillChangeNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private int oldLevel_ ;
-      /**
-       * <code>uint32 old_level = 12;</code>
-       * @return The oldLevel.
-       */
-      @java.lang.Override
-      public int getOldLevel() {
-        return oldLevel_;
-      }
-      /**
-       * <code>uint32 old_level = 12;</code>
-       * @param value The oldLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldLevel(int value) {
-        
-        oldLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 old_level = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldLevel() {
-        
-        oldLevel_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -878,10 +876,10 @@ public final class AvatarSkillChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarSkillChangeNotify.proto\"\230\001\n\027Avat" +
-      "arSkillChangeNotify\022\026\n\016skill_depot_id\030\002 " +
+      "arSkillChangeNotify\022\021\n\tcur_level\030\003 \001(\r\022\026" +
-      "\001(\r\022\021\n\tentity_id\030\006 \001(\r\022\023\n\013avatar_guid\030\005 " +
+      "\n\016skill_depot_id\030\006 \001(\r\022\021\n\told_level\030\t \001(" +
-      "\001(\004\022\021\n\tcur_level\030\007 \001(\r\022\027\n\017avatar_skill_i" +
+      "\r\022\021\n\tentity_id\030\013 \001(\r\022\023\n\013avatar_guid\030\016 \001(" +
-      "d\030\n \001(\r\022\021\n\told_level\030\014 \001(\rB\033\n\031emu.grassc" +
+      "\004\022\027\n\017avatar_skill_id\030\017 \001(\rB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -893,7 +891,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
     internal_static_AvatarSkillChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillChangeNotify_descriptor,
-        new java.lang.String[] { "SkillDepotId", "EntityId", "AvatarGuid", "CurLevel", "AvatarSkillId", "OldLevel", });
+        new java.lang.String[] { "CurLevel", "SkillDepotId", "OldLevel", "EntityId", "AvatarGuid", "AvatarSkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java

@@ -19,11 +19,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     int getSkillMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     boolean containsSkillMap(
         int key);
@@ -34,34 +34,33 @@ public final class AvatarSkillInfoNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
     getSkillMap();
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
     getSkillMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
 
     emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrDefault(
         int key,
         emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo defaultValue);
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
 
     emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrThrow(
         int key);
 
     /**
-     * <code>uint64 guid = 13;</code>
+     * <code>uint64 guid = 14;</code>
      * @return The guid.
      */
     long getGuid();
   }
   /**
    * <pre>
-   * CmdId: 29066
+   * CmdId: 25299
-   * Obf: NHOMLJLJGFL
    * </pre>
    *
    * Protobuf type {@code AvatarSkillInfoNotify}
@@ -109,7 +108,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 90: {
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 skillMap_ = com.google.protobuf.MapField.newMapField(
                     SkillMapDefaultEntryHolder.defaultEntry);
@@ -122,7 +121,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
                   skillMap__.getKey(), skillMap__.getValue());
               break;
             }
-            case 104: {
+            case 112: {
 
               guid_ = input.readUInt64();
               break;
@@ -156,7 +155,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 11:
+        case 13:
           return internalGetSkillMap();
         default:
           throw new RuntimeException(
@@ -171,7 +170,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.class, emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.Builder.class);
     }
 
-    public static final int SKILL_MAP_FIELD_NUMBER = 11;
+    public static final int SKILL_MAP_FIELD_NUMBER = 13;
     private static final class SkillMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo> defaultEntry =
@@ -198,7 +197,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return internalGetSkillMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
 
     @java.lang.Override
@@ -216,7 +215,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return getSkillMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     @java.lang.Override
 
@@ -224,7 +223,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return internalGetSkillMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     @java.lang.Override
 
@@ -237,7 +236,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     @java.lang.Override
 
@@ -252,10 +251,10 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int GUID_FIELD_NUMBER = 13;
+    public static final int GUID_FIELD_NUMBER = 14;
     private long guid_;
     /**
-     * <code>uint64 guid = 13;</code>
+     * <code>uint64 guid = 14;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -282,9 +281,9 @@ public final class AvatarSkillInfoNotifyOuterClass {
           output,
           internalGetSkillMap(),
           SkillMapDefaultEntryHolder.defaultEntry,
-          11);
+          13);
       if (guid_ != 0L) {
-        output.writeUInt64(13, guid_);
+        output.writeUInt64(14, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -303,11 +302,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(11, skillMap__);
+            .computeMessageSize(13, skillMap__);
       }
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, guid_);
+          .computeUInt64Size(14, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -443,8 +442,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 29066
+     * CmdId: 25299
-     * Obf: NHOMLJLJGFL
      * </pre>
      *
      * Protobuf type {@code AvatarSkillInfoNotify}
@@ -462,7 +460,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 11:
+          case 13:
             return internalGetSkillMap();
           default:
             throw new RuntimeException(
@@ -473,7 +471,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 11:
+          case 13:
             return internalGetMutableSkillMap();
           default:
             throw new RuntimeException(
@@ -649,7 +647,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return internalGetSkillMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
 
       @java.lang.Override
@@ -667,7 +665,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return getSkillMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       @java.lang.Override
 
@@ -675,7 +673,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return internalGetSkillMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       @java.lang.Override
 
@@ -688,7 +686,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       @java.lang.Override
 
@@ -709,7 +707,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
 
       public Builder removeSkillMap(
@@ -728,7 +726,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return internalGetMutableSkillMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       public Builder putSkillMap(
           int key,
@@ -740,7 +738,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
 
       public Builder putAllSkillMap(
@@ -752,7 +750,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 13;</code>
+       * <code>uint64 guid = 14;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -760,7 +758,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 13;</code>
+       * <code>uint64 guid = 14;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -771,7 +769,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 13;</code>
+       * <code>uint64 guid = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -854,8 +852,8 @@ public final class AvatarSkillInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033AvatarSkillInfoNotify.proto\032\025AvatarSki" +
       "llInfo.proto\"\241\001\n\025AvatarSkillInfoNotify\0227" +
-      "\n\tskill_map\030\013 \003(\0132$.AvatarSkillInfoNotif" +
+      "\n\tskill_map\030\r \003(\0132$.AvatarSkillInfoNotif" +
-      "y.SkillMapEntry\022\014\n\004guid\030\r \001(\004\032A\n\rSkillMa" +
+      "y.SkillMapEntry\022\014\n\004guid\030\016 \001(\004\032A\n\rSkillMa" +
       "pEntry\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(\0132\020.Ava" +
       "tarSkillInfo:\0028\001B\033\n\031emu.grasscutter.net." +
       "protob\006proto3"

src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoOuterClass.java

@@ -48,10 +48,6 @@ public final class AvatarSkillInfoOuterClass {
     int getMaxChargeCount();
   }
   /**
-   * <pre>
-   * Obf: FKBNODHMBMG
-   * </pre>
-   *
    * Protobuf type {@code AvatarSkillInfo}
    */
   public static final class AvatarSkillInfo extends
@@ -409,10 +405,6 @@ public final class AvatarSkillInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FKBNODHMBMG
-     * </pre>
-     *
      * Protobuf type {@code AvatarSkillInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java

@@ -19,13 +19,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 skill_id = 15;</code>
+     * <code>uint32 max_charge_count = 6;</code>
-     * @return The skillId.
-     */
-    int getSkillId();
-
-    /**
-     * <code>uint32 max_charge_count = 4;</code>
      * @return The maxChargeCount.
      */
     int getMaxChargeCount();
@@ -35,11 +29,16 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 skill_id = 15;</code>
+     * @return The skillId.
+     */
+    int getSkillId();
   }
   /**
    * <pre>
-   * CmdId: 22843
+   * CmdId: 28497
-   * Obf: MIPDHBPHHBA
    * </pre>
    *
    * Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -86,7 +85,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 48: {
 
               maxChargeCount_ = input.readUInt32();
               break;
@@ -133,21 +132,10 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.class, emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.Builder.class);
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 15;
+    public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 6;
-    private int skillId_;
-    /**
-     * <code>uint32 skill_id = 15;</code>
-     * @return The skillId.
-     */
-    @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
-    }
-
-    public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 4;
     private int maxChargeCount_;
     /**
-     * <code>uint32 max_charge_count = 4;</code>
+     * <code>uint32 max_charge_count = 6;</code>
      * @return The maxChargeCount.
      */
     @java.lang.Override
@@ -166,6 +154,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       return avatarGuid_;
     }
 
+    public static final int SKILL_ID_FIELD_NUMBER = 15;
+    private int skillId_;
+    /**
+     * <code>uint32 skill_id = 15;</code>
+     * @return The skillId.
+     */
+    @java.lang.Override
+    public int getSkillId() {
+      return skillId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -181,7 +180,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (maxChargeCount_ != 0) {
-        output.writeUInt32(4, maxChargeCount_);
+        output.writeUInt32(6, maxChargeCount_);
       }
       if (avatarGuid_ != 0L) {
         output.writeUInt64(7, avatarGuid_);
@@ -200,7 +199,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       size = 0;
       if (maxChargeCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, maxChargeCount_);
+          .computeUInt32Size(6, maxChargeCount_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
@@ -225,12 +224,12 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other = (emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify) obj;
 
-      if (getSkillId()
-          != other.getSkillId()) return false;
       if (getMaxChargeCount()
           != other.getMaxChargeCount()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +241,13 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
       hash = (37 * hash) + MAX_CHARGE_COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getMaxChargeCount();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,8 +345,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 22843
+     * CmdId: 28497
-     * Obf: MIPDHBPHHBA
      * </pre>
      *
      * Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -387,12 +385,12 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        skillId_ = 0;
-
         maxChargeCount_ = 0;
 
         avatarGuid_ = 0L;
 
+        skillId_ = 0;
+
         return this;
       }
 
@@ -419,9 +417,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify result = new emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify(this);
-        result.skillId_ = skillId_;
         result.maxChargeCount_ = maxChargeCount_;
         result.avatarGuid_ = avatarGuid_;
+        result.skillId_ = skillId_;
         onBuilt();
         return result;
       }
@@ -470,15 +468,15 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.getDefaultInstance()) return this;
-        if (other.getSkillId() != 0) {
-          setSkillId(other.getSkillId());
-        }
         if (other.getMaxChargeCount() != 0) {
           setMaxChargeCount(other.getMaxChargeCount());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getSkillId() != 0) {
+          setSkillId(other.getSkillId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -508,40 +506,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         return this;
       }
 
-      private int skillId_ ;
-      /**
-       * <code>uint32 skill_id = 15;</code>
-       * @return The skillId.
-       */
-      @java.lang.Override
-      public int getSkillId() {
-        return skillId_;
-      }
-      /**
-       * <code>uint32 skill_id = 15;</code>
-       * @param value The skillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillId(int value) {
-        
-        skillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillId() {
-        
-        skillId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int maxChargeCount_ ;
       /**
-       * <code>uint32 max_charge_count = 4;</code>
+       * <code>uint32 max_charge_count = 6;</code>
        * @return The maxChargeCount.
        */
       @java.lang.Override
@@ -549,7 +516,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         return maxChargeCount_;
       }
       /**
-       * <code>uint32 max_charge_count = 4;</code>
+       * <code>uint32 max_charge_count = 6;</code>
        * @param value The maxChargeCount to set.
        * @return This builder for chaining.
        */
@@ -560,7 +527,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 max_charge_count = 4;</code>
+       * <code>uint32 max_charge_count = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearMaxChargeCount() {
@@ -600,6 +567,37 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int skillId_ ;
+      /**
+       * <code>uint32 skill_id = 15;</code>
+       * @return The skillId.
+       */
+      @java.lang.Override
+      public int getSkillId() {
+        return skillId_;
+      }
+      /**
+       * <code>uint32 skill_id = 15;</code>
+       * @param value The skillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSkillId(int value) {
+        
+        skillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 skill_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSkillId() {
+        
+        skillId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,9 +666,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n%AvatarSkillMaxChargeCountNotify.proto\"" +
-      "b\n\037AvatarSkillMaxChargeCountNotify\022\020\n\010sk" +
+      "b\n\037AvatarSkillMaxChargeCountNotify\022\030\n\020ma" +
-      "ill_id\030\017 \001(\r\022\030\n\020max_charge_count\030\004 \001(\r\022\023" +
+      "x_charge_count\030\006 \001(\r\022\023\n\013avatar_guid\030\007 \001(" +
-      "\n\013avatar_guid\030\007 \001(\004B\033\n\031emu.grasscutter.n" +
+      "\004\022\020\n\010skill_id\030\017 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -682,7 +680,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
     internal_static_AvatarSkillMaxChargeCountNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillMaxChargeCountNotify_descriptor,
-        new java.lang.String[] { "SkillId", "MaxChargeCount", "AvatarGuid", });
+        new java.lang.String[] { "MaxChargeCount", "AvatarGuid", "SkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java

@@ -19,29 +19,24 @@ public final class AvatarSkillUpgradeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 avatar_skill_id = 13;</code>
+     * <code>uint32 old_level = 10;</code>
-     * @return The avatarSkillId.
-     */
-    int getAvatarSkillId();
-
-    /**
-     * <code>uint32 old_level = 9;</code>
      * @return The oldLevel.
      */
     int getOldLevel();
 
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint32 avatar_skill_id = 12;</code>
+     * @return The avatarSkillId.
+     */
+    int getAvatarSkillId();
+
+    /**
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 29541
-   * Obf: JLJFPGIINAB
-   * </pre>
-   *
    * Protobuf type {@code AvatarSkillUpgradeReq}
    */
   public static final class AvatarSkillUpgradeReq extends
@@ -86,17 +81,17 @@ public final class AvatarSkillUpgradeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 48: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 72: {
+            case 80: {
 
               oldLevel_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 96: {
 
               avatarSkillId_ = input.readUInt32();
               break;
@@ -133,21 +128,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
               emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.class, emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.Builder.class);
     }
 
-    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 13;
+    public static final int OLD_LEVEL_FIELD_NUMBER = 10;
-    private int avatarSkillId_;
-    /**
-     * <code>uint32 avatar_skill_id = 13;</code>
-     * @return The avatarSkillId.
-     */
-    @java.lang.Override
-    public int getAvatarSkillId() {
-      return avatarSkillId_;
-    }
-
-    public static final int OLD_LEVEL_FIELD_NUMBER = 9;
     private int oldLevel_;
     /**
-     * <code>uint32 old_level = 9;</code>
+     * <code>uint32 old_level = 10;</code>
      * @return The oldLevel.
      */
     @java.lang.Override
@@ -155,10 +139,21 @@ public final class AvatarSkillUpgradeReqOuterClass {
       return oldLevel_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
+    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 12;
+    private int avatarSkillId_;
+    /**
+     * <code>uint32 avatar_skill_id = 12;</code>
+     * @return The avatarSkillId.
+     */
+    @java.lang.Override
+    public int getAvatarSkillId() {
+      return avatarSkillId_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -181,13 +176,13 @@ public final class AvatarSkillUpgradeReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
+        output.writeUInt64(6, avatarGuid_);
       }
       if (oldLevel_ != 0) {
-        output.writeUInt32(9, oldLevel_);
+        output.writeUInt32(10, oldLevel_);
       }
       if (avatarSkillId_ != 0) {
-        output.writeUInt32(13, avatarSkillId_);
+        output.writeUInt32(12, avatarSkillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class AvatarSkillUpgradeReqOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
+          .computeUInt64Size(6, avatarGuid_);
       }
       if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, oldLevel_);
+          .computeUInt32Size(10, oldLevel_);
       }
       if (avatarSkillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, avatarSkillId_);
+          .computeUInt32Size(12, avatarSkillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +220,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other = (emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq) obj;
 
-      if (getAvatarSkillId()
-          != other.getAvatarSkillId()) return false;
       if (getOldLevel()
           != other.getOldLevel()) return false;
+      if (getAvatarSkillId()
+          != other.getAvatarSkillId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +237,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarSkillId();
       hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getOldLevel();
+      hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarSkillId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
@@ -345,11 +340,6 @@ public final class AvatarSkillUpgradeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29541
-     * Obf: JLJFPGIINAB
-     * </pre>
-     *
      * Protobuf type {@code AvatarSkillUpgradeReq}
      */
     public static final class Builder extends
@@ -387,10 +377,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarSkillId_ = 0;
-
         oldLevel_ = 0;
 
+        avatarSkillId_ = 0;
+
         avatarGuid_ = 0L;
 
         return this;
@@ -419,8 +409,8 @@ public final class AvatarSkillUpgradeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq result = new emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq(this);
-        result.avatarSkillId_ = avatarSkillId_;
         result.oldLevel_ = oldLevel_;
+        result.avatarSkillId_ = avatarSkillId_;
         result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
@@ -470,12 +460,12 @@ public final class AvatarSkillUpgradeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.getDefaultInstance()) return this;
-        if (other.getAvatarSkillId() != 0) {
-          setAvatarSkillId(other.getAvatarSkillId());
-        }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
+        if (other.getAvatarSkillId() != 0) {
+          setAvatarSkillId(other.getAvatarSkillId());
+        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
@@ -508,40 +498,9 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
 
-      private int avatarSkillId_ ;
-      /**
-       * <code>uint32 avatar_skill_id = 13;</code>
-       * @return The avatarSkillId.
-       */
-      @java.lang.Override
-      public int getAvatarSkillId() {
-        return avatarSkillId_;
-      }
-      /**
-       * <code>uint32 avatar_skill_id = 13;</code>
-       * @param value The avatarSkillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarSkillId(int value) {
-        
-        avatarSkillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 avatar_skill_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarSkillId() {
-        
-        avatarSkillId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int oldLevel_ ;
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 10;</code>
        * @return The oldLevel.
        */
       @java.lang.Override
@@ -549,7 +508,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return oldLevel_;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 10;</code>
        * @param value The oldLevel to set.
        * @return This builder for chaining.
        */
@@ -560,7 +519,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearOldLevel() {
@@ -570,9 +529,40 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
 
+      private int avatarSkillId_ ;
+      /**
+       * <code>uint32 avatar_skill_id = 12;</code>
+       * @return The avatarSkillId.
+       */
+      @java.lang.Override
+      public int getAvatarSkillId() {
+        return avatarSkillId_;
+      }
+      /**
+       * <code>uint32 avatar_skill_id = 12;</code>
+       * @param value The avatarSkillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarSkillId(int value) {
+        
+        avatarSkillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 avatar_skill_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarSkillId() {
+        
+        avatarSkillId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -580,7 +570,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -591,7 +581,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -668,8 +658,8 @@ public final class AvatarSkillUpgradeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarSkillUpgradeReq.proto\"X\n\025AvatarS" +
-      "killUpgradeReq\022\027\n\017avatar_skill_id\030\r \001(\r\022" +
+      "killUpgradeReq\022\021\n\told_level\030\n \001(\r\022\027\n\017ava" +
-      "\021\n\told_level\030\t \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B" +
+      "tar_skill_id\030\014 \001(\r\022\023\n\013avatar_guid\030\006 \001(\004B" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
     internal_static_AvatarSkillUpgradeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillUpgradeReq_descriptor,
-        new java.lang.String[] { "AvatarSkillId", "OldLevel", "AvatarGuid", });
+        new java.lang.String[] { "OldLevel", "AvatarSkillId", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java

@@ -19,41 +19,36 @@ public final class AvatarSkillUpgradeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_level = 2;</code>
+     * <code>uint32 old_level = 2;</code>
-     * @return The curLevel.
-     */
-    int getCurLevel();
-
-    /**
-     * <code>uint32 old_level = 9;</code>
      * @return The oldLevel.
      */
     int getOldLevel();
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 avatar_skill_id = 1;</code>
+     * <code>uint32 cur_level = 6;</code>
+     * @return The curLevel.
+     */
+    int getCurLevel();
+
+    /**
+     * <code>uint32 avatar_skill_id = 9;</code>
      * @return The avatarSkillId.
      */
     int getAvatarSkillId();
 
     /**
-     * <code>uint64 avatar_guid = 7;</code>
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 22584
-   * Obf: JDINKHGKCON
-   * </pre>
-   *
    * Protobuf type {@code AvatarSkillUpgradeRsp}
    */
   public static final class AvatarSkillUpgradeRsp extends
@@ -98,29 +93,29 @@ public final class AvatarSkillUpgradeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              avatarSkillId_ = input.readUInt32();
-              break;
-            }
             case 16: {
 
-              curLevel_ = input.readUInt32();
+              oldLevel_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 24: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 56: {
+            case 48: {
 
-              avatarGuid_ = input.readUInt64();
+              curLevel_ = input.readUInt32();
               break;
             }
             case 72: {
 
-              oldLevel_ = input.readUInt32();
+              avatarSkillId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              avatarGuid_ = input.readUInt64();
               break;
             }
             default: {
@@ -155,21 +150,10 @@ public final class AvatarSkillUpgradeRspOuterClass {
               emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.class, emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.Builder.class);
     }
 
-    public static final int CUR_LEVEL_FIELD_NUMBER = 2;
+    public static final int OLD_LEVEL_FIELD_NUMBER = 2;
-    private int curLevel_;
-    /**
-     * <code>uint32 cur_level = 2;</code>
-     * @return The curLevel.
-     */
-    @java.lang.Override
-    public int getCurLevel() {
-      return curLevel_;
-    }
-
-    public static final int OLD_LEVEL_FIELD_NUMBER = 9;
     private int oldLevel_;
     /**
-     * <code>uint32 old_level = 9;</code>
+     * <code>uint32 old_level = 2;</code>
      * @return The oldLevel.
      */
     @java.lang.Override
@@ -177,10 +161,10 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return oldLevel_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -188,10 +172,21 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 1;
+    public static final int CUR_LEVEL_FIELD_NUMBER = 6;
+    private int curLevel_;
+    /**
+     * <code>uint32 cur_level = 6;</code>
+     * @return The curLevel.
+     */
+    @java.lang.Override
+    public int getCurLevel() {
+      return curLevel_;
+    }
+
+    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 9;
     private int avatarSkillId_;
     /**
-     * <code>uint32 avatar_skill_id = 1;</code>
+     * <code>uint32 avatar_skill_id = 9;</code>
      * @return The avatarSkillId.
      */
     @java.lang.Override
@@ -199,10 +194,10 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return avatarSkillId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 7;</code>
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -224,20 +219,20 @@ public final class AvatarSkillUpgradeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (avatarSkillId_ != 0) {
+      if (oldLevel_ != 0) {
-        output.writeUInt32(1, avatarSkillId_);
+        output.writeUInt32(2, oldLevel_);
-      }
-      if (curLevel_ != 0) {
-        output.writeUInt32(2, curLevel_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(3, retcode_);
+      }
+      if (curLevel_ != 0) {
+        output.writeUInt32(6, curLevel_);
+      }
+      if (avatarSkillId_ != 0) {
+        output.writeUInt32(9, avatarSkillId_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(7, avatarGuid_);
+        output.writeUInt64(11, avatarGuid_);
-      }
-      if (oldLevel_ != 0) {
-        output.writeUInt32(9, oldLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -248,25 +243,25 @@ public final class AvatarSkillUpgradeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (avatarSkillId_ != 0) {
+      if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, avatarSkillId_);
+          .computeUInt32Size(2, oldLevel_);
-      }
-      if (curLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, curLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(3, retcode_);
+      }
+      if (curLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, curLevel_);
+      }
+      if (avatarSkillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, avatarSkillId_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, avatarGuid_);
+          .computeUInt64Size(11, avatarGuid_);
-      }
-      if (oldLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, oldLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -283,12 +278,12 @@ public final class AvatarSkillUpgradeRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp other = (emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp) obj;
 
-      if (getCurLevel()
-          != other.getCurLevel()) return false;
       if (getOldLevel()
           != other.getOldLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getCurLevel()
+          != other.getCurLevel()) return false;
       if (getAvatarSkillId()
           != other.getAvatarSkillId()) return false;
       if (getAvatarGuid()
@@ -304,12 +299,12 @@ public final class AvatarSkillUpgradeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getOldLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarSkillId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
@@ -411,11 +406,6 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22584
-     * Obf: JDINKHGKCON
-     * </pre>
-     *
      * Protobuf type {@code AvatarSkillUpgradeRsp}
      */
     public static final class Builder extends
@@ -453,12 +443,12 @@ public final class AvatarSkillUpgradeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curLevel_ = 0;
-
         oldLevel_ = 0;
 
         retcode_ = 0;
 
+        curLevel_ = 0;
+
         avatarSkillId_ = 0;
 
         avatarGuid_ = 0L;
@@ -489,9 +479,9 @@ public final class AvatarSkillUpgradeRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp result = new emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp(this);
-        result.curLevel_ = curLevel_;
         result.oldLevel_ = oldLevel_;
         result.retcode_ = retcode_;
+        result.curLevel_ = curLevel_;
         result.avatarSkillId_ = avatarSkillId_;
         result.avatarGuid_ = avatarGuid_;
         onBuilt();
@@ -542,15 +532,15 @@ public final class AvatarSkillUpgradeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.getDefaultInstance()) return this;
-        if (other.getCurLevel() != 0) {
-          setCurLevel(other.getCurLevel());
-        }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getCurLevel() != 0) {
+          setCurLevel(other.getCurLevel());
+        }
         if (other.getAvatarSkillId() != 0) {
           setAvatarSkillId(other.getAvatarSkillId());
         }
@@ -586,40 +576,9 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
 
-      private int curLevel_ ;
-      /**
-       * <code>uint32 cur_level = 2;</code>
-       * @return The curLevel.
-       */
-      @java.lang.Override
-      public int getCurLevel() {
-        return curLevel_;
-      }
-      /**
-       * <code>uint32 cur_level = 2;</code>
-       * @param value The curLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurLevel(int value) {
-        
-        curLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_level = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurLevel() {
-        
-        curLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int oldLevel_ ;
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 2;</code>
        * @return The oldLevel.
        */
       @java.lang.Override
@@ -627,7 +586,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return oldLevel_;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 2;</code>
        * @param value The oldLevel to set.
        * @return This builder for chaining.
        */
@@ -638,7 +597,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearOldLevel() {
@@ -650,7 +609,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -658,7 +617,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -669,7 +628,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -679,9 +638,40 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
 
+      private int curLevel_ ;
+      /**
+       * <code>uint32 cur_level = 6;</code>
+       * @return The curLevel.
+       */
+      @java.lang.Override
+      public int getCurLevel() {
+        return curLevel_;
+      }
+      /**
+       * <code>uint32 cur_level = 6;</code>
+       * @param value The curLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurLevel(int value) {
+        
+        curLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_level = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurLevel() {
+        
+        curLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int avatarSkillId_ ;
       /**
-       * <code>uint32 avatar_skill_id = 1;</code>
+       * <code>uint32 avatar_skill_id = 9;</code>
        * @return The avatarSkillId.
        */
       @java.lang.Override
@@ -689,7 +679,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return avatarSkillId_;
       }
       /**
-       * <code>uint32 avatar_skill_id = 1;</code>
+       * <code>uint32 avatar_skill_id = 9;</code>
        * @param value The avatarSkillId to set.
        * @return This builder for chaining.
        */
@@ -700,7 +690,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_skill_id = 1;</code>
+       * <code>uint32 avatar_skill_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarSkillId() {
@@ -712,7 +702,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 7;</code>
+       * <code>uint64 avatar_guid = 11;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -720,7 +710,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 7;</code>
+       * <code>uint64 avatar_guid = 11;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -731,7 +721,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 7;</code>
+       * <code>uint64 avatar_guid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -808,9 +798,9 @@ public final class AvatarSkillUpgradeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarSkillUpgradeRsp.proto\"|\n\025AvatarS" +
-      "killUpgradeRsp\022\021\n\tcur_level\030\002 \001(\r\022\021\n\told" +
+      "killUpgradeRsp\022\021\n\told_level\030\002 \001(\r\022\017\n\007ret" +
-      "_level\030\t \001(\r\022\017\n\007retcode\030\004 \001(\005\022\027\n\017avatar_" +
+      "code\030\003 \001(\005\022\021\n\tcur_level\030\006 \001(\r\022\027\n\017avatar_" +
-      "skill_id\030\001 \001(\r\022\023\n\013avatar_guid\030\007 \001(\004B\033\n\031e" +
+      "skill_id\030\t \001(\r\022\023\n\013avatar_guid\030\013 \001(\004B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -822,7 +812,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
     internal_static_AvatarSkillUpgradeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillUpgradeRsp_descriptor,
-        new java.lang.String[] { "CurLevel", "OldLevel", "Retcode", "AvatarSkillId", "AvatarGuid", });
+        new java.lang.String[] { "OldLevel", "Retcode", "CurLevel", "AvatarSkillId", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamAllDataNotifyOuterClass.java

@@ -19,11 +19,28 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @return A list containing the tempAvatarGuidList.
+     */
+    java.util.List<java.lang.Long> getTempAvatarGuidListList();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    int getTempAvatarGuidListCount();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The tempAvatarGuidList at the given index.
+     */
+    long getTempAvatarGuidList(int index);
+
+    /**
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     int getAvatarTeamMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     boolean containsAvatarTeamMap(
         int key);
@@ -34,24 +51,30 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrDefault(
         int key,
         emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam defaultValue);
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
         int key);
 
+    /**
+     * <code>uint32 cur_avatar_team_id = 10;</code>
+     * @return The curAvatarTeamId.
+     */
+    int getCurAvatarTeamId();
+
     /**
      * <code>repeated uint32 backup_avatar_team_order_list = 13;</code>
      * @return A list containing the backupAvatarTeamOrderList.
@@ -68,30 +91,8 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      * @return The backupAvatarTeamOrderList at the given index.
      */
     int getBackupAvatarTeamOrderList(int index);
-
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @return A list containing the tempAvatarGuidList.
-     */
-    java.util.List<java.lang.Long> getTempAvatarGuidListList();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    int getTempAvatarGuidListCount();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @param index The index of the element to return.
-     * @return The tempAvatarGuidList at the given index.
-     */
-    long getTempAvatarGuidList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 9854
-   * Obf: HHLJIKIGMOG
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeamAllDataNotify}
    */
   public static final class AvatarTeamAllDataNotify extends
@@ -104,8 +105,8 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       super(builder);
     }
     private AvatarTeamAllDataNotify() {
-      backupAvatarTeamOrderList_ = emptyIntList();
       tempAvatarGuidList_ = emptyLongList();
+      backupAvatarTeamOrderList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -139,11 +140,32 @@ public final class AvatarTeamAllDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                tempAvatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              tempAvatarGuidList_.addLong(input.readUInt64());
+              break;
+            }
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                tempAvatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tempAvatarGuidList_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
                     AvatarTeamMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
               avatarTeamMap__ = input.readMessage(
@@ -152,31 +174,15 @@ public final class AvatarTeamAllDataNotifyOuterClass {
                   avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
               break;
             }
-            case 64: {
+            case 80: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+
-                tempAvatarGuidList_ = newLongList();
+              curAvatarTeamId_ = input.readUInt32();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              tempAvatarGuidList_.addLong(input.readUInt64());
-              break;
-            }
-            case 66: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                tempAvatarGuidList_.addLong(input.readUInt64());
-              }
-              input.popLimit(limit);
               break;
             }
             case 104: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               backupAvatarTeamOrderList_.addInt(input.readUInt32());
               break;
@@ -184,9 +190,9 @@ public final class AvatarTeamAllDataNotifyOuterClass {
             case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
                 backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
                 backupAvatarTeamOrderList_.addInt(input.readUInt32());
@@ -209,10 +215,10 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           tempAvatarGuidList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           backupAvatarTeamOrderList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
@@ -229,7 +235,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 2:
+        case 7:
           return internalGetAvatarTeamMap();
         default:
           throw new RuntimeException(
@@ -244,7 +250,35 @@ public final class AvatarTeamAllDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.class, emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.Builder.class);
     }
 
-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 2;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @return A list containing the tempAvatarGuidList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getTempAvatarGuidListList() {
+      return tempAvatarGuidList_;
+    }
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    public int getTempAvatarGuidListCount() {
+      return tempAvatarGuidList_.size();
+    }
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The tempAvatarGuidList at the given index.
+     */
+    public long getTempAvatarGuidList(int index) {
+      return tempAvatarGuidList_.getLong(index);
+    }
+    private int tempAvatarGuidListMemoizedSerializedSize = -1;
+
+    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 7;
     private static final class AvatarTeamMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -271,7 +305,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
 
     @java.lang.Override
@@ -289,7 +323,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return getAvatarTeamMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     @java.lang.Override
 
@@ -297,7 +331,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     @java.lang.Override
 
@@ -310,7 +344,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     @java.lang.Override
 
@@ -325,6 +359,17 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return map.get(key);
     }
 
+    public static final int CUR_AVATAR_TEAM_ID_FIELD_NUMBER = 10;
+    private int curAvatarTeamId_;
+    /**
+     * <code>uint32 cur_avatar_team_id = 10;</code>
+     * @return The curAvatarTeamId.
+     */
+    @java.lang.Override
+    public int getCurAvatarTeamId() {
+      return curAvatarTeamId_;
+    }
+
     public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_;
     /**
@@ -353,34 +398,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     }
     private int backupAvatarTeamOrderListMemoizedSerializedSize = -1;
 
-    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 8;
-    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @return A list containing the tempAvatarGuidList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Long>
-        getTempAvatarGuidListList() {
-      return tempAvatarGuidList_;
-    }
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    public int getTempAvatarGuidListCount() {
-      return tempAvatarGuidList_.size();
-    }
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @param index The index of the element to return.
-     * @return The tempAvatarGuidList at the given index.
-     */
-    public long getTempAvatarGuidList(int index) {
-      return tempAvatarGuidList_.getLong(index);
-    }
-    private int tempAvatarGuidListMemoizedSerializedSize = -1;
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -396,18 +413,21 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (getTempAvatarGuidListList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
+        output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
+      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetAvatarTeamMap(),
           AvatarTeamMapDefaultEntryHolder.defaultEntry,
-          2);
+          7);
-      if (getTempAvatarGuidListList().size() > 0) {
+      if (curAvatarTeamId_ != 0) {
-        output.writeUInt32NoTag(66);
+        output.writeUInt32(10, curAvatarTeamId_);
-        output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
-        output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
       }
       if (getBackupAvatarTeamOrderListList().size() > 0) {
         output.writeUInt32NoTag(106);
@@ -425,16 +445,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
-           : internalGetAvatarTeamMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
-        avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(2, avatarTeamMap__);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -449,6 +459,20 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         }
         tempAvatarGuidListMemoizedSerializedSize = dataSize;
       }
+      for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
+           : internalGetAvatarTeamMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
+        avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(7, avatarTeamMap__);
+      }
+      if (curAvatarTeamId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, curAvatarTeamId_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
@@ -478,12 +502,14 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify other = (emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify) obj;
 
-      if (!internalGetAvatarTeamMap().equals(
-          other.internalGetAvatarTeamMap())) return false;
-      if (!getBackupAvatarTeamOrderListList()
-          .equals(other.getBackupAvatarTeamOrderListList())) return false;
       if (!getTempAvatarGuidListList()
           .equals(other.getTempAvatarGuidListList())) return false;
+      if (!internalGetAvatarTeamMap().equals(
+          other.internalGetAvatarTeamMap())) return false;
+      if (getCurAvatarTeamId()
+          != other.getCurAvatarTeamId()) return false;
+      if (!getBackupAvatarTeamOrderListList()
+          .equals(other.getBackupAvatarTeamOrderListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -495,18 +521,20 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getTempAvatarGuidListCount() > 0) {
+        hash = (37 * hash) + TEMP_AVATAR_GUID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTempAvatarGuidListList().hashCode();
+      }
       if (!internalGetAvatarTeamMap().getMap().isEmpty()) {
         hash = (37 * hash) + AVATAR_TEAM_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetAvatarTeamMap().hashCode();
       }
+      hash = (37 * hash) + CUR_AVATAR_TEAM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurAvatarTeamId();
       if (getBackupAvatarTeamOrderListCount() > 0) {
         hash = (37 * hash) + BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getBackupAvatarTeamOrderListList().hashCode();
       }
-      if (getTempAvatarGuidListCount() > 0) {
-        hash = (37 * hash) + TEMP_AVATAR_GUID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getTempAvatarGuidListList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -603,11 +631,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9854
-     * Obf: HHLJIKIGMOG
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeamAllDataNotify}
      */
     public static final class Builder extends
@@ -623,7 +646,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 7:
             return internalGetAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -634,7 +657,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 7:
             return internalGetMutableAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -667,10 +690,12 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        internalGetMutableAvatarTeamMap().clear();
-        backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        internalGetMutableAvatarTeamMap().clear();
+        curAvatarTeamId_ = 0;
+
+        backupAvatarTeamOrderList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
@@ -699,18 +724,19 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       public emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify result = new emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify(this);
         int from_bitField0_ = bitField0_;
-        result.avatarTeamMap_ = internalGetAvatarTeamMap();
+        if (((bitField0_ & 0x00000001) != 0)) {
-        result.avatarTeamMap_.makeImmutable();
-        if (((bitField0_ & 0x00000002) != 0)) {
-          backupAvatarTeamOrderList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
-        if (((bitField0_ & 0x00000004) != 0)) {
           tempAvatarGuidList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.tempAvatarGuidList_ = tempAvatarGuidList_;
+        result.avatarTeamMap_ = internalGetAvatarTeamMap();
+        result.avatarTeamMap_.makeImmutable();
+        result.curAvatarTeamId_ = curAvatarTeamId_;
+        if (((bitField0_ & 0x00000004) != 0)) {
+          backupAvatarTeamOrderList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
         onBuilt();
         return result;
       }
@@ -759,28 +785,31 @@ public final class AvatarTeamAllDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.getDefaultInstance()) return this;
-        internalGetMutableAvatarTeamMap().mergeFrom(
-            other.internalGetAvatarTeamMap());
-        if (!other.backupAvatarTeamOrderList_.isEmpty()) {
-          if (backupAvatarTeamOrderList_.isEmpty()) {
-            backupAvatarTeamOrderList_ = other.backupAvatarTeamOrderList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureBackupAvatarTeamOrderListIsMutable();
-            backupAvatarTeamOrderList_.addAll(other.backupAvatarTeamOrderList_);
-          }
-          onChanged();
-        }
         if (!other.tempAvatarGuidList_.isEmpty()) {
           if (tempAvatarGuidList_.isEmpty()) {
             tempAvatarGuidList_ = other.tempAvatarGuidList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureTempAvatarGuidListIsMutable();
             tempAvatarGuidList_.addAll(other.tempAvatarGuidList_);
           }
           onChanged();
         }
+        internalGetMutableAvatarTeamMap().mergeFrom(
+            other.internalGetAvatarTeamMap());
+        if (other.getCurAvatarTeamId() != 0) {
+          setCurAvatarTeamId(other.getCurAvatarTeamId());
+        }
+        if (!other.backupAvatarTeamOrderList_.isEmpty()) {
+          if (backupAvatarTeamOrderList_.isEmpty()) {
+            backupAvatarTeamOrderList_ = other.backupAvatarTeamOrderList_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureBackupAvatarTeamOrderListIsMutable();
+            backupAvatarTeamOrderList_.addAll(other.backupAvatarTeamOrderList_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -811,6 +840,85 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.LongList tempAvatarGuidList_ = emptyLongList();
+      private void ensureTempAvatarGuidListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          tempAvatarGuidList_ = mutableCopy(tempAvatarGuidList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @return A list containing the tempAvatarGuidList.
+       */
+      public java.util.List<java.lang.Long>
+          getTempAvatarGuidListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @return The count of tempAvatarGuidList.
+       */
+      public int getTempAvatarGuidListCount() {
+        return tempAvatarGuidList_.size();
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @param index The index of the element to return.
+       * @return The tempAvatarGuidList at the given index.
+       */
+      public long getTempAvatarGuidList(int index) {
+        return tempAvatarGuidList_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The tempAvatarGuidList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTempAvatarGuidList(
+          int index, long value) {
+        ensureTempAvatarGuidListIsMutable();
+        tempAvatarGuidList_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @param value The tempAvatarGuidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTempAvatarGuidList(long value) {
+        ensureTempAvatarGuidListIsMutable();
+        tempAvatarGuidList_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @param values The tempAvatarGuidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTempAvatarGuidList(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureTempAvatarGuidListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, tempAvatarGuidList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTempAvatarGuidList() {
+        tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> avatarTeamMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
@@ -838,7 +946,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
 
       @java.lang.Override
@@ -856,7 +964,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return getAvatarTeamMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       @java.lang.Override
 
@@ -864,7 +972,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       @java.lang.Override
 
@@ -877,7 +985,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       @java.lang.Override
 
@@ -898,7 +1006,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
 
       public Builder removeAvatarTeamMap(
@@ -917,7 +1025,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return internalGetMutableAvatarTeamMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       public Builder putAvatarTeamMap(
           int key,
@@ -929,7 +1037,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
 
       public Builder putAllAvatarTeamMap(
@@ -939,11 +1047,42 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return this;
       }
 
+      private int curAvatarTeamId_ ;
+      /**
+       * <code>uint32 cur_avatar_team_id = 10;</code>
+       * @return The curAvatarTeamId.
+       */
+      @java.lang.Override
+      public int getCurAvatarTeamId() {
+        return curAvatarTeamId_;
+      }
+      /**
+       * <code>uint32 cur_avatar_team_id = 10;</code>
+       * @param value The curAvatarTeamId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurAvatarTeamId(int value) {
+        
+        curAvatarTeamId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_avatar_team_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurAvatarTeamId() {
+        
+        curAvatarTeamId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_ = emptyIntList();
       private void ensureBackupAvatarTeamOrderListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           backupAvatarTeamOrderList_ = mutableCopy(backupAvatarTeamOrderList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000004;
          }
       }
       /**
@@ -952,7 +1091,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        */
       public java.util.List<java.lang.Integer>
           getBackupAvatarTeamOrderListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000004) != 0) ?
                  java.util.Collections.unmodifiableList(backupAvatarTeamOrderList_) : backupAvatarTeamOrderList_;
       }
       /**
@@ -1013,85 +1152,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        */
       public Builder clearBackupAvatarTeamOrderList() {
         backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.LongList tempAvatarGuidList_ = emptyLongList();
-      private void ensureTempAvatarGuidListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          tempAvatarGuidList_ = mutableCopy(tempAvatarGuidList_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-       * @return A list containing the tempAvatarGuidList.
-       */
-      public java.util.List<java.lang.Long>
-          getTempAvatarGuidListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-       * @return The count of tempAvatarGuidList.
-       */
-      public int getTempAvatarGuidListCount() {
-        return tempAvatarGuidList_.size();
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-       * @param index The index of the element to return.
-       * @return The tempAvatarGuidList at the given index.
-       */
-      public long getTempAvatarGuidList(int index) {
-        return tempAvatarGuidList_.getLong(index);
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-       * @param index The index to set the value at.
-       * @param value The tempAvatarGuidList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTempAvatarGuidList(
-          int index, long value) {
-        ensureTempAvatarGuidListIsMutable();
-        tempAvatarGuidList_.setLong(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-       * @param value The tempAvatarGuidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addTempAvatarGuidList(long value) {
-        ensureTempAvatarGuidListIsMutable();
-        tempAvatarGuidList_.addLong(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-       * @param values The tempAvatarGuidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllTempAvatarGuidList(
-          java.lang.Iterable<? extends java.lang.Long> values) {
-        ensureTempAvatarGuidListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, tempAvatarGuidList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTempAvatarGuidList() {
-        tempAvatarGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -1169,14 +1229,14 @@ public final class AvatarTeamAllDataNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarTeamAllDataNotify.proto\032\020AvatarT" +
-      "eam.proto\"\350\001\n\027AvatarTeamAllDataNotify\022D\n" +
+      "eam.proto\"\204\002\n\027AvatarTeamAllDataNotify\022\035\n" +
-      "\017avatar_team_map\030\002 \003(\0132+.AvatarTeamAllDa" +
+      "\025temp_avatar_guid_list\030\003 \003(\004\022D\n\017avatar_t" +
-      "taNotify.AvatarTeamMapEntry\022%\n\035backup_av" +
+      "eam_map\030\007 \003(\0132+.AvatarTeamAllDataNotify." +
-      "atar_team_order_list\030\r \003(\r\022\035\n\025temp_avata" +
+      "AvatarTeamMapEntry\022\032\n\022cur_avatar_team_id" +
-      "r_guid_list\030\010 \003(\004\032A\n\022AvatarTeamMapEntry\022" +
+      "\030\n \001(\r\022%\n\035backup_avatar_team_order_list\030" +
-      "\013\n\003key\030\001 \001(\r\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam" +
+      "\r \003(\r\032A\n\022AvatarTeamMapEntry\022\013\n\003key\030\001 \001(\r" +
-      ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" +
+      "\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam:\0028\001B\033\n\031emu." +
-      "3"
+      "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1188,7 +1248,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     internal_static_AvatarTeamAllDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarTeamAllDataNotify_descriptor,
-        new java.lang.String[] { "AvatarTeamMap", "BackupAvatarTeamOrderList", "TempAvatarGuidList", });
+        new java.lang.String[] { "TempAvatarGuidList", "AvatarTeamMap", "CurAvatarTeamId", "BackupAvatarTeamOrderList", });
     internal_static_AvatarTeamAllDataNotify_AvatarTeamMapEntry_descriptor =
       internal_static_AvatarTeamAllDataNotify_descriptor.getNestedTypes().get(0);
     internal_static_AvatarTeamAllDataNotify_AvatarTeamMapEntry_fieldAccessorTable = new

src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamOuterClass.java

@@ -19,39 +19,35 @@ public final class AvatarTeamOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The teamName.
      */
     java.lang.String getTeamName();
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The bytes for teamName.
      */
     com.google.protobuf.ByteString
         getTeamNameBytes();
 
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return A list containing the avatarGuidList.
      */
     java.util.List<java.lang.Long> getAvatarGuidListList();
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return The count of avatarGuidList.
      */
     int getAvatarGuidListCount();
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The avatarGuidList at the given index.
      */
     long getAvatarGuidList(int index);
   }
   /**
-   * <pre>
-   * Obf: CFFANBDNDEG
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeam}
    */
   public static final class AvatarTeam extends
@@ -99,13 +95,13 @@ public final class AvatarTeamOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 42: {
               java.lang.String s = input.readStringRequireUtf8();
 
               teamName_ = s;
               break;
             }
-            case 32: {
+            case 80: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,7 +109,7 @@ public final class AvatarTeamOuterClass {
               avatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 34: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -161,10 +157,10 @@ public final class AvatarTeamOuterClass {
               emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.class, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.Builder.class);
     }
 
-    public static final int TEAM_NAME_FIELD_NUMBER = 1;
+    public static final int TEAM_NAME_FIELD_NUMBER = 5;
     private volatile java.lang.Object teamName_;
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The teamName.
      */
     @java.lang.Override
@@ -181,7 +177,7 @@ public final class AvatarTeamOuterClass {
       }
     }
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The bytes for teamName.
      */
     @java.lang.Override
@@ -199,10 +195,10 @@ public final class AvatarTeamOuterClass {
       }
     }
 
-    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.LongList avatarGuidList_;
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return A list containing the avatarGuidList.
      */
     @java.lang.Override
@@ -211,14 +207,14 @@ public final class AvatarTeamOuterClass {
       return avatarGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return The count of avatarGuidList.
      */
     public int getAvatarGuidListCount() {
       return avatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The avatarGuidList at the given index.
      */
@@ -243,10 +239,10 @@ public final class AvatarTeamOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, teamName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, teamName_);
       }
       if (getAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarGuidList_.size(); i++) {
@@ -262,7 +258,7 @@ public final class AvatarTeamOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, teamName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, teamName_);
       }
       {
         int dataSize = 0;
@@ -410,10 +406,6 @@ public final class AvatarTeamOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CFFANBDNDEG
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeam}
      */
     public static final class Builder extends
@@ -582,7 +574,7 @@ public final class AvatarTeamOuterClass {
 
       private java.lang.Object teamName_ = "";
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @return The teamName.
        */
       public java.lang.String getTeamName() {
@@ -598,7 +590,7 @@ public final class AvatarTeamOuterClass {
         }
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @return The bytes for teamName.
        */
       public com.google.protobuf.ByteString
@@ -615,7 +607,7 @@ public final class AvatarTeamOuterClass {
         }
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @param value The teamName to set.
        * @return This builder for chaining.
        */
@@ -630,7 +622,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamName() {
@@ -640,7 +632,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @param value The bytes for teamName to set.
        * @return This builder for chaining.
        */
@@ -664,7 +656,7 @@ public final class AvatarTeamOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @return A list containing the avatarGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -673,14 +665,14 @@ public final class AvatarTeamOuterClass {
                  java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @return The count of avatarGuidList.
        */
       public int getAvatarGuidListCount() {
         return avatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param index The index of the element to return.
        * @return The avatarGuidList at the given index.
        */
@@ -688,7 +680,7 @@ public final class AvatarTeamOuterClass {
         return avatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The avatarGuidList to set.
        * @return This builder for chaining.
@@ -701,7 +693,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param value The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -712,7 +704,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param values The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -725,7 +717,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuidList() {
@@ -802,7 +794,7 @@ public final class AvatarTeamOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020AvatarTeam.proto\"9\n\nAvatarTeam\022\021\n\tteam" +
-      "_name\030\001 \001(\t\022\030\n\020avatar_guid_list\030\004 \003(\004B\033\n" +
+      "_name\030\005 \001(\t\022\030\n\020avatar_guid_list\030\n \003(\004B\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamResonanceInfoOuterClass.java

@@ -19,56 +19,52 @@ public final class AvatarTeamResonanceInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 7;</code>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-     * @return A list containing the aPADELCPLGE.
+     * @return A list containing the aJMOCMHLEOI.
      */
-    java.util.List<java.lang.Integer> getAPADELCPLGEList();
+    java.util.List<java.lang.Integer> getAJMOCMHLEOIList();
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-     * @return The count of aPADELCPLGE.
+     * @return The count of aJMOCMHLEOI.
      */
-    int getAPADELCPLGECount();
+    int getAJMOCMHLEOICount();
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
      * @param index The index of the element to return.
-     * @return The aPADELCPLGE at the given index.
+     * @return The aJMOCMHLEOI at the given index.
      */
-    int getAPADELCPLGE(int index);
+    int getAJMOCMHLEOI(int index);
 
     /**
-     * <code>uint64 avatar_guid = 6;</code>
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return A list containing the dGAGDLKNFFP.
+     */
+    java.util.List<java.lang.Integer> getDGAGDLKNFFPList();
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return The count of dGAGDLKNFFP.
+     */
+    int getDGAGDLKNFFPCount();
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @param index The index of the element to return.
+     * @return The dGAGDLKNFFP at the given index.
+     */
+    int getDGAGDLKNFFP(int index);
+
+    /**
+     * <code>uint64 avatar_guid = 15;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
-
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return A list containing the gFJMLEAFNBM.
-     */
-    java.util.List<java.lang.Integer> getGFJMLEAFNBMList();
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return The count of gFJMLEAFNBM.
-     */
-    int getGFJMLEAFNBMCount();
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @param index The index of the element to return.
-     * @return The gFJMLEAFNBM at the given index.
-     */
-    int getGFJMLEAFNBM(int index);
   }
   /**
-   * <pre>
-   * Obf: COBALHBKFBJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeamResonanceInfo}
    */
   public static final class AvatarTeamResonanceInfo extends
@@ -81,8 +77,8 @@ public final class AvatarTeamResonanceInfoOuterClass {
       super(builder);
     }
     private AvatarTeamResonanceInfo() {
-      aPADELCPLGE_ = emptyIntList();
+      aJMOCMHLEOI_ = emptyIntList();
-      gFJMLEAFNBM_ = emptyIntList();
+      dGAGDLKNFFP_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -117,57 +113,57 @@ public final class AvatarTeamResonanceInfoOuterClass {
               done = true;
               break;
             case 8: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                aPADELCPLGE_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              aPADELCPLGE_.addInt(input.readUInt32());
-              break;
-            }
-            case 10: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                aPADELCPLGE_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                aPADELCPLGE_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 48: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 56: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 56: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                gFJMLEAFNBM_ = newIntList();
+                aJMOCMHLEOI_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
-              gFJMLEAFNBM_.addInt(input.readUInt32());
+              aJMOCMHLEOI_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 58: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                aJMOCMHLEOI_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                aJMOCMHLEOI_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                dGAGDLKNFFP_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              dGAGDLKNFFP_.addInt(input.readUInt32());
+              break;
+            }
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                gFJMLEAFNBM_ = newIntList();
+                dGAGDLKNFFP_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                gFJMLEAFNBM_.addInt(input.readUInt32());
+                dGAGDLKNFFP_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
+            case 120: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -184,10 +180,10 @@ public final class AvatarTeamResonanceInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          aPADELCPLGE_.makeImmutable(); // C
+          aJMOCMHLEOI_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          gFJMLEAFNBM_.makeImmutable(); // C
+          dGAGDLKNFFP_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -206,10 +202,10 @@ public final class AvatarTeamResonanceInfoOuterClass {
               emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.class, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 7;
+    public static final int ENTITY_ID_FIELD_NUMBER = 1;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 7;</code>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -217,38 +213,66 @@ public final class AvatarTeamResonanceInfoOuterClass {
       return entityId_;
     }
 
-    public static final int APADELCPLGE_FIELD_NUMBER = 1;
+    public static final int AJMOCMHLEOI_FIELD_NUMBER = 7;
-    private com.google.protobuf.Internal.IntList aPADELCPLGE_;
+    private com.google.protobuf.Internal.IntList aJMOCMHLEOI_;
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-     * @return A list containing the aPADELCPLGE.
+     * @return A list containing the aJMOCMHLEOI.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getAPADELCPLGEList() {
+        getAJMOCMHLEOIList() {
-      return aPADELCPLGE_;
+      return aJMOCMHLEOI_;
     }
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-     * @return The count of aPADELCPLGE.
+     * @return The count of aJMOCMHLEOI.
      */
-    public int getAPADELCPLGECount() {
+    public int getAJMOCMHLEOICount() {
-      return aPADELCPLGE_.size();
+      return aJMOCMHLEOI_.size();
     }
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
      * @param index The index of the element to return.
-     * @return The aPADELCPLGE at the given index.
+     * @return The aJMOCMHLEOI at the given index.
      */
-    public int getAPADELCPLGE(int index) {
+    public int getAJMOCMHLEOI(int index) {
-      return aPADELCPLGE_.getInt(index);
+      return aJMOCMHLEOI_.getInt(index);
     }
-    private int aPADELCPLGEMemoizedSerializedSize = -1;
+    private int aJMOCMHLEOIMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
+    public static final int DGAGDLKNFFP_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.IntList dGAGDLKNFFP_;
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return A list containing the dGAGDLKNFFP.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getDGAGDLKNFFPList() {
+      return dGAGDLKNFFP_;
+    }
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return The count of dGAGDLKNFFP.
+     */
+    public int getDGAGDLKNFFPCount() {
+      return dGAGDLKNFFP_.size();
+    }
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @param index The index of the element to return.
+     * @return The dGAGDLKNFFP at the given index.
+     */
+    public int getDGAGDLKNFFP(int index) {
+      return dGAGDLKNFFP_.getInt(index);
+    }
+    private int dGAGDLKNFFPMemoizedSerializedSize = -1;
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 15;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 6;</code>
+     * <code>uint64 avatar_guid = 15;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -256,34 +280,6 @@ public final class AvatarTeamResonanceInfoOuterClass {
       return avatarGuid_;
     }
 
-    public static final int GFJMLEAFNBM_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList gFJMLEAFNBM_;
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return A list containing the gFJMLEAFNBM.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getGFJMLEAFNBMList() {
-      return gFJMLEAFNBM_;
-    }
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return The count of gFJMLEAFNBM.
-     */
-    public int getGFJMLEAFNBMCount() {
-      return gFJMLEAFNBM_.size();
-    }
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @param index The index of the element to return.
-     * @return The gFJMLEAFNBM at the given index.
-     */
-    public int getGFJMLEAFNBM(int index) {
-      return gFJMLEAFNBM_.getInt(index);
-    }
-    private int gFJMLEAFNBMMemoizedSerializedSize = -1;
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -299,25 +295,25 @@ public final class AvatarTeamResonanceInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getAPADELCPLGEList().size() > 0) {
+      if (entityId_ != 0) {
-        output.writeUInt32NoTag(10);
+        output.writeUInt32(1, entityId_);
-        output.writeUInt32NoTag(aPADELCPLGEMemoizedSerializedSize);
       }
-      for (int i = 0; i < aPADELCPLGE_.size(); i++) {
+      if (getAJMOCMHLEOIList().size() > 0) {
-        output.writeUInt32NoTag(aPADELCPLGE_.getInt(i));
+        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(aJMOCMHLEOIMemoizedSerializedSize);
+      }
+      for (int i = 0; i < aJMOCMHLEOI_.size(); i++) {
+        output.writeUInt32NoTag(aJMOCMHLEOI_.getInt(i));
+      }
+      if (getDGAGDLKNFFPList().size() > 0) {
+        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(dGAGDLKNFFPMemoizedSerializedSize);
+      }
+      for (int i = 0; i < dGAGDLKNFFP_.size(); i++) {
+        output.writeUInt32NoTag(dGAGDLKNFFP_.getInt(i));
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(6, avatarGuid_);
+        output.writeUInt64(15, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(7, entityId_);
-      }
-      if (getGFJMLEAFNBMList().size() > 0) {
-        output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(gFJMLEAFNBMMemoizedSerializedSize);
-      }
-      for (int i = 0; i < gFJMLEAFNBM_.size(); i++) {
-        output.writeUInt32NoTag(gFJMLEAFNBM_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -328,41 +324,41 @@ public final class AvatarTeamResonanceInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, entityId_);
+      }
       {
         int dataSize = 0;
-        for (int i = 0; i < aPADELCPLGE_.size(); i++) {
+        for (int i = 0; i < aJMOCMHLEOI_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(aPADELCPLGE_.getInt(i));
+            .computeUInt32SizeNoTag(aJMOCMHLEOI_.getInt(i));
         }
         size += dataSize;
-        if (!getAPADELCPLGEList().isEmpty()) {
+        if (!getAJMOCMHLEOIList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        aPADELCPLGEMemoizedSerializedSize = dataSize;
+        aJMOCMHLEOIMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < dGAGDLKNFFP_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dGAGDLKNFFP_.getInt(i));
+        }
+        size += dataSize;
+        if (!getDGAGDLKNFFPList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        dGAGDLKNFFPMemoizedSerializedSize = dataSize;
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, avatarGuid_);
+          .computeUInt64Size(15, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, entityId_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < gFJMLEAFNBM_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(gFJMLEAFNBM_.getInt(i));
-        }
-        size += dataSize;
-        if (!getGFJMLEAFNBMList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        gFJMLEAFNBMMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -381,12 +377,12 @@ public final class AvatarTeamResonanceInfoOuterClass {
 
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (!getAPADELCPLGEList()
+      if (!getAJMOCMHLEOIList()
-          .equals(other.getAPADELCPLGEList())) return false;
+          .equals(other.getAJMOCMHLEOIList())) return false;
+      if (!getDGAGDLKNFFPList()
+          .equals(other.getDGAGDLKNFFPList())) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (!getGFJMLEAFNBMList()
-          .equals(other.getGFJMLEAFNBMList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -400,17 +396,17 @@ public final class AvatarTeamResonanceInfoOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      if (getAPADELCPLGECount() > 0) {
+      if (getAJMOCMHLEOICount() > 0) {
-        hash = (37 * hash) + APADELCPLGE_FIELD_NUMBER;
+        hash = (37 * hash) + AJMOCMHLEOI_FIELD_NUMBER;
-        hash = (53 * hash) + getAPADELCPLGEList().hashCode();
+        hash = (53 * hash) + getAJMOCMHLEOIList().hashCode();
+      }
+      if (getDGAGDLKNFFPCount() > 0) {
+        hash = (37 * hash) + DGAGDLKNFFP_FIELD_NUMBER;
+        hash = (53 * hash) + getDGAGDLKNFFPList().hashCode();
       }
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      if (getGFJMLEAFNBMCount() > 0) {
-        hash = (37 * hash) + GFJMLEAFNBM_FIELD_NUMBER;
-        hash = (53 * hash) + getGFJMLEAFNBMList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -507,10 +503,6 @@ public final class AvatarTeamResonanceInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: COBALHBKFBJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeamResonanceInfo}
      */
     public static final class Builder extends
@@ -550,12 +542,12 @@ public final class AvatarTeamResonanceInfoOuterClass {
         super.clear();
         entityId_ = 0;
 
-        aPADELCPLGE_ = emptyIntList();
+        aJMOCMHLEOI_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        dGAGDLKNFFP_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         avatarGuid_ = 0L;
 
-        gFJMLEAFNBM_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -585,16 +577,16 @@ public final class AvatarTeamResonanceInfoOuterClass {
         int from_bitField0_ = bitField0_;
         result.entityId_ = entityId_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          aPADELCPLGE_.makeImmutable();
+          aJMOCMHLEOI_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.aPADELCPLGE_ = aPADELCPLGE_;
+        result.aJMOCMHLEOI_ = aJMOCMHLEOI_;
-        result.avatarGuid_ = avatarGuid_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          gFJMLEAFNBM_.makeImmutable();
+          dGAGDLKNFFP_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.gFJMLEAFNBM_ = gFJMLEAFNBM_;
+        result.dGAGDLKNFFP_ = dGAGDLKNFFP_;
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -646,29 +638,29 @@ public final class AvatarTeamResonanceInfoOuterClass {
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (!other.aPADELCPLGE_.isEmpty()) {
+        if (!other.aJMOCMHLEOI_.isEmpty()) {
-          if (aPADELCPLGE_.isEmpty()) {
+          if (aJMOCMHLEOI_.isEmpty()) {
-            aPADELCPLGE_ = other.aPADELCPLGE_;
+            aJMOCMHLEOI_ = other.aJMOCMHLEOI_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureAPADELCPLGEIsMutable();
+            ensureAJMOCMHLEOIIsMutable();
-            aPADELCPLGE_.addAll(other.aPADELCPLGE_);
+            aJMOCMHLEOI_.addAll(other.aJMOCMHLEOI_);
+          }
+          onChanged();
+        }
+        if (!other.dGAGDLKNFFP_.isEmpty()) {
+          if (dGAGDLKNFFP_.isEmpty()) {
+            dGAGDLKNFFP_ = other.dGAGDLKNFFP_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureDGAGDLKNFFPIsMutable();
+            dGAGDLKNFFP_.addAll(other.dGAGDLKNFFP_);
           }
           onChanged();
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (!other.gFJMLEAFNBM_.isEmpty()) {
-          if (gFJMLEAFNBM_.isEmpty()) {
-            gFJMLEAFNBM_ = other.gFJMLEAFNBM_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureGFJMLEAFNBMIsMutable();
-            gFJMLEAFNBM_.addAll(other.gFJMLEAFNBM_);
-          }
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -701,7 +693,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 7;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -709,7 +701,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 7;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -720,7 +712,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 7;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -730,88 +722,167 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList aPADELCPLGE_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList aJMOCMHLEOI_ = emptyIntList();
-      private void ensureAPADELCPLGEIsMutable() {
+      private void ensureAJMOCMHLEOIIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          aPADELCPLGE_ = mutableCopy(aPADELCPLGE_);
+          aJMOCMHLEOI_ = mutableCopy(aJMOCMHLEOI_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-       * @return A list containing the aPADELCPLGE.
+       * @return A list containing the aJMOCMHLEOI.
        */
       public java.util.List<java.lang.Integer>
-          getAPADELCPLGEList() {
+          getAJMOCMHLEOIList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(aPADELCPLGE_) : aPADELCPLGE_;
+                 java.util.Collections.unmodifiableList(aJMOCMHLEOI_) : aJMOCMHLEOI_;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-       * @return The count of aPADELCPLGE.
+       * @return The count of aJMOCMHLEOI.
        */
-      public int getAPADELCPLGECount() {
+      public int getAJMOCMHLEOICount() {
-        return aPADELCPLGE_.size();
+        return aJMOCMHLEOI_.size();
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
        * @param index The index of the element to return.
-       * @return The aPADELCPLGE at the given index.
+       * @return The aJMOCMHLEOI at the given index.
        */
-      public int getAPADELCPLGE(int index) {
+      public int getAJMOCMHLEOI(int index) {
-        return aPADELCPLGE_.getInt(index);
+        return aJMOCMHLEOI_.getInt(index);
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
        * @param index The index to set the value at.
-       * @param value The aPADELCPLGE to set.
+       * @param value The aJMOCMHLEOI to set.
        * @return This builder for chaining.
        */
-      public Builder setAPADELCPLGE(
+      public Builder setAJMOCMHLEOI(
           int index, int value) {
-        ensureAPADELCPLGEIsMutable();
+        ensureAJMOCMHLEOIIsMutable();
-        aPADELCPLGE_.setInt(index, value);
+        aJMOCMHLEOI_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-       * @param value The aPADELCPLGE to add.
+       * @param value The aJMOCMHLEOI to add.
        * @return This builder for chaining.
        */
-      public Builder addAPADELCPLGE(int value) {
+      public Builder addAJMOCMHLEOI(int value) {
-        ensureAPADELCPLGEIsMutable();
+        ensureAJMOCMHLEOIIsMutable();
-        aPADELCPLGE_.addInt(value);
+        aJMOCMHLEOI_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
-       * @param values The aPADELCPLGE to add.
+       * @param values The aJMOCMHLEOI to add.
        * @return This builder for chaining.
        */
-      public Builder addAllAPADELCPLGE(
+      public Builder addAllAJMOCMHLEOI(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureAPADELCPLGEIsMutable();
+        ensureAJMOCMHLEOIIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, aPADELCPLGE_);
+            values, aJMOCMHLEOI_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAPADELCPLGE() {
+      public Builder clearAJMOCMHLEOI() {
-        aPADELCPLGE_ = emptyIntList();
+        aJMOCMHLEOI_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
+      private com.google.protobuf.Internal.IntList dGAGDLKNFFP_ = emptyIntList();
+      private void ensureDGAGDLKNFFPIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          dGAGDLKNFFP_ = mutableCopy(dGAGDLKNFFP_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @return A list containing the dGAGDLKNFFP.
+       */
+      public java.util.List<java.lang.Integer>
+          getDGAGDLKNFFPList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(dGAGDLKNFFP_) : dGAGDLKNFFP_;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @return The count of dGAGDLKNFFP.
+       */
+      public int getDGAGDLKNFFPCount() {
+        return dGAGDLKNFFP_.size();
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param index The index of the element to return.
+       * @return The dGAGDLKNFFP at the given index.
+       */
+      public int getDGAGDLKNFFP(int index) {
+        return dGAGDLKNFFP_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The dGAGDLKNFFP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDGAGDLKNFFP(
+          int index, int value) {
+        ensureDGAGDLKNFFPIsMutable();
+        dGAGDLKNFFP_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param value The dGAGDLKNFFP to add.
+       * @return This builder for chaining.
+       */
+      public Builder addDGAGDLKNFFP(int value) {
+        ensureDGAGDLKNFFPIsMutable();
+        dGAGDLKNFFP_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param values The dGAGDLKNFFP to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllDGAGDLKNFFP(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureDGAGDLKNFFPIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, dGAGDLKNFFP_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDGAGDLKNFFP() {
+        dGAGDLKNFFP_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -819,7 +890,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -830,7 +901,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -839,85 +910,6 @@ public final class AvatarTeamResonanceInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.IntList gFJMLEAFNBM_ = emptyIntList();
-      private void ensureGFJMLEAFNBMIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          gFJMLEAFNBM_ = mutableCopy(gFJMLEAFNBM_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @return A list containing the gFJMLEAFNBM.
-       */
-      public java.util.List<java.lang.Integer>
-          getGFJMLEAFNBMList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(gFJMLEAFNBM_) : gFJMLEAFNBM_;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @return The count of gFJMLEAFNBM.
-       */
-      public int getGFJMLEAFNBMCount() {
-        return gFJMLEAFNBM_.size();
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param index The index of the element to return.
-       * @return The gFJMLEAFNBM at the given index.
-       */
-      public int getGFJMLEAFNBM(int index) {
-        return gFJMLEAFNBM_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param index The index to set the value at.
-       * @param value The gFJMLEAFNBM to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGFJMLEAFNBM(
-          int index, int value) {
-        ensureGFJMLEAFNBMIsMutable();
-        gFJMLEAFNBM_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param value The gFJMLEAFNBM to add.
-       * @return This builder for chaining.
-       */
-      public Builder addGFJMLEAFNBM(int value) {
-        ensureGFJMLEAFNBMIsMutable();
-        gFJMLEAFNBM_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param values The gFJMLEAFNBM to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllGFJMLEAFNBM(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureGFJMLEAFNBMIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, gFJMLEAFNBM_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGFJMLEAFNBM() {
-        gFJMLEAFNBM_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -986,9 +978,9 @@ public final class AvatarTeamResonanceInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarTeamResonanceInfo.proto\"k\n\027Avata" +
-      "rTeamResonanceInfo\022\021\n\tentity_id\030\007 \001(\r\022\023\n" +
+      "rTeamResonanceInfo\022\021\n\tentity_id\030\001 \001(\r\022\023\n" +
-      "\013APADELCPLGE\030\001 \003(\r\022\023\n\013avatar_guid\030\006 \001(\004\022" +
+      "\013AJMOCMHLEOI\030\007 \003(\r\022\023\n\013DGAGDLKNFFP\030\013 \003(\r\022" +
-      "\023\n\013GFJMLEAFNBM\030\016 \003(\rB\033\n\031emu.grasscutter." +
+      "\023\n\013avatar_guid\030\017 \001(\004B\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1000,7 +992,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
     internal_static_AvatarTeamResonanceInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarTeamResonanceInfo_descriptor,
-        new java.lang.String[] { "EntityId", "APADELCPLGE", "AvatarGuid", "GFJMLEAFNBM", });
+        new java.lang.String[] { "EntityId", "AJMOCMHLEOI", "DGAGDLKNFFP", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java

@@ -19,28 +19,28 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     java.util.List<java.lang.Long> getTempAvatarGuidListList();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return The count of tempAvatarGuidList.
      */
     int getTempAvatarGuidListCount();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The tempAvatarGuidList at the given index.
      */
     long getTempAvatarGuidList(int index);
 
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     int getAvatarTeamMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     boolean containsAvatarTeamMap(
         int key);
@@ -51,30 +51,25 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrDefault(
         int key,
         emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam defaultValue);
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 7828
-   * Obf: OLBHAPJCKDM
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeamUpdateNotify}
    */
   public static final class AvatarTeamUpdateNotify extends
@@ -121,20 +116,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 80: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
-                    AvatarTeamMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
-              avatarTeamMap__ = input.readMessage(
-                  AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              avatarTeamMap_.getMutableMap().put(
-                  avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
-              break;
-            }
-            case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 tempAvatarGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -142,7 +124,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
               tempAvatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 114: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -155,6 +137,19 @@ public final class AvatarTeamUpdateNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 98: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
+                    AvatarTeamMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
+              avatarTeamMap__ = input.readMessage(
+                  AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              avatarTeamMap_.getMutableMap().put(
+                  avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -187,7 +182,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 3:
+        case 12:
           return internalGetAvatarTeamMap();
         default:
           throw new RuntimeException(
@@ -202,10 +197,10 @@ public final class AvatarTeamUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.class, emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.Builder.class);
     }
 
-    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 14;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     @java.lang.Override
@@ -214,14 +209,14 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return tempAvatarGuidList_;
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return The count of tempAvatarGuidList.
      */
     public int getTempAvatarGuidListCount() {
       return tempAvatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The tempAvatarGuidList at the given index.
      */
@@ -230,7 +225,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     }
     private int tempAvatarGuidListMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 3;
+    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 12;
     private static final class AvatarTeamMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -257,7 +252,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
 
     @java.lang.Override
@@ -275,7 +270,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return getAvatarTeamMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     @java.lang.Override
 
@@ -283,7 +278,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     @java.lang.Override
 
@@ -296,7 +291,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     @java.lang.Override
 
@@ -326,19 +321,19 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetAvatarTeamMap(),
-          AvatarTeamMapDefaultEntryHolder.defaultEntry,
-          3);
       if (getTempAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
         output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
       }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetAvatarTeamMap(),
+          AvatarTeamMapDefaultEntryHolder.defaultEntry,
+          12);
       unknownFields.writeTo(output);
     }
 
@@ -348,16 +343,6 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
-           : internalGetAvatarTeamMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
-        avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(3, avatarTeamMap__);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -372,6 +357,16 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         }
         tempAvatarGuidListMemoizedSerializedSize = dataSize;
       }
+      for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
+           : internalGetAvatarTeamMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
+        avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(12, avatarTeamMap__);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -506,11 +501,6 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7828
-     * Obf: OLBHAPJCKDM
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeamUpdateNotify}
      */
     public static final class Builder extends
@@ -526,7 +516,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 12:
             return internalGetAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -537,7 +527,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 12:
             return internalGetMutableAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -705,7 +695,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @return A list containing the tempAvatarGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -714,14 +704,14 @@ public final class AvatarTeamUpdateNotifyOuterClass {
                  java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @return The count of tempAvatarGuidList.
        */
       public int getTempAvatarGuidListCount() {
         return tempAvatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param index The index of the element to return.
        * @return The tempAvatarGuidList at the given index.
        */
@@ -729,7 +719,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return tempAvatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The tempAvatarGuidList to set.
        * @return This builder for chaining.
@@ -742,7 +732,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param value The tempAvatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -753,7 +743,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param values The tempAvatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -766,7 +756,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTempAvatarGuidList() {
@@ -803,7 +793,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
 
       @java.lang.Override
@@ -821,7 +811,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return getAvatarTeamMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       @java.lang.Override
 
@@ -829,7 +819,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       @java.lang.Override
 
@@ -842,7 +832,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       @java.lang.Override
 
@@ -863,7 +853,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
 
       public Builder removeAvatarTeamMap(
@@ -882,7 +872,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return internalGetMutableAvatarTeamMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       public Builder putAvatarTeamMap(
           int key,
@@ -894,7 +884,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
 
       public Builder putAllAvatarTeamMap(
@@ -977,8 +967,8 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AvatarTeamUpdateNotify.proto\032\020AvatarTe" +
       "am.proto\"\277\001\n\026AvatarTeamUpdateNotify\022\035\n\025t" +
-      "emp_avatar_guid_list\030\016 \003(\004\022C\n\017avatar_tea" +
+      "emp_avatar_guid_list\030\n \003(\004\022C\n\017avatar_tea" +
-      "m_map\030\003 \003(\0132*.AvatarTeamUpdateNotify.Ava" +
+      "m_map\030\014 \003(\0132*.AvatarTeamUpdateNotify.Ava" +
       "tarTeamMapEntry\032A\n\022AvatarTeamMapEntry\022\013\n" +
       "\003key\030\001 \001(\r\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam:\002" +
       "8\001B\033\n\031emu.grasscutter.net.protob\006proto3"

src/generated/main/java/emu/grasscutter/net/proto/AvatarTypeOuterClass.java

@@ -15,10 +15,6 @@ public final class AvatarTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: OPLFNKHAOBP
-   * </pre>
-   *
    * Protobuf enum {@code AvatarType}
    */
   public enum AvatarType

src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java

@@ -19,35 +19,30 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 talent_id = 3;</code>
+     * <code>uint32 skill_depot_id = 1;</code>
-     * @return The talentId.
-     */
-    int getTalentId();
-
-    /**
-     * <code>uint64 avatar_guid = 9;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 skill_depot_id = 8;</code>
      * @return The skillDepotId.
      */
     int getSkillDepotId();
 
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint64 avatar_guid = 8;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint32 entity_id = 10;</code>
      * @return The entityId.
      */
     int getEntityId();
+
+    /**
+     * <code>uint32 talent_id = 14;</code>
+     * @return The talentId.
+     */
+    int getTalentId();
   }
   /**
-   * <pre>
-   * CmdId: 1805
-   * Obf: KNLJFLHONOK
-   * </pre>
-   *
    * Protobuf type {@code AvatarUnlockTalentNotify}
    */
   public static final class AvatarUnlockTalentNotify extends
@@ -94,22 +89,22 @@ public final class AvatarUnlockTalentNotifyOuterClass {
               break;
             case 8: {
 
-              entityId_ = input.readUInt32();
+              skillDepotId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-
-              talentId_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              skillDepotId_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 72: {
+            case 80: {
 
-              avatarGuid_ = input.readUInt64();
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              talentId_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,32 +139,10 @@ public final class AvatarUnlockTalentNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.class, emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.Builder.class);
     }
 
-    public static final int TALENT_ID_FIELD_NUMBER = 3;
+    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 1;
-    private int talentId_;
-    /**
-     * <code>uint32 talent_id = 3;</code>
-     * @return The talentId.
-     */
-    @java.lang.Override
-    public int getTalentId() {
-      return talentId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 9;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 8;
     private int skillDepotId_;
     /**
-     * <code>uint32 skill_depot_id = 8;</code>
+     * <code>uint32 skill_depot_id = 1;</code>
      * @return The skillDepotId.
      */
     @java.lang.Override
@@ -177,10 +150,21 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       return skillDepotId_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 1;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 8;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 8;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 10;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint32 entity_id = 10;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -188,6 +172,17 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       return entityId_;
     }
 
+    public static final int TALENT_ID_FIELD_NUMBER = 14;
+    private int talentId_;
+    /**
+     * <code>uint32 talent_id = 14;</code>
+     * @return The talentId.
+     */
+    @java.lang.Override
+    public int getTalentId() {
+      return talentId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,17 +197,17 @@ public final class AvatarUnlockTalentNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (entityId_ != 0) {
-        output.writeUInt32(1, entityId_);
-      }
-      if (talentId_ != 0) {
-        output.writeUInt32(3, talentId_);
-      }
       if (skillDepotId_ != 0) {
-        output.writeUInt32(8, skillDepotId_);
+        output.writeUInt32(1, skillDepotId_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
+        output.writeUInt64(8, avatarGuid_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(10, entityId_);
+      }
+      if (talentId_ != 0) {
+        output.writeUInt32(14, talentId_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +218,21 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, entityId_);
-      }
-      if (talentId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, talentId_);
-      }
       if (skillDepotId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, skillDepotId_);
+          .computeUInt32Size(1, skillDepotId_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
+          .computeUInt64Size(8, avatarGuid_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, entityId_);
+      }
+      if (talentId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, talentId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,14 +249,14 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify other = (emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify) obj;
 
-      if (getTalentId()
-          != other.getTalentId()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getSkillDepotId()
           != other.getSkillDepotId()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (getTalentId()
+          != other.getTalentId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -273,15 +268,15 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TALENT_ID_FIELD_NUMBER;
+      hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTalentId();
+      hash = (53 * hash) + getSkillDepotId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillDepotId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + TALENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTalentId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +373,6 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1805
-     * Obf: KNLJFLHONOK
-     * </pre>
-     *
      * Protobuf type {@code AvatarUnlockTalentNotify}
      */
     public static final class Builder extends
@@ -420,14 +410,14 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        talentId_ = 0;
+        skillDepotId_ = 0;
 
         avatarGuid_ = 0L;
 
-        skillDepotId_ = 0;
-
         entityId_ = 0;
 
+        talentId_ = 0;
+
         return this;
       }
 
@@ -454,10 +444,10 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify result = new emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify(this);
-        result.talentId_ = talentId_;
-        result.avatarGuid_ = avatarGuid_;
         result.skillDepotId_ = skillDepotId_;
+        result.avatarGuid_ = avatarGuid_;
         result.entityId_ = entityId_;
+        result.talentId_ = talentId_;
         onBuilt();
         return result;
       }
@@ -506,18 +496,18 @@ public final class AvatarUnlockTalentNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.getDefaultInstance()) return this;
-        if (other.getTalentId() != 0) {
+        if (other.getSkillDepotId() != 0) {
-          setTalentId(other.getTalentId());
+          setSkillDepotId(other.getSkillDepotId());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getSkillDepotId() != 0) {
-          setSkillDepotId(other.getSkillDepotId());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.getTalentId() != 0) {
+          setTalentId(other.getTalentId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,71 +537,9 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
 
-      private int talentId_ ;
-      /**
-       * <code>uint32 talent_id = 3;</code>
-       * @return The talentId.
-       */
-      @java.lang.Override
-      public int getTalentId() {
-        return talentId_;
-      }
-      /**
-       * <code>uint32 talent_id = 3;</code>
-       * @param value The talentId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTalentId(int value) {
-        
-        talentId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 talent_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTalentId() {
-        
-        talentId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 9;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 9;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int skillDepotId_ ;
       /**
-       * <code>uint32 skill_depot_id = 8;</code>
+       * <code>uint32 skill_depot_id = 1;</code>
        * @return The skillDepotId.
        */
       @java.lang.Override
@@ -619,7 +547,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return skillDepotId_;
       }
       /**
-       * <code>uint32 skill_depot_id = 8;</code>
+       * <code>uint32 skill_depot_id = 1;</code>
        * @param value The skillDepotId to set.
        * @return This builder for chaining.
        */
@@ -630,7 +558,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_depot_id = 8;</code>
+       * <code>uint32 skill_depot_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillDepotId() {
@@ -640,9 +568,40 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
 
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 8;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 8;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 avatar_guid = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 1;</code>
+       * <code>uint32 entity_id = 10;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -650,7 +609,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 1;</code>
+       * <code>uint32 entity_id = 10;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -661,7 +620,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 1;</code>
+       * <code>uint32 entity_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -670,6 +629,37 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int talentId_ ;
+      /**
+       * <code>uint32 talent_id = 14;</code>
+       * @return The talentId.
+       */
+      @java.lang.Override
+      public int getTalentId() {
+        return talentId_;
+      }
+      /**
+       * <code>uint32 talent_id = 14;</code>
+       * @param value The talentId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTalentId(int value) {
+        
+        talentId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 talent_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTalentId() {
+        
+        talentId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -738,9 +728,9 @@ public final class AvatarUnlockTalentNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarUnlockTalentNotify.proto\"m\n\030Avat" +
-      "arUnlockTalentNotify\022\021\n\ttalent_id\030\003 \001(\r\022" +
+      "arUnlockTalentNotify\022\026\n\016skill_depot_id\030\001" +
-      "\023\n\013avatar_guid\030\t \001(\004\022\026\n\016skill_depot_id\030\010" +
+      " \001(\r\022\023\n\013avatar_guid\030\010 \001(\004\022\021\n\tentity_id\030\n" +
-      " \001(\r\022\021\n\tentity_id\030\001 \001(\rB\033\n\031emu.grasscutt" +
+      " \001(\r\022\021\n\ttalent_id\030\016 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +742,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
     internal_static_AvatarUnlockTalentNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarUnlockTalentNotify_descriptor,
-        new java.lang.String[] { "TalentId", "AvatarGuid", "SkillDepotId", "EntityId", });
+        new java.lang.String[] { "SkillDepotId", "AvatarGuid", "EntityId", "TalentId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java

@@ -19,27 +19,38 @@ public final class AvatarUpgradeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 item_id = 5;</code>
+     * <code>repeated .ItemParam item_param_list = 13;</code>
-     * @return The itemId.
      */
-    int getItemId();
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getItemParamListList();
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index);
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    int getItemParamListCount();
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getItemParamListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+        int index);
 
     /**
-     * <code>uint64 avatar_guid = 10;</code>
+     * <code>uint64 avatar_guid = 9;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
-
-    /**
-     * <code>uint32 count = 1;</code>
-     * @return The count.
-     */
-    int getCount();
   }
   /**
    * <pre>
-   * CmdId: 28204
+   * CmdId: 1568
-   * Obf: CFIFEHLBHPM
    * </pre>
    *
    * Protobuf type {@code AvatarUpgradeReq}
@@ -54,6 +65,7 @@ public final class AvatarUpgradeReqOuterClass {
       super(builder);
     }
     private AvatarUpgradeReq() {
+      itemParamList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -76,6 +88,7 @@ public final class AvatarUpgradeReqOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
+      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -86,21 +99,20 @@ public final class AvatarUpgradeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 72: {
-
-              count_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-
-              itemId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 106: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              itemParamList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -116,6 +128,9 @@ public final class AvatarUpgradeReqOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -133,21 +148,50 @@ public final class AvatarUpgradeReqOuterClass {
               emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.class, emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.Builder.class);
     }
 
-    public static final int ITEM_ID_FIELD_NUMBER = 5;
+    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 13;
-    private int itemId_;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
     /**
-     * <code>uint32 item_id = 5;</code>
+     * <code>repeated .ItemParam item_param_list = 13;</code>
-     * @return The itemId.
      */
     @java.lang.Override
-    public int getItemId() {
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
-      return itemId_;
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getItemParamListOrBuilderList() {
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public int getItemParamListCount() {
+      return itemParamList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+      return itemParamList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+        int index) {
+      return itemParamList_.get(index);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 10;</code>
+     * <code>uint64 avatar_guid = 9;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -155,17 +199,6 @@ public final class AvatarUpgradeReqOuterClass {
       return avatarGuid_;
     }
 
-    public static final int COUNT_FIELD_NUMBER = 1;
-    private int count_;
-    /**
-     * <code>uint32 count = 1;</code>
-     * @return The count.
-     */
-    @java.lang.Override
-    public int getCount() {
-      return count_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +213,11 @@ public final class AvatarUpgradeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (count_ != 0) {
-        output.writeUInt32(1, count_);
-      }
-      if (itemId_ != 0) {
-        output.writeUInt32(5, itemId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(10, avatarGuid_);
+        output.writeUInt64(9, avatarGuid_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        output.writeMessage(13, itemParamList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +228,13 @@ public final class AvatarUpgradeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (count_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, count_);
-      }
-      if (itemId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, itemId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(10, avatarGuid_);
+          .computeUInt64Size(9, avatarGuid_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, itemParamList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +251,10 @@ public final class AvatarUpgradeReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other = (emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq) obj;
 
-      if (getItemId()
+      if (!getItemParamListList()
-          != other.getItemId()) return false;
+          .equals(other.getItemParamListList())) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (getCount()
-          != other.getCount()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +266,13 @@ public final class AvatarUpgradeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
+      if (getItemParamListCount() > 0) {
-      hash = (53 * hash) + getItemId();
+        hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getItemParamListList().hashCode();
+      }
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getCount();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,8 +370,7 @@ public final class AvatarUpgradeReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 28204
+     * CmdId: 1568
-     * Obf: CFIFEHLBHPM
      * </pre>
      *
      * Protobuf type {@code AvatarUpgradeReq}
@@ -382,17 +405,20 @@ public final class AvatarUpgradeReqOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getItemParamListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        itemId_ = 0;
+        if (itemParamListBuilder_ == null) {
-
+          itemParamList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          itemParamListBuilder_.clear();
+        }
         avatarGuid_ = 0L;
 
-        count_ = 0;
-
         return this;
       }
 
@@ -419,9 +445,17 @@ public final class AvatarUpgradeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq buildPartial() {
         emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq result = new emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq(this);
-        result.itemId_ = itemId_;
+        int from_bitField0_ = bitField0_;
+        if (itemParamListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.itemParamList_ = itemParamList_;
+        } else {
+          result.itemParamList_ = itemParamListBuilder_.build();
+        }
         result.avatarGuid_ = avatarGuid_;
-        result.count_ = count_;
         onBuilt();
         return result;
       }
@@ -470,15 +504,35 @@ public final class AvatarUpgradeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other) {
         if (other == emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.getDefaultInstance()) return this;
-        if (other.getItemId() != 0) {
+        if (itemParamListBuilder_ == null) {
-          setItemId(other.getItemId());
+          if (!other.itemParamList_.isEmpty()) {
+            if (itemParamList_.isEmpty()) {
+              itemParamList_ = other.itemParamList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureItemParamListIsMutable();
+              itemParamList_.addAll(other.itemParamList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.itemParamList_.isEmpty()) {
+            if (itemParamListBuilder_.isEmpty()) {
+              itemParamListBuilder_.dispose();
+              itemParamListBuilder_ = null;
+              itemParamList_ = other.itemParamList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              itemParamListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getItemParamListFieldBuilder() : null;
+            } else {
+              itemParamListBuilder_.addAllMessages(other.itemParamList_);
+            }
+          }
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getCount() != 0) {
-          setCount(other.getCount());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,41 +561,251 @@ public final class AvatarUpgradeReqOuterClass {
         }
         return this;
       }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_ =
+        java.util.Collections.emptyList();
+      private void ensureItemParamListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(itemParamList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
 
-      private int itemId_ ;
       /**
-       * <code>uint32 item_id = 5;</code>
+       * <code>repeated .ItemParam item_param_list = 13;</code>
-       * @return The itemId.
        */
-      @java.lang.Override
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
-      public int getItemId() {
+        if (itemParamListBuilder_ == null) {
-        return itemId_;
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        } else {
+          return itemParamListBuilder_.getMessageList();
+        }
       }
       /**
-       * <code>uint32 item_id = 5;</code>
+       * <code>repeated .ItemParam item_param_list = 13;</code>
-       * @param value The itemId to set.
-       * @return This builder for chaining.
        */
-      public Builder setItemId(int value) {
+      public int getItemParamListCount() {
-        
+        if (itemParamListBuilder_ == null) {
-        itemId_ = value;
+          return itemParamList_.size();
-        onChanged();
+        } else {
+          return itemParamListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);
+        } else {
+          return itemParamListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder setItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, value);
+        }
         return this;
       }
       /**
-       * <code>uint32 item_id = 5;</code>
+       * <code>repeated .ItemParam item_param_list = 13;</code>
-       * @return This builder for chaining.
        */
-      public Builder clearItemId() {
+      public Builder setItemParamList(
-        
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        itemId_ = 0;
+        if (itemParamListBuilder_ == null) {
-        onChanged();
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, builderForValue.build());
+        }
         return this;
       }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addAllItemParamList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, itemParamList_);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder clearItemParamList() {
+        if (itemParamListBuilder_ == null) {
+          itemParamList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          itemParamListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder removeItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.remove(index);
+          onChanged();
+        } else {
+          itemParamListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+          int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);  } else {
+          return itemParamListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getItemParamListOrBuilderList() {
+        if (itemParamListBuilder_ != null) {
+          return itemParamListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
+        return getItemParamListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getItemParamListBuilderList() {
+        return getItemParamListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getItemParamListFieldBuilder() {
+        if (itemParamListBuilder_ == null) {
+          itemParamListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  itemParamList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          itemParamList_ = null;
+        }
+        return itemParamListBuilder_;
+      }
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -549,7 +813,7 @@ public final class AvatarUpgradeReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -560,7 +824,7 @@ public final class AvatarUpgradeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -569,37 +833,6 @@ public final class AvatarUpgradeReqOuterClass {
         onChanged();
         return this;
       }
-
-      private int count_ ;
-      /**
-       * <code>uint32 count = 1;</code>
-       * @return The count.
-       */
-      @java.lang.Override
-      public int getCount() {
-        return count_;
-      }
-      /**
-       * <code>uint32 count = 1;</code>
-       * @param value The count to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCount(int value) {
-        
-        count_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 count = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCount() {
-        
-        count_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,21 +900,23 @@ public final class AvatarUpgradeReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026AvatarUpgradeReq.proto\"G\n\020AvatarUpgrad" +
+      "\n\026AvatarUpgradeReq.proto\032\017ItemParam.prot" +
-      "eReq\022\017\n\007item_id\030\005 \001(\r\022\023\n\013avatar_guid\030\n \001" +
+      "o\"L\n\020AvatarUpgradeReq\022#\n\017item_param_list" +
-      "(\004\022\r\n\005count\030\001 \001(\rB\033\n\031emu.grasscutter.net" +
+      "\030\r \003(\0132\n.ItemParam\022\023\n\013avatar_guid\030\t \001(\004B" +
-      ".protob\006proto3"
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(),
         });
     internal_static_AvatarUpgradeReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_AvatarUpgradeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarUpgradeReq_descriptor,
-        new java.lang.String[] { "ItemId", "AvatarGuid", "Count", });
+        new java.lang.String[] { "ItemParamList", "AvatarGuid", });
+    emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java

@@ -19,23 +19,18 @@ public final class AvatarWearFlycloakReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 flycloak_id = 7;</code>
+     * <code>uint64 avatar_guid = 4;</code>
-     * @return The flycloakId.
-     */
-    int getFlycloakId();
-
-    /**
-     * <code>uint64 avatar_guid = 1;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 flycloak_id = 10;</code>
+     * @return The flycloakId.
+     */
+    int getFlycloakId();
   }
   /**
-   * <pre>
-   * CmdId: 824
-   * Obf: LNDKKJJEFBJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarWearFlycloakReq}
    */
   public static final class AvatarWearFlycloakReq extends
@@ -80,12 +75,12 @@ public final class AvatarWearFlycloakReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 56: {
+            case 80: {
 
               flycloakId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class AvatarWearFlycloakReqOuterClass {
               emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.class, emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.Builder.class);
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 7;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
-    private int flycloakId_;
-    /**
-     * <code>uint32 flycloak_id = 7;</code>
-     * @return The flycloakId.
-     */
-    @java.lang.Override
-    public int getFlycloakId() {
-      return flycloakId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 1;</code>
+     * <code>uint64 avatar_guid = 4;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class AvatarWearFlycloakReqOuterClass {
       return avatarGuid_;
     }
 
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 10;
+    private int flycloakId_;
+    /**
+     * <code>uint32 flycloak_id = 10;</code>
+     * @return The flycloakId.
+     */
+    @java.lang.Override
+    public int getFlycloakId() {
+      return flycloakId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class AvatarWearFlycloakReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(1, avatarGuid_);
+        output.writeUInt64(4, avatarGuid_);
       }
       if (flycloakId_ != 0) {
-        output.writeUInt32(7, flycloakId_);
+        output.writeUInt32(10, flycloakId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class AvatarWearFlycloakReqOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, avatarGuid_);
+          .computeUInt64Size(4, avatarGuid_);
       }
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, flycloakId_);
+          .computeUInt32Size(10, flycloakId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class AvatarWearFlycloakReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq other = (emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq) obj;
 
-      if (getFlycloakId()
-          != other.getFlycloakId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getFlycloakId()
+          != other.getFlycloakId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +206,11 @@ public final class AvatarWearFlycloakReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getFlycloakId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getFlycloakId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,11 +307,6 @@ public final class AvatarWearFlycloakReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 824
-     * Obf: LNDKKJJEFBJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarWearFlycloakReq}
      */
     public static final class Builder extends
@@ -354,10 +344,10 @@ public final class AvatarWearFlycloakReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        flycloakId_ = 0;
-
         avatarGuid_ = 0L;
 
+        flycloakId_ = 0;
+
         return this;
       }
 
@@ -384,8 +374,8 @@ public final class AvatarWearFlycloakReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq buildPartial() {
         emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq result = new emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq(this);
-        result.flycloakId_ = flycloakId_;
         result.avatarGuid_ = avatarGuid_;
+        result.flycloakId_ = flycloakId_;
         onBuilt();
         return result;
       }
@@ -434,12 +424,12 @@ public final class AvatarWearFlycloakReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq other) {
         if (other == emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.getDefaultInstance()) return this;
-        if (other.getFlycloakId() != 0) {
-          setFlycloakId(other.getFlycloakId());
-        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getFlycloakId() != 0) {
+          setFlycloakId(other.getFlycloakId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +459,9 @@ public final class AvatarWearFlycloakReqOuterClass {
         return this;
       }
 
-      private int flycloakId_ ;
-      /**
-       * <code>uint32 flycloak_id = 7;</code>
-       * @return The flycloakId.
-       */
-      @java.lang.Override
-      public int getFlycloakId() {
-        return flycloakId_;
-      }
-      /**
-       * <code>uint32 flycloak_id = 7;</code>
-       * @param value The flycloakId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFlycloakId(int value) {
-        
-        flycloakId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 flycloak_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFlycloakId() {
-        
-        flycloakId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 1;</code>
+       * <code>uint64 avatar_guid = 4;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -510,7 +469,7 @@ public final class AvatarWearFlycloakReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
+       * <code>uint64 avatar_guid = 4;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -521,7 +480,7 @@ public final class AvatarWearFlycloakReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
+       * <code>uint64 avatar_guid = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -530,6 +489,37 @@ public final class AvatarWearFlycloakReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int flycloakId_ ;
+      /**
+       * <code>uint32 flycloak_id = 10;</code>
+       * @return The flycloakId.
+       */
+      @java.lang.Override
+      public int getFlycloakId() {
+        return flycloakId_;
+      }
+      /**
+       * <code>uint32 flycloak_id = 10;</code>
+       * @param value The flycloakId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFlycloakId(int value) {
+        
+        flycloakId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 flycloak_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFlycloakId() {
+        
+        flycloakId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -598,8 +588,8 @@ public final class AvatarWearFlycloakReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarWearFlycloakReq.proto\"A\n\025AvatarW" +
-      "earFlycloakReq\022\023\n\013flycloak_id\030\007 \001(\r\022\023\n\013a" +
+      "earFlycloakReq\022\023\n\013avatar_guid\030\004 \001(\004\022\023\n\013f" +
-      "vatar_guid\030\001 \001(\004B\033\n\031emu.grasscutter.net." +
+      "lycloak_id\030\n \001(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +601,7 @@ public final class AvatarWearFlycloakReqOuterClass {
     internal_static_AvatarWearFlycloakReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarWearFlycloakReq_descriptor,
-        new java.lang.String[] { "FlycloakId", "AvatarGuid", });
+        new java.lang.String[] { "AvatarGuid", "FlycloakId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java

@@ -19,29 +19,24 @@ public final class AvatarWearFlycloakRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 10;</code>
+     * <code>uint64 avatar_guid = 8;</code>
-     * @return The retcode.
+     * @return The avatarGuid.
      */
-    int getRetcode();
+    long getAvatarGuid();
 
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 9;</code>
      * @return The flycloakId.
      */
     int getFlycloakId();
 
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>int32 retcode = 13;</code>
-     * @return The avatarGuid.
+     * @return The retcode.
      */
-    long getAvatarGuid();
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 21633
-   * Obf: BCLNBCGCHKJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarWearFlycloakRsp}
    */
   public static final class AvatarWearFlycloakRsp extends
@@ -86,17 +81,17 @@ public final class AvatarWearFlycloakRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 64: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 48: {
+            case 72: {
 
               flycloakId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 104: {
 
               retcode_ = input.readInt32();
               break;
@@ -133,21 +128,21 @@ public final class AvatarWearFlycloakRspOuterClass {
               emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.class, emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 8;
-    private int retcode_;
+    private long avatarGuid_;
     /**
-     * <code>int32 retcode = 10;</code>
+     * <code>uint64 avatar_guid = 8;</code>
-     * @return The retcode.
+     * @return The avatarGuid.
      */
     @java.lang.Override
-    public int getRetcode() {
+    public long getAvatarGuid() {
-      return retcode_;
+      return avatarGuid_;
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 6;
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 9;
     private int flycloakId_;
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 9;</code>
      * @return The flycloakId.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class AvatarWearFlycloakRspOuterClass {
       return flycloakId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 13;
-    private long avatarGuid_;
+    private int retcode_;
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>int32 retcode = 13;</code>
-     * @return The avatarGuid.
+     * @return The retcode.
      */
     @java.lang.Override
-    public long getAvatarGuid() {
+    public int getRetcode() {
-      return avatarGuid_;
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -181,13 +176,13 @@ public final class AvatarWearFlycloakRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
+        output.writeUInt64(8, avatarGuid_);
       }
       if (flycloakId_ != 0) {
-        output.writeUInt32(6, flycloakId_);
+        output.writeUInt32(9, flycloakId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class AvatarWearFlycloakRspOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
+          .computeUInt64Size(8, avatarGuid_);
       }
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, flycloakId_);
+          .computeUInt32Size(9, flycloakId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class AvatarWearFlycloakRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp other = (emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getFlycloakId()
-          != other.getFlycloakId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getFlycloakId()
+          != other.getFlycloakId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +237,13 @@ public final class AvatarWearFlycloakRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getFlycloakId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getFlycloakId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,11 +340,6 @@ public final class AvatarWearFlycloakRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21633
-     * Obf: BCLNBCGCHKJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarWearFlycloakRsp}
      */
     public static final class Builder extends
@@ -387,11 +377,11 @@ public final class AvatarWearFlycloakRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
+        avatarGuid_ = 0L;
 
         flycloakId_ = 0;
 
-        avatarGuid_ = 0L;
+        retcode_ = 0;
 
         return this;
       }
@@ -419,9 +409,9 @@ public final class AvatarWearFlycloakRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp result = new emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp(this);
-        result.retcode_ = retcode_;
-        result.flycloakId_ = flycloakId_;
         result.avatarGuid_ = avatarGuid_;
+        result.flycloakId_ = flycloakId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -470,14 +460,14 @@ public final class AvatarWearFlycloakRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
+        if (other.getAvatarGuid() != 0L) {
-          setRetcode(other.getRetcode());
+          setAvatarGuid(other.getAvatarGuid());
         }
         if (other.getFlycloakId() != 0) {
           setFlycloakId(other.getFlycloakId());
         }
-        if (other.getAvatarGuid() != 0L) {
+        if (other.getRetcode() != 0) {
-          setAvatarGuid(other.getAvatarGuid());
+          setRetcode(other.getRetcode());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -508,71 +498,9 @@ public final class AvatarWearFlycloakRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 10;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 10;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int flycloakId_ ;
-      /**
-       * <code>uint32 flycloak_id = 6;</code>
-       * @return The flycloakId.
-       */
-      @java.lang.Override
-      public int getFlycloakId() {
-        return flycloakId_;
-      }
-      /**
-       * <code>uint32 flycloak_id = 6;</code>
-       * @param value The flycloakId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFlycloakId(int value) {
-        
-        flycloakId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 flycloak_id = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFlycloakId() {
-        
-        flycloakId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -580,7 +508,7 @@ public final class AvatarWearFlycloakRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -591,7 +519,7 @@ public final class AvatarWearFlycloakRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -600,6 +528,68 @@ public final class AvatarWearFlycloakRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int flycloakId_ ;
+      /**
+       * <code>uint32 flycloak_id = 9;</code>
+       * @return The flycloakId.
+       */
+      @java.lang.Override
+      public int getFlycloakId() {
+        return flycloakId_;
+      }
+      /**
+       * <code>uint32 flycloak_id = 9;</code>
+       * @param value The flycloakId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFlycloakId(int value) {
+        
+        flycloakId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 flycloak_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFlycloakId() {
+        
+        flycloakId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,8 +658,8 @@ public final class AvatarWearFlycloakRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarWearFlycloakRsp.proto\"R\n\025AvatarW" +
-      "earFlycloakRsp\022\017\n\007retcode\030\n \001(\005\022\023\n\013flycl" +
+      "earFlycloakRsp\022\023\n\013avatar_guid\030\010 \001(\004\022\023\n\013f" +
-      "oak_id\030\006 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031emu" +
+      "lycloak_id\030\t \001(\r\022\017\n\007retcode\030\r \001(\005B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarWearFlycloakRspOuterClass {
     internal_static_AvatarWearFlycloakRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarWearFlycloakRsp_descriptor,
-        new java.lang.String[] { "Retcode", "FlycloakId", "AvatarGuid", });
+        new java.lang.String[] { "AvatarGuid", "FlycloakId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldReqOuterClass.java

@@ -19,11 +19,6 @@ public final class BackMyWorldReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 7284
-   * Obf: KMDLHONLMJH
-   * </pre>
-   *
    * Protobuf type {@code BackMyWorldReq}
    */
   public static final class BackMyWorldReq extends
@@ -245,11 +240,6 @@ public final class BackMyWorldReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7284
-     * Obf: KMDLHONLMJH
-     * </pre>
-     *
      * Protobuf type {@code BackMyWorldReq}
      */
     public static final class Builder extends