Add support for v3.5.0 (#2090)

* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>

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

@@ -19,33 +19,38 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 srcThreadIndex = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 5;</code>
+     * @return Whether the srcPlayerInfo field is set.
+     */
+    boolean hasSrcPlayerInfo();
+    /**
+     * <code>.OnlinePlayerInfo src_player_info = 5;</code>
+     * @return The srcPlayerInfo.
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
+    /**
+     * <code>.OnlinePlayerInfo src_player_info = 5;</code>
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
+
+    /**
+     * <code>uint32 src_thread_index = 7;</code>
      * @return The srcThreadIndex.
      */
     int getSrcThreadIndex();
 
     /**
-     * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
-     * @return Whether the srcPlayerInfo field is set.
-     */
-    boolean hasSrcPlayerInfo();
-    /**
-     * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
-     * @return The srcPlayerInfo.
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
-    /**
-     * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
-
-    /**
-     * <code>uint32 srcAppId = 12;</code>
+     * <code>uint32 src_app_id = 8;</code>
      * @return The srcAppId.
      */
     int getSrcAppId();
   }
   /**
+   * <pre>
+   * Name: PKHNOEDAGBD
+   * CmdId: 1848
+   * </pre>
+   *
    * Protobuf type {@code PlayerApplyEnterMpNotify}
    */
   public static final class PlayerApplyEnterMpNotify extends
