update gc 3.4 (#2041)

* update 3.4

* update3.4

* update 3.4

* update 3.4

* Add files via upload

* Delete SetPropCommand.java

* update 3.4 area id

* update version

* exchange cmdid

* exchange cmdid

* exchange cmdid

* my fault

* update AiSyncInfo

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

@@ -19,34 +19,34 @@ public final class FungusDetailOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 name_id = 8;</code>
-     * @return The nameId.
-     */
-    int getNameId();
-
-    /**
-     * <code>uint32 Unk3300_EHNBDJPANKL = 2;</code>
-     * @return The unk3300EHNBDJPANKL.
-     */
-    int getUnk3300EHNBDJPANKL();
-
-    /**
-     * <code>uint32 fungus_id = 3;</code>
-     * @return The fungusId.
-     */
-    int getFungusId();
-
-    /**
-     * <code>bool is_cultivate = 7;</code>
+     * <code>bool isCultivate = 12;</code>
      * @return The isCultivate.
      */
     boolean getIsCultivate();
 
     /**
-     * <code>uint32 Unk3300_GCLBPDJDEDN = 13;</code>
+     * <code>uint32 Unk3300_GCLBPDJDEDN = 14;</code>
      * @return The unk3300GCLBPDJDEDN.
      */
     int getUnk3300GCLBPDJDEDN();
+
+    /**
+     * <code>uint32 Unk3300_EHNBDJPANKL = 3;</code>
+     * @return The unk3300EHNBDJPANKL.
+     */
+    int getUnk3300EHNBDJPANKL();
+
+    /**
+     * <code>uint32 fungusId = 6;</code>
+     * @return The fungusId.
+     */
+    int getFungusId();
+
+    /**
+     * <code>uint32 nameId = 4;</code>
+     * @return The nameId.
+     */
+    int getNameId();
   }
   /**
    * Protobuf type {@code FungusDetail}
@@ -93,27 +93,27 @@ public final class FungusDetailOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
               unk3300EHNBDJPANKL_ = input.readUInt32();
               break;
             }
-            case 24: {
-
-              fungusId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              isCultivate_ = input.readBool();
-              break;
-            }
-            case 64: {
+            case 32: {
 
               nameId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 48: {
+
+              fungusId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              isCultivate_ = input.readBool();
+              break;
+            }
+            case 112: {
 
               unk3300GCLBPDJDEDN_ = input.readUInt32();
               break;
@@ -150,43 +150,10 @@ public final class FungusDetailOuterClass {
               emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail.class, emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail.Builder.class);
     }
 
-    public static final int NAME_ID_FIELD_NUMBER = 8;
-    private int nameId_;
-    /**
-     * <code>uint32 name_id = 8;</code>
-     * @return The nameId.
-     */
-    @java.lang.Override
-    public int getNameId() {
-      return nameId_;
-    }
-
-    public static final int UNK3300_EHNBDJPANKL_FIELD_NUMBER = 2;
-    private int unk3300EHNBDJPANKL_;
-    /**
-     * <code>uint32 Unk3300_EHNBDJPANKL = 2;</code>
-     * @return The unk3300EHNBDJPANKL.
-     */
-    @java.lang.Override
-    public int getUnk3300EHNBDJPANKL() {
-      return unk3300EHNBDJPANKL_;
-    }
-
-    public static final int FUNGUS_ID_FIELD_NUMBER = 3;
-    private int fungusId_;
-    /**
-     * <code>uint32 fungus_id = 3;</code>
-     * @return The fungusId.
-     */
-    @java.lang.Override
-    public int getFungusId() {
-      return fungusId_;
-    }
-
-    public static final int IS_CULTIVATE_FIELD_NUMBER = 7;
+    public static final int ISCULTIVATE_FIELD_NUMBER = 12;
     private boolean isCultivate_;
     /**
-     * <code>bool is_cultivate = 7;</code>
+     * <code>bool isCultivate = 12;</code>
      * @return The isCultivate.
      */
     @java.lang.Override
@@ -194,10 +161,10 @@ public final class FungusDetailOuterClass {
       return isCultivate_;
     }
 
-    public static final int UNK3300_GCLBPDJDEDN_FIELD_NUMBER = 13;
+    public static final int UNK3300_GCLBPDJDEDN_FIELD_NUMBER = 14;
     private int unk3300GCLBPDJDEDN_;
     /**
-     * <code>uint32 Unk3300_GCLBPDJDEDN = 13;</code>
+     * <code>uint32 Unk3300_GCLBPDJDEDN = 14;</code>
      * @return The unk3300GCLBPDJDEDN.
      */
     @java.lang.Override
@@ -205,6 +172,39 @@ public final class FungusDetailOuterClass {
       return unk3300GCLBPDJDEDN_;
     }
 
