Add support for game version 3.6 (#2110)

* Update to game version `3.6.0` (pt. 1) not complete! * Update to game version `3.6.0` (pt. 2) not complete! * Update compiled definitions
2026-05-24 03:19:50 +08:00 · 2023-04-30 19:08:54 -07:00
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
@@ -19,45 +19,45 @@ public final class HitTreeNotifyOuterClass {
      com.google.protobuf.MessageOrBuilder {

    /**
-     * <code>.Vector drop_pos = 6;</code>
-     * @return Whether the dropPos field is set.
-     */
-    boolean hasDropPos();
-    /**
-     * <code>.Vector drop_pos = 6;</code>
-     * @return The dropPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos();
-    /**
-     * <code>.Vector drop_pos = 6;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder();
-
-    /**
-     * <code>.Vector tree_pos = 2;</code>
+     * <code>.Vector tree_pos = 12;</code>
     * @return Whether the treePos field is set.
     */
    boolean hasTreePos();
    /**
-     * <code>.Vector tree_pos = 2;</code>
+     * <code>.Vector tree_pos = 12;</code>
     * @return The treePos.
     */
    emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos();
    /**
-     * <code>.Vector tree_pos = 2;</code>
+     * <code>.Vector tree_pos = 12;</code>
     */
    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder();

    /**
-     * <code>uint32 tree_type = 11;</code>
+     * <code>.Vector drop_pos = 1;</code>
+     * @return Whether the dropPos field is set.
+     */
+    boolean hasDropPos();
+    /**
+     * <code>.Vector drop_pos = 1;</code>
+     * @return The dropPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos();
+    /**
+     * <code>.Vector drop_pos = 1;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder();
+
+    /**
+     * <code>uint32 tree_type = 9;</code>
     * @return The treeType.
     */
    int getTreeType();
  }
  /**
   * <pre>
-   * Name: FCOELCNJHFD
-   * CmdId: 3299
+   * CmdId: 3035
+   * Name: DMADALIOKGO
   * </pre>
   *
   * Protobuf type {@code HitTreeNotify}
@@ -104,20 +104,7 @@ public final class HitTreeNotifyOuterClass {
            case 0:
              done = true;
              break;
-            case 18: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (treePos_ != null) {
-                subBuilder = treePos_.toBuilder();
-              }
-              treePos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(treePos_);
-                treePos_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 50: {
+            case 10: {
              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
              if (dropPos_ != null) {
                subBuilder = dropPos_.toBuilder();
@@ -130,11 +117,24 @@ public final class HitTreeNotifyOuterClass {

              break;
            }
-            case 88: {
+            case 72: {

              treeType_ = input.readUInt32();
              break;
            }
+            case 98: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (treePos_ != null) {
+                subBuilder = treePos_.toBuilder();
+              }
+              treePos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(treePos_);
+                treePos_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
            default: {
              if (!parseUnknownField(
                  input, unknownFields, extensionRegistry, tag)) {
@@ -167,36 +167,10 @@ public final class HitTreeNotifyOuterClass {
              emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.class, emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.Builder.class);
    }

-    public static final int DROP_POS_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
-    /**
-     * <code>.Vector drop_pos = 6;</code>
-     * @return Whether the dropPos field is set.
-     */
-    @java.lang.Override
-    public boolean hasDropPos() {
-      return dropPos_ != null;
-    }
-    /**
-     * <code>.Vector drop_pos = 6;</code>
-     * @return The dropPos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() {
-      return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
-    }
-    /**
-     * <code>.Vector drop_pos = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
-      return getDropPos();
-    }
-
-    public static final int TREE_POS_FIELD_NUMBER = 2;
+    public static final int TREE_POS_FIELD_NUMBER = 12;
    private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
    /**
-     * <code>.Vector tree_pos = 2;</code>
+     * <code>.Vector tree_pos = 12;</code>
     * @return Whether the treePos field is set.
     */
    @java.lang.Override
@@ -204,7 +178,7 @@ public final class HitTreeNotifyOuterClass {
      return treePos_ != null;
    }
    /**
-     * <code>.Vector tree_pos = 2;</code>
+     * <code>.Vector tree_pos = 12;</code>
     * @return The treePos.
     */
    @java.lang.Override
@@ -212,17 +186,43 @@ public final class HitTreeNotifyOuterClass {
      return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
    }
    /**
-     * <code>.Vector tree_pos = 2;</code>
+     * <code>.Vector tree_pos = 12;</code>
     */
    @java.lang.Override
    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
      return getTreePos();
    }

-    public static final int TREE_TYPE_FIELD_NUMBER = 11;
+    public static final int DROP_POS_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
+    /**
+     * <code>.Vector drop_pos = 1;</code>
+     * @return Whether the dropPos field is set.
+     */
+    @java.lang.Override
+    public boolean hasDropPos() {
+      return dropPos_ != null;
+    }
+    /**
+     * <code>.Vector drop_pos = 1;</code>
+     * @return The dropPos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() {
+      return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
+    }
+    /**
+     * <code>.Vector drop_pos = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
+      return getDropPos();
+    }
+
+    public static final int TREE_TYPE_FIELD_NUMBER = 9;
    private int treeType_;
    /**
-     * <code>uint32 tree_type = 11;</code>
+     * <code>uint32 tree_type = 9;</code>
     * @return The treeType.
     */
    @java.lang.Override
@@ -244,14 +244,14 @@ public final class HitTreeNotifyOuterClass {
    @java.lang.Override
    public void writeTo(com.google.protobuf.CodedOutputStream output)
                        throws java.io.IOException {
-      if (treePos_ != null) {
-        output.writeMessage(2, getTreePos());
-      }
      if (dropPos_ != null) {
-        output.writeMessage(6, getDropPos());
+        output.writeMessage(1, getDropPos());
      }
      if (treeType_ != 0) {
-        output.writeUInt32(11, treeType_);
+        output.writeUInt32(9, treeType_);
+      }
+      if (treePos_ != null) {
+        output.writeMessage(12, getTreePos());
      }
      unknownFields.writeTo(output);
    }
@@ -262,17 +262,17 @@ public final class HitTreeNotifyOuterClass {
      if (size != -1) return size;

      size = 0;
-      if (treePos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getTreePos());
-      }
      if (dropPos_ != null) {
        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getDropPos());
+          .computeMessageSize(1, getDropPos());
      }
      if (treeType_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, treeType_);
+          .computeUInt32Size(9, treeType_);
+      }
+      if (treePos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getTreePos());
      }
      size += unknownFields.getSerializedSize();
      memoizedSize = size;