@@ -90,7 +95,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 90: {
+            case 42: {
               emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
               if (srcPlayerInfo_ != null) {
                 subBuilder = srcPlayerInfo_.toBuilder();
@@ -103,16 +108,16 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
 
               break;
             }
-            case 96: {
-
-              srcAppId_ = input.readUInt32();
-              break;
-            }
-            case 112: {
+            case 56: {
 
               srcThreadIndex_ = input.readUInt32();
               break;
             }
+            case 64: {
+
+              srcAppId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -145,152 +150,10 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.class, emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.Builder.class);
     }
 
-    /**
-     * Protobuf enum {@code PlayerApplyEnterMpNotify.BALMBLBPAGP}
-     */
-    public enum BALMBLBPAGP
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>NONE = 0;</code>
-       */
-      NONE(0, 0),
-      /**
-       * <code>PEPPOHPHJOJ = 1838;</code>
-       */
-      PEPPOHPHJOJ(1, 1838),
-      /**
-       * <code>NNBKOLMPOEA = 1;</code>
-       */
-      NNBKOLMPOEA(3, 1),
-      UNRECOGNIZED(-1, -1),
-      ;
-
-      /**
-       * <code>DCDNILFDFLB = 0;</code>
-       */
-      public static final BALMBLBPAGP DCDNILFDFLB = NONE;
-      /**
-       * <code>NONE = 0;</code>
-       */
-      public static final int NONE_VALUE = 0;
-      /**
-       * <code>PEPPOHPHJOJ = 1838;</code>
-       */
-      public static final int PEPPOHPHJOJ_VALUE = 1838;
-      /**
-       * <code>DCDNILFDFLB = 0;</code>
-       */
-      public static final int DCDNILFDFLB_VALUE = 0;
-      /**
-       * <code>NNBKOLMPOEA = 1;</code>
-       */
-      public static final int NNBKOLMPOEA_VALUE = 1;
-
-
-      public final int getNumber() {
-        if (index == -1) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static BALMBLBPAGP valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static BALMBLBPAGP forNumber(int value) {
-        switch (value) {
-          case 0: return NONE;
-          case 1838: return PEPPOHPHJOJ;
-          case 1: return NNBKOLMPOEA;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<BALMBLBPAGP>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          BALMBLBPAGP> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<BALMBLBPAGP>() {
-              public BALMBLBPAGP findValueByNumber(int number) {
-                return BALMBLBPAGP.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (index == -1) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(index);
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final BALMBLBPAGP[] VALUES = getStaticValuesArray();
-      private static BALMBLBPAGP[] getStaticValuesArray() {
-        return new BALMBLBPAGP[] {
-          NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, 
-        };
-      }
-      public static BALMBLBPAGP valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int index;
-      private final int value;
-
-      private BALMBLBPAGP(int index, int value) {
-        this.index = index;
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:PlayerApplyEnterMpNotify.BALMBLBPAGP)
-    }
-
-    public static final int SRCTHREADINDEX_FIELD_NUMBER = 14;
-    private int srcThreadIndex_;
-    /**
-     * <code>uint32 srcThreadIndex = 14;</code>
-     * @return The srcThreadIndex.
-     */
-    @java.lang.Override
-    public int getSrcThreadIndex() {
-      return srcThreadIndex_;
-    }
-
-    public static final int SRCPLAYERINFO_FIELD_NUMBER = 11;
+    public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
     /**
-     * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 5;</code>
      * @return Whether the srcPlayerInfo field is set.
      */
     @java.lang.Override
@@ -298,7 +161,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return srcPlayerInfo_ != null;
     }
     /**
-     * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 5;</code>
      * @return The srcPlayerInfo.
      */
     @java.lang.Override
@@ -306,17 +169,28 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return srcPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : srcPlayerInfo_;
     }
     /**
-     * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
       return getSrcPlayerInfo();
     }
 
-    public static final int SRCAPPID_FIELD_NUMBER = 12;
+    public static final int SRC_THREAD_INDEX_FIELD_NUMBER = 7;
+    private int srcThreadIndex_;
+    /**
+     * <code>uint32 src_thread_index = 7;</code>
+     * @return The srcThreadIndex.
+     */
+    @java.lang.Override
+    public int getSrcThreadIndex() {
+      return srcThreadIndex_;
+    }
+
+    public static final int SRC_APP_ID_FIELD_NUMBER = 8;
     private int srcAppId_;
     /**
-     * <code>uint32 srcAppId = 12;</code>
+     * <code>uint32 src_app_id = 8;</code>
      * @return The srcAppId.
      */
     @java.lang.Override
@@ -339,13 +213,13 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (srcPlayerInfo_ != null) {
-        output.writeMessage(11, getSrcPlayerInfo());
-      }
-      if (srcAppId_ != 0) {
-        output.writeUInt32(12, srcAppId_);
+        output.writeMessage(5, getSrcPlayerInfo());
       }
       if (srcThreadIndex_ != 0) {
-        output.writeUInt32(14, srcThreadIndex_);
+        output.writeUInt32(7, srcThreadIndex_);
+      }
+      if (srcAppId_ != 0) {
+        output.writeUInt32(8, srcAppId_);
       }
       unknownFields.writeTo(output);
     }
@@ -358,15 +232,15 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       size = 0;
       if (srcPlayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getSrcPlayerInfo());
-      }
-      if (srcAppId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, srcAppId_);
+          .computeMessageSize(5, getSrcPlayerInfo());
       }
       if (srcThreadIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, srcThreadIndex_);
+          .computeUInt32Size(7, srcThreadIndex_);
+      }
+      if (srcAppId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, srcAppId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -383,13 +257,13 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify other = (emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify) obj;
 
-      if (getSrcThreadIndex()
-          != other.getSrcThreadIndex()) return false;
       if (hasSrcPlayerInfo() != other.hasSrcPlayerInfo()) return false;
       if (hasSrcPlayerInfo()) {
         if (!getSrcPlayerInfo()
             .equals(other.getSrcPlayerInfo())) return false;
       }
+      if (getSrcThreadIndex()
+          != other.getSrcThreadIndex()) return false;
       if (getSrcAppId()
           != other.getSrcAppId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -403,13 +277,13 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SRCTHREADINDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getSrcThreadIndex();
       if (hasSrcPlayerInfo()) {
-        hash = (37 * hash) + SRCPLAYERINFO_FIELD_NUMBER;
+        hash = (37 * hash) + SRC_PLAYER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getSrcPlayerInfo().hashCode();
       }
-      hash = (37 * hash) + SRCAPPID_FIELD_NUMBER;
+      hash = (37 * hash) + SRC_THREAD_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getSrcThreadIndex();
+      hash = (37 * hash) + SRC_APP_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSrcAppId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -507,6 +381,11 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return builder;
     }
     /**
+     * <pre>
+     * Name: PKHNOEDAGBD
+     * CmdId: 1848
+     * </pre>
+     *
      * Protobuf type {@code PlayerApplyEnterMpNotify}
      */
     public static final class Builder extends
@@ -544,14 +423,14 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        srcThreadIndex_ = 0;
-
         if (srcPlayerInfoBuilder_ == null) {
           srcPlayerInfo_ = null;
         } else {
           srcPlayerInfo_ = null;
           srcPlayerInfoBuilder_ = null;
         }
+        srcThreadIndex_ = 0;
+
         srcAppId_ = 0;
 
         return this;
@@ -580,12 +459,12 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify result = new emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify(this);
-        result.srcThreadIndex_ = srcThreadIndex_;
         if (srcPlayerInfoBuilder_ == null) {
           result.srcPlayerInfo_ = srcPlayerInfo_;
         } else {
           result.srcPlayerInfo_ = srcPlayerInfoBuilder_.build();
         }
+        result.srcThreadIndex_ = srcThreadIndex_;
         result.srcAppId_ = srcAppId_;
         onBuilt();
         return result;
@@ -635,12 +514,12 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.getDefaultInstance()) return this;
-        if (other.getSrcThreadIndex() != 0) {
-          setSrcThreadIndex(other.getSrcThreadIndex());
-        }
         if (other.hasSrcPlayerInfo()) {
           mergeSrcPlayerInfo(other.getSrcPlayerInfo());
         }