+    public static final int UNK3300_EHNBDJPANKL_FIELD_NUMBER = 3;
+    private int unk3300EHNBDJPANKL_;
+    /**
+     * <code>uint32 Unk3300_EHNBDJPANKL = 3;</code>
+     * @return The unk3300EHNBDJPANKL.
+     */
+    @java.lang.Override
+    public int getUnk3300EHNBDJPANKL() {
+      return unk3300EHNBDJPANKL_;
+    }
+
+    public static final int FUNGUSID_FIELD_NUMBER = 6;
+    private int fungusId_;
+    /**
+     * <code>uint32 fungusId = 6;</code>
+     * @return The fungusId.
+     */
+    @java.lang.Override
+    public int getFungusId() {
+      return fungusId_;
+    }
+
+    public static final int NAMEID_FIELD_NUMBER = 4;
+    private int nameId_;
+    /**
+     * <code>uint32 nameId = 4;</code>
+     * @return The nameId.
+     */
+    @java.lang.Override
+    public int getNameId() {
+      return nameId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -220,19 +220,19 @@ public final class FungusDetailOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (unk3300EHNBDJPANKL_ != 0) {
-        output.writeUInt32(2, unk3300EHNBDJPANKL_);
-      }
-      if (fungusId_ != 0) {
-        output.writeUInt32(3, fungusId_);
-      }
-      if (isCultivate_ != false) {
-        output.writeBool(7, isCultivate_);
+        output.writeUInt32(3, unk3300EHNBDJPANKL_);
       }
       if (nameId_ != 0) {
-        output.writeUInt32(8, nameId_);
+        output.writeUInt32(4, nameId_);
+      }
+      if (fungusId_ != 0) {
+        output.writeUInt32(6, fungusId_);
+      }
+      if (isCultivate_ != false) {
+        output.writeBool(12, isCultivate_);
       }
       if (unk3300GCLBPDJDEDN_ != 0) {
-        output.writeUInt32(13, unk3300GCLBPDJDEDN_);
+        output.writeUInt32(14, unk3300GCLBPDJDEDN_);
       }
       unknownFields.writeTo(output);
     }
@@ -245,23 +245,23 @@ public final class FungusDetailOuterClass {
       size = 0;
       if (unk3300EHNBDJPANKL_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, unk3300EHNBDJPANKL_);
-      }
-      if (fungusId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, fungusId_);
-      }
-      if (isCultivate_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isCultivate_);
+          .computeUInt32Size(3, unk3300EHNBDJPANKL_);
       }
       if (nameId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, nameId_);
+          .computeUInt32Size(4, nameId_);
+      }
+      if (fungusId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, fungusId_);
+      }
+      if (isCultivate_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, isCultivate_);
       }
       if (unk3300GCLBPDJDEDN_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, unk3300GCLBPDJDEDN_);
+          .computeUInt32Size(14, unk3300GCLBPDJDEDN_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,16 +278,16 @@ public final class FungusDetailOuterClass {
       }
       emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail other = (emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail) obj;
 
-      if (getNameId()
-          != other.getNameId()) return false;
-      if (getUnk3300EHNBDJPANKL()
-          != other.getUnk3300EHNBDJPANKL()) return false;
-      if (getFungusId()
-          != other.getFungusId()) return false;
       if (getIsCultivate()
           != other.getIsCultivate()) return false;
       if (getUnk3300GCLBPDJDEDN()
           != other.getUnk3300GCLBPDJDEDN()) return false;
+      if (getUnk3300EHNBDJPANKL()
+          != other.getUnk3300EHNBDJPANKL()) return false;
+      if (getFungusId()
+          != other.getFungusId()) return false;
+      if (getNameId()
+          != other.getNameId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -299,17 +299,17 @@ public final class FungusDetailOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + NAME_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getNameId();
-      hash = (37 * hash) + UNK3300_EHNBDJPANKL_FIELD_NUMBER;
-      hash = (53 * hash) + getUnk3300EHNBDJPANKL();
-      hash = (37 * hash) + FUNGUS_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getFungusId();
-      hash = (37 * hash) + IS_CULTIVATE_FIELD_NUMBER;
+      hash = (37 * hash) + ISCULTIVATE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsCultivate());
       hash = (37 * hash) + UNK3300_GCLBPDJDEDN_FIELD_NUMBER;
       hash = (53 * hash) + getUnk3300GCLBPDJDEDN();
+      hash = (37 * hash) + UNK3300_EHNBDJPANKL_FIELD_NUMBER;
+      hash = (53 * hash) + getUnk3300EHNBDJPANKL();
+      hash = (37 * hash) + FUNGUSID_FIELD_NUMBER;
+      hash = (53 * hash) + getFungusId();
+      hash = (37 * hash) + NAMEID_FIELD_NUMBER;
+      hash = (53 * hash) + getNameId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -443,15 +443,15 @@ public final class FungusDetailOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        nameId_ = 0;
+        isCultivate_ = false;
+
+        unk3300GCLBPDJDEDN_ = 0;
 
         unk3300EHNBDJPANKL_ = 0;
 
         fungusId_ = 0;
 
-        isCultivate_ = false;
-
-        unk3300GCLBPDJDEDN_ = 0;
+        nameId_ = 0;
 
         return this;
       }
