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

@@ -19,24 +19,28 @@ public final class WidgetCoolDownDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 id = 8;</code>
-     * @return The id.
-     */
-    int getId();
-
-    /**
-     * <code>uint64 coolDownTime = 15;</code>
+     * <code>uint64 cool_down_time = 2;</code>
      * @return The coolDownTime.
      */
     long getCoolDownTime();
 
     /**
-     * <code>bool isSuccess = 12;</code>
+     * <code>uint32 id = 3;</code>
+     * @return The id.
+     */
+    int getId();
+
+    /**
+     * <code>bool is_success = 10;</code>
      * @return The isSuccess.
      */
     boolean getIsSuccess();
   }
   /**
+   * <pre>
+   * Name: JPEDGKIPECE
+   * </pre>
+   *
    * Protobuf type {@code WidgetCoolDownData}
    */
   public static final class WidgetCoolDownData extends
@@ -81,21 +85,21 @@ public final class WidgetCoolDownDataOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 16: {
+
+              coolDownTime_ = input.readUInt64();
+              break;
+            }
+            case 24: {
 
               id_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 80: {
 
               isSuccess_ = input.readBool();
               break;
             }
-            case 120: {
-
-              coolDownTime_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -128,21 +132,10 @@ public final class WidgetCoolDownDataOuterClass {
               emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.class, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder.class);
     }
 
-    public static final int ID_FIELD_NUMBER = 8;
-    private int id_;
-    /**
-     * <code>uint32 id = 8;</code>
-     * @return The id.
-     */
-    @java.lang.Override
-    public int getId() {
-      return id_;
-    }
-
-    public static final int COOLDOWNTIME_FIELD_NUMBER = 15;
+    public static final int COOL_DOWN_TIME_FIELD_NUMBER = 2;
     private long coolDownTime_;
     /**
-     * <code>uint64 coolDownTime = 15;</code>
+     * <code>uint64 cool_down_time = 2;</code>
      * @return The coolDownTime.
      */
     @java.lang.Override
@@ -150,10 +143,21 @@ public final class WidgetCoolDownDataOuterClass {
       return coolDownTime_;
     }
 
-    public static final int ISSUCCESS_FIELD_NUMBER = 12;
+    public static final int ID_FIELD_NUMBER = 3;
+    private int id_;
+    /**
+     * <code>uint32 id = 3;</code>
+     * @return The id.
+     */
+    @java.lang.Override
+    public int getId() {
+      return id_;
+    }
+
+    public static final int IS_SUCCESS_FIELD_NUMBER = 10;
     private boolean isSuccess_;
     /**
-     * <code>bool isSuccess = 12;</code>
+     * <code>bool is_success = 10;</code>
      * @return The isSuccess.
      */
     @java.lang.Override
@@ -175,14 +179,14 @@ public final class WidgetCoolDownDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (coolDownTime_ != 0L) {
+        output.writeUInt64(2, coolDownTime_);
+      }
       if (id_ != 0) {
-        output.writeUInt32(8, id_);
+        output.writeUInt32(3, id_);
       }
       if (isSuccess_ != false) {
-        output.writeBool(12, isSuccess_);
-      }
-      if (coolDownTime_ != 0L) {
-        output.writeUInt64(15, coolDownTime_);
+        output.writeBool(10, isSuccess_);
       }
       unknownFields.writeTo(output);
     }
@@ -193,17 +197,17 @@ public final class WidgetCoolDownDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (coolDownTime_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(2, coolDownTime_);
+      }
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, id_);
+          .computeUInt32Size(3, id_);
       }
       if (isSuccess_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isSuccess_);
-      }
-      if (coolDownTime_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, coolDownTime_);
+          .computeBoolSize(10, isSuccess_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -220,10 +224,10 @@ public final class WidgetCoolDownDataOuterClass {
       }
       emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other = (emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData) obj;
 
-      if (getId()
-          != other.getId()) return false;
       if (getCoolDownTime()
           != other.getCoolDownTime()) return false;
+      if (getId()
+          != other.getId()) return false;
       if (getIsSuccess()
           != other.getIsSuccess()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -237,12 +241,12 @@ public final class WidgetCoolDownDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId();
-      hash = (37 * hash) + COOLDOWNTIME_FIELD_NUMBER;
+      hash = (37 * hash) + COOL_DOWN_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getCoolDownTime());
-      hash = (37 * hash) + ISSUCCESS_FIELD_NUMBER;
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
+      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsSuccess());
       hash = (29 * hash) + unknownFields.hashCode();
@@ -341,6 +345,10 @@ public final class WidgetCoolDownDataOuterClass {
       return builder;
     }
     /**
+     * <pre>
+     * Name: JPEDGKIPECE
+     * </pre>
+     *
      * Protobuf type {@code WidgetCoolDownData}
      */
     public static final class Builder extends
