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/EnterScenePeerNotifyOuterClass.java

@@ -19,30 +19,35 @@ public final class EnterScenePeerNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 hostPeerId = 10;</code>
-     * @return The hostPeerId.
-     */
-    int getHostPeerId();
-
-    /**
-     * <code>uint32 destSceneId = 8;</code>
+     * <code>uint32 dest_scene_id = 11;</code>
      * @return The destSceneId.
      */
     int getDestSceneId();
 
     /**
-     * <code>uint32 enterSceneToken = 9;</code>
-     * @return The enterSceneToken.
+     * <code>uint32 host_peer_id = 15;</code>
+     * @return The hostPeerId.
      */
-    int getEnterSceneToken();
+    int getHostPeerId();
 
     /**
-     * <code>uint32 peerId = 6;</code>
+     * <code>uint32 peer_id = 3;</code>
      * @return The peerId.
      */
     int getPeerId();
+
+    /**
+     * <code>uint32 enter_scene_token = 13;</code>
+     * @return The enterSceneToken.
+     */
+    int getEnterSceneToken();
   }
   /**
+   * <pre>
+   * Name: BEPKDPLOLPA
+   * CmdId: 215
+   * </pre>
+   *
    * Protobuf type {@code EnterScenePeerNotify}
    */
   public static final class EnterScenePeerNotify extends