@@ -289,16 +289,16 @@ public final class HitTreeNotifyOuterClass {
      }
      emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other = (emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify) obj;

-      if (hasDropPos() != other.hasDropPos()) return false;
-      if (hasDropPos()) {
-        if (!getDropPos()
-            .equals(other.getDropPos())) return false;
-      }
      if (hasTreePos() != other.hasTreePos()) return false;
      if (hasTreePos()) {
        if (!getTreePos()
            .equals(other.getTreePos())) return false;
      }
+      if (hasDropPos() != other.hasDropPos()) return false;
+      if (hasDropPos()) {
+        if (!getDropPos()
+            .equals(other.getDropPos())) return false;
+      }
      if (getTreeType()
          != other.getTreeType()) return false;
      if (!unknownFields.equals(other.unknownFields)) return false;
@@ -312,14 +312,14 @@ public final class HitTreeNotifyOuterClass {
      }
      int hash = 41;
      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasDropPos()) {
-        hash = (37 * hash) + DROP_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getDropPos().hashCode();
-      }
      if (hasTreePos()) {
        hash = (37 * hash) + TREE_POS_FIELD_NUMBER;
        hash = (53 * hash) + getTreePos().hashCode();
      }
+      if (hasDropPos()) {
+        hash = (37 * hash) + DROP_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getDropPos().hashCode();
+      }
      hash = (37 * hash) + TREE_TYPE_FIELD_NUMBER;
      hash = (53 * hash) + getTreeType();
      hash = (29 * hash) + unknownFields.hashCode();
