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

@@ -19,33 +19,38 @@ public final class BuyGoodsReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 buyCount = 14;</code>
+     * <code>uint32 buy_count = 14;</code>
      * @return The buyCount.
      */
     int getBuyCount();
 
     /**
-     * <code>uint32 shopType = 5;</code>
-     * @return The shopType.
-     */
-    int getShopType();
-
-    /**
-     * <code>.ShopGoods goods = 3;</code>
+     * <code>.ShopGoods goods = 5;</code>
      * @return Whether the goods field is set.
      */
     boolean hasGoods();
     /**
-     * <code>.ShopGoods goods = 3;</code>
+     * <code>.ShopGoods goods = 5;</code>
      * @return The goods.
      */
     emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods();
     /**
-     * <code>.ShopGoods goods = 3;</code>
+     * <code>.ShopGoods goods = 5;</code>
      */
     emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder();
+
+    /**
+     * <code>uint32 shop_type = 11;</code>
+     * @return The shopType.
+     */
+    int getShopType();
   }
   /**
+   * <pre>
+   * Name: KNMKFMAAMHH
+   * CmdId: 754
+   * </pre>
+   *
    * Protobuf type {@code BuyGoodsReq}
    */
   public static final class BuyGoodsReq extends
@@ -90,7 +95,7 @@ public final class BuyGoodsReqOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 42: {
               emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder subBuilder = null;
               if (goods_ != null) {
                 subBuilder = goods_.toBuilder();
@@ -103,7 +108,7 @@ public final class BuyGoodsReqOuterClass {
 
               break;
             }
-            case 40: {
+            case 88: {
 
               shopType_ = input.readUInt32();
               break;
@@ -145,149 +150,10 @@ public final class BuyGoodsReqOuterClass {
               emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.class, emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.Builder.class);
     }
 
-    /**
-     * Protobuf enum {@code BuyGoodsReq.ELOCMPDKODO}
-     */
-    public enum ELOCMPDKODO
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>NONE = 0;</code>
-       */
-      NONE(0, 0),
-      /**
-       * <code>PEPPOHPHJOJ = 787;</code>
-       */
-      PEPPOHPHJOJ(1, 787),
-      /**
-       * <code>NNBKOLMPOEA = 1;</code>
-       */
-      NNBKOLMPOEA(3, 1),
-      UNRECOGNIZED(-1, -1),
-      ;
-
-      /**
-       * <code>DCDNILFDFLB = 0;</code>
-       */
-      public static final ELOCMPDKODO DCDNILFDFLB = NONE;
-      /**
-       * <code>EAJIABGAOCI = 1;</code>
-       */
-      public static final ELOCMPDKODO EAJIABGAOCI = NNBKOLMPOEA;
-      /**
-       * <code>NONE = 0;</code>
-       */
-      public static final int NONE_VALUE = 0;
-      /**
-       * <code>PEPPOHPHJOJ = 787;</code>
-       */
-      public static final int PEPPOHPHJOJ_VALUE = 787;
-      /**
-       * <code>DCDNILFDFLB = 0;</code>
-       */
-      public static final int DCDNILFDFLB_VALUE = 0;
-      /**
-       * <code>NNBKOLMPOEA = 1;</code>
-       */
-      public static final int NNBKOLMPOEA_VALUE = 1;
-      /**
-       * <code>EAJIABGAOCI = 1;</code>
-       */
-      public static final int EAJIABGAOCI_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 ELOCMPDKODO 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 ELOCMPDKODO forNumber(int value) {
-        switch (value) {
-          case 0: return NONE;
-          case 787: return PEPPOHPHJOJ;
-          case 1: return NNBKOLMPOEA;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<ELOCMPDKODO>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          ELOCMPDKODO> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<ELOCMPDKODO>() {
-              public ELOCMPDKODO findValueByNumber(int number) {
-                return ELOCMPDKODO.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.BuyGoodsReqOuterClass.BuyGoodsReq.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final ELOCMPDKODO[] VALUES = getStaticValuesArray();
-      private static ELOCMPDKODO[] getStaticValuesArray() {
-        return new ELOCMPDKODO[] {
-          NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI, 
-        };
-      }
-      public static ELOCMPDKODO 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 ELOCMPDKODO(int index, int value) {
-        this.index = index;
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:BuyGoodsReq.ELOCMPDKODO)
-    }
-
-    public static final int BUYCOUNT_FIELD_NUMBER = 14;
+    public static final int BUY_COUNT_FIELD_NUMBER = 14;
     private int buyCount_;
     /**
-     * <code>uint32 buyCount = 14;</code>
+     * <code>uint32 buy_count = 14;</code>
      * @return The buyCount.
      */
     @java.lang.Override
@@ -295,21 +161,10 @@ public final class BuyGoodsReqOuterClass {
       return buyCount_;
     }
 
-    public static final int SHOPTYPE_FIELD_NUMBER = 5;
-    private int shopType_;
-    /**
-     * <code>uint32 shopType = 5;</code>
-     * @return The shopType.
-     */
-    @java.lang.Override
-    public int getShopType() {
-      return shopType_;
-    }
-
-    public static final int GOODS_FIELD_NUMBER = 3;
+    public static final int GOODS_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
     /**
-     * <code>.ShopGoods goods = 3;</code>
+     * <code>.ShopGoods goods = 5;</code>
      * @return Whether the goods field is set.
      */
     @java.lang.Override
@@ -317,7 +172,7 @@ public final class BuyGoodsReqOuterClass {
       return goods_ != null;
     }
     /**
-     * <code>.ShopGoods goods = 3;</code>
+     * <code>.ShopGoods goods = 5;</code>
      * @return The goods.
      */
     @java.lang.Override
@@ -325,13 +180,24 @@ public final class BuyGoodsReqOuterClass {
       return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
     }
     /**
-     * <code>.ShopGoods goods = 3;</code>
+     * <code>.ShopGoods goods = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
       return getGoods();
     }
 
+    public static final int SHOP_TYPE_FIELD_NUMBER = 11;
+    private int shopType_;
+    /**
+     * <code>uint32 shop_type = 11;</code>
+     * @return The shopType.
+     */
+    @java.lang.Override
+    public int getShopType() {
+      return shopType_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -347,10 +213,10 @@ public final class BuyGoodsReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (goods_ != null) {
-        output.writeMessage(3, getGoods());
+        output.writeMessage(5, getGoods());
       }
       if (shopType_ != 0) {
-        output.writeUInt32(5, shopType_);
+        output.writeUInt32(11, shopType_);
       }
       if (buyCount_ != 0) {
         output.writeUInt32(14, buyCount_);
@@ -366,11 +232,11 @@ public final class BuyGoodsReqOuterClass {
       size = 0;
       if (goods_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getGoods());
+          .computeMessageSize(5, getGoods());
       }
       if (shopType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, shopType_);
+          .computeUInt32Size(11, shopType_);
       }
       if (buyCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -393,13 +259,13 @@ public final class BuyGoodsReqOuterClass {
 
       if (getBuyCount()
           != other.getBuyCount()) return false;
-      if (getShopType()
-          != other.getShopType()) return false;
       if (hasGoods() != other.hasGoods()) return false;
       if (hasGoods()) {
         if (!getGoods()
             .equals(other.getGoods())) return false;
       }
+      if (getShopType()
+          != other.getShopType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -411,14 +277,14 @@ public final class BuyGoodsReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + BUYCOUNT_FIELD_NUMBER;
+      hash = (37 * hash) + BUY_COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getBuyCount();
-      hash = (37 * hash) + SHOPTYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getShopType();
       if (hasGoods()) {
         hash = (37 * hash) + GOODS_FIELD_NUMBER;
         hash = (53 * hash) + getGoods().hashCode();
       }
+      hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getShopType();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -515,6 +381,11 @@ public final class BuyGoodsReqOuterClass {
       return builder;
     }
     /**
+     * <pre>
+     * Name: KNMKFMAAMHH
+     * CmdId: 754
+     * </pre>
+     *
      * Protobuf type {@code BuyGoodsReq}
      */
     public static final class Builder extends
@@ -554,14 +425,14 @@ public final class BuyGoodsReqOuterClass {
         super.clear();
         buyCount_ = 0;
 
-        shopType_ = 0;
-
         if (goodsBuilder_ == null) {
           goods_ = null;
         } else {
           goods_ = null;
           goodsBuilder_ = null;
         }
+        shopType_ = 0;
+
         return this;
       }
 
@@ -589,12 +460,12 @@ public final class BuyGoodsReqOuterClass {
       public emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq buildPartial() {
         emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq result = new emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq(this);
         result.buyCount_ = buyCount_;
-        result.shopType_ = shopType_;
         if (goodsBuilder_ == null) {
           result.goods_ = goods_;
         } else {
           result.goods_ = goodsBuilder_.build();
         }
+        result.shopType_ = shopType_;
         onBuilt();
         return result;
       }
@@ -646,12 +517,12 @@ public final class BuyGoodsReqOuterClass {
         if (other.getBuyCount() != 0) {
           setBuyCount(other.getBuyCount());
         }
-        if (other.getShopType() != 0) {
-          setShopType(other.getShopType());
-        }
         if (other.hasGoods()) {
           mergeGoods(other.getGoods());
         }
+        if (other.getShopType() != 0) {
+          setShopType(other.getShopType());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -683,7 +554,7 @@ public final class BuyGoodsReqOuterClass {
 
       private int buyCount_ ;
       /**
-       * <code>uint32 buyCount = 14;</code>
+       * <code>uint32 buy_count = 14;</code>
        * @return The buyCount.
        */
       @java.lang.Override
@@ -691,7 +562,7 @@ public final class BuyGoodsReqOuterClass {
         return buyCount_;
       }
       /**
-       * <code>uint32 buyCount = 14;</code>
+       * <code>uint32 buy_count = 14;</code>
        * @param value The buyCount to set.
        * @return This builder for chaining.
        */
@@ -702,7 +573,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 buyCount = 14;</code>
+       * <code>uint32 buy_count = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearBuyCount() {
@@ -712,49 +583,18 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
 
-      private int shopType_ ;
-      /**
-       * <code>uint32 shopType = 5;</code>
-       * @return The shopType.
-       */
-      @java.lang.Override
-      public int getShopType() {
-        return shopType_;
-      }
-      /**
-       * <code>uint32 shopType = 5;</code>
-       * @param value The shopType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setShopType(int value) {
-        
-        shopType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 shopType = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearShopType() {
-        
-        shopType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsBuilder_;
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        * @return Whether the goods field is set.
        */
       public boolean hasGoods() {
         return goodsBuilder_ != null || goods_ != null;
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        * @return The goods.
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
@@ -765,7 +605,7 @@ public final class BuyGoodsReqOuterClass {
         }
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        */
       public Builder setGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
         if (goodsBuilder_ == null) {
@@ -781,7 +621,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        */
       public Builder setGoods(
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
@@ -795,7 +635,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        */
       public Builder mergeGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
         if (goodsBuilder_ == null) {
@@ -813,7 +653,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        */
       public Builder clearGoods() {
         if (goodsBuilder_ == null) {
@@ -827,7 +667,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsBuilder() {
         
@@ -835,7 +675,7 @@ public final class BuyGoodsReqOuterClass {
         return getGoodsFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
         if (goodsBuilder_ != null) {
@@ -846,7 +686,7 @@ public final class BuyGoodsReqOuterClass {
         }
       }
       /**
-       * <code>.ShopGoods goods = 3;</code>
+       * <code>.ShopGoods goods = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
@@ -861,6 +701,37 @@ public final class BuyGoodsReqOuterClass {
         }
         return goodsBuilder_;
       }
+
+      private int shopType_ ;
+      /**
+       * <code>uint32 shop_type = 11;</code>
+       * @return The shopType.
+       */
+      @java.lang.Override
+      public int getShopType() {
+        return shopType_;
+      }
+      /**
+       * <code>uint32 shop_type = 11;</code>
+       * @param value The shopType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setShopType(int value) {
+        
+        shopType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 shop_type = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearShopType() {
+        
+        shopType_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -928,13 +799,10 @@ public final class BuyGoodsReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021BuyGoodsReq.proto\032\017ShopGoods.proto\"\256\001\n" +
-      "\013BuyGoodsReq\022\020\n\010buyCount\030\016 \001(\r\022\020\n\010shopTy" +
-      "pe\030\005 \001(\r\022\031\n\005goods\030\003 \001(\0132\n.ShopGoods\"`\n\013E" +
-      "LOCMPDKODO\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\223\006\022\017" +
-      "\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJI" +
-      "ABGAOCI\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.pro" +
-      "tob\006proto3"
+      "\n\021BuyGoodsReq.proto\032\017ShopGoods.proto\"N\n\013" +
+      "BuyGoodsReq\022\021\n\tbuy_count\030\016 \001(\r\022\031\n\005goods\030" +
+      "\005 \001(\0132\n.ShopGoods\022\021\n\tshop_type\030\013 \001(\rB\033\n\031" +
+      "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -946,7 +814,7 @@ public final class BuyGoodsReqOuterClass {
     internal_static_BuyGoodsReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BuyGoodsReq_descriptor,
-        new java.lang.String[] { "BuyCount", "ShopType", "Goods", });
+        new java.lang.String[] { "BuyCount", "Goods", "ShopType", });
     emu.grasscutter.net.proto.ShopGoodsOuterClass.getDescriptor();
   }