@@ -87,22 +92,22 @@ public final class EnterScenePeerNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 24: {
 
               peerId_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 88: {
 
               destSceneId_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 104: {
 
               enterSceneToken_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 120: {
 
               hostPeerId_ = input.readUInt32();
               break;
@@ -139,152 +144,10 @@ public final class EnterScenePeerNotifyOuterClass {
               emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.class, emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.Builder.class);
     }
 
-    /**
-     * Protobuf enum {@code EnterScenePeerNotify.NNINOKOEOCE}
-     */
-    public enum NNINOKOEOCE
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>NONE = 0;</code>
-       */
-      NONE(0, 0),
-      /**
-       * <code>PEPPOHPHJOJ = 286;</code>
-       */
-      PEPPOHPHJOJ(1, 286),
-      /**
-       * <code>NNBKOLMPOEA = 1;</code>
-       */
-      NNBKOLMPOEA(3, 1),
-      UNRECOGNIZED(-1, -1),
-      ;
-
-      /**
-       * <code>DCDNILFDFLB = 0;</code>
-       */
-      public static final NNINOKOEOCE DCDNILFDFLB = NONE;
-      /**
-       * <code>NONE = 0;</code>
-       */
-      public static final int NONE_VALUE = 0;
-      /**
-       * <code>PEPPOHPHJOJ = 286;</code>
-       */
-      public static final int PEPPOHPHJOJ_VALUE = 286;
-      /**
-       * <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 NNINOKOEOCE 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 NNINOKOEOCE forNumber(int value) {
-        switch (value) {
-          case 0: return NONE;
-          case 286: return PEPPOHPHJOJ;
-          case 1: return NNBKOLMPOEA;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<NNINOKOEOCE>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          NNINOKOEOCE> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<NNINOKOEOCE>() {
-              public NNINOKOEOCE findValueByNumber(int number) {
-                return NNINOKOEOCE.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.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final NNINOKOEOCE[] VALUES = getStaticValuesArray();
-      private static NNINOKOEOCE[] getStaticValuesArray() {
-        return new NNINOKOEOCE[] {
-          NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, 
-        };
-      }
-      public static NNINOKOEOCE 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 NNINOKOEOCE(int index, int value) {
-        this.index = index;
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:EnterScenePeerNotify.NNINOKOEOCE)
-    }
-
-    public static final int HOSTPEERID_FIELD_NUMBER = 10;
-    private int hostPeerId_;
-    /**
-     * <code>uint32 hostPeerId = 10;</code>
-     * @return The hostPeerId.
-     */
-    @java.lang.Override
-    public int getHostPeerId() {
-      return hostPeerId_;
-    }
-
-    public static final int DESTSCENEID_FIELD_NUMBER = 8;
+    public static final int DEST_SCENE_ID_FIELD_NUMBER = 11;
     private int destSceneId_;
     /**
-     * <code>uint32 destSceneId = 8;</code>
+     * <code>uint32 dest_scene_id = 11;</code>
      * @return The destSceneId.
      */
     @java.lang.Override
@@ -292,21 +155,21 @@ public final class EnterScenePeerNotifyOuterClass {
       return destSceneId_;
     }
 
-    public static final int ENTERSCENETOKEN_FIELD_NUMBER = 9;
-    private int enterSceneToken_;
+    public static final int HOST_PEER_ID_FIELD_NUMBER = 15;
+    private int hostPeerId_;
     /**
-     * <code>uint32 enterSceneToken = 9;</code>
-     * @return The enterSceneToken.
+     * <code>uint32 host_peer_id = 15;</code>
+     * @return The hostPeerId.
      */
     @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
+    public int getHostPeerId() {
+      return hostPeerId_;
     }
 
-    public static final int PEERID_FIELD_NUMBER = 6;
+    public static final int PEER_ID_FIELD_NUMBER = 3;
     private int peerId_;
     /**
-     * <code>uint32 peerId = 6;</code>
+     * <code>uint32 peer_id = 3;</code>
      * @return The peerId.
      */
     @java.lang.Override
@@ -314,6 +177,17 @@ public final class EnterScenePeerNotifyOuterClass {
       return peerId_;
     }
 
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 13;
+    private int enterSceneToken_;
+    /**
+     * <code>uint32 enter_scene_token = 13;</code>
+     * @return The enterSceneToken.
+     */
+    @java.lang.Override
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -329,16 +203,16 @@ public final class EnterScenePeerNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (peerId_ != 0) {
-        output.writeUInt32(6, peerId_);
+        output.writeUInt32(3, peerId_);
       }
       if (destSceneId_ != 0) {
-        output.writeUInt32(8, destSceneId_);
+        output.writeUInt32(11, destSceneId_);
       }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(9, enterSceneToken_);
+        output.writeUInt32(13, enterSceneToken_);
       }
       if (hostPeerId_ != 0) {
-        output.writeUInt32(10, hostPeerId_);
+        output.writeUInt32(15, hostPeerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -351,19 +225,19 @@ public final class EnterScenePeerNotifyOuterClass {
       size = 0;
       if (peerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, peerId_);
+          .computeUInt32Size(3, peerId_);
       }
       if (destSceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, destSceneId_);
+          .computeUInt32Size(11, destSceneId_);
       }
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, enterSceneToken_);
+          .computeUInt32Size(13, enterSceneToken_);
       }
       if (hostPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, hostPeerId_);
+          .computeUInt32Size(15, hostPeerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -380,14 +254,14 @@ public final class EnterScenePeerNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify other = (emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify) obj;
 
-      if (getHostPeerId()
-          != other.getHostPeerId()) return false;
       if (getDestSceneId()
           != other.getDestSceneId()) return false;
-      if (getEnterSceneToken()
-          != other.getEnterSceneToken()) return false;
+      if (getHostPeerId()
+          != other.getHostPeerId()) return false;
       if (getPeerId()
           != other.getPeerId()) return false;
+      if (getEnterSceneToken()
+          != other.getEnterSceneToken()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -399,14 +273,14 @@ public final class EnterScenePeerNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + HOSTPEERID_FIELD_NUMBER;
-      hash = (53 * hash) + getHostPeerId();
-      hash = (37 * hash) + DESTSCENEID_FIELD_NUMBER;
+      hash = (37 * hash) + DEST_SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getDestSceneId();
-      hash = (37 * hash) + ENTERSCENETOKEN_FIELD_NUMBER;
-      hash = (53 * hash) + getEnterSceneToken();
-      hash = (37 * hash) + PEERID_FIELD_NUMBER;
+      hash = (37 * hash) + HOST_PEER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getHostPeerId();
+      hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getPeerId();
+      hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
+      hash = (53 * hash) + getEnterSceneToken();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -503,6 +377,11 @@ public final class EnterScenePeerNotifyOuterClass {
       return builder;
     }
     /**
+     * <pre>
+     * Name: BEPKDPLOLPA
+     * CmdId: 215
+     * </pre>
+     *
      * Protobuf type {@code EnterScenePeerNotify}
      */
     public static final class Builder extends
@@ -540,14 +419,14 @@ public final class EnterScenePeerNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        hostPeerId_ = 0;
-
         destSceneId_ = 0;
 
-        enterSceneToken_ = 0;
+        hostPeerId_ = 0;
 
         peerId_ = 0;
 
+        enterSceneToken_ = 0;
+
         return this;
       }
 
@@ -574,10 +453,10 @@ public final class EnterScenePeerNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify buildPartial() {
         emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify result = new emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify(this);
-        result.hostPeerId_ = hostPeerId_;
         result.destSceneId_ = destSceneId_;
-        result.enterSceneToken_ = enterSceneToken_;
+        result.hostPeerId_ = hostPeerId_;
         result.peerId_ = peerId_;
+        result.enterSceneToken_ = enterSceneToken_;
         onBuilt();
         return result;
       }
@@ -626,18 +505,18 @@ public final class EnterScenePeerNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify other) {
         if (other == emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.getDefaultInstance()) return this;
-        if (other.getHostPeerId() != 0) {
-          setHostPeerId(other.getHostPeerId());
-        }
         if (other.getDestSceneId() != 0) {
           setDestSceneId(other.getDestSceneId());
         }
-        if (other.getEnterSceneToken() != 0) {
-          setEnterSceneToken(other.getEnterSceneToken());
+        if (other.getHostPeerId() != 0) {
+          setHostPeerId(other.getHostPeerId());
         }
         if (other.getPeerId() != 0) {
           setPeerId(other.getPeerId());
         }
+        if (other.getEnterSceneToken() != 0) {
+          setEnterSceneToken(other.getEnterSceneToken());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -667,40 +546,9 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
 
-      private int hostPeerId_ ;
-      /**
-       * <code>uint32 hostPeerId = 10;</code>
-       * @return The hostPeerId.
-       */
-      @java.lang.Override
-      public int getHostPeerId() {
-        return hostPeerId_;
-      }
-      /**
-       * <code>uint32 hostPeerId = 10;</code>
-       * @param value The hostPeerId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHostPeerId(int value) {
-        
-        hostPeerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 hostPeerId = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHostPeerId() {
-        
-        hostPeerId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int destSceneId_ ;
       /**
-       * <code>uint32 destSceneId = 8;</code>
+       * <code>uint32 dest_scene_id = 11;</code>
        * @return The destSceneId.
        */
       @java.lang.Override
@@ -708,7 +556,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return destSceneId_;
       }
       /**
-       * <code>uint32 destSceneId = 8;</code>
+       * <code>uint32 dest_scene_id = 11;</code>
        * @param value The destSceneId to set.
        * @return This builder for chaining.
        */
@@ -719,7 +567,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 destSceneId = 8;</code>
+       * <code>uint32 dest_scene_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearDestSceneId() {
@@ -729,40 +577,40 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
 
-      private int enterSceneToken_ ;
+      private int hostPeerId_ ;
       /**
-       * <code>uint32 enterSceneToken = 9;</code>
-       * @return The enterSceneToken.
+       * <code>uint32 host_peer_id = 15;</code>
+       * @return The hostPeerId.
        */
       @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
+      public int getHostPeerId() {
+        return hostPeerId_;
       }
       /**
-       * <code>uint32 enterSceneToken = 9;</code>
-       * @param value The enterSceneToken to set.
+       * <code>uint32 host_peer_id = 15;</code>
+       * @param value The hostPeerId to set.
        * @return This builder for chaining.
        */
-      public Builder setEnterSceneToken(int value) {
+      public Builder setHostPeerId(int value) {
         
-        enterSceneToken_ = value;
+        hostPeerId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 enterSceneToken = 9;</code>
+       * <code>uint32 host_peer_id = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEnterSceneToken() {
+      public Builder clearHostPeerId() {
         
-        enterSceneToken_ = 0;
+        hostPeerId_ = 0;
         onChanged();
         return this;
       }
 
       private int peerId_ ;
       /**
-       * <code>uint32 peerId = 6;</code>
+       * <code>uint32 peer_id = 3;</code>
        * @return The peerId.
        */
       @java.lang.Override
@@ -770,7 +618,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return peerId_;
       }
       /**
-       * <code>uint32 peerId = 6;</code>
+       * <code>uint32 peer_id = 3;</code>
        * @param value The peerId to set.
        * @return This builder for chaining.
        */
@@ -781,7 +629,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 peerId = 6;</code>
+       * <code>uint32 peer_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearPeerId() {
@@ -790,6 +638,37 @@ public final class EnterScenePeerNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int enterSceneToken_ ;
+      /**
+       * <code>uint32 enter_scene_token = 13;</code>
+       * @return The enterSceneToken.
+       */
+      @java.lang.Override
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
+      }
+      /**
+       * <code>uint32 enter_scene_token = 13;</code>
+       * @param value The enterSceneToken to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEnterSceneToken(int value) {
+        
+        enterSceneToken_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 enter_scene_token = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEnterSceneToken() {
+        
+        enterSceneToken_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -857,13 +736,11 @@ public final class EnterScenePeerNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032EnterScenePeerNotify.proto\"\271\001\n\024EnterSc" +
-      "enePeerNotify\022\022\n\nhostPeerId\030\n \001(\r\022\023\n\013des" +
-      "tSceneId\030\010 \001(\r\022\027\n\017enterSceneToken\030\t \001(\r\022" +
-      "\016\n\006peerId\030\006 \001(\r\"O\n\013NNINOKOEOCE\022\010\n\004NONE\020\000" +
-      "\022\020\n\013PEPPOHPHJOJ\020\236\002\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013N" +
-      "NBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net." +
-      "protob\006proto3"
+      "\n\032EnterScenePeerNotify.proto\"o\n\024EnterSce" +
+      "nePeerNotify\022\025\n\rdest_scene_id\030\013 \001(\r\022\024\n\014h" +
+      "ost_peer_id\030\017 \001(\r\022\017\n\007peer_id\030\003 \001(\r\022\031\n\021en" +
+      "ter_scene_token\030\r \001(\rB\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -874,7 +751,7 @@ public final class EnterScenePeerNotifyOuterClass {
     internal_static_EnterScenePeerNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterScenePeerNotify_descriptor,
-        new java.lang.String[] { "HostPeerId", "DestSceneId", "EnterSceneToken", "PeerId", });
+        new java.lang.String[] { "DestSceneId", "HostPeerId", "PeerId", "EnterSceneToken", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)