@@ -419,8 +419,8 @@ public final class HitTreeNotifyOuterClass {
    }
    /**
     * <pre>
-     * Name: FCOELCNJHFD
-     * CmdId: 3299
+     * CmdId: 3035
+     * Name: DMADALIOKGO
     * </pre>
     *
     * Protobuf type {@code HitTreeNotify}
@@ -460,18 +460,18 @@ public final class HitTreeNotifyOuterClass {
      @java.lang.Override
      public Builder clear() {
        super.clear();
-        if (dropPosBuilder_ == null) {
-          dropPos_ = null;
-        } else {
-          dropPos_ = null;
-          dropPosBuilder_ = null;
-        }
        if (treePosBuilder_ == null) {
          treePos_ = null;
        } else {
          treePos_ = null;
          treePosBuilder_ = null;
        }
+        if (dropPosBuilder_ == null) {
+          dropPos_ = null;
+        } else {
+          dropPos_ = null;
+          dropPosBuilder_ = null;
+        }
        treeType_ = 0;

        return this;
@@ -500,16 +500,16 @@ public final class HitTreeNotifyOuterClass {
      @java.lang.Override
      public emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify buildPartial() {
        emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify result = new emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify(this);
-        if (dropPosBuilder_ == null) {
-          result.dropPos_ = dropPos_;
-        } else {
-          result.dropPos_ = dropPosBuilder_.build();
-        }
        if (treePosBuilder_ == null) {
          result.treePos_ = treePos_;
        } else {
          result.treePos_ = treePosBuilder_.build();
        }
+        if (dropPosBuilder_ == null) {
+          result.dropPos_ = dropPos_;
+        } else {
+          result.dropPos_ = dropPosBuilder_.build();
+        }
        result.treeType_ = treeType_;
        onBuilt();
        return result;
@@ -559,12 +559,12 @@ public final class HitTreeNotifyOuterClass {

      public Builder mergeFrom(emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other) {
        if (other == emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.getDefaultInstance()) return this;
-        if (other.hasDropPos()) {
-          mergeDropPos(other.getDropPos());
-        }
        if (other.hasTreePos()) {
          mergeTreePos(other.getTreePos());
        }
+        if (other.hasDropPos()) {
+          mergeDropPos(other.getDropPos());
+        }
        if (other.getTreeType() != 0) {
          setTreeType(other.getTreeType());
        }
@@ -597,137 +597,18 @@ public final class HitTreeNotifyOuterClass {
        return this;
      }

-      private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dropPosBuilder_;
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       * @return Whether the dropPos field is set.
-       */
-      public boolean hasDropPos() {
-        return dropPosBuilder_ != null || dropPos_ != null;
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       * @return The dropPos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() {
-        if (dropPosBuilder_ == null) {
-          return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
-        } else {
-          return dropPosBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       */
-      public Builder setDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (dropPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          dropPos_ = value;
-          onChanged();
-        } else {
-          dropPosBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       */
-      public Builder setDropPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (dropPosBuilder_ == null) {
-          dropPos_ = builderForValue.build();
-          onChanged();
-        } else {
-          dropPosBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       */
-      public Builder mergeDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (dropPosBuilder_ == null) {
-          if (dropPos_ != null) {
-            dropPos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(dropPos_).mergeFrom(value).buildPartial();
-          } else {
-            dropPos_ = value;
-          }
-          onChanged();
-        } else {
-          dropPosBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       */
-      public Builder clearDropPos() {
-        if (dropPosBuilder_ == null) {
-          dropPos_ = null;
-          onChanged();
-        } else {
-          dropPos_ = null;
-          dropPosBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDropPosBuilder() {
-        
-        onChanged();
-        return getDropPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
-        if (dropPosBuilder_ != null) {
-          return dropPosBuilder_.getMessageOrBuilder();
-        } else {
-          return dropPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
-        }
-      }
-      /**
-       * <code>.Vector drop_pos = 6;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-          getDropPosFieldBuilder() {
-        if (dropPosBuilder_ == null) {
-          dropPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getDropPos(),
-                  getParentForChildren(),
-                  isClean());
-          dropPos_ = null;
-        }
-        return dropPosBuilder_;
-      }
-
      private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
      private com.google.protobuf.SingleFieldBuilderV3<
          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> treePosBuilder_;
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       * @return Whether the treePos field is set.
       */
      public boolean hasTreePos() {
        return treePosBuilder_ != null || treePos_ != null;
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       * @return The treePos.
       */
      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() {
@@ -738,7 +619,7 @@ public final class HitTreeNotifyOuterClass {
        }
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       */
      public Builder setTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
        if (treePosBuilder_ == null) {
@@ -754,7 +635,7 @@ public final class HitTreeNotifyOuterClass {
        return this;
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       */
      public Builder setTreePos(
          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -768,7 +649,7 @@ public final class HitTreeNotifyOuterClass {
        return this;
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       */
      public Builder mergeTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
        if (treePosBuilder_ == null) {
@@ -786,7 +667,7 @@ public final class HitTreeNotifyOuterClass {
        return this;
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       */
      public Builder clearTreePos() {
        if (treePosBuilder_ == null) {
@@ -800,7 +681,7 @@ public final class HitTreeNotifyOuterClass {
        return this;
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       */
      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTreePosBuilder() {
        
@@ -808,7 +689,7 @@ public final class HitTreeNotifyOuterClass {
        return getTreePosFieldBuilder().getBuilder();
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       */
      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
        if (treePosBuilder_ != null) {
@@ -819,7 +700,7 @@ public final class HitTreeNotifyOuterClass {
        }
      }
      /**
-       * <code>.Vector tree_pos = 2;</code>
+       * <code>.Vector tree_pos = 12;</code>
       */
      private com.google.protobuf.SingleFieldBuilderV3<
          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -835,9 +716,128 @@ public final class HitTreeNotifyOuterClass {
        return treePosBuilder_;
      }

+      private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dropPosBuilder_;
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       * @return Whether the dropPos field is set.
+       */
+      public boolean hasDropPos() {
+        return dropPosBuilder_ != null || dropPos_ != null;
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       * @return The dropPos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() {
+        if (dropPosBuilder_ == null) {
+          return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
+        } else {
+          return dropPosBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       */
+      public Builder setDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (dropPosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          dropPos_ = value;
+          onChanged();
+        } else {
+          dropPosBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       */
+      public Builder setDropPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (dropPosBuilder_ == null) {
+          dropPos_ = builderForValue.build();
+          onChanged();
+        } else {
+          dropPosBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       */
+      public Builder mergeDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (dropPosBuilder_ == null) {
+          if (dropPos_ != null) {
+            dropPos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(dropPos_).mergeFrom(value).buildPartial();
+          } else {
+            dropPos_ = value;
+          }
+          onChanged();
+        } else {
+          dropPosBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       */
+      public Builder clearDropPos() {
+        if (dropPosBuilder_ == null) {
+          dropPos_ = null;
+          onChanged();
+        } else {
+          dropPos_ = null;
+          dropPosBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDropPosBuilder() {
+        
+        onChanged();
+        return getDropPosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
+        if (dropPosBuilder_ != null) {
+          return dropPosBuilder_.getMessageOrBuilder();
+        } else {
+          return dropPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
+        }
+      }
+      /**
+       * <code>.Vector drop_pos = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+          getDropPosFieldBuilder() {
+        if (dropPosBuilder_ == null) {
+          dropPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getDropPos(),
+                  getParentForChildren(),
+                  isClean());
+          dropPos_ = null;
+        }
+        return dropPosBuilder_;
+      }
+
      private int treeType_ ;
      /**
-       * <code>uint32 tree_type = 11;</code>
+       * <code>uint32 tree_type = 9;</code>
       * @return The treeType.
       */
      @java.lang.Override
@@ -845,7 +845,7 @@ public final class HitTreeNotifyOuterClass {
        return treeType_;
      }
      /**
-       * <code>uint32 tree_type = 11;</code>
+       * <code>uint32 tree_type = 9;</code>
       * @param value The treeType to set.
       * @return This builder for chaining.
       */
@@ -856,7 +856,7 @@ public final class HitTreeNotifyOuterClass {
        return this;
      }
      /**
-       * <code>uint32 tree_type = 11;</code>
+       * <code>uint32 tree_type = 9;</code>
       * @return This builder for chaining.
       */
      public Builder clearTreeType() {
@@ -933,9 +933,9 @@ public final class HitTreeNotifyOuterClass {
  static {
    java.lang.String[] descriptorData = {
      "\n\023HitTreeNotify.proto\032\014Vector.proto\"X\n\rH" +
-      "itTreeNotify\022\031\n\010drop_pos\030\006 \001(\0132\007.Vector\022" +
-      "\031\n\010tree_pos\030\002 \001(\0132\007.Vector\022\021\n\ttree_type\030" +
-      "\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "itTreeNotify\022\031\n\010tree_pos\030\014 \001(\0132\007.Vector\022" +
+      "\031\n\010drop_pos\030\001 \001(\0132\007.Vector\022\021\n\ttree_type\030" +
+      "\t \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
      "o3"
    };
    descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -948,7 +948,7 @@ public final class HitTreeNotifyOuterClass {
    internal_static_HitTreeNotify_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_HitTreeNotify_descriptor,
-        new java.lang.String[] { "DropPos", "TreePos", "TreeType", });
+        new java.lang.String[] { "TreePos", "DropPos", "TreeType", });
    emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
  }