+        if (other.getSrcThreadIndex() != 0) {
+          setSrcThreadIndex(other.getSrcThreadIndex());
+        }
         if (other.getSrcAppId() != 0) {
           setSrcAppId(other.getSrcAppId());
         }
@@ -673,49 +552,18 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
 
-      private int srcThreadIndex_ ;
-      /**
-       * <code>uint32 srcThreadIndex = 14;</code>
-       * @return The srcThreadIndex.
-       */
-      @java.lang.Override
-      public int getSrcThreadIndex() {
-        return srcThreadIndex_;
-      }
-      /**
-       * <code>uint32 srcThreadIndex = 14;</code>
-       * @param value The srcThreadIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSrcThreadIndex(int value) {
-        
-        srcThreadIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 srcThreadIndex = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSrcThreadIndex() {
-        
-        srcThreadIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> srcPlayerInfoBuilder_;
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        * @return Whether the srcPlayerInfo field is set.
        */
       public boolean hasSrcPlayerInfo() {
         return srcPlayerInfoBuilder_ != null || srcPlayerInfo_ != null;
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        * @return The srcPlayerInfo.
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo() {
@@ -726,7 +574,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        */
       public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (srcPlayerInfoBuilder_ == null) {
@@ -742,7 +590,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        */
       public Builder setSrcPlayerInfo(
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -756,7 +604,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        */
       public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (srcPlayerInfoBuilder_ == null) {
@@ -774,7 +622,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        */
       public Builder clearSrcPlayerInfo() {
         if (srcPlayerInfoBuilder_ == null) {
@@ -788,7 +636,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getSrcPlayerInfoBuilder() {
         
@@ -796,7 +644,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return getSrcPlayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
         if (srcPlayerInfoBuilder_ != null) {
@@ -807,7 +655,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo srcPlayerInfo = 11;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
@@ -823,9 +671,40 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return srcPlayerInfoBuilder_;
       }
 
+      private int srcThreadIndex_ ;
+      /**
+       * <code>uint32 src_thread_index = 7;</code>
+       * @return The srcThreadIndex.
+       */
+      @java.lang.Override
+      public int getSrcThreadIndex() {
+        return srcThreadIndex_;
+      }
+      /**
+       * <code>uint32 src_thread_index = 7;</code>
+       * @param value The srcThreadIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSrcThreadIndex(int value) {
+        
+        srcThreadIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 src_thread_index = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSrcThreadIndex() {
+        
+        srcThreadIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int srcAppId_ ;
       /**
-       * <code>uint32 srcAppId = 12;</code>
+       * <code>uint32 src_app_id = 8;</code>
        * @return The srcAppId.
        */
       @java.lang.Override
@@ -833,7 +712,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return srcAppId_;
       }
       /**
-       * <code>uint32 srcAppId = 12;</code>
+       * <code>uint32 src_app_id = 8;</code>
        * @param value The srcAppId to set.
        * @return This builder for chaining.
        */
@@ -844,7 +723,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 srcAppId = 12;</code>
+       * <code>uint32 src_app_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearSrcAppId() {
@@ -921,13 +800,11 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036PlayerApplyEnterMpNotify.proto\032\026Online" +
-      "PlayerInfo.proto\"\277\001\n\030PlayerApplyEnterMpN" +
-      "otify\022\026\n\016srcThreadIndex\030\016 \001(\r\022(\n\rsrcPlay" +
-      "erInfo\030\013 \001(\0132\021.OnlinePlayerInfo\022\020\n\010srcAp" +
-      "pId\030\014 \001(\r\"O\n\013BALMBLBPAGP\022\010\n\004NONE\020\000\022\020\n\013PE" +
-      "PPOHPHJOJ\020\256\016\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLM" +
-      "POEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.protob" +
-      "\006proto3"
+      "PlayerInfo.proto\"t\n\030PlayerApplyEnterMpNo" +
+      "tify\022*\n\017src_player_info\030\005 \001(\0132\021.OnlinePl" +
+      "ayerInfo\022\030\n\020src_thread_index\030\007 \001(\r\022\022\n\nsr" +
+      "c_app_id\030\010 \001(\rB\033\n\031emu.grasscutter.net.pr" +
+      "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -939,7 +816,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
     internal_static_PlayerApplyEnterMpNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerApplyEnterMpNotify_descriptor,
-        new java.lang.String[] { "SrcThreadIndex", "SrcPlayerInfo", "SrcAppId", });
+        new java.lang.String[] { "SrcPlayerInfo", "SrcThreadIndex", "SrcAppId", });
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
   }