Update 3.0 protos

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

@@ -43,7 +43,8 @@ public final class AbilityChangeNotifyOuterClass {
    * <pre>
    * CmdId: 1131
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AbilityChangeNotify}
@@ -352,7 +353,8 @@ public final class AbilityChangeNotifyOuterClass {
      * <pre>
      * CmdId: 1131
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AbilityChangeNotify}

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

@@ -46,7 +46,7 @@ public final class AbilityInvocationsNotifyOuterClass {
    * <pre>
    * CmdId: 1198
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -341,7 +341,7 @@ public final class AbilityInvocationsNotifyOuterClass {
      * <pre>
      * CmdId: 1198
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *

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

@@ -167,6 +167,14 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL = 63;</code>
      */
     ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL(63),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP = 64;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP(64),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD = 65;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD(65),
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100;</code>
      */
@@ -235,6 +243,18 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB = 116;</code>
      */
     ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB(116),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP = 117;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP(117),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL = 118;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL(118),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG = 119;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG(119),
     UNRECOGNIZED(-1),
     ;
 
@@ -386,6 +406,14 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL = 63;</code>
      */
     public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL_VALUE = 63;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP = 64;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP_VALUE = 64;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD = 65;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD_VALUE = 65;
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100;</code>
      */
@@ -454,6 +482,18 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB = 116;</code>
      */
     public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB_VALUE = 116;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP = 117;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP_VALUE = 117;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL = 118;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL_VALUE = 118;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG = 119;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG_VALUE = 119;
 
 
     public final int getNumber() {
@@ -517,6 +557,8 @@ public final class AbilityInvokeArgumentOuterClass {
         case 61: return ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE;
         case 62: return ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE;
         case 63: return ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL;
+        case 64: return ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP;
+        case 65: return ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD;
         case 100: return ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA;
         case 101: return ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND;
         case 102: return ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE;
@@ -534,6 +576,9 @@ public final class AbilityInvokeArgumentOuterClass {
         case 114: return ABILITY_INVOKE_ARGUMENT_Unk2700_EGCIFFFLLBG;
         case 115: return ABILITY_INVOKE_ARGUMENT_Unk2700_OFDGFACOLDI;
         case 116: return ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB;
+        case 117: return ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP;
+        case 118: return ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL;
+        case 119: return ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG;
         default: return null;
       }
     }
@@ -599,7 +644,7 @@ public final class AbilityInvokeArgumentOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033AbilityInvokeArgument.proto*\253\026\n\025Abilit" +
+      "\n\033AbilityInvokeArgument.proto*\240\030\n\025Abilit" +
       "yInvokeArgument\022 \n\034ABILITY_INVOKE_ARGUME" +
       "NT_NONE\020\000\0220\n,ABILITY_INVOKE_ARGUMENT_MET" +
       "A_MODIFIER_CHANGE\020\001\022@\n<ABILITY_INVOKE_AR" +
@@ -649,30 +694,36 @@ public final class AbilityInvokeArgumentOuterClass {
       "NVOKE_ARGUMENT_ACTION_DESTROY_TILE\020=\0223\n/" +
       "ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTE" +
       "R_IMAGE\020>\022/\n+ABILITY_INVOKE_ARGUMENT_Unk" +
-      "2700_FNANDDPDLOL\020?\0228\n4ABILITY_INVOKE_ARG" +
-      "UMENT_MIXIN_AVATAR_STEER_BY_CAMERA\020d\0220\n," +
-      "ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DE" +
-      "FEND\020e\022+\n\'ABILITY_INVOKE_ARGUMENT_MIXIN_" +
-      "WIND_ZONE\020f\022.\n*ABILITY_INVOKE_ARGUMENT_M" +
-      "IXIN_COST_STAMINA\020g\022.\n*ABILITY_INVOKE_AR" +
-      "GUMENT_MIXIN_ELITE_SHIELD\020h\0220\n,ABILITY_I" +
-      "NVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD\020i\022/\n" +
-      "+ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SH" +
-      "IELD\020j\022,\n(ABILITY_INVOKE_ARGUMENT_MIXIN_" +
-      "SHIELD_BAR\020k\0223\n/ABILITY_INVOKE_ARGUMENT_" +
-      "MIXIN_WIND_SEED_SPAWNER\020l\022?\n;ABILITY_INV" +
-      "OKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_" +
-      "REACTION\020m\022;\n7ABILITY_INVOKE_ARGUMENT_MI" +
-      "XIN_FIELD_ENTITY_COUNT_CHANGE\020n\0221\n-ABILI" +
-      "TY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC" +
-      "\020o\0223\n/ABILITY_INVOKE_ARGUMENT_MIXIN_WIDG" +
-      "ET_MP_SUPPORT\020p\022/\n+ABILITY_INVOKE_ARGUME" +
-      "NT_Unk2700_NJHBFADEOON\020q\022/\n+ABILITY_INVO" +
-      "KE_ARGUMENT_Unk2700_EGCIFFFLLBG\020r\022/\n+ABI" +
-      "LITY_INVOKE_ARGUMENT_Unk2700_OFDGFACOLDI" +
-      "\020s\022/\n+ABILITY_INVOKE_ARGUMENT_Unk2700_KD" +
-      "PKJGJNGFB\020tB\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "2700_FNANDDPDLOL\020?\022/\n+ABILITY_INVOKE_ARG" +
+      "UMENT_Unk3000_EEANHJONEEP\020@\022/\n+ABILITY_I" +
+      "NVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD\020A\0228\n4" +
+      "ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STE" +
+      "ER_BY_CAMERA\020d\0220\n,ABILITY_INVOKE_ARGUMEN" +
+      "T_MIXIN_MONSTER_DEFEND\020e\022+\n\'ABILITY_INVO" +
+      "KE_ARGUMENT_MIXIN_WIND_ZONE\020f\022.\n*ABILITY" +
+      "_INVOKE_ARGUMENT_MIXIN_COST_STAMINA\020g\022.\n" +
+      "*ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHI" +
+      "ELD\020h\0220\n,ABILITY_INVOKE_ARGUMENT_MIXIN_E" +
+      "LEMENT_SHIELD\020i\022/\n+ABILITY_INVOKE_ARGUME" +
+      "NT_MIXIN_GLOBAL_SHIELD\020j\022,\n(ABILITY_INVO" +
+      "KE_ARGUMENT_MIXIN_SHIELD_BAR\020k\0223\n/ABILIT" +
+      "Y_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNE" +
+      "R\020l\022?\n;ABILITY_INVOKE_ARGUMENT_MIXIN_DO_" +
+      "ACTION_BY_ELEMENT_REACTION\020m\022;\n7ABILITY_" +
+      "INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT" +
+      "_CHANGE\020n\0221\n-ABILITY_INVOKE_ARGUMENT_MIX" +
+      "IN_SCENE_PROP_SYNC\020o\0223\n/ABILITY_INVOKE_A" +
+      "RGUMENT_MIXIN_WIDGET_MP_SUPPORT\020p\022/\n+ABI" +
+      "LITY_INVOKE_ARGUMENT_Unk2700_NJHBFADEOON" +
+      "\020q\022/\n+ABILITY_INVOKE_ARGUMENT_Unk2700_EG" +
+      "CIFFFLLBG\020r\022/\n+ABILITY_INVOKE_ARGUMENT_U" +
+      "nk2700_OFDGFACOLDI\020s\022/\n+ABILITY_INVOKE_A" +
+      "RGUMENT_Unk2700_KDPKJGJNGFB\020t\022/\n+ABILITY" +
+      "_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP\020u\022/" +
+      "\n+ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOC" +
+      "BHKAL\020v\022/\n+ABILITY_INVOKE_ARGUMENT_Unk30" +
+      "00_EFJIGCEGHJG\020wB\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

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

@@ -35,9 +35,9 @@ public final class ActivityInfoNotifyOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 2125
+   * CmdId: 2060
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -318,9 +318,9 @@ public final class ActivityInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 2125
+     * CmdId: 2060
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *

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

@@ -60,6 +60,10 @@ public final class ActivityInfoOuterClass {
     int getTakenRewardList(int index);
 
     /**
+     * <pre>
+     *bool Unk2700_NONJFHAIFLA = 102;
+     * </pre>
+     *
      * <code>uint32 selected_avatar_reward_id = 1290;</code>
      * @return The selectedAvatarRewardId.
      */
@@ -142,24 +146,44 @@ public final class ActivityInfoOuterClass {
     int getActivityType();
 
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     java.util.List<emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC> 
         getUnk2800KOMIPKKKOBEList();
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC getUnk2800KOMIPKKKOBE(int index);
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     int getUnk2800KOMIPKKKOBECount();
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLCOrBuilder> 
         getUnk2800KOMIPKKKOBEOrBuilderList();
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLCOrBuilder getUnk2800KOMIPKKKOBEOrBuilder(
@@ -183,16 +207,28 @@ public final class ActivityInfoOuterClass {
     int getMeetCondList(int index);
 
     /**
+     * <pre>
+     *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+     * </pre>
+     *
      * <code>repeated uint32 expire_cond_list = 3;</code>
      * @return A list containing the expireCondList.
      */
     java.util.List<java.lang.Integer> getExpireCondListList();
     /**
+     * <pre>
+     *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+     * </pre>
+     *
      * <code>repeated uint32 expire_cond_list = 3;</code>
      * @return The count of expireCondList.
      */
     int getExpireCondListCount();
     /**
+     * <pre>
+     *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+     * </pre>
+     *
      * <code>repeated uint32 expire_cond_list = 3;</code>
      * @param index The index of the element to return.
      * @return The expireCondList at the given index.
@@ -742,6 +778,10 @@ public final class ActivityInfoOuterClass {
     public static final int SELECTED_AVATAR_REWARD_ID_FIELD_NUMBER = 1290;
     private int selectedAvatarRewardId_;
     /**
+     * <pre>
+     *bool Unk2700_NONJFHAIFLA = 102;
+     * </pre>
+     *
      * <code>uint32 selected_avatar_reward_id = 1290;</code>
      * @return The selectedAvatarRewardId.
      */
@@ -911,6 +951,10 @@ public final class ActivityInfoOuterClass {
     public static final int UNK2800_KOMIPKKKOBE_FIELD_NUMBER = 864;
     private java.util.List<emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC> unk2800KOMIPKKKOBE_;
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     @java.lang.Override
@@ -918,6 +962,10 @@ public final class ActivityInfoOuterClass {
       return unk2800KOMIPKKKOBE_;
     }
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     @java.lang.Override
@@ -926,6 +974,10 @@ public final class ActivityInfoOuterClass {
       return unk2800KOMIPKKKOBE_;
     }
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     @java.lang.Override
@@ -933,6 +985,10 @@ public final class ActivityInfoOuterClass {
       return unk2800KOMIPKKKOBE_.size();
     }
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     @java.lang.Override
@@ -940,6 +996,10 @@ public final class ActivityInfoOuterClass {
       return unk2800KOMIPKKKOBE_.get(index);
     }
     /**
+     * <pre>
+     *bool Unk2700_EDKLLHBEEGE = 1449;
+     * </pre>
+     *
      * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
      */
     @java.lang.Override
@@ -979,6 +1039,10 @@ public final class ActivityInfoOuterClass {
     public static final int EXPIRE_COND_LIST_FIELD_NUMBER = 3;
     private com.google.protobuf.Internal.IntList expireCondList_;
     /**
+     * <pre>
+     *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+     * </pre>
+     *
      * <code>repeated uint32 expire_cond_list = 3;</code>
      * @return A list containing the expireCondList.
      */
@@ -988,6 +1052,10 @@ public final class ActivityInfoOuterClass {
       return expireCondList_;
     }
     /**
+     * <pre>
+     *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+     * </pre>
+     *
      * <code>repeated uint32 expire_cond_list = 3;</code>
      * @return The count of expireCondList.
      */
@@ -995,6 +1063,10 @@ public final class ActivityInfoOuterClass {
       return expireCondList_.size();
     }
     /**
+     * <pre>
+     *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+     * </pre>
+     *
      * <code>repeated uint32 expire_cond_list = 3;</code>
      * @param index The index of the element to return.
      * @return The expireCondList at the given index.
@@ -2252,6 +2324,10 @@ public final class ActivityInfoOuterClass {
 
       private int selectedAvatarRewardId_ ;
       /**
+       * <pre>
+       *bool Unk2700_NONJFHAIFLA = 102;
+       * </pre>
+       *
        * <code>uint32 selected_avatar_reward_id = 1290;</code>
        * @return The selectedAvatarRewardId.
        */
@@ -2260,6 +2336,10 @@ public final class ActivityInfoOuterClass {
         return selectedAvatarRewardId_;
       }
       /**
+       * <pre>
+       *bool Unk2700_NONJFHAIFLA = 102;
+       * </pre>
+       *
        * <code>uint32 selected_avatar_reward_id = 1290;</code>
        * @param value The selectedAvatarRewardId to set.
        * @return This builder for chaining.
@@ -2271,6 +2351,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_NONJFHAIFLA = 102;
+       * </pre>
+       *
        * <code>uint32 selected_avatar_reward_id = 1290;</code>
        * @return This builder for chaining.
        */
@@ -2639,6 +2723,10 @@ public final class ActivityInfoOuterClass {
           emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC, emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC.Builder, emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLCOrBuilder> unk2800KOMIPKKKOBEBuilder_;
 
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC> getUnk2800KOMIPKKKOBEList() {
@@ -2649,6 +2737,10 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public int getUnk2800KOMIPKKKOBECount() {
@@ -2659,6 +2751,10 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC getUnk2800KOMIPKKKOBE(int index) {
@@ -2669,6 +2765,10 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder setUnk2800KOMIPKKKOBE(
@@ -2686,6 +2786,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder setUnk2800KOMIPKKKOBE(
@@ -2700,6 +2804,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder addUnk2800KOMIPKKKOBE(emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC value) {
@@ -2716,6 +2824,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder addUnk2800KOMIPKKKOBE(
@@ -2733,6 +2845,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder addUnk2800KOMIPKKKOBE(
@@ -2747,6 +2863,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder addUnk2800KOMIPKKKOBE(
@@ -2761,6 +2881,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder addAllUnk2800KOMIPKKKOBE(
@@ -2776,6 +2900,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder clearUnk2800KOMIPKKKOBE() {
@@ -2789,6 +2917,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public Builder removeUnk2800KOMIPKKKOBE(int index) {
@@ -2802,6 +2934,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC.Builder getUnk2800KOMIPKKKOBEBuilder(
@@ -2809,6 +2945,10 @@ public final class ActivityInfoOuterClass {
         return getUnk2800KOMIPKKKOBEFieldBuilder().getBuilder(index);
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLCOrBuilder getUnk2800KOMIPKKKOBEOrBuilder(
@@ -2819,6 +2959,10 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLCOrBuilder> 
@@ -2830,6 +2974,10 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC.Builder addUnk2800KOMIPKKKOBEBuilder() {
@@ -2837,6 +2985,10 @@ public final class ActivityInfoOuterClass {
             emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC.getDefaultInstance());
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC.Builder addUnk2800KOMIPKKKOBEBuilder(
@@ -2845,6 +2997,10 @@ public final class ActivityInfoOuterClass {
             index, emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC.getDefaultInstance());
       }
       /**
+       * <pre>
+       *bool Unk2700_EDKLLHBEEGE = 1449;
+       * </pre>
+       *
        * <code>repeated .Unk2800_PHPHMILPOLC Unk2800_KOMIPKKKOBE = 864;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Unk2800PHPHMILPOLC.Unk2800_PHPHMILPOLC.Builder> 
@@ -2953,6 +3109,10 @@ public final class ActivityInfoOuterClass {
          }
       }
       /**
+       * <pre>
+       *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+       * </pre>
+       *
        * <code>repeated uint32 expire_cond_list = 3;</code>
        * @return A list containing the expireCondList.
        */
@@ -2962,6 +3122,10 @@ public final class ActivityInfoOuterClass {
                  java.util.Collections.unmodifiableList(expireCondList_) : expireCondList_;
       }
       /**
+       * <pre>
+       *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+       * </pre>
+       *
        * <code>repeated uint32 expire_cond_list = 3;</code>
        * @return The count of expireCondList.
        */
@@ -2969,6 +3133,10 @@ public final class ActivityInfoOuterClass {
         return expireCondList_.size();
       }
       /**
+       * <pre>
+       *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+       * </pre>
+       *
        * <code>repeated uint32 expire_cond_list = 3;</code>
        * @param index The index of the element to return.
        * @return The expireCondList at the given index.
@@ -2977,6 +3145,10 @@ public final class ActivityInfoOuterClass {
         return expireCondList_.getInt(index);
       }
       /**
+       * <pre>
+       *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+       * </pre>
+       *
        * <code>repeated uint32 expire_cond_list = 3;</code>
        * @param index The index to set the value at.
        * @param value The expireCondList to set.
@@ -2990,6 +3162,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+       * </pre>
+       *
        * <code>repeated uint32 expire_cond_list = 3;</code>
        * @param value The expireCondList to add.
        * @return This builder for chaining.
@@ -3001,6 +3177,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+       * </pre>
+       *
        * <code>repeated uint32 expire_cond_list = 3;</code>
        * @param values The expireCondList to add.
        * @return This builder for chaining.
@@ -3014,6 +3194,10 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *map&lt;uint32, uint32&gt; Unk2700_IFPBCNLCKLG = 1399;
+       * </pre>
+       *
        * <code>repeated uint32 expire_cond_list = 3;</code>
        * @return This builder for chaining.
        */

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

@@ -50,9 +50,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 2033
+   * CmdId: 2073
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -372,9 +372,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 2033
+     * CmdId: 2073
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *

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

@@ -19,10 +19,10 @@ public final class ActivityScheduleInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 activity_id = 14;</code>
-     * @return The activityId.
+     * <code>uint32 schedule_id = 13;</code>
+     * @return The scheduleId.
      */
-    int getActivityId();
+    int getScheduleId();
 
     /**
      * <code>bool is_open = 2;</code>
@@ -31,22 +31,22 @@ public final class ActivityScheduleInfoOuterClass {
     boolean getIsOpen();
 
     /**
-     * <code>uint32 schedule_id = 13;</code>
-     * @return The scheduleId.
-     */
-    int getScheduleId();
-
-    /**
-     * <code>uint32 begin_time = 10;</code>
-     * @return The beginTime.
+     * <code>uint32 activity_id = 14;</code>
+     * @return The activityId.
      */
-    int getBeginTime();
+    int getActivityId();
 
     /**
      * <code>uint32 end_time = 1;</code>
      * @return The endTime.
      */
     int getEndTime();
+
+    /**
+     * <code>uint32 begin_time = 10;</code>
+     * @return The beginTime.
+     */
+    int getBeginTime();
   }
   /**
    * Protobuf type {@code ActivityScheduleInfo}
@@ -150,15 +150,15 @@ public final class ActivityScheduleInfoOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.class, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder.class);
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 14;
-    private int activityId_;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 13;
+    private int scheduleId_;
     /**
-     * <code>uint32 activity_id = 14;</code>
-     * @return The activityId.
+     * <code>uint32 schedule_id = 13;</code>
+     * @return The scheduleId.
      */
     @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
+    public int getScheduleId() {
+      return scheduleId_;
     }
 
     public static final int IS_OPEN_FIELD_NUMBER = 2;
@@ -172,26 +172,15 @@ public final class ActivityScheduleInfoOuterClass {
       return isOpen_;
     }
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 13;
-    private int scheduleId_;
-    /**
-     * <code>uint32 schedule_id = 13;</code>
-     * @return The scheduleId.
-     */
-    @java.lang.Override
-    public int getScheduleId() {
-      return scheduleId_;
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 10;
-    private int beginTime_;
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 14;
+    private int activityId_;
     /**
-     * <code>uint32 begin_time = 10;</code>
-     * @return The beginTime.
+     * <code>uint32 activity_id = 14;</code>
+     * @return The activityId.
      */
     @java.lang.Override
-    public int getBeginTime() {
-      return beginTime_;
+    public int getActivityId() {
+      return activityId_;
     }
 
     public static final int END_TIME_FIELD_NUMBER = 1;
@@ -205,6 +194,17 @@ public final class ActivityScheduleInfoOuterClass {
       return endTime_;
     }
 
+    public static final int BEGIN_TIME_FIELD_NUMBER = 10;
+    private int beginTime_;
+    /**
+     * <code>uint32 begin_time = 10;</code>
+     * @return The beginTime.
+     */
+    @java.lang.Override
+    public int getBeginTime() {
+      return beginTime_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -278,16 +278,16 @@ public final class ActivityScheduleInfoOuterClass {
       }
       emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo other = (emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo) obj;
 
-      if (getActivityId()
-          != other.getActivityId()) return false;
-      if (getIsOpen()
-          != other.getIsOpen()) return false;
       if (getScheduleId()
           != other.getScheduleId()) return false;
-      if (getBeginTime()
-          != other.getBeginTime()) return false;
+      if (getIsOpen()
+          != other.getIsOpen()) return false;
+      if (getActivityId()
+          != other.getActivityId()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
+      if (getBeginTime()
+          != other.getBeginTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -299,17 +299,17 @@ public final class ActivityScheduleInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
+      hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getScheduleId();
       hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsOpen());
-      hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getScheduleId();
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
+      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityId();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
+      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getBeginTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -443,16 +443,16 @@ public final class ActivityScheduleInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        activityId_ = 0;
+        scheduleId_ = 0;
 
         isOpen_ = false;
 
-        scheduleId_ = 0;
-
-        beginTime_ = 0;
+        activityId_ = 0;
 
         endTime_ = 0;
 
+        beginTime_ = 0;
+
         return this;
       }
 
@@ -479,11 +479,11 @@ public final class ActivityScheduleInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo buildPartial() {
         emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo result = new emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo(this);
-        result.activityId_ = activityId_;
-        result.isOpen_ = isOpen_;
         result.scheduleId_ = scheduleId_;
-        result.beginTime_ = beginTime_;
+        result.isOpen_ = isOpen_;
+        result.activityId_ = activityId_;
         result.endTime_ = endTime_;
+        result.beginTime_ = beginTime_;
         onBuilt();
         return result;
       }
@@ -532,21 +532,21 @@ public final class ActivityScheduleInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo other) {
         if (other == emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance()) return this;
-        if (other.getActivityId() != 0) {
-          setActivityId(other.getActivityId());
+        if (other.getScheduleId() != 0) {
+          setScheduleId(other.getScheduleId());
         }
         if (other.getIsOpen() != false) {
           setIsOpen(other.getIsOpen());
         }
-        if (other.getScheduleId() != 0) {
-          setScheduleId(other.getScheduleId());
-        }
-        if (other.getBeginTime() != 0) {
-          setBeginTime(other.getBeginTime());
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
         }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
         }
+        if (other.getBeginTime() != 0) {
+          setBeginTime(other.getBeginTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -576,33 +576,33 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
 
-      private int activityId_ ;
+      private int scheduleId_ ;
       /**
-       * <code>uint32 activity_id = 14;</code>
-       * @return The activityId.
+       * <code>uint32 schedule_id = 13;</code>
+       * @return The scheduleId.
        */
       @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
+      public int getScheduleId() {
+        return scheduleId_;
       }
       /**
-       * <code>uint32 activity_id = 14;</code>
-       * @param value The activityId to set.
+       * <code>uint32 schedule_id = 13;</code>
+       * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
-      public Builder setActivityId(int value) {
+      public Builder setScheduleId(int value) {
         
-        activityId_ = value;
+        scheduleId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 activity_id = 14;</code>
+       * <code>uint32 schedule_id = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearActivityId() {
+      public Builder clearScheduleId() {
         
-        activityId_ = 0;
+        scheduleId_ = 0;
         onChanged();
         return this;
       }
@@ -638,95 +638,95 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
 
-      private int scheduleId_ ;
+      private int activityId_ ;
       /**
-       * <code>uint32 schedule_id = 13;</code>
-       * @return The scheduleId.
+       * <code>uint32 activity_id = 14;</code>
+       * @return The activityId.
        */
       @java.lang.Override
-      public int getScheduleId() {
-        return scheduleId_;
+      public int getActivityId() {
+        return activityId_;
       }
       /**
-       * <code>uint32 schedule_id = 13;</code>
-       * @param value The scheduleId to set.
+       * <code>uint32 activity_id = 14;</code>
+       * @param value The activityId to set.
        * @return This builder for chaining.
        */
-      public Builder setScheduleId(int value) {
+      public Builder setActivityId(int value) {
         
-        scheduleId_ = value;
+        activityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 13;</code>
+       * <code>uint32 activity_id = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearScheduleId() {
+      public Builder clearActivityId() {
         
-        scheduleId_ = 0;
+        activityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int beginTime_ ;
+      private int endTime_ ;
       /**
-       * <code>uint32 begin_time = 10;</code>
-       * @return The beginTime.
+       * <code>uint32 end_time = 1;</code>
+       * @return The endTime.
        */
       @java.lang.Override
-      public int getBeginTime() {
-        return beginTime_;
+      public int getEndTime() {
+        return endTime_;
       }
       /**
-       * <code>uint32 begin_time = 10;</code>
-       * @param value The beginTime to set.
+       * <code>uint32 end_time = 1;</code>
+       * @param value The endTime to set.
        * @return This builder for chaining.
        */
-      public Builder setBeginTime(int value) {
+      public Builder setEndTime(int value) {
         
-        beginTime_ = value;
+        endTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 begin_time = 10;</code>
+       * <code>uint32 end_time = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBeginTime() {
+      public Builder clearEndTime() {
         
-        beginTime_ = 0;
+        endTime_ = 0;
         onChanged();
         return this;
       }
 
-      private int endTime_ ;
+      private int beginTime_ ;
       /**
-       * <code>uint32 end_time = 1;</code>
-       * @return The endTime.
+       * <code>uint32 begin_time = 10;</code>
+       * @return The beginTime.
        */
       @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
+      public int getBeginTime() {
+        return beginTime_;
       }
       /**
-       * <code>uint32 end_time = 1;</code>
-       * @param value The endTime to set.
+       * <code>uint32 begin_time = 10;</code>
+       * @param value The beginTime to set.
        * @return This builder for chaining.
        */
-      public Builder setEndTime(int value) {
+      public Builder setBeginTime(int value) {
         
-        endTime_ = value;
+        beginTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 end_time = 1;</code>
+       * <code>uint32 begin_time = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEndTime() {
+      public Builder clearBeginTime() {
         
-        endTime_ = 0;
+        beginTime_ = 0;
         onChanged();
         return this;
       }
@@ -798,9 +798,9 @@ public final class ActivityScheduleInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032ActivityScheduleInfo.proto\"w\n\024Activity" +
-      "ScheduleInfo\022\023\n\013activity_id\030\016 \001(\r\022\017\n\007is_" +
-      "open\030\002 \001(\010\022\023\n\013schedule_id\030\r \001(\r\022\022\n\nbegin" +
-      "_time\030\n \001(\r\022\020\n\010end_time\030\001 \001(\rB\033\n\031emu.gra" +
+      "ScheduleInfo\022\023\n\013schedule_id\030\r \001(\r\022\017\n\007is_" +
+      "open\030\002 \001(\010\022\023\n\013activity_id\030\016 \001(\r\022\020\n\010end_t" +
+      "ime\030\001 \001(\r\022\022\n\nbegin_time\030\n \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -812,7 +812,7 @@ public final class ActivityScheduleInfoOuterClass {
     internal_static_ActivityScheduleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityScheduleInfo_descriptor,
-        new java.lang.String[] { "ActivityId", "IsOpen", "ScheduleId", "BeginTime", "EndTime", });
+        new java.lang.String[] { "ScheduleId", "IsOpen", "ActivityId", "EndTime", "BeginTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -32,9 +32,9 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 2090
+   * CmdId: 2038
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -314,9 +314,9 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 2090
+     * CmdId: 2038
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *

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

@@ -18,12 +18,6 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       // @@protoc_insertion_point(interface_extends:ActivityTakeWatcherRewardRsp)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
     /**
      * <code>uint32 activity_id = 14;</code>
      * @return The activityId.
@@ -35,12 +29,19 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
      * @return The watcherId.
      */
     int getWatcherId();
+
+    /**
+     * <code>int32 retcode = 9;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 2025
+   * CmdId: 2034
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -134,17 +135,6 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
               emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
     public static final int ACTIVITY_ID_FIELD_NUMBER = 14;
     private int activityId_;
     /**
@@ -167,6 +157,17 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       return watcherId_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 9;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 9;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -226,12 +227,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       }
       emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp other = (emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getActivityId()
           != other.getActivityId()) return false;
       if (getWatcherId()
           != other.getWatcherId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -243,12 +244,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getActivityId();
       hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getWatcherId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,9 +347,10 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 2025
+     * CmdId: 2034
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -388,12 +390,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         activityId_ = 0;
 
         watcherId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -420,9 +422,9 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp buildPartial() {
         emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp result = new emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp(this);
-        result.retcode_ = retcode_;
         result.activityId_ = activityId_;
         result.watcherId_ = watcherId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -471,15 +473,15 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp other) {
         if (other == emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getActivityId() != 0) {
           setActivityId(other.getActivityId());
         }
         if (other.getWatcherId() != 0) {
           setWatcherId(other.getWatcherId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,37 +511,6 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int activityId_ ;
       /**
        * <code>uint32 activity_id = 14;</code>
@@ -601,6 +572,37 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 9;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 9;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -669,9 +671,9 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\"ActivityTakeWatcherRewardRsp.proto\"X\n\034" +
-      "ActivityTakeWatcherRewardRsp\022\017\n\007retcode\030" +
-      "\t \001(\005\022\023\n\013activity_id\030\016 \001(\r\022\022\n\nwatcher_id" +
-      "\030\007 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "ActivityTakeWatcherRewardRsp\022\023\n\013activity" +
+      "_id\030\016 \001(\r\022\022\n\nwatcher_id\030\007 \001(\r\022\017\n\007retcode" +
+      "\030\t \001(\005B\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -683,7 +685,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
     internal_static_ActivityTakeWatcherRewardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityTakeWatcherRewardRsp_descriptor,
-        new java.lang.String[] { "Retcode", "ActivityId", "WatcherId", });
+        new java.lang.String[] { "ActivityId", "WatcherId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -18,12 +18,6 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:ActivityUpdateWatcherNotify)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 activity_id = 1;</code>
-     * @return The activityId.
-     */
-    int getActivityId();
-
     /**
      * <code>.ActivityWatcherInfo watcher_info = 2;</code>
      * @return Whether the watcherInfo field is set.
@@ -38,12 +32,18 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
      * <code>.ActivityWatcherInfo watcher_info = 2;</code>
      */
     emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder();
+
+    /**
+     * <code>uint32 activity_id = 1;</code>
+     * @return The activityId.
+     */
+    int getActivityId();
   }
   /**
    * <pre>
-   * CmdId: 2172
+   * CmdId: 2156
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -141,17 +141,6 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.class, emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.Builder.class);
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 1;
-    private int activityId_;
-    /**
-     * <code>uint32 activity_id = 1;</code>
-     * @return The activityId.
-     */
-    @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
-    }
-
     public static final int WATCHER_INFO_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
     /**
@@ -178,6 +167,17 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       return getWatcherInfo();
     }
 
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 1;
+    private int activityId_;
+    /**
+     * <code>uint32 activity_id = 1;</code>
+     * @return The activityId.
+     */
+    @java.lang.Override
+    public int getActivityId() {
+      return activityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -230,13 +230,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other = (emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify) obj;
 
-      if (getActivityId()
-          != other.getActivityId()) return false;
       if (hasWatcherInfo() != other.hasWatcherInfo()) return false;
       if (hasWatcherInfo()) {
         if (!getWatcherInfo()
             .equals(other.getWatcherInfo())) return false;
       }
+      if (getActivityId()
+          != other.getActivityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -248,12 +248,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
       if (hasWatcherInfo()) {
         hash = (37 * hash) + WATCHER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getWatcherInfo().hashCode();
       }
+      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -351,9 +351,9 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 2172
+     * CmdId: 2156
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *
@@ -394,14 +394,14 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        activityId_ = 0;
-
         if (watcherInfoBuilder_ == null) {
           watcherInfo_ = null;
         } else {
           watcherInfo_ = null;
           watcherInfoBuilder_ = null;
         }
+        activityId_ = 0;
+
         return this;
       }
 
@@ -428,12 +428,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify buildPartial() {
         emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify result = new emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify(this);
-        result.activityId_ = activityId_;
         if (watcherInfoBuilder_ == null) {
           result.watcherInfo_ = watcherInfo_;
         } else {
           result.watcherInfo_ = watcherInfoBuilder_.build();
         }
+        result.activityId_ = activityId_;
         onBuilt();
         return result;
       }
@@ -482,12 +482,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other) {
         if (other == emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.getDefaultInstance()) return this;
-        if (other.getActivityId() != 0) {
-          setActivityId(other.getActivityId());
-        }
         if (other.hasWatcherInfo()) {
           mergeWatcherInfo(other.getWatcherInfo());
         }
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -517,37 +517,6 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         return this;
       }
 
-      private int activityId_ ;
-      /**
-       * <code>uint32 activity_id = 1;</code>
-       * @return The activityId.
-       */
-      @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
-      }
-      /**
-       * <code>uint32 activity_id = 1;</code>
-       * @param value The activityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityId(int value) {
-        
-        activityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityId() {
-        
-        activityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> watcherInfoBuilder_;
@@ -666,6 +635,37 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         }
         return watcherInfoBuilder_;
       }
+
+      private int activityId_ ;
+      /**
+       * <code>uint32 activity_id = 1;</code>
+       * @return The activityId.
+       */
+      @java.lang.Override
+      public int getActivityId() {
+        return activityId_;
+      }
+      /**
+       * <code>uint32 activity_id = 1;</code>
+       * @param value The activityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityId(int value) {
+        
+        activityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityId() {
+        
+        activityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -735,8 +735,8 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!ActivityUpdateWatcherNotify.proto\032\031Act" +
       "ivityWatcherInfo.proto\"^\n\033ActivityUpdate" +
-      "WatcherNotify\022\023\n\013activity_id\030\001 \001(\r\022*\n\014wa" +
-      "tcher_info\030\002 \001(\0132\024.ActivityWatcherInfoB\033" +
+      "WatcherNotify\022*\n\014watcher_info\030\002 \001(\0132\024.Ac" +
+      "tivityWatcherInfo\022\023\n\013activity_id\030\001 \001(\rB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -749,7 +749,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
     internal_static_ActivityUpdateWatcherNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityUpdateWatcherNotify_descriptor,
-        new java.lang.String[] { "ActivityId", "WatcherInfo", });
+        new java.lang.String[] { "WatcherInfo", "ActivityId", });
     emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.getDescriptor();
   }
 

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

@@ -19,7 +19,7 @@ public final class ActivityWatcherInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_taken_reward = 5;</code>
+     * <code>bool is_taken_reward = 8;</code>
      * @return The isTakenReward.
      */
     boolean getIsTakenReward();
@@ -37,7 +37,7 @@ public final class ActivityWatcherInfoOuterClass {
     int getTotalProgress();
 
     /**
-     * <code>uint32 watcher_id = 8;</code>
+     * <code>uint32 watcher_id = 5;</code>
      * @return The watcherId.
      */
     int getWatcherId();
@@ -99,12 +99,12 @@ public final class ActivityWatcherInfoOuterClass {
             }
             case 40: {
 
-              isTakenReward_ = input.readBool();
+              watcherId_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              watcherId_ = input.readUInt32();
+              isTakenReward_ = input.readBool();
               break;
             }
             default: {
@@ -139,10 +139,10 @@ public final class ActivityWatcherInfoOuterClass {
               emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.class, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder.class);
     }
 
-    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 5;
+    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 8;
     private boolean isTakenReward_;
     /**
-     * <code>bool is_taken_reward = 5;</code>
+     * <code>bool is_taken_reward = 8;</code>
      * @return The isTakenReward.
      */
     @java.lang.Override
@@ -172,10 +172,10 @@ public final class ActivityWatcherInfoOuterClass {
       return totalProgress_;
     }
 
-    public static final int WATCHER_ID_FIELD_NUMBER = 8;
+    public static final int WATCHER_ID_FIELD_NUMBER = 5;
     private int watcherId_;
     /**
-     * <code>uint32 watcher_id = 8;</code>
+     * <code>uint32 watcher_id = 5;</code>
      * @return The watcherId.
      */
     @java.lang.Override
@@ -203,11 +203,11 @@ public final class ActivityWatcherInfoOuterClass {
       if (totalProgress_ != 0) {
         output.writeUInt32(4, totalProgress_);
       }
-      if (isTakenReward_ != false) {
-        output.writeBool(5, isTakenReward_);
-      }
       if (watcherId_ != 0) {
-        output.writeUInt32(8, watcherId_);
+        output.writeUInt32(5, watcherId_);
+      }
+      if (isTakenReward_ != false) {
+        output.writeBool(8, isTakenReward_);
       }
       unknownFields.writeTo(output);
     }
@@ -226,13 +226,13 @@ public final class ActivityWatcherInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(4, totalProgress_);
       }
-      if (isTakenReward_ != false) {
+      if (watcherId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isTakenReward_);
+          .computeUInt32Size(5, watcherId_);
       }
-      if (watcherId_ != 0) {
+      if (isTakenReward_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, watcherId_);
+          .computeBoolSize(8, isTakenReward_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -539,7 +539,7 @@ public final class ActivityWatcherInfoOuterClass {
 
       private boolean isTakenReward_ ;
       /**
-       * <code>bool is_taken_reward = 5;</code>
+       * <code>bool is_taken_reward = 8;</code>
        * @return The isTakenReward.
        */
       @java.lang.Override
@@ -547,7 +547,7 @@ public final class ActivityWatcherInfoOuterClass {
         return isTakenReward_;
       }
       /**
-       * <code>bool is_taken_reward = 5;</code>
+       * <code>bool is_taken_reward = 8;</code>
        * @param value The isTakenReward to set.
        * @return This builder for chaining.
        */
@@ -558,7 +558,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_taken_reward = 5;</code>
+       * <code>bool is_taken_reward = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsTakenReward() {
@@ -632,7 +632,7 @@ public final class ActivityWatcherInfoOuterClass {
 
       private int watcherId_ ;
       /**
-       * <code>uint32 watcher_id = 8;</code>
+       * <code>uint32 watcher_id = 5;</code>
        * @return The watcherId.
        */
       @java.lang.Override
@@ -640,7 +640,7 @@ public final class ActivityWatcherInfoOuterClass {
         return watcherId_;
       }
       /**
-       * <code>uint32 watcher_id = 8;</code>
+       * <code>uint32 watcher_id = 5;</code>
        * @param value The watcherId to set.
        * @return This builder for chaining.
        */
@@ -651,7 +651,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 watcher_id = 8;</code>
+       * <code>uint32 watcher_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearWatcherId() {
@@ -728,9 +728,9 @@ public final class ActivityWatcherInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031ActivityWatcherInfo.proto\"p\n\023ActivityW" +
-      "atcherInfo\022\027\n\017is_taken_reward\030\005 \001(\010\022\024\n\014c" +
+      "atcherInfo\022\027\n\017is_taken_reward\030\010 \001(\010\022\024\n\014c" +
       "ur_progress\030\002 \001(\r\022\026\n\016total_progress\030\004 \001(" +
-      "\r\022\022\n\nwatcher_id\030\010 \001(\rB\033\n\031emu.grasscutter" +
+      "\r\022\022\n\nwatcher_id\030\005 \001(\rB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

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

@@ -40,7 +40,7 @@ public final class AddQuestContentProgressReqOuterClass {
    * <pre>
    * CmdId: 421
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -349,7 +349,7 @@ public final class AddQuestContentProgressReqOuterClass {
      * <pre>
      * CmdId: 421
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *

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

@@ -34,7 +34,8 @@ public final class AddQuestContentProgressRspOuterClass {
    * <pre>
    * CmdId: 403
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AddQuestContentProgressRsp}
@@ -315,7 +316,8 @@ public final class AddQuestContentProgressRspOuterClass {
      * <pre>
      * CmdId: 403
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AddQuestContentProgressRsp}

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

@@ -52,7 +52,8 @@ public final class AnchorPointDataNotifyOuterClass {
    * <pre>
    * CmdId: 4276
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AnchorPointDataNotify}
@@ -373,7 +374,8 @@ public final class AnchorPointDataNotifyOuterClass {
      * <pre>
      * CmdId: 4276
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AnchorPointDataNotify}

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

@@ -34,7 +34,7 @@ public final class AnchorPointOpReqOuterClass {
    * <pre>
    * CmdId: 4257
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -433,7 +433,7 @@ public final class AnchorPointOpReqOuterClass {
      * <pre>
      * CmdId: 4257
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *

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

@@ -40,7 +40,8 @@ public final class AnchorPointOpRspOuterClass {
    * <pre>
    * CmdId: 4252
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AnchorPointOpRsp}
@@ -348,7 +349,8 @@ public final class AnchorPointOpRspOuterClass {
      * <pre>
      * CmdId: 4252
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AnchorPointOpRsp}

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

@@ -43,7 +43,8 @@ public final class AskAddFriendNotifyOuterClass {
    * <pre>
    * CmdId: 4065
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AskAddFriendNotify}
@@ -352,7 +353,8 @@ public final class AskAddFriendNotifyOuterClass {
      * <pre>
      * CmdId: 4065
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AskAddFriendNotify}

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

@@ -28,7 +28,7 @@ public final class AskAddFriendReqOuterClass {
    * <pre>
    * CmdId: 4007
    * EnetChannelId: 0
-   * EnetIsReliable: true
+   * EnetIsReliable: false
    * IsAllowClient: true
    * </pre>
    *
@@ -283,7 +283,7 @@ public final class AskAddFriendReqOuterClass {
      * <pre>
      * CmdId: 4007
      * EnetChannelId: 0
-     * EnetIsReliable: true
+     * EnetIsReliable: false
      * IsAllowClient: true
      * </pre>
      *