@@ -479,11 +479,11 @@ public final class FungusDetailOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail buildPartial() {
         emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail result = new emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail(this);
-        result.nameId_ = nameId_;
-        result.unk3300EHNBDJPANKL_ = unk3300EHNBDJPANKL_;
-        result.fungusId_ = fungusId_;
         result.isCultivate_ = isCultivate_;
         result.unk3300GCLBPDJDEDN_ = unk3300GCLBPDJDEDN_;
+        result.unk3300EHNBDJPANKL_ = unk3300EHNBDJPANKL_;
+        result.fungusId_ = fungusId_;
+        result.nameId_ = nameId_;
         onBuilt();
         return result;
       }
@@ -532,8 +532,11 @@ public final class FungusDetailOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail other) {
         if (other == emu.grasscutter.net.proto.FungusDetailOuterClass.FungusDetail.getDefaultInstance()) return this;
-        if (other.getNameId() != 0) {
-          setNameId(other.getNameId());
+        if (other.getIsCultivate() != false) {
+          setIsCultivate(other.getIsCultivate());
+        }
+        if (other.getUnk3300GCLBPDJDEDN() != 0) {
+          setUnk3300GCLBPDJDEDN(other.getUnk3300GCLBPDJDEDN());
         }
         if (other.getUnk3300EHNBDJPANKL() != 0) {
           setUnk3300EHNBDJPANKL(other.getUnk3300EHNBDJPANKL());
@@ -541,11 +544,8 @@ public final class FungusDetailOuterClass {
         if (other.getFungusId() != 0) {
           setFungusId(other.getFungusId());
         }
-        if (other.getIsCultivate() != false) {
-          setIsCultivate(other.getIsCultivate());
-        }
-        if (other.getUnk3300GCLBPDJDEDN() != 0) {
-          setUnk3300GCLBPDJDEDN(other.getUnk3300GCLBPDJDEDN());
+        if (other.getNameId() != 0) {
+          setNameId(other.getNameId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -576,102 +576,9 @@ public final class FungusDetailOuterClass {
         return this;
       }
 
-      private int nameId_ ;
-      /**
-       * <code>uint32 name_id = 8;</code>
-       * @return The nameId.
-       */
-      @java.lang.Override
-      public int getNameId() {
-        return nameId_;
-      }
-      /**
-       * <code>uint32 name_id = 8;</code>
-       * @param value The nameId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNameId(int value) {
-        
-        nameId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 name_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNameId() {
-        
-        nameId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int unk3300EHNBDJPANKL_ ;
-      /**
-       * <code>uint32 Unk3300_EHNBDJPANKL = 2;</code>
-       * @return The unk3300EHNBDJPANKL.
-       */
-      @java.lang.Override
-      public int getUnk3300EHNBDJPANKL() {
-        return unk3300EHNBDJPANKL_;
-      }
-      /**
-       * <code>uint32 Unk3300_EHNBDJPANKL = 2;</code>
-       * @param value The unk3300EHNBDJPANKL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUnk3300EHNBDJPANKL(int value) {
-        
-        unk3300EHNBDJPANKL_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 Unk3300_EHNBDJPANKL = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUnk3300EHNBDJPANKL() {
-        
-        unk3300EHNBDJPANKL_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int fungusId_ ;
-      /**
-       * <code>uint32 fungus_id = 3;</code>
-       * @return The fungusId.
-       */
-      @java.lang.Override
-      public int getFungusId() {
-        return fungusId_;
-      }
-      /**
-       * <code>uint32 fungus_id = 3;</code>
-       * @param value The fungusId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFungusId(int value) {
-        
-        fungusId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 fungus_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFungusId() {
-        
-        fungusId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isCultivate_ ;
       /**
-       * <code>bool is_cultivate = 7;</code>
+       * <code>bool isCultivate = 12;</code>
        * @return The isCultivate.
        */
       @java.lang.Override
@@ -679,7 +586,7 @@ public final class FungusDetailOuterClass {
         return isCultivate_;
       }
       /**
-       * <code>bool is_cultivate = 7;</code>
+       * <code>bool isCultivate = 12;</code>
        * @param value The isCultivate to set.
        * @return This builder for chaining.
        */
@@ -690,7 +597,7 @@ public final class FungusDetailOuterClass {
         return this;
       }
       /**
-       * <code>bool is_cultivate = 7;</code>
+       * <code>bool isCultivate = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsCultivate() {
@@ -702,7 +609,7 @@ public final class FungusDetailOuterClass {
 
       private int unk3300GCLBPDJDEDN_ ;
       /**
-       * <code>uint32 Unk3300_GCLBPDJDEDN = 13;</code>
+       * <code>uint32 Unk3300_GCLBPDJDEDN = 14;</code>
        * @return The unk3300GCLBPDJDEDN.
        */
       @java.lang.Override
@@ -710,7 +617,7 @@ public final class FungusDetailOuterClass {
         return unk3300GCLBPDJDEDN_;
       }
       /**
-       * <code>uint32 Unk3300_GCLBPDJDEDN = 13;</code>
+       * <code>uint32 Unk3300_GCLBPDJDEDN = 14;</code>
        * @param value The unk3300GCLBPDJDEDN to set.
        * @return This builder for chaining.
        */
@@ -721,7 +628,7 @@ public final class FungusDetailOuterClass {
         return this;
       }
       /**
-       * <code>uint32 Unk3300_GCLBPDJDEDN = 13;</code>
+       * <code>uint32 Unk3300_GCLBPDJDEDN = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearUnk3300GCLBPDJDEDN() {
@@ -730,6 +637,99 @@ public final class FungusDetailOuterClass {
         onChanged();
         return this;
       }
+
+      private int unk3300EHNBDJPANKL_ ;
+      /**
+       * <code>uint32 Unk3300_EHNBDJPANKL = 3;</code>
+       * @return The unk3300EHNBDJPANKL.
+       */
+      @java.lang.Override
+      public int getUnk3300EHNBDJPANKL() {
+        return unk3300EHNBDJPANKL_;
+      }
+      /**
+       * <code>uint32 Unk3300_EHNBDJPANKL = 3;</code>
+       * @param value The unk3300EHNBDJPANKL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnk3300EHNBDJPANKL(int value) {
+        
+        unk3300EHNBDJPANKL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 Unk3300_EHNBDJPANKL = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnk3300EHNBDJPANKL() {
+        
+        unk3300EHNBDJPANKL_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int fungusId_ ;
+      /**
+       * <code>uint32 fungusId = 6;</code>
+       * @return The fungusId.
+       */
+      @java.lang.Override
+      public int getFungusId() {
+        return fungusId_;
+      }
+      /**
+       * <code>uint32 fungusId = 6;</code>
+       * @param value The fungusId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFungusId(int value) {
+        
+        fungusId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 fungusId = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFungusId() {
+        
+        fungusId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nameId_ ;
+      /**
+       * <code>uint32 nameId = 4;</code>
+       * @return The nameId.
+       */
+      @java.lang.Override
+      public int getNameId() {
+        return nameId_;
+      }
+      /**
+       * <code>uint32 nameId = 4;</code>
+       * @param value The nameId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNameId(int value) {
+        
+        nameId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 nameId = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNameId() {
+        
+        nameId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -797,11 +797,11 @@ public final class FungusDetailOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022FungusDetail.proto\"\202\001\n\014FungusDetail\022\017\n" +
-      "\007name_id\030\010 \001(\r\022\033\n\023Unk3300_EHNBDJPANKL\030\002 " +
-      "\001(\r\022\021\n\tfungus_id\030\003 \001(\r\022\024\n\014is_cultivate\030\007" +
-      " \001(\010\022\033\n\023Unk3300_GCLBPDJDEDN\030\r \001(\rB\033\n\031emu" +
-      ".grasscutter.net.protob\006proto3"
+      "\n\022FungusDetail.proto\"\177\n\014FungusDetail\022\023\n\013" +
+      "isCultivate\030\014 \001(\010\022\033\n\023Unk3300_GCLBPDJDEDN" +
+      "\030\016 \001(\r\022\033\n\023Unk3300_EHNBDJPANKL\030\003 \001(\r\022\020\n\010f" +
+      "ungusId\030\006 \001(\r\022\016\n\006nameId\030\004 \001(\rB\033\n\031emu.gra" +
+      "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -812,7 +812,7 @@ public final class FungusDetailOuterClass {
     internal_static_FungusDetail_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_FungusDetail_descriptor,
-        new java.lang.String[] { "NameId", "Unk3300EHNBDJPANKL", "FungusId", "IsCultivate", "Unk3300GCLBPDJDEDN", });
+        new java.lang.String[] { "IsCultivate", "Unk3300GCLBPDJDEDN", "Unk3300EHNBDJPANKL", "FungusId", "NameId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)