Upgrade to REL3.7 (#2164)

* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal

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

@@ -19,39 +19,39 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 remain_fly_sea_lamp_num = 7;</code>
+     * <code>uint32 remain_fly_sea_lamp_num = 5;</code>
      * @return The remainFlySeaLampNum.
      */
     int getRemainFlySeaLampNum();
 
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> 
         getActivityScheduleListList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index);
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     int getActivityScheduleListCount();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
         getActivityScheduleListOrBuilderList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 2020
-   * Name: OIIEMAPPMNO
+   * CmdId: 2107
+   * Obf: HHEIHADMIIN
    * </pre>
    *
    * Protobuf type {@code ActivityScheduleInfoNotify}
@@ -100,7 +100,12 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 40: {
+
+              remainFlySeaLampNum_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 activityScheduleList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +114,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.parser(), extensionRegistry));
               break;
             }
-            case 56: {
-
-              remainFlySeaLampNum_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +149,10 @@ public final class ActivityScheduleInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.class, emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.Builder.class);
     }
 
-    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 7;
+    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 5;
     private int remainFlySeaLampNum_;
     /**
-     * <code>uint32 remain_fly_sea_lamp_num = 7;</code>
+     * <code>uint32 remain_fly_sea_lamp_num = 5;</code>
      * @return The remainFlySeaLampNum.
      */
     @java.lang.Override
@@ -160,17 +160,17 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return remainFlySeaLampNum_;
     }
 
-    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 3;
+    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_;
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
@@ -178,21 +178,21 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public int getActivityScheduleListCount() {
       return activityScheduleList_.size();
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
       return activityScheduleList_.get(index);
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
@@ -214,11 +214,11 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < activityScheduleList_.size(); i++) {
-        output.writeMessage(3, activityScheduleList_.get(i));
-      }
       if (remainFlySeaLampNum_ != 0) {
-        output.writeUInt32(7, remainFlySeaLampNum_);
+        output.writeUInt32(5, remainFlySeaLampNum_);
+      }
+      for (int i = 0; i < activityScheduleList_.size(); i++) {
+        output.writeMessage(12, activityScheduleList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +229,13 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < activityScheduleList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, activityScheduleList_.get(i));
-      }
       if (remainFlySeaLampNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, remainFlySeaLampNum_);
+          .computeUInt32Size(5, remainFlySeaLampNum_);
+      }
+      for (int i = 0; i < activityScheduleList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, activityScheduleList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -370,8 +370,8 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 2020
-     * Name: OIIEMAPPMNO
+     * CmdId: 2107
+     * Obf: HHEIHADMIIN
      * </pre>
      *
      * Protobuf type {@code ActivityScheduleInfoNotify}
@@ -566,7 +566,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
 
       private int remainFlySeaLampNum_ ;
       /**
-       * <code>uint32 remain_fly_sea_lamp_num = 7;</code>
+       * <code>uint32 remain_fly_sea_lamp_num = 5;</code>
        * @return The remainFlySeaLampNum.
        */
       @java.lang.Override
@@ -574,7 +574,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return remainFlySeaLampNum_;
       }
       /**
-       * <code>uint32 remain_fly_sea_lamp_num = 7;</code>
+       * <code>uint32 remain_fly_sea_lamp_num = 5;</code>
        * @param value The remainFlySeaLampNum to set.
        * @return This builder for chaining.
        */
@@ -585,7 +585,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 remain_fly_sea_lamp_num = 7;</code>
+       * <code>uint32 remain_fly_sea_lamp_num = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRemainFlySeaLampNum() {
@@ -608,7 +608,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> activityScheduleListBuilder_;
 
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
         if (activityScheduleListBuilder_ == null) {
@@ -618,7 +618,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public int getActivityScheduleListCount() {
         if (activityScheduleListBuilder_ == null) {
@@ -628,7 +628,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -638,7 +638,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -655,7 +655,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -669,7 +669,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
         if (activityScheduleListBuilder_ == null) {
@@ -685,7 +685,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -702,7 +702,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -716,7 +716,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -730,7 +730,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addAllActivityScheduleList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> values) {
@@ -745,7 +745,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder clearActivityScheduleList() {
         if (activityScheduleListBuilder_ == null) {
@@ -758,7 +758,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder removeActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -771,14 +771,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder getActivityScheduleListBuilder(
           int index) {
         return getActivityScheduleListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
           int index) {
@@ -788,7 +788,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
            getActivityScheduleListOrBuilderList() {
@@ -799,14 +799,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder() {
         return getActivityScheduleListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder(
           int index) {
@@ -814,7 +814,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 3;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder> 
            getActivityScheduleListBuilderList() {
@@ -904,7 +904,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       "\n ActivityScheduleInfoNotify.proto\032\032Acti" +
       "vityScheduleInfo.proto\"t\n\032ActivitySchedu" +
       "leInfoNotify\022\037\n\027remain_fly_sea_lamp_num\030" +
-      "\007 \001(\r\0225\n\026activity_schedule_list\030\003 \003(\0132\025." +
+      "\005 \001(\r\0225\n\026activity_schedule_list\030\014 \003(\0132\025." +
       "ActivityScheduleInfoB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };