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

@@ -19,17 +19,17 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
     int getExpeditionInfoMapCount();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
     boolean containsExpeditionInfoMap(
         long key);
@@ -40,25 +40,30 @@ public final class AvatarExpeditionCallBackRspOuterClass {
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
     getExpeditionInfoMap();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
     getExpeditionInfoMapMap();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
 
     emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrDefault(
         long key,
         emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo defaultValue);
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
 
     emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
         long key);
   }
   /**
+   * <pre>
+   * Name: DLDIHMKBDPJ
+   * CmdId: 1631
+   * </pre>
+   *
    * Protobuf type {@code AvatarExpeditionCallBackRsp}
    */
   public static final class AvatarExpeditionCallBackRsp extends
@@ -104,7 +109,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
+            case 42: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
                     ExpeditionInfoMapDefaultEntryHolder.defaultEntry);
@@ -117,7 +122,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
                   expeditionInfoMap__.getKey(), expeditionInfoMap__.getValue());
               break;
             }
-            case 112: {
+            case 96: {
 
               retcode_ = input.readInt32();
               break;
@@ -151,7 +156,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 7:
+        case 5:
           return internalGetExpeditionInfoMap();
         default:
           throw new RuntimeException(
@@ -166,141 +171,10 @@ public final class AvatarExpeditionCallBackRspOuterClass {
               emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.class, emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.Builder.class);
     }
 
-    /**
-     * Protobuf enum {@code AvatarExpeditionCallBackRsp.PAFOHCPJJIP}
-     */
-    public enum PAFOHCPJJIP
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>NONE = 0;</code>
-       */
-      NONE(0, 0),
-      /**
-       * <code>PEPPOHPHJOJ = 1632;</code>
-       */
-      PEPPOHPHJOJ(1, 1632),
-      /**
-       * <code>NNBKOLMPOEA = 1;</code>
-       */
-      NNBKOLMPOEA(3, 1),
-      UNRECOGNIZED(-1, -1),
-      ;
-
-      /**
-       * <code>DCDNILFDFLB = 0;</code>
-       */
-      public static final PAFOHCPJJIP DCDNILFDFLB = NONE;
-      /**
-       * <code>NONE = 0;</code>
-       */
-      public static final int NONE_VALUE = 0;
-      /**
-       * <code>PEPPOHPHJOJ = 1632;</code>
-       */
-      public static final int PEPPOHPHJOJ_VALUE = 1632;
-      /**
-       * <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 PAFOHCPJJIP 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 PAFOHCPJJIP forNumber(int value) {
-        switch (value) {
-          case 0: return NONE;
-          case 1632: return PEPPOHPHJOJ;
-          case 1: return NNBKOLMPOEA;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<PAFOHCPJJIP>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          PAFOHCPJJIP> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<PAFOHCPJJIP>() {
-              public PAFOHCPJJIP findValueByNumber(int number) {
-                return PAFOHCPJJIP.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.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final PAFOHCPJJIP[] VALUES = getStaticValuesArray();
-      private static PAFOHCPJJIP[] getStaticValuesArray() {
-        return new PAFOHCPJJIP[] {
-          NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, 
-        };
-      }
-      public static PAFOHCPJJIP 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 PAFOHCPJJIP(int index, int value) {
-        this.index = index;
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:AvatarExpeditionCallBackRsp.PAFOHCPJJIP)
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 12;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -308,7 +182,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       return retcode_;
     }
 
-    public static final int EXPEDITIONINFOMAP_FIELD_NUMBER = 7;
+    public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 5;
     private static final class ExpeditionInfoMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> defaultEntry =
@@ -335,7 +209,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       return internalGetExpeditionInfoMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
 
     @java.lang.Override
@@ -353,7 +227,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       return getExpeditionInfoMapMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
     @java.lang.Override
 
@@ -361,7 +235,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       return internalGetExpeditionInfoMap().getMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
     @java.lang.Override
 
@@ -374,7 +248,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
      */
     @java.lang.Override
 
@@ -408,9 +282,9 @@ public final class AvatarExpeditionCallBackRspOuterClass {
           output,
           internalGetExpeditionInfoMap(),
           ExpeditionInfoMapDefaultEntryHolder.defaultEntry,
-          7);
+          5);
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(12, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -429,11 +303,11 @@ public final class AvatarExpeditionCallBackRspOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(7, expeditionInfoMap__);
+            .computeMessageSize(5, expeditionInfoMap__);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(12, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -468,7 +342,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       if (!internalGetExpeditionInfoMap().getMap().isEmpty()) {
-        hash = (37 * hash) + EXPEDITIONINFOMAP_FIELD_NUMBER;
+        hash = (37 * hash) + EXPEDITION_INFO_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetExpeditionInfoMap().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -567,6 +441,11 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       return builder;
     }
     /**
+     * <pre>
+     * Name: DLDIHMKBDPJ
+     * CmdId: 1631
+     * </pre>
+     *
      * Protobuf type {@code AvatarExpeditionCallBackRsp}
      */
     public static final class Builder extends
@@ -582,7 +461,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 7:
+          case 5:
             return internalGetExpeditionInfoMap();
           default:
             throw new RuntimeException(
@@ -593,7 +472,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 7:
+          case 5:
             return internalGetMutableExpeditionInfoMap();
           default:
             throw new RuntimeException(
@@ -744,7 +623,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 12;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -752,7 +631,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 12;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -763,7 +642,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -800,7 +679,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return internalGetExpeditionInfoMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
        */
 
       @java.lang.Override
@@ -818,7 +697,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return getExpeditionInfoMapMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
        */
       @java.lang.Override
 
@@ -826,7 +705,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return internalGetExpeditionInfoMap().getMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
        */
       @java.lang.Override
 
@@ -839,7 +718,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
        */
       @java.lang.Override
 
@@ -860,7 +739,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
        */
 
       public Builder removeExpeditionInfoMap(
@@ -879,7 +758,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return internalGetMutableExpeditionInfoMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
        */
       public Builder putExpeditionInfoMap(
           long key,
@@ -891,7 +770,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expeditionInfoMap = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 5;</code>
        */
 
       public Builder putAllExpeditionInfoMap(
@@ -973,15 +852,13 @@ public final class AvatarExpeditionCallBackRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n!AvatarExpeditionCallBackRsp.proto\032\032Ava" +
-      "tarExpeditionInfo.proto\"\240\002\n\033AvatarExpedi" +
-      "tionCallBackRsp\022\017\n\007retcode\030\016 \001(\005\022N\n\021expe" +
-      "ditionInfoMap\030\007 \003(\01323.AvatarExpeditionCa" +
-      "llBackRsp.ExpeditionInfoMapEntry\032O\n\026Expe" +
-      "ditionInfoMapEntry\022\013\n\003key\030\001 \001(\004\022$\n\005value" +
-      "\030\002 \001(\0132\025.AvatarExpeditionInfo:\0028\001\"O\n\013PAF" +
-      "OHCPJJIP\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\340\014\022\017\n\013" +
-      "DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031em" +
-      "u.grasscutter.net.protob\006proto3"
+      "tarExpeditionInfo.proto\"\321\001\n\033AvatarExpedi" +
+      "tionCallBackRsp\022\017\n\007retcode\030\014 \001(\005\022P\n\023expe" +
+      "dition_info_map\030\005 \003(\01323.AvatarExpedition" +
+      "CallBackRsp.ExpeditionInfoMapEntry\032O\n\026Ex" +
+      "peditionInfoMapEntry\022\013\n\003key\030\001 \001(\004\022$\n\005val" +
+      "ue\030\002 \001(\0132\025.AvatarExpeditionInfo:\0028\001B\033\n\031e" +
+      "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,