@@ -378,10 +386,10 @@ public final class WidgetCoolDownDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        id_ = 0;
-
         coolDownTime_ = 0L;
 
+        id_ = 0;
+
         isSuccess_ = false;
 
         return this;
@@ -410,8 +418,8 @@ public final class WidgetCoolDownDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData buildPartial() {
         emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData result = new emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData(this);
-        result.id_ = id_;
         result.coolDownTime_ = coolDownTime_;
+        result.id_ = id_;
         result.isSuccess_ = isSuccess_;
         onBuilt();
         return result;
@@ -461,12 +469,12 @@ public final class WidgetCoolDownDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other) {
         if (other == emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()) return this;
-        if (other.getId() != 0) {
-          setId(other.getId());
-        }
         if (other.getCoolDownTime() != 0L) {
           setCoolDownTime(other.getCoolDownTime());
         }
+        if (other.getId() != 0) {
+          setId(other.getId());
+        }
         if (other.getIsSuccess() != false) {
           setIsSuccess(other.getIsSuccess());
         }
@@ -499,40 +507,9 @@ public final class WidgetCoolDownDataOuterClass {
         return this;
       }
 
-      private int id_ ;
-      /**
-       * <code>uint32 id = 8;</code>
-       * @return The id.
-       */
-      @java.lang.Override
-      public int getId() {
-        return id_;
-      }
-      /**
-       * <code>uint32 id = 8;</code>
-       * @param value The id to set.
-       * @return This builder for chaining.
-       */
-      public Builder setId(int value) {
-        
-        id_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearId() {
-        
-        id_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long coolDownTime_ ;
       /**
-       * <code>uint64 coolDownTime = 15;</code>
+       * <code>uint64 cool_down_time = 2;</code>
        * @return The coolDownTime.
        */
       @java.lang.Override
@@ -540,7 +517,7 @@ public final class WidgetCoolDownDataOuterClass {
         return coolDownTime_;
       }
       /**
-       * <code>uint64 coolDownTime = 15;</code>
+       * <code>uint64 cool_down_time = 2;</code>
        * @param value The coolDownTime to set.
        * @return This builder for chaining.
        */
@@ -551,7 +528,7 @@ public final class WidgetCoolDownDataOuterClass {
         return this;
       }
       /**
-       * <code>uint64 coolDownTime = 15;</code>
+       * <code>uint64 cool_down_time = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCoolDownTime() {
@@ -561,9 +538,40 @@ public final class WidgetCoolDownDataOuterClass {
         return this;
       }
 
+      private int id_ ;
+      /**
+       * <code>uint32 id = 3;</code>
+       * @return The id.
+       */
+      @java.lang.Override
+      public int getId() {
+        return id_;
+      }
+      /**
+       * <code>uint32 id = 3;</code>
+       * @param value The id to set.
+       * @return This builder for chaining.
+       */
+      public Builder setId(int value) {
+        
+        id_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearId() {
+        
+        id_ = 0;
+        onChanged();
+        return this;
+      }
+
       private boolean isSuccess_ ;
       /**
-       * <code>bool isSuccess = 12;</code>
+       * <code>bool is_success = 10;</code>
        * @return The isSuccess.
        */
       @java.lang.Override
@@ -571,7 +579,7 @@ public final class WidgetCoolDownDataOuterClass {
         return isSuccess_;
       }
       /**
-       * <code>bool isSuccess = 12;</code>
+       * <code>bool is_success = 10;</code>
        * @param value The isSuccess to set.
        * @return This builder for chaining.
        */
@@ -582,7 +590,7 @@ public final class WidgetCoolDownDataOuterClass {
         return this;
       }
       /**
-       * <code>bool isSuccess = 12;</code>
+       * <code>bool is_success = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsSuccess() {
@@ -658,10 +666,10 @@ public final class WidgetCoolDownDataOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030WidgetCoolDownData.proto\"I\n\022WidgetCool" +
-      "DownData\022\n\n\002id\030\010 \001(\r\022\024\n\014coolDownTime\030\017 \001" +
-      "(\004\022\021\n\tisSuccess\030\014 \001(\010B\033\n\031emu.grasscutter" +
-      ".net.protob\006proto3"
+      "\n\030WidgetCoolDownData.proto\"L\n\022WidgetCool" +
+      "DownData\022\026\n\016cool_down_time\030\002 \001(\004\022\n\n\002id\030\003" +
+      " \001(\r\022\022\n\nis_success\030\n \001(\010B\033\n\031emu.grasscut" +
+      "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -672,7 +680,7 @@ public final class WidgetCoolDownDataOuterClass {
     internal_static_WidgetCoolDownData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WidgetCoolDownData_descriptor,
-        new java.lang.String[] { "Id", "CoolDownTime", "IsSuccess", });
+        new java.lang.String[] { "CoolDownTime", "Id", "IsSuccess", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)