Run the formatter & Generate protocol definitions

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

@@ -19,23 +19,23 @@ public final class AbilityMetaSetPoseParameterOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+     * <code>.AnimatorParameterValueInfoPair value = 15;</code>
      * @return Whether the value field is set.
      */
     boolean hasValue();
     /**
-     * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+     * <code>.AnimatorParameterValueInfoPair value = 15;</code>
      * @return The value.
      */
     emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue();
     /**
-     * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+     * <code>.AnimatorParameterValueInfoPair value = 15;</code>
      */
     emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder();
   }
   /**
    * <pre>
-   * Obf: AFDPLNIIALH
+   * Obf: FOHAAJOMMPL
    * </pre>
    *
    * Protobuf type {@code AbilityMetaSetPoseParameter}
@@ -82,7 +82,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 122: {
               emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder subBuilder = null;
               if (value_ != null) {
                 subBuilder = value_.toBuilder();
@@ -127,10 +127,10 @@ public final class AbilityMetaSetPoseParameterOuterClass {
               emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.class, emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.Builder.class);
     }
 
-    public static final int VALUE_FIELD_NUMBER = 1;
+    public static final int VALUE_FIELD_NUMBER = 15;
     private emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value_;
     /**
-     * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+     * <code>.AnimatorParameterValueInfoPair value = 15;</code>
      * @return Whether the value field is set.
      */
     @java.lang.Override
@@ -138,7 +138,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
       return value_ != null;
     }
     /**
-     * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+     * <code>.AnimatorParameterValueInfoPair value = 15;</code>
      * @return The value.
      */
     @java.lang.Override
@@ -146,7 +146,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
       return value_ == null ? emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.getDefaultInstance() : value_;
     }
     /**
-     * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+     * <code>.AnimatorParameterValueInfoPair value = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() {
@@ -168,7 +168,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (value_ != null) {
-        output.writeMessage(1, getValue());
+        output.writeMessage(15, getValue());
       }
       unknownFields.writeTo(output);
     }
@@ -181,7 +181,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
       size = 0;
       if (value_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getValue());
+          .computeMessageSize(15, getValue());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,7 +315,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
     }
     /**
      * <pre>
-     * Obf: AFDPLNIIALH
+     * Obf: FOHAAJOMMPL
      * </pre>
      *
      * Protobuf type {@code AbilityMetaSetPoseParameter}
@@ -476,14 +476,14 @@ public final class AbilityMetaSetPoseParameterOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder> valueBuilder_;
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        * @return Whether the value field is set.
        */
       public boolean hasValue() {
         return valueBuilder_ != null || value_ != null;
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        * @return The value.
        */
       public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue() {
@@ -494,7 +494,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
         }
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        */
       public Builder setValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) {
         if (valueBuilder_ == null) {
@@ -510,7 +510,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
         return this;
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        */
       public Builder setValue(
           emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder builderForValue) {
@@ -524,7 +524,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
         return this;
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        */
       public Builder mergeValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) {
         if (valueBuilder_ == null) {
@@ -542,7 +542,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
         return this;
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        */
       public Builder clearValue() {
         if (valueBuilder_ == null) {
@@ -556,7 +556,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
         return this;
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        */
       public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder getValueBuilder() {
         
@@ -564,7 +564,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
         return getValueFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        */
       public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() {
         if (valueBuilder_ != null) {
@@ -575,7 +575,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
         }
       }
       /**
-       * <code>.AnimatorParameterValueInfoPair value = 1;</code>
+       * <code>.AnimatorParameterValueInfoPair value = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder> 
@@ -659,7 +659,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
     java.lang.String[] descriptorData = {
       "\n!AbilityMetaSetPoseParameter.proto\032$Ani" +
       "matorParameterValueInfoPair.proto\"M\n\033Abi" +
-      "lityMetaSetPoseParameter\022.\n\005value\030\001 \001(\0132" +
+      "lityMetaSetPoseParameter\022.\n\005value\030\017 \001(\0132" +
       "\037.AnimatorParameterValueInfoPairB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };

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

@@ -0,0 +1,537 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: AbilityMixinCostStamina.proto
+
+package emu.grasscutter.net.proto;
+
+public final class AbilityMixinCostStaminaOuterClass {
+  private AbilityMixinCostStaminaOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface AbilityMixinCostStaminaOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:AbilityMixinCostStamina)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool is_swim = 7;</code>
+     * @return The isSwim.
+     */
+    boolean getIsSwim();
+  }
+  /**
+   * Protobuf type {@code AbilityMixinCostStamina}
+   */
+  public static final class AbilityMixinCostStamina extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:AbilityMixinCostStamina)
+      AbilityMixinCostStaminaOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use AbilityMixinCostStamina.newBuilder() to construct.
+    private AbilityMixinCostStamina(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private AbilityMixinCostStamina() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new AbilityMixinCostStamina();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AbilityMixinCostStamina(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 56: {
+
+              isSwim_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.class, emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.Builder.class);
+    }
+
+    public static final int IS_SWIM_FIELD_NUMBER = 7;
+    private boolean isSwim_;
+    /**
+     * <code>bool is_swim = 7;</code>
+     * @return The isSwim.
+     */
+    @java.lang.Override
+    public boolean getIsSwim() {
+      return isSwim_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (isSwim_ != false) {
+        output.writeBool(7, isSwim_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (isSwim_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(7, isSwim_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina other = (emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina) obj;
+
+      if (getIsSwim()
+          != other.getIsSwim()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_SWIM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsSwim());
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code AbilityMixinCostStamina}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:AbilityMixinCostStamina)
+        emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStaminaOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.class, emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        isSwim_ = false;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina build() {
+        emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina buildPartial() {
+        emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina result = new emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina(this);
+        result.isSwim_ = isSwim_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina) {
+          return mergeFrom((emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina other) {
+        if (other == emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.getDefaultInstance()) return this;
+        if (other.getIsSwim() != false) {
+          setIsSwim(other.getIsSwim());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private boolean isSwim_ ;
+      /**
+       * <code>bool is_swim = 7;</code>
+       * @return The isSwim.
+       */
+      @java.lang.Override
+      public boolean getIsSwim() {
+        return isSwim_;
+      }
+      /**
+       * <code>bool is_swim = 7;</code>
+       * @param value The isSwim to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSwim(boolean value) {
+        
+        isSwim_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_swim = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSwim() {
+        
+        isSwim_ = false;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:AbilityMixinCostStamina)
+    }
+
+    // @@protoc_insertion_point(class_scope:AbilityMixinCostStamina)
+    private static final emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina();
+    }
+
+    public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<AbilityMixinCostStamina>
+        PARSER = new com.google.protobuf.AbstractParser<AbilityMixinCostStamina>() {
+      @java.lang.Override
+      public AbilityMixinCostStamina parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AbilityMixinCostStamina(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<AbilityMixinCostStamina> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AbilityMixinCostStamina> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AbilityMixinCostStamina_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AbilityMixinCostStamina_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\035AbilityMixinCostStamina.proto\"*\n\027Abili" +
+      "tyMixinCostStamina\022\017\n\007is_swim\030\007 \001(\010B\033\n\031e" +
+      "mu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_AbilityMixinCostStamina_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_AbilityMixinCostStamina_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AbilityMixinCostStamina_descriptor,
+        new java.lang.String[] { "IsSwim", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -25,15 +25,15 @@ public final class AchievementOuterClass {
     int getFinishTimestamp();
 
     /**
-     * <code>.Status status = 10;</code>
+     * <code>.Achievement.Status status = 10;</code>
      * @return The enum numeric value on the wire for status.
      */
     int getStatusValue();
     /**
-     * <code>.Status status = 10;</code>
+     * <code>.Achievement.Status status = 10;</code>
      * @return The status.
      */
-    emu.grasscutter.net.proto.StatusOuterClass.Status getStatus();
+    emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus();
 
     /**
      * <code>uint32 total_progress = 4;</code>
@@ -161,6 +161,132 @@ public final class AchievementOuterClass {
               emu.grasscutter.net.proto.AchievementOuterClass.Achievement.class, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder.class);
     }
 
+    /**
+     * Protobuf enum {@code Achievement.Status}
+     */
+    public enum Status
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>STATUS_INVALID = 0;</code>
+       */
+      STATUS_INVALID(0),
+      /**
+       * <code>STATUS_UNFINISHED = 1;</code>
+       */
+      STATUS_UNFINISHED(1),
+      /**
+       * <code>STATUS_FINISHED = 2;</code>
+       */
+      STATUS_FINISHED(2),
+      /**
+       * <code>STATUS_REWARD_TAKEN = 3;</code>
+       */
+      STATUS_REWARD_TAKEN(3),
+      UNRECOGNIZED(-1),
+      ;
+
+      /**
+       * <code>STATUS_INVALID = 0;</code>
+       */
+      public static final int STATUS_INVALID_VALUE = 0;
+      /**
+       * <code>STATUS_UNFINISHED = 1;</code>
+       */
+      public static final int STATUS_UNFINISHED_VALUE = 1;
+      /**
+       * <code>STATUS_FINISHED = 2;</code>
+       */
+      public static final int STATUS_FINISHED_VALUE = 2;
+      /**
+       * <code>STATUS_REWARD_TAKEN = 3;</code>
+       */
+      public static final int STATUS_REWARD_TAKEN_VALUE = 3;
+
+
+      public final int getNumber() {
+        if (this == UNRECOGNIZED) {
+          throw new java.lang.IllegalArgumentException(
+              "Can't get the number of an unknown enum value.");
+        }
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static Status valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static Status forNumber(int value) {
+        switch (value) {
+          case 0: return STATUS_INVALID;
+          case 1: return STATUS_UNFINISHED;
+          case 2: return STATUS_FINISHED;
+          case 3: return STATUS_REWARD_TAKEN;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<Status>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          Status> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<Status>() {
+              public Status findValueByNumber(int number) {
+                return Status.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        if (this == UNRECOGNIZED) {
+          throw new java.lang.IllegalStateException(
+              "Can't get the descriptor of an unrecognized enum value.");
+        }
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final Status[] VALUES = values();
+
+      public static Status valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        if (desc.getIndex() == -1) {
+          return UNRECOGNIZED;
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private Status(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:Achievement.Status)
+    }
+
     public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 15;
     private int finishTimestamp_;
     /**
@@ -175,20 +301,20 @@ public final class AchievementOuterClass {
     public static final int STATUS_FIELD_NUMBER = 10;
     private int status_;
     /**
-     * <code>.Status status = 10;</code>
+     * <code>.Achievement.Status status = 10;</code>
      * @return The enum numeric value on the wire for status.
      */
     @java.lang.Override public int getStatusValue() {
       return status_;
     }
     /**
-     * <code>.Status status = 10;</code>
+     * <code>.Achievement.Status status = 10;</code>
      * @return The status.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() {
+    @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
       @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.StatusOuterClass.Status result = emu.grasscutter.net.proto.StatusOuterClass.Status.valueOf(status_);
+      emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
-      return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
+      return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
     }
 
     public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
@@ -244,7 +370,7 @@ public final class AchievementOuterClass {
       if (id_ != 0) {
         output.writeUInt32(5, id_);
       }
-      if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
+      if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
         output.writeEnum(10, status_);
       }
       if (curProgress_ != 0) {
@@ -270,7 +396,7 @@ public final class AchievementOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(5, id_);
       }
-      if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
+      if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(10, status_);
       }
@@ -630,14 +756,14 @@ public final class AchievementOuterClass {
 
       private int status_ = 0;
       /**
-       * <code>.Status status = 10;</code>
+       * <code>.Achievement.Status status = 10;</code>
        * @return The enum numeric value on the wire for status.
        */
       @java.lang.Override public int getStatusValue() {
         return status_;
       }
       /**
-       * <code>.Status status = 10;</code>
+       * <code>.Achievement.Status status = 10;</code>
        * @param value The enum numeric value on the wire for status to set.
        * @return This builder for chaining.
        */
@@ -648,21 +774,21 @@ public final class AchievementOuterClass {
         return this;
       }
       /**
-       * <code>.Status status = 10;</code>
+       * <code>.Achievement.Status status = 10;</code>
        * @return The status.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() {
+      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
         @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.StatusOuterClass.Status result = emu.grasscutter.net.proto.StatusOuterClass.Status.valueOf(status_);
+        emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
-        return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
+        return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
       }
       /**
-       * <code>.Status status = 10;</code>
+       * <code>.Achievement.Status status = 10;</code>
        * @param value The status to set.
        * @return This builder for chaining.
        */
-      public Builder setStatus(emu.grasscutter.net.proto.StatusOuterClass.Status value) {
+      public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -672,7 +798,7 @@ public final class AchievementOuterClass {
         return this;
       }
       /**
-       * <code>.Status status = 10;</code>
+       * <code>.Achievement.Status status = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearStatus() {
@@ -841,16 +967,18 @@ public final class AchievementOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021Achievement.proto\032\014Status.proto\"z\n\013Ach" +
+      "\n\021Achievement.proto\"\351\001\n\013Achievement\022\030\n\020f" +
-      "ievement\022\030\n\020finish_timestamp\030\017 \001(\r\022\027\n\006st" +
+      "inish_timestamp\030\017 \001(\r\022#\n\006status\030\n \001(\0162\023." +
-      "atus\030\n \001(\0162\007.Status\022\026\n\016total_progress\030\004 " +
+      "Achievement.Status\022\026\n\016total_progress\030\004 \001" +
-      "\001(\r\022\024\n\014cur_progress\030\016 \001(\r\022\n\n\002id\030\005 \001(\rB\033\n" +
+      "(\r\022\024\n\014cur_progress\030\016 \001(\r\022\n\n\002id\030\005 \001(\r\"a\n\006" +
-      "\031emu.grasscutter.net.protob\006proto3"
+      "Status\022\022\n\016STATUS_INVALID\020\000\022\025\n\021STATUS_UNF" +
+      "INISHED\020\001\022\023\n\017STATUS_FINISHED\020\002\022\027\n\023STATUS" +
+      "_REWARD_TAKEN\020\003B\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.StatusOuterClass.getDescriptor(),
         });
     internal_static_Achievement_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -858,7 +986,6 @@ public final class AchievementOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Achievement_descriptor,
         new java.lang.String[] { "FinishTimestamp", "Status", "TotalProgress", "CurProgress", "Id", });
-    emu.grasscutter.net.proto.StatusOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -19,15 +19,15 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 schedule_id = 14;</code>
+     * <code>uint32 schedule_id = 6;</code>
      * @return The scheduleId.
      */
     int getScheduleId();
   }
   /**
    * <pre>
-   * CmdId: 4453
+   * CmdId: 8127
-   * Obf: FKDKFJNGBMH
+   * Obf: KMIKAFFCKAL
    * </pre>
    *
    * Protobuf type {@code ActivityGetFriendGiftWishListReq}
@@ -74,7 +74,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 48: {
 
               scheduleId_ = input.readUInt32();
               break;
@@ -111,10 +111,10 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
               emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.class, emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.Builder.class);
     }
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 14;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 6;
     private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 14;</code>
+     * <code>uint32 schedule_id = 6;</code>
      * @return The scheduleId.
      */
     @java.lang.Override
@@ -137,7 +137,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (scheduleId_ != 0) {
-        output.writeUInt32(14, scheduleId_);
+        output.writeUInt32(6, scheduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +150,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
       size = 0;
       if (scheduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, scheduleId_);
+          .computeUInt32Size(6, scheduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +279,8 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 4453
+     * CmdId: 8127
-     * Obf: FKDKFJNGBMH
+     * Obf: KMIKAFFCKAL
      * </pre>
      *
      * Protobuf type {@code ActivityGetFriendGiftWishListReq}
@@ -431,7 +431,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
 
       private int scheduleId_ ;
       /**
-       * <code>uint32 schedule_id = 14;</code>
+       * <code>uint32 schedule_id = 6;</code>
        * @return The scheduleId.
        */
       @java.lang.Override
@@ -439,7 +439,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
         return scheduleId_;
       }
       /**
-       * <code>uint32 schedule_id = 14;</code>
+       * <code>uint32 schedule_id = 6;</code>
        * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +450,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 14;</code>
+       * <code>uint32 schedule_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearScheduleId() {
@@ -528,7 +528,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n&ActivityGetFriendGiftWishListReq.proto" +
       "\"7\n ActivityGetFriendGiftWishListReq\022\023\n\013" +
-      "schedule_id\030\016 \001(\rB\033\n\031emu.grasscutter.net" +
+      "schedule_id\030\006 \001(\rB\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

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

@@ -141,21 +141,21 @@ public final class ActivityInfoOuterClass {
         int key);
 
     /**
-     * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return A list containing the dCPENBLPKHK.
+     * @return A list containing the meetCondList.
      */
-    java.util.List<java.lang.Integer> getDCPENBLPKHKList();
+    java.util.List<java.lang.Integer> getMeetCondListList();
     /**
-     * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return The count of dCPENBLPKHK.
+     * @return The count of meetCondList.
      */
-    int getDCPENBLPKHKCount();
+    int getMeetCondListCount();
     /**
-     * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+     * <code>repeated uint32 meet_cond_list = 12;</code>
      * @param index The index of the element to return.
-     * @return The dCPENBLPKHK at the given index.
+     * @return The meetCondList at the given index.
      */
-    int getDCPENBLPKHK(int index);
+    int getMeetCondList(int index);
 
     /**
      * <code>bool DKJDABCNGBP = 13;</code>
@@ -264,21 +264,21 @@ public final class ActivityInfoOuterClass {
         int key);
 
     /**
-     * <code>repeated uint32 meet_cond_list = 4;</code>
+     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return A list containing the meetCondList.
+     * @return A list containing the pHCOMIFAIJD.
      */
-    java.util.List<java.lang.Integer> getMeetCondListList();
+    java.util.List<java.lang.Integer> getPHCOMIFAIJDList();
     /**
-     * <code>repeated uint32 meet_cond_list = 4;</code>
+     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return The count of meetCondList.
+     * @return The count of pHCOMIFAIJD.
      */
-    int getMeetCondListCount();
+    int getPHCOMIFAIJDCount();
     /**
-     * <code>repeated uint32 meet_cond_list = 4;</code>
+     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
      * @param index The index of the element to return.
-     * @return The meetCondList at the given index.
+     * @return The pHCOMIFAIJD at the given index.
      */
-    int getMeetCondList(int index);
+    int getPHCOMIFAIJD(int index);
 
     /**
      * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
@@ -1601,8 +1601,8 @@ public final class ActivityInfoOuterClass {
       dNMOEAFCDGC_ = emptyIntList();
       watcherInfoList_ = java.util.Collections.emptyList();
       lJLDCLMAMNL_ = emptyIntList();
-      dCPENBLPKHK_ = emptyIntList();
       meetCondList_ = emptyIntList();
+      pHCOMIFAIJD_ = emptyIntList();
       activityPushTipsDataList_ = java.util.Collections.emptyList();
     }
 
@@ -1654,21 +1654,21 @@ public final class ActivityInfoOuterClass {
             }
             case 32: {
               if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                meetCondList_ = newIntList();
+                pHCOMIFAIJD_ = newIntList();
                 mutable_bitField0_ |= 0x00000040;
               }
-              meetCondList_.addInt(input.readUInt32());
+              pHCOMIFAIJD_.addInt(input.readUInt32());
               break;
             }
             case 34: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
-                meetCondList_ = newIntList();
+                pHCOMIFAIJD_ = newIntList();
                 mutable_bitField0_ |= 0x00000040;
               }
               while (input.getBytesUntilLimit() > 0) {
-                meetCondList_.addInt(input.readUInt32());
+                pHCOMIFAIJD_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -1750,21 +1750,21 @@ public final class ActivityInfoOuterClass {
             }
             case 96: {
               if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                dCPENBLPKHK_ = newIntList();
+                meetCondList_ = newIntList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              dCPENBLPKHK_.addInt(input.readUInt32());
+              meetCondList_.addInt(input.readUInt32());
               break;
             }
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                dCPENBLPKHK_ = newIntList();
+                meetCondList_ = newIntList();
                 mutable_bitField0_ |= 0x00000010;
               }
               while (input.getBytesUntilLimit() > 0) {
-                dCPENBLPKHK_.addInt(input.readUInt32());
+                meetCondList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -3056,13 +3056,13 @@ public final class ActivityInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          meetCondList_.makeImmutable(); // C
+          pHCOMIFAIJD_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           watcherInfoList_ = java.util.Collections.unmodifiableList(watcherInfoList_);
         }
         if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          dCPENBLPKHK_.makeImmutable(); // C
+          meetCondList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
           lJLDCLMAMNL_.makeImmutable(); // C
@@ -3543,33 +3543,33 @@ public final class ActivityInfoOuterClass {
       return map.get(key);
     }
 
-    public static final int DCPENBLPKHK_FIELD_NUMBER = 12;
+    public static final int MEET_COND_LIST_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList dCPENBLPKHK_;
+    private com.google.protobuf.Internal.IntList meetCondList_;
     /**
-     * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return A list containing the dCPENBLPKHK.
+     * @return A list containing the meetCondList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getDCPENBLPKHKList() {
+        getMeetCondListList() {
-      return dCPENBLPKHK_;
+      return meetCondList_;
     }
     /**
-     * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return The count of dCPENBLPKHK.
+     * @return The count of meetCondList.
      */
-    public int getDCPENBLPKHKCount() {
+    public int getMeetCondListCount() {
-      return dCPENBLPKHK_.size();
+      return meetCondList_.size();
     }
     /**
-     * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+     * <code>repeated uint32 meet_cond_list = 12;</code>
      * @param index The index of the element to return.
-     * @return The dCPENBLPKHK at the given index.
+     * @return The meetCondList at the given index.
      */
-    public int getDCPENBLPKHK(int index) {
+    public int getMeetCondList(int index) {
-      return dCPENBLPKHK_.getInt(index);
+      return meetCondList_.getInt(index);
     }
-    private int dCPENBLPKHKMemoizedSerializedSize = -1;
+    private int meetCondListMemoizedSerializedSize = -1;
 
     public static final int DKJDABCNGBP_FIELD_NUMBER = 13;
     private boolean dKJDABCNGBP_;
@@ -3784,33 +3784,33 @@ public final class ActivityInfoOuterClass {
       return map.get(key);
     }
 
-    public static final int MEET_COND_LIST_FIELD_NUMBER = 4;
+    public static final int PHCOMIFAIJD_FIELD_NUMBER = 4;
-    private com.google.protobuf.Internal.IntList meetCondList_;
+    private com.google.protobuf.Internal.IntList pHCOMIFAIJD_;
     /**
-     * <code>repeated uint32 meet_cond_list = 4;</code>
+     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return A list containing the meetCondList.
+     * @return A list containing the pHCOMIFAIJD.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getMeetCondListList() {
+        getPHCOMIFAIJDList() {
-      return meetCondList_;
+      return pHCOMIFAIJD_;
     }
     /**
-     * <code>repeated uint32 meet_cond_list = 4;</code>
+     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return The count of meetCondList.
+     * @return The count of pHCOMIFAIJD.
      */
-    public int getMeetCondListCount() {
+    public int getPHCOMIFAIJDCount() {
-      return meetCondList_.size();
+      return pHCOMIFAIJD_.size();
     }
     /**
-     * <code>repeated uint32 meet_cond_list = 4;</code>
+     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
      * @param index The index of the element to return.
-     * @return The meetCondList at the given index.
+     * @return The pHCOMIFAIJD at the given index.
      */
-    public int getMeetCondList(int index) {
+    public int getPHCOMIFAIJD(int index) {
-      return meetCondList_.getInt(index);
+      return pHCOMIFAIJD_.getInt(index);
     }
-    private int meetCondListMemoizedSerializedSize = -1;
+    private int pHCOMIFAIJDMemoizedSerializedSize = -1;
 
     public static final int ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER = 643;
     private java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> activityPushTipsDataList_;
@@ -6511,12 +6511,12 @@ public final class ActivityInfoOuterClass {
       if (activityId_ != 0) {
         output.writeUInt32(3, activityId_);
       }
-      if (getMeetCondListList().size() > 0) {
+      if (getPHCOMIFAIJDList().size() > 0) {
         output.writeUInt32NoTag(34);
-        output.writeUInt32NoTag(meetCondListMemoizedSerializedSize);
+        output.writeUInt32NoTag(pHCOMIFAIJDMemoizedSerializedSize);
       }
-      for (int i = 0; i < meetCondList_.size(); i++) {
+      for (int i = 0; i < pHCOMIFAIJD_.size(); i++) {
-        output.writeUInt32NoTag(meetCondList_.getInt(i));
+        output.writeUInt32NoTag(pHCOMIFAIJD_.getInt(i));
       }
       if (scheduleId_ != 0) {
         output.writeUInt32(5, scheduleId_);
@@ -6539,12 +6539,12 @@ public final class ActivityInfoOuterClass {
       if (endTime_ != 0) {
         output.writeUInt32(11, endTime_);
       }
-      if (getDCPENBLPKHKList().size() > 0) {
+      if (getMeetCondListList().size() > 0) {
         output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(dCPENBLPKHKMemoizedSerializedSize);
+        output.writeUInt32NoTag(meetCondListMemoizedSerializedSize);
       }
-      for (int i = 0; i < dCPENBLPKHK_.size(); i++) {
+      for (int i = 0; i < meetCondList_.size(); i++) {
-        output.writeUInt32NoTag(dCPENBLPKHK_.getInt(i));
+        output.writeUInt32NoTag(meetCondList_.getInt(i));
       }
       if (dKJDABCNGBP_ != false) {
         output.writeBool(13, dKJDABCNGBP_);
@@ -6877,17 +6877,17 @@ public final class ActivityInfoOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < meetCondList_.size(); i++) {
+        for (int i = 0; i < pHCOMIFAIJD_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(meetCondList_.getInt(i));
+            .computeUInt32SizeNoTag(pHCOMIFAIJD_.getInt(i));
         }
         size += dataSize;
-        if (!getMeetCondListList().isEmpty()) {
+        if (!getPHCOMIFAIJDList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        meetCondListMemoizedSerializedSize = dataSize;
+        pHCOMIFAIJDMemoizedSerializedSize = dataSize;
       }
       if (scheduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -6919,17 +6919,17 @@ public final class ActivityInfoOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < dCPENBLPKHK_.size(); i++) {
+        for (int i = 0; i < meetCondList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(dCPENBLPKHK_.getInt(i));
+            .computeUInt32SizeNoTag(meetCondList_.getInt(i));
         }
         size += dataSize;
-        if (!getDCPENBLPKHKList().isEmpty()) {
+        if (!getMeetCondListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        dCPENBLPKHKMemoizedSerializedSize = dataSize;
+        meetCondListMemoizedSerializedSize = dataSize;
       }
       if (dKJDABCNGBP_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -7388,8 +7388,8 @@ public final class ActivityInfoOuterClass {
           != other.getScheduleId()) return false;
       if (!internalGetActivityCoinMap().equals(
           other.internalGetActivityCoinMap())) return false;
-      if (!getDCPENBLPKHKList()
+      if (!getMeetCondListList()
-          .equals(other.getDCPENBLPKHKList())) return false;
+          .equals(other.getMeetCondListList())) return false;
       if (getDKJDABCNGBP()
           != other.getDKJDABCNGBP()) return false;
       if (getBeginTime()
@@ -7416,8 +7416,8 @@ public final class ActivityInfoOuterClass {
           != other.getEndTime()) return false;
       if (!internalGetWishGiftNumMap().equals(
           other.internalGetWishGiftNumMap())) return false;
-      if (!getMeetCondListList()
+      if (!getPHCOMIFAIJDList()
-          .equals(other.getMeetCondListList())) return false;
+          .equals(other.getPHCOMIFAIJDList())) return false;
       if (!getActivityPushTipsDataListList()
           .equals(other.getActivityPushTipsDataListList())) return false;
       if (!getDetailCase().equals(other.getDetailCase())) return false;
@@ -7804,9 +7804,9 @@ public final class ActivityInfoOuterClass {
         hash = (37 * hash) + ACTIVITY_COIN_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetActivityCoinMap().hashCode();
       }
-      if (getDCPENBLPKHKCount() > 0) {
+      if (getMeetCondListCount() > 0) {
-        hash = (37 * hash) + DCPENBLPKHK_FIELD_NUMBER;
+        hash = (37 * hash) + MEET_COND_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDCPENBLPKHKList().hashCode();
+        hash = (53 * hash) + getMeetCondListList().hashCode();
       }
       hash = (37 * hash) + DKJDABCNGBP_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
@@ -7841,9 +7841,9 @@ public final class ActivityInfoOuterClass {
         hash = (37 * hash) + WISH_GIFT_NUM_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetWishGiftNumMap().hashCode();
       }
-      if (getMeetCondListCount() > 0) {
+      if (getPHCOMIFAIJDCount() > 0) {
-        hash = (37 * hash) + MEET_COND_LIST_FIELD_NUMBER;
+        hash = (37 * hash) + PHCOMIFAIJD_FIELD_NUMBER;
-        hash = (53 * hash) + getMeetCondListList().hashCode();
+        hash = (53 * hash) + getPHCOMIFAIJDList().hashCode();
       }
       if (getActivityPushTipsDataListCount() > 0) {
         hash = (37 * hash) + ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER;
@@ -8379,7 +8379,7 @@ public final class ActivityInfoOuterClass {
         scheduleId_ = 0;
 
         internalGetMutableActivityCoinMap().clear();
-        dCPENBLPKHK_ = emptyIntList();
+        meetCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
         dKJDABCNGBP_ = false;
 
@@ -8406,7 +8406,7 @@ public final class ActivityInfoOuterClass {
         endTime_ = 0;
 
         internalGetMutableWishGiftNumMap().clear();
-        meetCondList_ = emptyIntList();
+        pHCOMIFAIJD_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000040);
         if (activityPushTipsDataListBuilder_ == null) {
           activityPushTipsDataList_ = java.util.Collections.emptyList();
@@ -8470,10 +8470,10 @@ public final class ActivityInfoOuterClass {
         result.activityCoinMap_ = internalGetActivityCoinMap();
         result.activityCoinMap_.makeImmutable();
         if (((bitField0_ & 0x00000010) != 0)) {
-          dCPENBLPKHK_.makeImmutable();
+          meetCondList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000010);
         }
-        result.dCPENBLPKHK_ = dCPENBLPKHK_;
+        result.meetCondList_ = meetCondList_;
         result.dKJDABCNGBP_ = dKJDABCNGBP_;
         result.beginTime_ = beginTime_;
         result.iNGFNLLCDOL_ = iNGFNLLCDOL_;
@@ -8489,10 +8489,10 @@ public final class ActivityInfoOuterClass {
         result.wishGiftNumMap_ = internalGetWishGiftNumMap();
         result.wishGiftNumMap_.makeImmutable();
         if (((bitField0_ & 0x00000040) != 0)) {
-          meetCondList_.makeImmutable();
+          pHCOMIFAIJD_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000040);
         }
-        result.meetCondList_ = meetCondList_;
+        result.pHCOMIFAIJD_ = pHCOMIFAIJD_;
         if (activityPushTipsDataListBuilder_ == null) {
           if (((bitField0_ & 0x00000080) != 0)) {
             activityPushTipsDataList_ = java.util.Collections.unmodifiableList(activityPushTipsDataList_);
@@ -9209,13 +9209,13 @@ public final class ActivityInfoOuterClass {
         }
         internalGetMutableActivityCoinMap().mergeFrom(
             other.internalGetActivityCoinMap());
-        if (!other.dCPENBLPKHK_.isEmpty()) {
+        if (!other.meetCondList_.isEmpty()) {
-          if (dCPENBLPKHK_.isEmpty()) {
+          if (meetCondList_.isEmpty()) {
-            dCPENBLPKHK_ = other.dCPENBLPKHK_;
+            meetCondList_ = other.meetCondList_;
             bitField0_ = (bitField0_ & ~0x00000010);
           } else {
-            ensureDCPENBLPKHKIsMutable();
+            ensureMeetCondListIsMutable();
-            dCPENBLPKHK_.addAll(other.dCPENBLPKHK_);
+            meetCondList_.addAll(other.meetCondList_);
           }
           onChanged();
         }
@@ -9257,13 +9257,13 @@ public final class ActivityInfoOuterClass {
         }
         internalGetMutableWishGiftNumMap().mergeFrom(
             other.internalGetWishGiftNumMap());
-        if (!other.meetCondList_.isEmpty()) {
+        if (!other.pHCOMIFAIJD_.isEmpty()) {
-          if (meetCondList_.isEmpty()) {
+          if (pHCOMIFAIJD_.isEmpty()) {
-            meetCondList_ = other.meetCondList_;
+            pHCOMIFAIJD_ = other.pHCOMIFAIJD_;
             bitField0_ = (bitField0_ & ~0x00000040);
           } else {
-            ensureMeetCondListIsMutable();
+            ensurePHCOMIFAIJDIsMutable();
-            meetCondList_.addAll(other.meetCondList_);
+            pHCOMIFAIJD_.addAll(other.pHCOMIFAIJD_);
           }
           onChanged();
         }
@@ -10364,80 +10364,80 @@ public final class ActivityInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList dCPENBLPKHK_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList();
-      private void ensureDCPENBLPKHKIsMutable() {
+      private void ensureMeetCondListIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
-          dCPENBLPKHK_ = mutableCopy(dCPENBLPKHK_);
+          meetCondList_ = mutableCopy(meetCondList_);
           bitField0_ |= 0x00000010;
          }
       }
       /**
-       * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @return A list containing the dCPENBLPKHK.
+       * @return A list containing the meetCondList.
        */
       public java.util.List<java.lang.Integer>
-          getDCPENBLPKHKList() {
+          getMeetCondListList() {
         return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(dCPENBLPKHK_) : dCPENBLPKHK_;
+                 java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_;
       }
       /**
-       * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @return The count of dCPENBLPKHK.
+       * @return The count of meetCondList.
        */
-      public int getDCPENBLPKHKCount() {
+      public int getMeetCondListCount() {
-        return dCPENBLPKHK_.size();
+        return meetCondList_.size();
       }
       /**
-       * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+       * <code>repeated uint32 meet_cond_list = 12;</code>
        * @param index The index of the element to return.
-       * @return The dCPENBLPKHK at the given index.
+       * @return The meetCondList at the given index.
        */
-      public int getDCPENBLPKHK(int index) {
+      public int getMeetCondList(int index) {
-        return dCPENBLPKHK_.getInt(index);
+        return meetCondList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+       * <code>repeated uint32 meet_cond_list = 12;</code>
        * @param index The index to set the value at.
-       * @param value The dCPENBLPKHK to set.
+       * @param value The meetCondList to set.
        * @return This builder for chaining.
        */
-      public Builder setDCPENBLPKHK(
+      public Builder setMeetCondList(
           int index, int value) {
-        ensureDCPENBLPKHKIsMutable();
+        ensureMeetCondListIsMutable();
-        dCPENBLPKHK_.setInt(index, value);
+        meetCondList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @param value The dCPENBLPKHK to add.
+       * @param value The meetCondList to add.
        * @return This builder for chaining.
        */
-      public Builder addDCPENBLPKHK(int value) {
+      public Builder addMeetCondList(int value) {
-        ensureDCPENBLPKHKIsMutable();
+        ensureMeetCondListIsMutable();
-        dCPENBLPKHK_.addInt(value);
+        meetCondList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @param values The dCPENBLPKHK to add.
+       * @param values The meetCondList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllDCPENBLPKHK(
+      public Builder addAllMeetCondList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureDCPENBLPKHKIsMutable();
+        ensureMeetCondListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, dCPENBLPKHK_);
+            values, meetCondList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DCPENBLPKHK = 12;</code>
+       * <code>repeated uint32 meet_cond_list = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDCPENBLPKHK() {
+      public Builder clearMeetCondList() {
-        dCPENBLPKHK_ = emptyIntList();
+        meetCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
@@ -10943,80 +10943,80 @@ public final class ActivityInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList pHCOMIFAIJD_ = emptyIntList();
-      private void ensureMeetCondListIsMutable() {
+      private void ensurePHCOMIFAIJDIsMutable() {
         if (!((bitField0_ & 0x00000040) != 0)) {
-          meetCondList_ = mutableCopy(meetCondList_);
+          pHCOMIFAIJD_ = mutableCopy(pHCOMIFAIJD_);
           bitField0_ |= 0x00000040;
          }
       }
       /**
-       * <code>repeated uint32 meet_cond_list = 4;</code>
+       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @return A list containing the meetCondList.
+       * @return A list containing the pHCOMIFAIJD.
        */
       public java.util.List<java.lang.Integer>
-          getMeetCondListList() {
+          getPHCOMIFAIJDList() {
         return ((bitField0_ & 0x00000040) != 0) ?
-                 java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_;
+                 java.util.Collections.unmodifiableList(pHCOMIFAIJD_) : pHCOMIFAIJD_;
       }
       /**
-       * <code>repeated uint32 meet_cond_list = 4;</code>
+       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @return The count of meetCondList.
+       * @return The count of pHCOMIFAIJD.
        */
-      public int getMeetCondListCount() {
+      public int getPHCOMIFAIJDCount() {
-        return meetCondList_.size();
+        return pHCOMIFAIJD_.size();
       }
       /**
-       * <code>repeated uint32 meet_cond_list = 4;</code>
+       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
        * @param index The index of the element to return.
-       * @return The meetCondList at the given index.
+       * @return The pHCOMIFAIJD at the given index.
        */
-      public int getMeetCondList(int index) {
+      public int getPHCOMIFAIJD(int index) {
-        return meetCondList_.getInt(index);
+        return pHCOMIFAIJD_.getInt(index);
       }
       /**
-       * <code>repeated uint32 meet_cond_list = 4;</code>
+       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
        * @param index The index to set the value at.
-       * @param value The meetCondList to set.
+       * @param value The pHCOMIFAIJD to set.
        * @return This builder for chaining.
        */
-      public Builder setMeetCondList(
+      public Builder setPHCOMIFAIJD(
           int index, int value) {
-        ensureMeetCondListIsMutable();
+        ensurePHCOMIFAIJDIsMutable();
-        meetCondList_.setInt(index, value);
+        pHCOMIFAIJD_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 meet_cond_list = 4;</code>
+       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @param value The meetCondList to add.
+       * @param value The pHCOMIFAIJD to add.
        * @return This builder for chaining.
        */
-      public Builder addMeetCondList(int value) {
+      public Builder addPHCOMIFAIJD(int value) {
-        ensureMeetCondListIsMutable();
+        ensurePHCOMIFAIJDIsMutable();
-        meetCondList_.addInt(value);
+        pHCOMIFAIJD_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 meet_cond_list = 4;</code>
+       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @param values The meetCondList to add.
+       * @param values The pHCOMIFAIJD to add.
        * @return This builder for chaining.
        */
-      public Builder addAllMeetCondList(
+      public Builder addAllPHCOMIFAIJD(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureMeetCondListIsMutable();
+        ensurePHCOMIFAIJDIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, meetCondList_);
+            values, pHCOMIFAIJD_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 meet_cond_list = 4;</code>
+       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMeetCondList() {
+      public Builder clearPHCOMIFAIJD() {
-        meetCondList_ = emptyIntList();
+        pHCOMIFAIJD_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
@@ -23399,16 +23399,16 @@ public final class ActivityInfoOuterClass {
       "\010\022\024\n\013LJLDCLMAMNL\030\342\003 \003(\r\022\023\n\013PJJKJGALLGD\030\020" +
       " \001(\010\022\025\n\ractivity_type\030\001 \001(\r\022\023\n\013schedule_" +
       "id\030\005 \001(\r\022>\n\021activity_coin_map\030\232\014 \003(\0132\".A" +
-      "ctivityInfo.ActivityCoinMapEntry\022\023\n\013DCPE" +
+      "ctivityInfo.ActivityCoinMapEntry\022\026\n\016meet" +
-      "NBLPKHK\030\014 \003(\r\022\023\n\013DKJDABCNGBP\030\r \001(\010\022\022\n\nbe" +
+      "_cond_list\030\014 \003(\r\022\023\n\013DKJDABCNGBP\030\r \001(\010\022\022\n" +
-      "gin_time\030\002 \001(\r\022\024\n\013INGFNLLCDOL\030\335\005 \001(\r\022\023\n\013" +
+      "\nbegin_time\030\002 \001(\r\022\024\n\013INGFNLLCDOL\030\335\005 \001(\r\022" +
-      "ENNDKMJIMHN\030\017 \001(\010\022\022\n\tcur_score\030\223\014 \001(\r\022\024\n" +
+      "\023\n\013ENNDKMJIMHN\030\017 \001(\010\022\022\n\tcur_score\030\223\014 \001(\r" +
-      "\013BKJNDLLNAML\030\232\016 \001(\010\022\035\n\024first_day_start_t" +
+      "\022\024\n\013BKJNDLLNAML\030\232\016 \001(\010\022\035\n\024first_day_star" +
-      "ime\030\322\007 \001(\r\022\024\n\013ABMOPKOIMPA\030\215\004 \001(\010\022\024\n\013FGFG" +
+      "t_time\030\322\007 \001(\r\022\024\n\013ABMOPKOIMPA\030\215\004 \001(\010\022\024\n\013F" +
-      "ECAAKJM\030\247\r \001(\r\022\024\n\013GFEMIEBKKKL\030\335\010 \001(\010\022\024\n\013" +
+      "GFGECAAKJM\030\247\r \001(\r\022\024\n\013GFEMIEBKKKL\030\335\010 \001(\010\022" +
-      "CEFIPNKPEKA\030\355\004 \001(\r\022\020\n\010end_time\030\013 \001(\r\022=\n\021" +
+      "\024\n\013CEFIPNKPEKA\030\355\004 \001(\r\022\020\n\010end_time\030\013 \001(\r\022" +
-      "wish_gift_num_map\030\234\007 \003(\0132!.ActivityInfo." +
+      "=\n\021wish_gift_num_map\030\234\007 \003(\0132!.ActivityIn" +
-      "WishGiftNumMapEntry\022\026\n\016meet_cond_list\030\004 " +
+      "fo.WishGiftNumMapEntry\022\023\n\013PHCOMIFAIJD\030\004 " +
       "\003(\r\022<\n\034activity_push_tips_data_list\030\203\005 \003" +
       "(\0132\025.ActivityPushTipsData\0223\n\rsam_lamp_in" +
       "fo\030\n \001(\0132\032.SeaLampActivityDetailInfoH\000\0224" +
@@ -23632,7 +23632,7 @@ public final class ActivityInfoOuterClass {
     internal_static_ActivityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityInfo_descriptor,
-        new java.lang.String[] { "ActivityId", "DNMOEAFCDGC", "WatcherInfoList", "IsFinished", "LJLDCLMAMNL", "PJJKJGALLGD", "ActivityType", "ScheduleId", "ActivityCoinMap", "DCPENBLPKHK", "DKJDABCNGBP", "BeginTime", "INGFNLLCDOL", "ENNDKMJIMHN", "CurScore", "BKJNDLLNAML", "FirstDayStartTime", "ABMOPKOIMPA", "FGFGECAAKJM", "GFEMIEBKKKL", "CEFIPNKPEKA", "EndTime", "WishGiftNumMap", "MeetCondList", "ActivityPushTipsDataList", "SamLampInfo", "CrucibleInfo", "SalesmanInfo", "TrialAvatarInfo", "DeliveryInfo", "AsterInfo", "FlightInfo", "DragonSpineInfo", "EffigyInfo", "TreasureMapInfo", "BlessingInfo", "SeaLampInfo", "ExpeditionInfo", "ArenaChallengeInfo", "FleurFairInfo", "WaterSpiritInfo", "ChallnelerSlabInfo", "MistTrialActivityInfo", "HideAndSeekInfo", "FindHilichurlInfo", "SummerTimeInfo", "BuoyantCombatInfo", "EchoShellInfo", "BounceConjuringInfo", "BlitzRushInfo", "ChessInfo", "SumoInfo", "MoonfinTrialInfo", "LunaRiteInfo", "PlantFlowerInfo", "MusicGameInfo", "RoguelikeDungoenInfo", "DigInfo", "HachiInfo", "WinterCampInfo", "PotionInfo", "TanukiTravelActivityInfo", "LanternRiteActivityInfo", "MichiaeMatsuriInfo", "BartenderInfo", "UgcInfo", "CrystalLinkInfo", "IrodoriInfo", "PhotoInfo", "SpiceInfo", "GachaInfo", "LuminanceStoneChallengeInfo", "RogueDiaryInfo", "SummerTimeV2Info", "IslandPartyInfo", "GearInfo", "GravenInnocenceInfo", "InstableSprayInfo", "MuqadasPotionInfo", "TreasureSeelieInfo", "RockBoardExploreInfo", "VintageInfo", "WindFieldInfo", "FungusFighterInfo", "CharAmusementInfo", "EffigyChallengeInfo", "CoinCollectInfo", "BrickBreakerInfo", "DuelHeartInfo", "SeaLampV3Info", "TeamChainInfo", "ElectroherculesBattleInfo", "GcgFestivalInfo", "FleurFairV2Info", "FungusFighterV2Info", "AkaFesInfo", "SandwormCannonDetailInfo", "SorushTrialInfo", "JourneyInfo", "EffigyChallengeV4Info", "GcgPveInfo", "UgcV2Info", "PenumbraAdventureInfo", "AnimalViewInfo", "ActivityMultiCharacterInfo", "GcgPveInfiniteInfo", "ToyBattleInfo", "PhotoUnderseaInfo", "FontaineGatherInfo", "GcgPvePuzzleInfo", "Detail", });
+        new java.lang.String[] { "ActivityId", "DNMOEAFCDGC", "WatcherInfoList", "IsFinished", "LJLDCLMAMNL", "PJJKJGALLGD", "ActivityType", "ScheduleId", "ActivityCoinMap", "MeetCondList", "DKJDABCNGBP", "BeginTime", "INGFNLLCDOL", "ENNDKMJIMHN", "CurScore", "BKJNDLLNAML", "FirstDayStartTime", "ABMOPKOIMPA", "FGFGECAAKJM", "GFEMIEBKKKL", "CEFIPNKPEKA", "EndTime", "WishGiftNumMap", "PHCOMIFAIJD", "ActivityPushTipsDataList", "SamLampInfo", "CrucibleInfo", "SalesmanInfo", "TrialAvatarInfo", "DeliveryInfo", "AsterInfo", "FlightInfo", "DragonSpineInfo", "EffigyInfo", "TreasureMapInfo", "BlessingInfo", "SeaLampInfo", "ExpeditionInfo", "ArenaChallengeInfo", "FleurFairInfo", "WaterSpiritInfo", "ChallnelerSlabInfo", "MistTrialActivityInfo", "HideAndSeekInfo", "FindHilichurlInfo", "SummerTimeInfo", "BuoyantCombatInfo", "EchoShellInfo", "BounceConjuringInfo", "BlitzRushInfo", "ChessInfo", "SumoInfo", "MoonfinTrialInfo", "LunaRiteInfo", "PlantFlowerInfo", "MusicGameInfo", "RoguelikeDungoenInfo", "DigInfo", "HachiInfo", "WinterCampInfo", "PotionInfo", "TanukiTravelActivityInfo", "LanternRiteActivityInfo", "MichiaeMatsuriInfo", "BartenderInfo", "UgcInfo", "CrystalLinkInfo", "IrodoriInfo", "PhotoInfo", "SpiceInfo", "GachaInfo", "LuminanceStoneChallengeInfo", "RogueDiaryInfo", "SummerTimeV2Info", "IslandPartyInfo", "GearInfo", "GravenInnocenceInfo", "InstableSprayInfo", "MuqadasPotionInfo", "TreasureSeelieInfo", "RockBoardExploreInfo", "VintageInfo", "WindFieldInfo", "FungusFighterInfo", "CharAmusementInfo", "EffigyChallengeInfo", "CoinCollectInfo", "BrickBreakerInfo", "DuelHeartInfo", "SeaLampV3Info", "TeamChainInfo", "ElectroherculesBattleInfo", "GcgFestivalInfo", "FleurFairV2Info", "FungusFighterV2Info", "AkaFesInfo", "SandwormCannonDetailInfo", "SorushTrialInfo", "JourneyInfo", "EffigyChallengeV4Info", "GcgPveInfo", "UgcV2Info", "PenumbraAdventureInfo", "AnimalViewInfo", "ActivityMultiCharacterInfo", "GcgPveInfiniteInfo", "ToyBattleInfo", "PhotoUnderseaInfo", "FontaineGatherInfo", "GcgPvePuzzleInfo", "Detail", });
     internal_static_ActivityInfo_ActivityCoinMapEntry_descriptor =
       internal_static_ActivityInfo_descriptor.getNestedTypes().get(0);
     internal_static_ActivityInfo_ActivityCoinMapEntry_fieldAccessorTable = new

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

@@ -225,6 +225,10 @@ public final class ChatInfoOuterClass {
     }
 
     /**
+     * <pre>
+     * Obf: LGDLFPKODMA
+     * </pre>
+     *
      * Protobuf enum {@code ChatInfo.SystemHintType}
      */
     public enum SystemHintType
@@ -352,10 +356,6 @@ public final class ChatInfoOuterClass {
       int getType();
     }
     /**
-     * <pre>
-     * Obf: LGDLFPKODMA
-     * </pre>
-     *
      * Protobuf type {@code ChatInfo.SystemHint}
      */
     public static final class SystemHint extends
@@ -604,10 +604,6 @@ public final class ChatInfoOuterClass {
         return builder;
       }
       /**
-       * <pre>
-       * Obf: LGDLFPKODMA
-       * </pre>
-       *
        * Protobuf type {@code ChatInfo.SystemHint}
        */
       public static final class Builder extends

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

@@ -0,0 +1,914 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FireWorkData.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FireWorkDataOuterClass {
+  private FireWorkDataOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface FireWorkDataOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:FireWorkData)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 id = 1;</code>
+     * @return The id.
+     */
+    int getId();
+
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance> 
+        getFireWorkInstanceList();
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index);
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    int getFireWorkInstanceCount();
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> 
+        getFireWorkInstanceOrBuilderList();
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder(
+        int index);
+  }
+  /**
+   * Protobuf type {@code FireWorkData}
+   */
+  public static final class FireWorkData extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:FireWorkData)
+      FireWorkDataOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use FireWorkData.newBuilder() to construct.
+    private FireWorkData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private FireWorkData() {
+      fireWorkInstance_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new FireWorkData();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private FireWorkData(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              id_ = input.readUInt32();
+              break;
+            }
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                fireWorkInstance_ = new java.util.ArrayList<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              fireWorkInstance_.add(
+                  input.readMessage(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          fireWorkInstance_ = java.util.Collections.unmodifiableList(fireWorkInstance_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.class, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder.class);
+    }
+
+    public static final int ID_FIELD_NUMBER = 1;
+    private int id_;
+    /**
+     * <code>uint32 id = 1;</code>
+     * @return The id.
+     */
+    @java.lang.Override
+    public int getId() {
+      return id_;
+    }
+
+    public static final int FIREWORKINSTANCE_FIELD_NUMBER = 2;
+    private java.util.List<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance> fireWorkInstance_;
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance> getFireWorkInstanceList() {
+      return fireWorkInstance_;
+    }
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> 
+        getFireWorkInstanceOrBuilderList() {
+      return fireWorkInstance_;
+    }
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    @java.lang.Override
+    public int getFireWorkInstanceCount() {
+      return fireWorkInstance_.size();
+    }
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index) {
+      return fireWorkInstance_.get(index);
+    }
+    /**
+     * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder(
+        int index) {
+      return fireWorkInstance_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (id_ != 0) {
+        output.writeUInt32(1, id_);
+      }
+      for (int i = 0; i < fireWorkInstance_.size(); i++) {
+        output.writeMessage(2, fireWorkInstance_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (id_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, id_);
+      }
+      for (int i = 0; i < fireWorkInstance_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, fireWorkInstance_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData other = (emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData) obj;
+
+      if (getId()
+          != other.getId()) return false;
+      if (!getFireWorkInstanceList()
+          .equals(other.getFireWorkInstanceList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
+      if (getFireWorkInstanceCount() > 0) {
+        hash = (37 * hash) + FIREWORKINSTANCE_FIELD_NUMBER;
+        hash = (53 * hash) + getFireWorkInstanceList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code FireWorkData}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:FireWorkData)
+        emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.class, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getFireWorkInstanceFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        id_ = 0;
+
+        if (fireWorkInstanceBuilder_ == null) {
+          fireWorkInstance_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          fireWorkInstanceBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData build() {
+        emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData buildPartial() {
+        emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData result = new emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData(this);
+        int from_bitField0_ = bitField0_;
+        result.id_ = id_;
+        if (fireWorkInstanceBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            fireWorkInstance_ = java.util.Collections.unmodifiableList(fireWorkInstance_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.fireWorkInstance_ = fireWorkInstance_;
+        } else {
+          result.fireWorkInstance_ = fireWorkInstanceBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData) {
+          return mergeFrom((emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData other) {
+        if (other == emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance()) return this;
+        if (other.getId() != 0) {
+          setId(other.getId());
+        }
+        if (fireWorkInstanceBuilder_ == null) {
+          if (!other.fireWorkInstance_.isEmpty()) {
+            if (fireWorkInstance_.isEmpty()) {
+              fireWorkInstance_ = other.fireWorkInstance_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureFireWorkInstanceIsMutable();
+              fireWorkInstance_.addAll(other.fireWorkInstance_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.fireWorkInstance_.isEmpty()) {
+            if (fireWorkInstanceBuilder_.isEmpty()) {
+              fireWorkInstanceBuilder_.dispose();
+              fireWorkInstanceBuilder_ = null;
+              fireWorkInstance_ = other.fireWorkInstance_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              fireWorkInstanceBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getFireWorkInstanceFieldBuilder() : null;
+            } else {
+              fireWorkInstanceBuilder_.addAllMessages(other.fireWorkInstance_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private int id_ ;
+      /**
+       * <code>uint32 id = 1;</code>
+       * @return The id.
+       */
+      @java.lang.Override
+      public int getId() {
+        return id_;
+      }
+      /**
+       * <code>uint32 id = 1;</code>
+       * @param value The id to set.
+       * @return This builder for chaining.
+       */
+      public Builder setId(int value) {
+        
+        id_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearId() {
+        
+        id_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance> fireWorkInstance_ =
+        java.util.Collections.emptyList();
+      private void ensureFireWorkInstanceIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          fireWorkInstance_ = new java.util.ArrayList<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance>(fireWorkInstance_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> fireWorkInstanceBuilder_;
+
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance> getFireWorkInstanceList() {
+        if (fireWorkInstanceBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(fireWorkInstance_);
+        } else {
+          return fireWorkInstanceBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public int getFireWorkInstanceCount() {
+        if (fireWorkInstanceBuilder_ == null) {
+          return fireWorkInstance_.size();
+        } else {
+          return fireWorkInstanceBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index) {
+        if (fireWorkInstanceBuilder_ == null) {
+          return fireWorkInstance_.get(index);
+        } else {
+          return fireWorkInstanceBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder setFireWorkInstance(
+          int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) {
+        if (fireWorkInstanceBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFireWorkInstanceIsMutable();
+          fireWorkInstance_.set(index, value);
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder setFireWorkInstance(
+          int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) {
+        if (fireWorkInstanceBuilder_ == null) {
+          ensureFireWorkInstanceIsMutable();
+          fireWorkInstance_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder addFireWorkInstance(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) {
+        if (fireWorkInstanceBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFireWorkInstanceIsMutable();
+          fireWorkInstance_.add(value);
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder addFireWorkInstance(
+          int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) {
+        if (fireWorkInstanceBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFireWorkInstanceIsMutable();
+          fireWorkInstance_.add(index, value);
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder addFireWorkInstance(
+          emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) {
+        if (fireWorkInstanceBuilder_ == null) {
+          ensureFireWorkInstanceIsMutable();
+          fireWorkInstance_.add(builderForValue.build());
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder addFireWorkInstance(
+          int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) {
+        if (fireWorkInstanceBuilder_ == null) {
+          ensureFireWorkInstanceIsMutable();
+          fireWorkInstance_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder addAllFireWorkInstance(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance> values) {
+        if (fireWorkInstanceBuilder_ == null) {
+          ensureFireWorkInstanceIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, fireWorkInstance_);
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder clearFireWorkInstance() {
+        if (fireWorkInstanceBuilder_ == null) {
+          fireWorkInstance_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public Builder removeFireWorkInstance(int index) {
+        if (fireWorkInstanceBuilder_ == null) {
+          ensureFireWorkInstanceIsMutable();
+          fireWorkInstance_.remove(index);
+          onChanged();
+        } else {
+          fireWorkInstanceBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder getFireWorkInstanceBuilder(
+          int index) {
+        return getFireWorkInstanceFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder(
+          int index) {
+        if (fireWorkInstanceBuilder_ == null) {
+          return fireWorkInstance_.get(index);  } else {
+          return fireWorkInstanceBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> 
+           getFireWorkInstanceOrBuilderList() {
+        if (fireWorkInstanceBuilder_ != null) {
+          return fireWorkInstanceBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(fireWorkInstance_);
+        }
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder addFireWorkInstanceBuilder() {
+        return getFireWorkInstanceFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder addFireWorkInstanceBuilder(
+          int index) {
+        return getFireWorkInstanceFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .FireWorkInstance fireWorkInstance = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder> 
+           getFireWorkInstanceBuilderList() {
+        return getFireWorkInstanceFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> 
+          getFireWorkInstanceFieldBuilder() {
+        if (fireWorkInstanceBuilder_ == null) {
+          fireWorkInstanceBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder>(
+                  fireWorkInstance_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          fireWorkInstance_ = null;
+        }
+        return fireWorkInstanceBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:FireWorkData)
+    }
+
+    // @@protoc_insertion_point(class_scope:FireWorkData)
+    private static final emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData();
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<FireWorkData>
+        PARSER = new com.google.protobuf.AbstractParser<FireWorkData>() {
+      @java.lang.Override
+      public FireWorkData parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new FireWorkData(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<FireWorkData> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<FireWorkData> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_FireWorkData_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_FireWorkData_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\022FireWorkData.proto\032\026FireWorkInstance.p" +
+      "roto\"G\n\014FireWorkData\022\n\n\002id\030\001 \001(\r\022+\n\020fire" +
+      "WorkInstance\030\002 \003(\0132\021.FireWorkInstanceB\033\n" +
+      "\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.FireWorkInstanceOuterClass.getDescriptor(),
+        });
+    internal_static_FireWorkData_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_FireWorkData_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_FireWorkData_descriptor,
+        new java.lang.String[] { "Id", "FireWorkInstance", });
+    emu.grasscutter.net.proto.FireWorkInstanceOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -0,0 +1,646 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FireWorkInstance.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FireWorkInstanceOuterClass {
+  private FireWorkInstanceOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface FireWorkInstanceOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:FireWorkInstance)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>.FireWorkType type = 1;</code>
+     * @return The enum numeric value on the wire for type.
+     */
+    int getTypeValue();
+    /**
+     * <code>.FireWorkType type = 1;</code>
+     * @return The type.
+     */
+    emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType getType();
+
+    /**
+     * <code>int32 value = 2;</code>
+     * @return The value.
+     */
+    int getValue();
+  }
+  /**
+   * Protobuf type {@code FireWorkInstance}
+   */
+  public static final class FireWorkInstance extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:FireWorkInstance)
+      FireWorkInstanceOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use FireWorkInstance.newBuilder() to construct.
+    private FireWorkInstance(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private FireWorkInstance() {
+      type_ = 0;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new FireWorkInstance();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private FireWorkInstance(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+            case 16: {
+
+              value_ = input.readInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.class, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder.class);
+    }
+
+    public static final int TYPE_FIELD_NUMBER = 1;
+    private int type_;
+    /**
+     * <code>.FireWorkType type = 1;</code>
+     * @return The enum numeric value on the wire for type.
+     */
+    @java.lang.Override public int getTypeValue() {
+      return type_;
+    }
+    /**
+     * <code>.FireWorkType type = 1;</code>
+     * @return The type.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType getType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType result = emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.valueOf(type_);
+      return result == null ? emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.UNRECOGNIZED : result;
+    }
+
+    public static final int VALUE_FIELD_NUMBER = 2;
+    private int value_;
+    /**
+     * <code>int32 value = 2;</code>
+     * @return The value.
+     */
+    @java.lang.Override
+    public int getValue() {
+      return value_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (type_ != emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.FireWorkType_ODJKANKMPPJ.getNumber()) {
+        output.writeEnum(1, type_);
+      }
+      if (value_ != 0) {
+        output.writeInt32(2, value_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (type_ != emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.FireWorkType_ODJKANKMPPJ.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(1, type_);
+      }
+      if (value_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, value_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance other = (emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance) obj;
+
+      if (type_ != other.type_) return false;
+      if (getValue()
+          != other.getValue()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + type_;
+      hash = (37 * hash) + VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getValue();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code FireWorkInstance}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:FireWorkInstance)
+        emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.class, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        type_ = 0;
+
+        value_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance build() {
+        emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance buildPartial() {
+        emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance result = new emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance(this);
+        result.type_ = type_;
+        result.value_ = value_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance) {
+          return mergeFrom((emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance other) {
+        if (other == emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance()) return this;
+        if (other.type_ != 0) {
+          setTypeValue(other.getTypeValue());
+        }
+        if (other.getValue() != 0) {
+          setValue(other.getValue());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int type_ = 0;
+      /**
+       * <code>.FireWorkType type = 1;</code>
+       * @return The enum numeric value on the wire for type.
+       */
+      @java.lang.Override public int getTypeValue() {
+        return type_;
+      }
+      /**
+       * <code>.FireWorkType type = 1;</code>
+       * @param value The enum numeric value on the wire for type to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTypeValue(int value) {
+        
+        type_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.FireWorkType type = 1;</code>
+       * @return The type.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType getType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType result = emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.valueOf(type_);
+        return result == null ? emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.FireWorkType type = 1;</code>
+       * @param value The type to set.
+       * @return This builder for chaining.
+       */
+      public Builder setType(emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        type_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.FireWorkType type = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearType() {
+        
+        type_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int value_ ;
+      /**
+       * <code>int32 value = 2;</code>
+       * @return The value.
+       */
+      @java.lang.Override
+      public int getValue() {
+        return value_;
+      }
+      /**
+       * <code>int32 value = 2;</code>
+       * @param value The value to set.
+       * @return This builder for chaining.
+       */
+      public Builder setValue(int value) {
+        
+        value_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 value = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearValue() {
+        
+        value_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:FireWorkInstance)
+    }
+
+    // @@protoc_insertion_point(class_scope:FireWorkInstance)
+    private static final emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance();
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<FireWorkInstance>
+        PARSER = new com.google.protobuf.AbstractParser<FireWorkInstance>() {
+      @java.lang.Override
+      public FireWorkInstance parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new FireWorkInstance(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<FireWorkInstance> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<FireWorkInstance> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_FireWorkInstance_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_FireWorkInstance_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\026FireWorkInstance.proto\032\022FireWorkType.p" +
+      "roto\">\n\020FireWorkInstance\022\033\n\004type\030\001 \001(\0162\r" +
+      ".FireWorkType\022\r\n\005value\030\002 \001(\005B\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.FireWorkTypeOuterClass.getDescriptor(),
+        });
+    internal_static_FireWorkInstance_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_FireWorkInstance_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_FireWorkInstance_descriptor,
+        new java.lang.String[] { "Type", "Value", });
+    emu.grasscutter.net.proto.FireWorkTypeOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -0,0 +1,856 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FireWorkNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FireWorkNotifyOuterClass {
+  private FireWorkNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface FireWorkNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:FireWorkNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData> 
+        getFireWorkDataList();
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData(int index);
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    int getFireWorkDataCount();
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> 
+        getFireWorkDataOrBuilderList();
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder(
+        int index);
+  }
+  /**
+   * <pre>
+   * CmdId: 6079
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * </pre>
+   *
+   * Protobuf type {@code FireWorkNotify}
+   */
+  public static final class FireWorkNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:FireWorkNotify)
+      FireWorkNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use FireWorkNotify.newBuilder() to construct.
+    private FireWorkNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private FireWorkNotify() {
+      fireWorkData_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new FireWorkNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private FireWorkNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                fireWorkData_ = new java.util.ArrayList<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              fireWorkData_.add(
+                  input.readMessage(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          fireWorkData_ = java.util.Collections.unmodifiableList(fireWorkData_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.class, emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.Builder.class);
+    }
+
+    public static final int FIREWORKDATA_FIELD_NUMBER = 1;
+    private java.util.List<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData> fireWorkData_;
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData> getFireWorkDataList() {
+      return fireWorkData_;
+    }
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> 
+        getFireWorkDataOrBuilderList() {
+      return fireWorkData_;
+    }
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    @java.lang.Override
+    public int getFireWorkDataCount() {
+      return fireWorkData_.size();
+    }
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData(int index) {
+      return fireWorkData_.get(index);
+    }
+    /**
+     * <code>repeated .FireWorkData fireWorkData = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder(
+        int index) {
+      return fireWorkData_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < fireWorkData_.size(); i++) {
+        output.writeMessage(1, fireWorkData_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < fireWorkData_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, fireWorkData_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify other = (emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify) obj;
+
+      if (!getFireWorkDataList()
+          .equals(other.getFireWorkDataList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getFireWorkDataCount() > 0) {
+        hash = (37 * hash) + FIREWORKDATA_FIELD_NUMBER;
+        hash = (53 * hash) + getFireWorkDataList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 6079
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * </pre>
+     *
+     * Protobuf type {@code FireWorkNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:FireWorkNotify)
+        emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.class, emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getFireWorkDataFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (fireWorkDataBuilder_ == null) {
+          fireWorkData_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          fireWorkDataBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify build() {
+        emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify buildPartial() {
+        emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify result = new emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify(this);
+        int from_bitField0_ = bitField0_;
+        if (fireWorkDataBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            fireWorkData_ = java.util.Collections.unmodifiableList(fireWorkData_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.fireWorkData_ = fireWorkData_;
+        } else {
+          result.fireWorkData_ = fireWorkDataBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify other) {
+        if (other == emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.getDefaultInstance()) return this;
+        if (fireWorkDataBuilder_ == null) {
+          if (!other.fireWorkData_.isEmpty()) {
+            if (fireWorkData_.isEmpty()) {
+              fireWorkData_ = other.fireWorkData_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureFireWorkDataIsMutable();
+              fireWorkData_.addAll(other.fireWorkData_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.fireWorkData_.isEmpty()) {
+            if (fireWorkDataBuilder_.isEmpty()) {
+              fireWorkDataBuilder_.dispose();
+              fireWorkDataBuilder_ = null;
+              fireWorkData_ = other.fireWorkData_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              fireWorkDataBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getFireWorkDataFieldBuilder() : null;
+            } else {
+              fireWorkDataBuilder_.addAllMessages(other.fireWorkData_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData> fireWorkData_ =
+        java.util.Collections.emptyList();
+      private void ensureFireWorkDataIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          fireWorkData_ = new java.util.ArrayList<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData>(fireWorkData_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> fireWorkDataBuilder_;
+
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData> getFireWorkDataList() {
+        if (fireWorkDataBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(fireWorkData_);
+        } else {
+          return fireWorkDataBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public int getFireWorkDataCount() {
+        if (fireWorkDataBuilder_ == null) {
+          return fireWorkData_.size();
+        } else {
+          return fireWorkDataBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData(int index) {
+        if (fireWorkDataBuilder_ == null) {
+          return fireWorkData_.get(index);
+        } else {
+          return fireWorkDataBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder setFireWorkData(
+          int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) {
+        if (fireWorkDataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFireWorkDataIsMutable();
+          fireWorkData_.set(index, value);
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder setFireWorkData(
+          int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) {
+        if (fireWorkDataBuilder_ == null) {
+          ensureFireWorkDataIsMutable();
+          fireWorkData_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder addFireWorkData(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) {
+        if (fireWorkDataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFireWorkDataIsMutable();
+          fireWorkData_.add(value);
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder addFireWorkData(
+          int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) {
+        if (fireWorkDataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFireWorkDataIsMutable();
+          fireWorkData_.add(index, value);
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder addFireWorkData(
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) {
+        if (fireWorkDataBuilder_ == null) {
+          ensureFireWorkDataIsMutable();
+          fireWorkData_.add(builderForValue.build());
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder addFireWorkData(
+          int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) {
+        if (fireWorkDataBuilder_ == null) {
+          ensureFireWorkDataIsMutable();
+          fireWorkData_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder addAllFireWorkData(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData> values) {
+        if (fireWorkDataBuilder_ == null) {
+          ensureFireWorkDataIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, fireWorkData_);
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder clearFireWorkData() {
+        if (fireWorkDataBuilder_ == null) {
+          fireWorkData_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public Builder removeFireWorkData(int index) {
+        if (fireWorkDataBuilder_ == null) {
+          ensureFireWorkDataIsMutable();
+          fireWorkData_.remove(index);
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder getFireWorkDataBuilder(
+          int index) {
+        return getFireWorkDataFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder(
+          int index) {
+        if (fireWorkDataBuilder_ == null) {
+          return fireWorkData_.get(index);  } else {
+          return fireWorkDataBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> 
+           getFireWorkDataOrBuilderList() {
+        if (fireWorkDataBuilder_ != null) {
+          return fireWorkDataBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(fireWorkData_);
+        }
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder addFireWorkDataBuilder() {
+        return getFireWorkDataFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder addFireWorkDataBuilder(
+          int index) {
+        return getFireWorkDataFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .FireWorkData fireWorkData = 1;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder> 
+           getFireWorkDataBuilderList() {
+        return getFireWorkDataFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> 
+          getFireWorkDataFieldBuilder() {
+        if (fireWorkDataBuilder_ == null) {
+          fireWorkDataBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder>(
+                  fireWorkData_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          fireWorkData_ = null;
+        }
+        return fireWorkDataBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:FireWorkNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:FireWorkNotify)
+    private static final emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify();
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<FireWorkNotify>
+        PARSER = new com.google.protobuf.AbstractParser<FireWorkNotify>() {
+      @java.lang.Override
+      public FireWorkNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new FireWorkNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<FireWorkNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<FireWorkNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_FireWorkNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_FireWorkNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\024FireWorkNotify.proto\032\022FireWorkData.pro" +
+      "to\"5\n\016FireWorkNotify\022#\n\014fireWorkData\030\001 \003" +
+      "(\0132\r.FireWorkDataB\033\n\031emu.grasscutter.net" +
+      ".protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor(),
+        });
+    internal_static_FireWorkNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_FireWorkNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_FireWorkNotify_descriptor,
+        new java.lang.String[] { "FireWorkData", });
+    emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -0,0 +1,686 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FireWorkReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FireWorkReqOuterClass {
+  private FireWorkReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface FireWorkReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:FireWorkReq)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>.FireWorkData fireWorkData = 7;</code>
+     * @return Whether the fireWorkData field is set.
+     */
+    boolean hasFireWorkData();
+    /**
+     * <code>.FireWorkData fireWorkData = 7;</code>
+     * @return The fireWorkData.
+     */
+    emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData();
+    /**
+     * <code>.FireWorkData fireWorkData = 7;</code>
+     */
+    emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder();
+  }
+  /**
+   * <pre>
+   * CmdId: 6068
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * IsAllowClient: true
+   * </pre>
+   *
+   * Protobuf type {@code FireWorkReq}
+   */
+  public static final class FireWorkReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:FireWorkReq)
+      FireWorkReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use FireWorkReq.newBuilder() to construct.
+    private FireWorkReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private FireWorkReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new FireWorkReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private FireWorkReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 58: {
+              emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder subBuilder = null;
+              if (fireWorkData_ != null) {
+                subBuilder = fireWorkData_.toBuilder();
+              }
+              fireWorkData_ = input.readMessage(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(fireWorkData_);
+                fireWorkData_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.class, emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.Builder.class);
+    }
+
+    public static final int FIREWORKDATA_FIELD_NUMBER = 7;
+    private emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData fireWorkData_;
+    /**
+     * <code>.FireWorkData fireWorkData = 7;</code>
+     * @return Whether the fireWorkData field is set.
+     */
+    @java.lang.Override
+    public boolean hasFireWorkData() {
+      return fireWorkData_ != null;
+    }
+    /**
+     * <code>.FireWorkData fireWorkData = 7;</code>
+     * @return The fireWorkData.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData() {
+      return fireWorkData_ == null ? emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance() : fireWorkData_;
+    }
+    /**
+     * <code>.FireWorkData fireWorkData = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder() {
+      return getFireWorkData();
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (fireWorkData_ != null) {
+        output.writeMessage(7, getFireWorkData());
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (fireWorkData_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, getFireWorkData());
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq other = (emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq) obj;
+
+      if (hasFireWorkData() != other.hasFireWorkData()) return false;
+      if (hasFireWorkData()) {
+        if (!getFireWorkData()
+            .equals(other.getFireWorkData())) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasFireWorkData()) {
+        hash = (37 * hash) + FIREWORKDATA_FIELD_NUMBER;
+        hash = (53 * hash) + getFireWorkData().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 6068
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * IsAllowClient: true
+     * </pre>
+     *
+     * Protobuf type {@code FireWorkReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:FireWorkReq)
+        emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.class, emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (fireWorkDataBuilder_ == null) {
+          fireWorkData_ = null;
+        } else {
+          fireWorkData_ = null;
+          fireWorkDataBuilder_ = null;
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq build() {
+        emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq buildPartial() {
+        emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq result = new emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq(this);
+        if (fireWorkDataBuilder_ == null) {
+          result.fireWorkData_ = fireWorkData_;
+        } else {
+          result.fireWorkData_ = fireWorkDataBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq) {
+          return mergeFrom((emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq other) {
+        if (other == emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.getDefaultInstance()) return this;
+        if (other.hasFireWorkData()) {
+          mergeFireWorkData(other.getFireWorkData());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData fireWorkData_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> fireWorkDataBuilder_;
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       * @return Whether the fireWorkData field is set.
+       */
+      public boolean hasFireWorkData() {
+        return fireWorkDataBuilder_ != null || fireWorkData_ != null;
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       * @return The fireWorkData.
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData() {
+        if (fireWorkDataBuilder_ == null) {
+          return fireWorkData_ == null ? emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance() : fireWorkData_;
+        } else {
+          return fireWorkDataBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       */
+      public Builder setFireWorkData(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) {
+        if (fireWorkDataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          fireWorkData_ = value;
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       */
+      public Builder setFireWorkData(
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) {
+        if (fireWorkDataBuilder_ == null) {
+          fireWorkData_ = builderForValue.build();
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       */
+      public Builder mergeFireWorkData(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) {
+        if (fireWorkDataBuilder_ == null) {
+          if (fireWorkData_ != null) {
+            fireWorkData_ =
+              emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.newBuilder(fireWorkData_).mergeFrom(value).buildPartial();
+          } else {
+            fireWorkData_ = value;
+          }
+          onChanged();
+        } else {
+          fireWorkDataBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       */
+      public Builder clearFireWorkData() {
+        if (fireWorkDataBuilder_ == null) {
+          fireWorkData_ = null;
+          onChanged();
+        } else {
+          fireWorkData_ = null;
+          fireWorkDataBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder getFireWorkDataBuilder() {
+        
+        onChanged();
+        return getFireWorkDataFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       */
+      public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder() {
+        if (fireWorkDataBuilder_ != null) {
+          return fireWorkDataBuilder_.getMessageOrBuilder();
+        } else {
+          return fireWorkData_ == null ?
+              emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance() : fireWorkData_;
+        }
+      }
+      /**
+       * <code>.FireWorkData fireWorkData = 7;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> 
+          getFireWorkDataFieldBuilder() {
+        if (fireWorkDataBuilder_ == null) {
+          fireWorkDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder>(
+                  getFireWorkData(),
+                  getParentForChildren(),
+                  isClean());
+          fireWorkData_ = null;
+        }
+        return fireWorkDataBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:FireWorkReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:FireWorkReq)
+    private static final emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq();
+    }
+
+    public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<FireWorkReq>
+        PARSER = new com.google.protobuf.AbstractParser<FireWorkReq>() {
+      @java.lang.Override
+      public FireWorkReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new FireWorkReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<FireWorkReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<FireWorkReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_FireWorkReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_FireWorkReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\021FireWorkReq.proto\032\022FireWorkData.proto\"" +
+      "2\n\013FireWorkReq\022#\n\014fireWorkData\030\007 \001(\0132\r.F" +
+      "ireWorkDataB\033\n\031emu.grasscutter.net.proto" +
+      "b\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor(),
+        });
+    internal_static_FireWorkReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_FireWorkReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_FireWorkReq_descriptor,
+        new java.lang.String[] { "FireWorkData", });
+    emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -0,0 +1,185 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FireWorkType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FireWorkTypeOuterClass {
+  private FireWorkTypeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code FireWorkType}
+   */
+  public enum FireWorkType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FireWorkType_ODJKANKMPPJ = 0;</code>
+     */
+    FireWorkType_ODJKANKMPPJ(0),
+    /**
+     * <code>FireWorkType_EFGLHEIODFN = 1;</code>
+     */
+    FireWorkType_EFGLHEIODFN(1),
+    /**
+     * <code>FireWorkType_JPBBBCFGHAK = 2;</code>
+     */
+    FireWorkType_JPBBBCFGHAK(2),
+    /**
+     * <code>FireWorkType_IDCMGHBHBFH = 3;</code>
+     */
+    FireWorkType_IDCMGHBHBFH(3),
+    /**
+     * <code>FireWorkType_ODDBNNDFMBO = 4;</code>
+     */
+    FireWorkType_ODDBNNDFMBO(4),
+    /**
+     * <code>FireWorkType_AGIDMOGJOBD = 5;</code>
+     */
+    FireWorkType_AGIDMOGJOBD(5),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>FireWorkType_ODJKANKMPPJ = 0;</code>
+     */
+    public static final int FireWorkType_ODJKANKMPPJ_VALUE = 0;
+    /**
+     * <code>FireWorkType_EFGLHEIODFN = 1;</code>
+     */
+    public static final int FireWorkType_EFGLHEIODFN_VALUE = 1;
+    /**
+     * <code>FireWorkType_JPBBBCFGHAK = 2;</code>
+     */
+    public static final int FireWorkType_JPBBBCFGHAK_VALUE = 2;
+    /**
+     * <code>FireWorkType_IDCMGHBHBFH = 3;</code>
+     */
+    public static final int FireWorkType_IDCMGHBHBFH_VALUE = 3;
+    /**
+     * <code>FireWorkType_ODDBNNDFMBO = 4;</code>
+     */
+    public static final int FireWorkType_ODDBNNDFMBO_VALUE = 4;
+    /**
+     * <code>FireWorkType_AGIDMOGJOBD = 5;</code>
+     */
+    public static final int FireWorkType_AGIDMOGJOBD_VALUE = 5;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static FireWorkType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static FireWorkType forNumber(int value) {
+      switch (value) {
+        case 0: return FireWorkType_ODJKANKMPPJ;
+        case 1: return FireWorkType_EFGLHEIODFN;
+        case 2: return FireWorkType_JPBBBCFGHAK;
+        case 3: return FireWorkType_IDCMGHBHBFH;
+        case 4: return FireWorkType_ODDBNNDFMBO;
+        case 5: return FireWorkType_AGIDMOGJOBD;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<FireWorkType>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        FireWorkType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<FireWorkType>() {
+            public FireWorkType findValueByNumber(int number) {
+              return FireWorkType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FireWorkTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final FireWorkType[] VALUES = values();
+
+    public static FireWorkType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private FireWorkType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:FireWorkType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\022FireWorkType.proto*\302\001\n\014FireWorkType\022\034\n" +
+      "\030FireWorkType_ODJKANKMPPJ\020\000\022\034\n\030FireWorkT" +
+      "ype_EFGLHEIODFN\020\001\022\034\n\030FireWorkType_JPBBBC" +
+      "FGHAK\020\002\022\034\n\030FireWorkType_IDCMGHBHBFH\020\003\022\034\n" +
+      "\030FireWorkType_ODDBNNDFMBO\020\004\022\034\n\030FireWorkT" +
+      "ype_AGIDMOGJOBD\020\005B\033\n\031emu.grasscutter.net" +
+      ".protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -0,0 +1,926 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FireworkSetNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FireworkSetNotifyOuterClass {
+  private FireworkSetNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface FireworkSetNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:FireworkSetNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 code = 1;</code>
+     * @return The code.
+     */
+    int getCode();
+
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData> 
+        getDataList();
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData(int index);
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    int getDataCount();
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> 
+        getDataOrBuilderList();
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder(
+        int index);
+  }
+  /**
+   * <pre>
+   * CmdId: 5934
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * </pre>
+   *
+   * Protobuf type {@code FireworkSetNotify}
+   */
+  public static final class FireworkSetNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:FireworkSetNotify)
+      FireworkSetNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use FireworkSetNotify.newBuilder() to construct.
+    private FireworkSetNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private FireworkSetNotify() {
+      data_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new FireworkSetNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private FireworkSetNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              code_ = input.readUInt32();
+              break;
+            }
+            case 74: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                data_ = new java.util.ArrayList<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              data_.add(
+                  input.readMessage(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          data_ = java.util.Collections.unmodifiableList(data_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.class, emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.Builder.class);
+    }
+
+    public static final int CODE_FIELD_NUMBER = 1;
+    private int code_;
+    /**
+     * <code>uint32 code = 1;</code>
+     * @return The code.
+     */
+    @java.lang.Override
+    public int getCode() {
+      return code_;
+    }
+
+    public static final int DATA_FIELD_NUMBER = 9;
+    private java.util.List<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData> data_;
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData> getDataList() {
+      return data_;
+    }
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> 
+        getDataOrBuilderList() {
+      return data_;
+    }
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    @java.lang.Override
+    public int getDataCount() {
+      return data_.size();
+    }
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData(int index) {
+      return data_.get(index);
+    }
+    /**
+     * <code>repeated .FireworkSetData data = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder(
+        int index) {
+      return data_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (code_ != 0) {
+        output.writeUInt32(1, code_);
+      }
+      for (int i = 0; i < data_.size(); i++) {
+        output.writeMessage(9, data_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (code_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, code_);
+      }
+      for (int i = 0; i < data_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, data_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify other = (emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify) obj;
+
+      if (getCode()
+          != other.getCode()) return false;
+      if (!getDataList()
+          .equals(other.getDataList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CODE_FIELD_NUMBER;
+      hash = (53 * hash) + getCode();
+      if (getDataCount() > 0) {
+        hash = (37 * hash) + DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getDataList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 5934
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * </pre>
+     *
+     * Protobuf type {@code FireworkSetNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:FireworkSetNotify)
+        emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.class, emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getDataFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        code_ = 0;
+
+        if (dataBuilder_ == null) {
+          data_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          dataBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify build() {
+        emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify buildPartial() {
+        emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify result = new emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify(this);
+        int from_bitField0_ = bitField0_;
+        result.code_ = code_;
+        if (dataBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            data_ = java.util.Collections.unmodifiableList(data_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.data_ = data_;
+        } else {
+          result.data_ = dataBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify other) {
+        if (other == emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.getDefaultInstance()) return this;
+        if (other.getCode() != 0) {
+          setCode(other.getCode());
+        }
+        if (dataBuilder_ == null) {
+          if (!other.data_.isEmpty()) {
+            if (data_.isEmpty()) {
+              data_ = other.data_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureDataIsMutable();
+              data_.addAll(other.data_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.data_.isEmpty()) {
+            if (dataBuilder_.isEmpty()) {
+              dataBuilder_.dispose();
+              dataBuilder_ = null;
+              data_ = other.data_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              dataBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getDataFieldBuilder() : null;
+            } else {
+              dataBuilder_.addAllMessages(other.data_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private int code_ ;
+      /**
+       * <code>uint32 code = 1;</code>
+       * @return The code.
+       */
+      @java.lang.Override
+      public int getCode() {
+        return code_;
+      }
+      /**
+       * <code>uint32 code = 1;</code>
+       * @param value The code to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCode(int value) {
+        
+        code_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 code = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCode() {
+        
+        code_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData> data_ =
+        java.util.Collections.emptyList();
+      private void ensureDataIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          data_ = new java.util.ArrayList<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData>(data_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> dataBuilder_;
+
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData> getDataList() {
+        if (dataBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(data_);
+        } else {
+          return dataBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public int getDataCount() {
+        if (dataBuilder_ == null) {
+          return data_.size();
+        } else {
+          return dataBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData(int index) {
+        if (dataBuilder_ == null) {
+          return data_.get(index);
+        } else {
+          return dataBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder setData(
+          int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) {
+        if (dataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDataIsMutable();
+          data_.set(index, value);
+          onChanged();
+        } else {
+          dataBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder setData(
+          int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) {
+        if (dataBuilder_ == null) {
+          ensureDataIsMutable();
+          data_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          dataBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder addData(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) {
+        if (dataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDataIsMutable();
+          data_.add(value);
+          onChanged();
+        } else {
+          dataBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder addData(
+          int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) {
+        if (dataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDataIsMutable();
+          data_.add(index, value);
+          onChanged();
+        } else {
+          dataBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder addData(
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) {
+        if (dataBuilder_ == null) {
+          ensureDataIsMutable();
+          data_.add(builderForValue.build());
+          onChanged();
+        } else {
+          dataBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder addData(
+          int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) {
+        if (dataBuilder_ == null) {
+          ensureDataIsMutable();
+          data_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          dataBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder addAllData(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData> values) {
+        if (dataBuilder_ == null) {
+          ensureDataIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, data_);
+          onChanged();
+        } else {
+          dataBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder clearData() {
+        if (dataBuilder_ == null) {
+          data_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          dataBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public Builder removeData(int index) {
+        if (dataBuilder_ == null) {
+          ensureDataIsMutable();
+          data_.remove(index);
+          onChanged();
+        } else {
+          dataBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder getDataBuilder(
+          int index) {
+        return getDataFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder(
+          int index) {
+        if (dataBuilder_ == null) {
+          return data_.get(index);  } else {
+          return dataBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> 
+           getDataOrBuilderList() {
+        if (dataBuilder_ != null) {
+          return dataBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(data_);
+        }
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder addDataBuilder() {
+        return getDataFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder addDataBuilder(
+          int index) {
+        return getDataFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .FireworkSetData data = 9;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder> 
+           getDataBuilderList() {
+        return getDataFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> 
+          getDataFieldBuilder() {
+        if (dataBuilder_ == null) {
+          dataBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder>(
+                  data_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          data_ = null;
+        }
+        return dataBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:FireworkSetNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:FireworkSetNotify)
+    private static final emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify();
+    }
+
+    public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<FireworkSetNotify>
+        PARSER = new com.google.protobuf.AbstractParser<FireworkSetNotify>() {
+      @java.lang.Override
+      public FireworkSetNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new FireworkSetNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<FireworkSetNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<FireworkSetNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_FireworkSetNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_FireworkSetNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\027FireworkSetNotify.proto\032\025FireworkSetDa" +
+      "ta.proto\"A\n\021FireworkSetNotify\022\014\n\004code\030\001 " +
+      "\001(\r\022\036\n\004data\030\t \003(\0132\020.FireworkSetDataB\033\n\031e" +
+      "mu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor(),
+        });
+    internal_static_FireworkSetNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_FireworkSetNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_FireworkSetNotify_descriptor,
+        new java.lang.String[] { "Code", "Data", });
+    emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -0,0 +1,686 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FireworkSetReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FireworkSetReqOuterClass {
+  private FireworkSetReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface FireworkSetReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:FireworkSetReq)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>.FireworkSetData data = 2;</code>
+     * @return Whether the data field is set.
+     */
+    boolean hasData();
+    /**
+     * <code>.FireworkSetData data = 2;</code>
+     * @return The data.
+     */
+    emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData();
+    /**
+     * <code>.FireworkSetData data = 2;</code>
+     */
+    emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder();
+  }
+  /**
+   * <pre>
+   * CmdId: 6099
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * IsAllowClient: true
+   * </pre>
+   *
+   * Protobuf type {@code FireworkSetReq}
+   */
+  public static final class FireworkSetReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:FireworkSetReq)
+      FireworkSetReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use FireworkSetReq.newBuilder() to construct.
+    private FireworkSetReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private FireworkSetReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new FireworkSetReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private FireworkSetReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 18: {
+              emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder subBuilder = null;
+              if (data_ != null) {
+                subBuilder = data_.toBuilder();
+              }
+              data_ = input.readMessage(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(data_);
+                data_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.class, emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.Builder.class);
+    }
+
+    public static final int DATA_FIELD_NUMBER = 2;
+    private emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData data_;
+    /**
+     * <code>.FireworkSetData data = 2;</code>
+     * @return Whether the data field is set.
+     */
+    @java.lang.Override
+    public boolean hasData() {
+      return data_ != null;
+    }
+    /**
+     * <code>.FireworkSetData data = 2;</code>
+     * @return The data.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData() {
+      return data_ == null ? emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance() : data_;
+    }
+    /**
+     * <code>.FireworkSetData data = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder() {
+      return getData();
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (data_ != null) {
+        output.writeMessage(2, getData());
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (data_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, getData());
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq other = (emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq) obj;
+
+      if (hasData() != other.hasData()) return false;
+      if (hasData()) {
+        if (!getData()
+            .equals(other.getData())) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasData()) {
+        hash = (37 * hash) + DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getData().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 6099
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * IsAllowClient: true
+     * </pre>
+     *
+     * Protobuf type {@code FireworkSetReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:FireworkSetReq)
+        emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.class, emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (dataBuilder_ == null) {
+          data_ = null;
+        } else {
+          data_ = null;
+          dataBuilder_ = null;
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq build() {
+        emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq buildPartial() {
+        emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq result = new emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq(this);
+        if (dataBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = dataBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq) {
+          return mergeFrom((emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq other) {
+        if (other == emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.getDefaultInstance()) return this;
+        if (other.hasData()) {
+          mergeData(other.getData());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData data_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> dataBuilder_;
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       * @return Whether the data field is set.
+       */
+      public boolean hasData() {
+        return dataBuilder_ != null || data_ != null;
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       * @return The data.
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData() {
+        if (dataBuilder_ == null) {
+          return data_ == null ? emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance() : data_;
+        } else {
+          return dataBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       */
+      public Builder setData(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) {
+        if (dataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          data_ = value;
+          onChanged();
+        } else {
+          dataBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       */
+      public Builder setData(
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) {
+        if (dataBuilder_ == null) {
+          data_ = builderForValue.build();
+          onChanged();
+        } else {
+          dataBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       */
+      public Builder mergeData(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) {
+        if (dataBuilder_ == null) {
+          if (data_ != null) {
+            data_ =
+              emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.newBuilder(data_).mergeFrom(value).buildPartial();
+          } else {
+            data_ = value;
+          }
+          onChanged();
+        } else {
+          dataBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       */
+      public Builder clearData() {
+        if (dataBuilder_ == null) {
+          data_ = null;
+          onChanged();
+        } else {
+          data_ = null;
+          dataBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder getDataBuilder() {
+        
+        onChanged();
+        return getDataFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       */
+      public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder() {
+        if (dataBuilder_ != null) {
+          return dataBuilder_.getMessageOrBuilder();
+        } else {
+          return data_ == null ?
+              emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance() : data_;
+        }
+      }
+      /**
+       * <code>.FireworkSetData data = 2;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> 
+          getDataFieldBuilder() {
+        if (dataBuilder_ == null) {
+          dataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder>(
+                  getData(),
+                  getParentForChildren(),
+                  isClean());
+          data_ = null;
+        }
+        return dataBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:FireworkSetReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:FireworkSetReq)
+    private static final emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq();
+    }
+
+    public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<FireworkSetReq>
+        PARSER = new com.google.protobuf.AbstractParser<FireworkSetReq>() {
+      @java.lang.Override
+      public FireworkSetReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new FireworkSetReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<FireworkSetReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<FireworkSetReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_FireworkSetReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_FireworkSetReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\024FireworkSetReq.proto\032\025FireworkSetData." +
+      "proto\"0\n\016FireworkSetReq\022\036\n\004data\030\002 \001(\0132\020." +
+      "FireworkSetDataB\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor(),
+        });
+    internal_static_FireworkSetReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_FireworkSetReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_FireworkSetReq_descriptor,
+        new java.lang.String[] { "Data", });
+    emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ACDCLDJFDFK.proto
+// source: FireworkSetRsp.proto
 
 package emu.grasscutter.net.proto;
 
-public final class ACDCLDJFDFKOuterClass {
+public final class FireworkSetRsp {
-  private ACDCLDJFDFKOuterClass() {}
+  private FireworkSetRsp() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,40 +14,42 @@ public final class ACDCLDJFDFKOuterClass {
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface ACDCLDJFDFKOrBuilder extends
+  public interface NBFJOJPCCEK_RspOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:ACDCLDJFDFK)
+      // @@protoc_insertion_point(interface_extends:NBFJOJPCCEK_Rsp)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 PPLHKCKDHEC = 13;</code>
+     * <code>int32 retcode = 7;</code>
-     * @return The pPLHKCKDHEC.
+     * @return The retcode.
      */
-    int getPPLHKCKDHEC();
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 26672
+   * CmdId: 5969
+   * EnetChannelId: 0
+   * EnetIsReliable: true
    * </pre>
    *
-   * Protobuf type {@code ACDCLDJFDFK}
+   * Protobuf type {@code NBFJOJPCCEK_Rsp}
    */
-  public static final class ACDCLDJFDFK extends
+  public static final class NBFJOJPCCEK_Rsp extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:ACDCLDJFDFK)
+      // @@protoc_insertion_point(message_implements:NBFJOJPCCEK_Rsp)
-      ACDCLDJFDFKOrBuilder {
+      NBFJOJPCCEK_RspOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use ACDCLDJFDFK.newBuilder() to construct.
+    // Use NBFJOJPCCEK_Rsp.newBuilder() to construct.
-    private ACDCLDJFDFK(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private NBFJOJPCCEK_Rsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-    private ACDCLDJFDFK() {
+    private NBFJOJPCCEK_Rsp() {
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
         UnusedPrivateParameter unused) {
-      return new ACDCLDJFDFK();
+      return new NBFJOJPCCEK_Rsp();
     }
 
     @java.lang.Override
@@ -55,7 +57,7 @@ public final class ACDCLDJFDFKOuterClass {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private ACDCLDJFDFK(
+    private NBFJOJPCCEK_Rsp(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -73,9 +75,9 @@ public final class ACDCLDJFDFKOuterClass {
             case 0:
               done = true;
               break;
-            case 104: {
+            case 56: {
 
-              pPLHKCKDHEC_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -99,26 +101,26 @@ public final class ACDCLDJFDFKOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_descriptor;
+      return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_fieldAccessorTable
+      return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.class, emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.Builder.class);
+              emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.class, emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.Builder.class);
     }
 
-    public static final int PPLHKCKDHEC_FIELD_NUMBER = 13;
+    public static final int RETCODE_FIELD_NUMBER = 7;
-    private int pPLHKCKDHEC_;
+    private int retcode_;
     /**
-     * <code>uint32 PPLHKCKDHEC = 13;</code>
+     * <code>int32 retcode = 7;</code>
-     * @return The pPLHKCKDHEC.
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getPPLHKCKDHEC() {
+    public int getRetcode() {
-      return pPLHKCKDHEC_;
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -135,8 +137,8 @@ public final class ACDCLDJFDFKOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pPLHKCKDHEC_ != 0) {
+      if (retcode_ != 0) {
-        output.writeUInt32(13, pPLHKCKDHEC_);
+        output.writeInt32(7, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -147,9 +149,9 @@ public final class ACDCLDJFDFKOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pPLHKCKDHEC_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, pPLHKCKDHEC_);
+          .computeInt32Size(7, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -161,13 +163,13 @@ public final class ACDCLDJFDFKOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK)) {
+      if (!(obj instanceof emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp)) {
         return super.equals(obj);
       }
-      emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK other = (emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK) obj;
+      emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp other = (emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp) obj;
 
-      if (getPPLHKCKDHEC()
+      if (getRetcode()
-          != other.getPPLHKCKDHEC()) return false;
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -179,76 +181,76 @@ public final class ACDCLDJFDFKOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PPLHKCKDHEC_FIELD_NUMBER;
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getPPLHKCKDHEC();
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(byte[] data)
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseDelimitedFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseDelimitedFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -261,7 +263,7 @@ public final class ACDCLDJFDFKOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK prototype) {
+    public static Builder newBuilder(emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -278,29 +280,31 @@ public final class ACDCLDJFDFKOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 26672
+     * CmdId: 5969
+     * EnetChannelId: 0
+     * EnetIsReliable: true
      * </pre>
      *
-     * Protobuf type {@code ACDCLDJFDFK}
+     * Protobuf type {@code NBFJOJPCCEK_Rsp}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:ACDCLDJFDFK)
+        // @@protoc_insertion_point(builder_implements:NBFJOJPCCEK_Rsp)
-        emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFKOrBuilder {
+        emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_RspOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_descriptor;
+        return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_fieldAccessorTable
+        return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.class, emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.Builder.class);
+                emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.class, emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.Builder.class);
       }
 
-      // Construct using emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.newBuilder()
+      // Construct using emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -318,7 +322,7 @@ public final class ACDCLDJFDFKOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pPLHKCKDHEC_ = 0;
+        retcode_ = 0;
 
         return this;
       }
@@ -326,17 +330,17 @@ public final class ACDCLDJFDFKOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_descriptor;
+        return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_descriptor;
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK getDefaultInstanceForType() {
+      public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.getDefaultInstance();
+        return emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.getDefaultInstance();
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK build() {
+      public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp build() {
-        emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK result = buildPartial();
+        emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -344,9 +348,9 @@ public final class ACDCLDJFDFKOuterClass {
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK buildPartial() {
+      public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp buildPartial() {
-        emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK result = new emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK(this);
+        emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp result = new emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp(this);
-        result.pPLHKCKDHEC_ = pPLHKCKDHEC_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -385,18 +389,18 @@ public final class ACDCLDJFDFKOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK) {
+        if (other instanceof emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp) {
-          return mergeFrom((emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK)other);
+          return mergeFrom((emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK other) {
+      public Builder mergeFrom(emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp other) {
-        if (other == emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.getDefaultInstance()) return this;
+        if (other == emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.getDefaultInstance()) return this;
-        if (other.getPPLHKCKDHEC() != 0) {
+        if (other.getRetcode() != 0) {
-          setPPLHKCKDHEC(other.getPPLHKCKDHEC());
+          setRetcode(other.getRetcode());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -413,11 +417,11 @@ public final class ACDCLDJFDFKOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parsedMessage = null;
+        emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK) e.getUnfinishedMessage();
+          parsedMessage = (emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -427,33 +431,33 @@ public final class ACDCLDJFDFKOuterClass {
         return this;
       }
 
-      private int pPLHKCKDHEC_ ;
+      private int retcode_ ;
       /**
-       * <code>uint32 PPLHKCKDHEC = 13;</code>
+       * <code>int32 retcode = 7;</code>
-       * @return The pPLHKCKDHEC.
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getPPLHKCKDHEC() {
+      public int getRetcode() {
-        return pPLHKCKDHEC_;
+        return retcode_;
       }
       /**
-       * <code>uint32 PPLHKCKDHEC = 13;</code>
+       * <code>int32 retcode = 7;</code>
-       * @param value The pPLHKCKDHEC to set.
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setPPLHKCKDHEC(int value) {
+      public Builder setRetcode(int value) {
         
-        pPLHKCKDHEC_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 PPLHKCKDHEC = 13;</code>
+       * <code>int32 retcode = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPPLHKCKDHEC() {
+      public Builder clearRetcode() {
         
-        pPLHKCKDHEC_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -470,51 +474,51 @@ public final class ACDCLDJFDFKOuterClass {
       }
 
 
-      // @@protoc_insertion_point(builder_scope:ACDCLDJFDFK)
+      // @@protoc_insertion_point(builder_scope:NBFJOJPCCEK_Rsp)
     }
 
-    // @@protoc_insertion_point(class_scope:ACDCLDJFDFK)
+    // @@protoc_insertion_point(class_scope:NBFJOJPCCEK_Rsp)
-    private static final emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK DEFAULT_INSTANCE;
+    private static final emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK();
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp();
     }
 
-    public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK getDefaultInstance() {
+    public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<ACDCLDJFDFK>
+    private static final com.google.protobuf.Parser<NBFJOJPCCEK_Rsp>
-        PARSER = new com.google.protobuf.AbstractParser<ACDCLDJFDFK>() {
+        PARSER = new com.google.protobuf.AbstractParser<NBFJOJPCCEK_Rsp>() {
       @java.lang.Override
-      public ACDCLDJFDFK parsePartialFrom(
+      public NBFJOJPCCEK_Rsp parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ACDCLDJFDFK(input, extensionRegistry);
+        return new NBFJOJPCCEK_Rsp(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<ACDCLDJFDFK> parser() {
+    public static com.google.protobuf.Parser<NBFJOJPCCEK_Rsp> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<ACDCLDJFDFK> getParserForType() {
+    public com.google.protobuf.Parser<NBFJOJPCCEK_Rsp> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK getDefaultInstanceForType() {
+    public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ACDCLDJFDFK_descriptor;
+    internal_static_NBFJOJPCCEK_Rsp_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ACDCLDJFDFK_fieldAccessorTable;
+      internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -524,20 +528,20 @@ public final class ACDCLDJFDFKOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021ACDCLDJFDFK.proto\"\"\n\013ACDCLDJFDFK\022\023\n\013PP" +
+      "\n\024FireworkSetRsp.proto\"\"\n\017NBFJOJPCCEK_Rs" +
-      "LHKCKDHEC\030\r \001(\rB\033\n\031emu.grasscutter.net.p" +
+      "p\022\017\n\007retcode\030\007 \001(\005B\033\n\031emu.grasscutter.ne" +
-      "rotob\006proto3"
+      "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         });
-    internal_static_ACDCLDJFDFK_descriptor =
+    internal_static_NBFJOJPCCEK_Rsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_ACDCLDJFDFK_fieldAccessorTable = new
+    internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ACDCLDJFDFK_descriptor,
+        internal_static_NBFJOJPCCEK_Rsp_descriptor,
-        new java.lang.String[] { "PPLHKCKDHEC", });
+        new java.lang.String[] { "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -19,10 +19,10 @@ public final class ForgeQueueDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 queue_id = 13;</code>
+     * <code>uint32 total_finish_timestamp = 13;</code>
-     * @return The queueId.
+     * @return The totalFinishTimestamp.
      */
-    int getQueueId();
+    int getTotalFinishTimestamp();
 
     /**
      * <code>uint32 avatar_id = 8;</code>
@@ -31,29 +31,29 @@ public final class ForgeQueueDataOuterClass {
     int getAvatarId();
 
     /**
-     * <code>uint32 finish_count = 3;</code>
+     * <code>uint32 queue_id = 3;</code>
+     * @return The queueId.
+     */
+    int getQueueId();
+
+    /**
+     * <code>uint32 finish_count = 14;</code>
      * @return The finishCount.
      */
     int getFinishCount();
 
     /**
-     * <code>uint32 unfinish_count = 14;</code>
+     * <code>uint32 next_finish_timestamp = 11;</code>
-     * @return The unfinishCount.
-     */
-    int getUnfinishCount();
-
-    /**
-     * <code>uint32 total_finish_timestamp = 11;</code>
-     * @return The totalFinishTimestamp.
-     */
-    int getTotalFinishTimestamp();
-
-    /**
-     * <code>uint32 next_finish_timestamp = 4;</code>
      * @return The nextFinishTimestamp.
      */
     int getNextFinishTimestamp();
 
+    /**
+     * <code>uint32 unfinish_count = 4;</code>
+     * @return The unfinishCount.
+     */
+    int getUnfinishCount();
+
     /**
      * <code>uint32 forge_id = 15;</code>
      * @return The forgeId.
@@ -111,12 +111,12 @@ public final class ForgeQueueDataOuterClass {
               break;
             case 24: {
 
-              finishCount_ = input.readUInt32();
+              queueId_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              nextFinishTimestamp_ = input.readUInt32();
+              unfinishCount_ = input.readUInt32();
               break;
             }
             case 64: {
@@ -126,17 +126,17 @@ public final class ForgeQueueDataOuterClass {
             }
             case 88: {
 
-              totalFinishTimestamp_ = input.readUInt32();
+              nextFinishTimestamp_ = input.readUInt32();
               break;
             }
             case 104: {
 
-              queueId_ = input.readUInt32();
+              totalFinishTimestamp_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              unfinishCount_ = input.readUInt32();
+              finishCount_ = input.readUInt32();
               break;
             }
             case 120: {
@@ -176,15 +176,15 @@ public final class ForgeQueueDataOuterClass {
               emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.class, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.Builder.class);
     }
 
-    public static final int QUEUE_ID_FIELD_NUMBER = 13;
+    public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 13;
-    private int queueId_;
+    private int totalFinishTimestamp_;
     /**
-     * <code>uint32 queue_id = 13;</code>
+     * <code>uint32 total_finish_timestamp = 13;</code>
-     * @return The queueId.
+     * @return The totalFinishTimestamp.
      */
     @java.lang.Override
-    public int getQueueId() {
+    public int getTotalFinishTimestamp() {
-      return queueId_;
+      return totalFinishTimestamp_;
     }
 
     public static final int AVATAR_ID_FIELD_NUMBER = 8;
@@ -198,10 +198,21 @@ public final class ForgeQueueDataOuterClass {
       return avatarId_;
     }
 
-    public static final int FINISH_COUNT_FIELD_NUMBER = 3;
+    public static final int QUEUE_ID_FIELD_NUMBER = 3;
+    private int queueId_;
+    /**
+     * <code>uint32 queue_id = 3;</code>
+     * @return The queueId.
+     */
+    @java.lang.Override
+    public int getQueueId() {
+      return queueId_;
+    }
+
+    public static final int FINISH_COUNT_FIELD_NUMBER = 14;
     private int finishCount_;
     /**
-     * <code>uint32 finish_count = 3;</code>
+     * <code>uint32 finish_count = 14;</code>
      * @return The finishCount.
      */
     @java.lang.Override
@@ -209,32 +220,10 @@ public final class ForgeQueueDataOuterClass {
       return finishCount_;
     }
 
-    public static final int UNFINISH_COUNT_FIELD_NUMBER = 14;
+    public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 11;
-    private int unfinishCount_;
-    /**
-     * <code>uint32 unfinish_count = 14;</code>
-     * @return The unfinishCount.
-     */
-    @java.lang.Override
-    public int getUnfinishCount() {
-      return unfinishCount_;
-    }
-
-    public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 11;
-    private int totalFinishTimestamp_;
-    /**
-     * <code>uint32 total_finish_timestamp = 11;</code>
-     * @return The totalFinishTimestamp.
-     */
-    @java.lang.Override
-    public int getTotalFinishTimestamp() {
-      return totalFinishTimestamp_;
-    }
-
-    public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 4;
     private int nextFinishTimestamp_;
     /**
-     * <code>uint32 next_finish_timestamp = 4;</code>
+     * <code>uint32 next_finish_timestamp = 11;</code>
      * @return The nextFinishTimestamp.
      */
     @java.lang.Override
@@ -242,6 +231,17 @@ public final class ForgeQueueDataOuterClass {
       return nextFinishTimestamp_;
     }
 
+    public static final int UNFINISH_COUNT_FIELD_NUMBER = 4;
+    private int unfinishCount_;
+    /**
+     * <code>uint32 unfinish_count = 4;</code>
+     * @return The unfinishCount.
+     */
+    @java.lang.Override
+    public int getUnfinishCount() {
+      return unfinishCount_;
+    }
+
     public static final int FORGE_ID_FIELD_NUMBER = 15;
     private int forgeId_;
     /**
@@ -267,23 +267,23 @@ public final class ForgeQueueDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (finishCount_ != 0) {
+      if (queueId_ != 0) {
-        output.writeUInt32(3, finishCount_);
+        output.writeUInt32(3, queueId_);
       }
-      if (nextFinishTimestamp_ != 0) {
+      if (unfinishCount_ != 0) {
-        output.writeUInt32(4, nextFinishTimestamp_);
+        output.writeUInt32(4, unfinishCount_);
       }
       if (avatarId_ != 0) {
         output.writeUInt32(8, avatarId_);
       }
+      if (nextFinishTimestamp_ != 0) {
+        output.writeUInt32(11, nextFinishTimestamp_);
+      }
       if (totalFinishTimestamp_ != 0) {
-        output.writeUInt32(11, totalFinishTimestamp_);
+        output.writeUInt32(13, totalFinishTimestamp_);
       }
-      if (queueId_ != 0) {
+      if (finishCount_ != 0) {
-        output.writeUInt32(13, queueId_);
+        output.writeUInt32(14, finishCount_);
-      }
-      if (unfinishCount_ != 0) {
-        output.writeUInt32(14, unfinishCount_);
       }
       if (forgeId_ != 0) {
         output.writeUInt32(15, forgeId_);
@@ -297,29 +297,29 @@ public final class ForgeQueueDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (finishCount_ != 0) {
+      if (queueId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, finishCount_);
+          .computeUInt32Size(3, queueId_);
       }
-      if (nextFinishTimestamp_ != 0) {
+      if (unfinishCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, nextFinishTimestamp_);
+          .computeUInt32Size(4, unfinishCount_);
       }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(8, avatarId_);
       }
+      if (nextFinishTimestamp_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, nextFinishTimestamp_);
+      }
       if (totalFinishTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, totalFinishTimestamp_);
+          .computeUInt32Size(13, totalFinishTimestamp_);
       }
-      if (queueId_ != 0) {
+      if (finishCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, queueId_);
+          .computeUInt32Size(14, finishCount_);
-      }
-      if (unfinishCount_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, unfinishCount_);
       }
       if (forgeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -340,18 +340,18 @@ public final class ForgeQueueDataOuterClass {
       }
       emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData other = (emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData) obj;
 
-      if (getQueueId()
-          != other.getQueueId()) return false;
-      if (getAvatarId()
-          != other.getAvatarId()) return false;
-      if (getFinishCount()
-          != other.getFinishCount()) return false;
-      if (getUnfinishCount()
-          != other.getUnfinishCount()) return false;
       if (getTotalFinishTimestamp()
           != other.getTotalFinishTimestamp()) return false;
+      if (getAvatarId()
+          != other.getAvatarId()) return false;
+      if (getQueueId()
+          != other.getQueueId()) return false;
+      if (getFinishCount()
+          != other.getFinishCount()) return false;
       if (getNextFinishTimestamp()
           != other.getNextFinishTimestamp()) return false;
+      if (getUnfinishCount()
+          != other.getUnfinishCount()) return false;
       if (getForgeId()
           != other.getForgeId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -365,18 +365,18 @@ public final class ForgeQueueDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQueueId();
-      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarId();
-      hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getFinishCount();
-      hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getUnfinishCount();
       hash = (37 * hash) + TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER;
       hash = (53 * hash) + getTotalFinishTimestamp();
+      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarId();
+      hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQueueId();
+      hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + getFinishCount();
       hash = (37 * hash) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER;
       hash = (53 * hash) + getNextFinishTimestamp();
+      hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + getUnfinishCount();
       hash = (37 * hash) + FORGE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getForgeId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -516,18 +516,18 @@ public final class ForgeQueueDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        queueId_ = 0;
+        totalFinishTimestamp_ = 0;
 
         avatarId_ = 0;
 
+        queueId_ = 0;
+
         finishCount_ = 0;
 
-        unfinishCount_ = 0;
-
-        totalFinishTimestamp_ = 0;
-
         nextFinishTimestamp_ = 0;
 
+        unfinishCount_ = 0;
+
         forgeId_ = 0;
 
         return this;
@@ -556,12 +556,12 @@ public final class ForgeQueueDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData buildPartial() {
         emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData result = new emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData(this);
-        result.queueId_ = queueId_;
-        result.avatarId_ = avatarId_;
-        result.finishCount_ = finishCount_;
-        result.unfinishCount_ = unfinishCount_;
         result.totalFinishTimestamp_ = totalFinishTimestamp_;
+        result.avatarId_ = avatarId_;
+        result.queueId_ = queueId_;
+        result.finishCount_ = finishCount_;
         result.nextFinishTimestamp_ = nextFinishTimestamp_;
+        result.unfinishCount_ = unfinishCount_;
         result.forgeId_ = forgeId_;
         onBuilt();
         return result;
@@ -611,24 +611,24 @@ public final class ForgeQueueDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData other) {
         if (other == emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.getDefaultInstance()) return this;
-        if (other.getQueueId() != 0) {
+        if (other.getTotalFinishTimestamp() != 0) {
-          setQueueId(other.getQueueId());
+          setTotalFinishTimestamp(other.getTotalFinishTimestamp());
         }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
         }
+        if (other.getQueueId() != 0) {
+          setQueueId(other.getQueueId());
+        }
         if (other.getFinishCount() != 0) {
           setFinishCount(other.getFinishCount());
         }
-        if (other.getUnfinishCount() != 0) {
-          setUnfinishCount(other.getUnfinishCount());
-        }
-        if (other.getTotalFinishTimestamp() != 0) {
-          setTotalFinishTimestamp(other.getTotalFinishTimestamp());
-        }
         if (other.getNextFinishTimestamp() != 0) {
           setNextFinishTimestamp(other.getNextFinishTimestamp());
         }
+        if (other.getUnfinishCount() != 0) {
+          setUnfinishCount(other.getUnfinishCount());
+        }
         if (other.getForgeId() != 0) {
           setForgeId(other.getForgeId());
         }
@@ -661,33 +661,33 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
 
-      private int queueId_ ;
+      private int totalFinishTimestamp_ ;
       /**
-       * <code>uint32 queue_id = 13;</code>
+       * <code>uint32 total_finish_timestamp = 13;</code>
-       * @return The queueId.
+       * @return The totalFinishTimestamp.
        */
       @java.lang.Override
-      public int getQueueId() {
+      public int getTotalFinishTimestamp() {
-        return queueId_;
+        return totalFinishTimestamp_;
       }
       /**
-       * <code>uint32 queue_id = 13;</code>
+       * <code>uint32 total_finish_timestamp = 13;</code>
-       * @param value The queueId to set.
+       * @param value The totalFinishTimestamp to set.
        * @return This builder for chaining.
        */
-      public Builder setQueueId(int value) {
+      public Builder setTotalFinishTimestamp(int value) {
         
-        queueId_ = value;
+        totalFinishTimestamp_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 queue_id = 13;</code>
+       * <code>uint32 total_finish_timestamp = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearQueueId() {
+      public Builder clearTotalFinishTimestamp() {
         
-        queueId_ = 0;
+        totalFinishTimestamp_ = 0;
         onChanged();
         return this;
       }
@@ -723,9 +723,40 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
 
+      private int queueId_ ;
+      /**
+       * <code>uint32 queue_id = 3;</code>
+       * @return The queueId.
+       */
+      @java.lang.Override
+      public int getQueueId() {
+        return queueId_;
+      }
+      /**
+       * <code>uint32 queue_id = 3;</code>
+       * @param value The queueId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setQueueId(int value) {
+        
+        queueId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 queue_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearQueueId() {
+        
+        queueId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int finishCount_ ;
       /**
-       * <code>uint32 finish_count = 3;</code>
+       * <code>uint32 finish_count = 14;</code>
        * @return The finishCount.
        */
       @java.lang.Override
@@ -733,7 +764,7 @@ public final class ForgeQueueDataOuterClass {
         return finishCount_;
       }
       /**
-       * <code>uint32 finish_count = 3;</code>
+       * <code>uint32 finish_count = 14;</code>
        * @param value The finishCount to set.
        * @return This builder for chaining.
        */
@@ -744,7 +775,7 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 finish_count = 3;</code>
+       * <code>uint32 finish_count = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishCount() {
@@ -754,71 +785,9 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
 
-      private int unfinishCount_ ;
-      /**
-       * <code>uint32 unfinish_count = 14;</code>
-       * @return The unfinishCount.
-       */
-      @java.lang.Override
-      public int getUnfinishCount() {
-        return unfinishCount_;
-      }
-      /**
-       * <code>uint32 unfinish_count = 14;</code>
-       * @param value The unfinishCount to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUnfinishCount(int value) {
-        
-        unfinishCount_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 unfinish_count = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUnfinishCount() {
-        
-        unfinishCount_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int totalFinishTimestamp_ ;
-      /**
-       * <code>uint32 total_finish_timestamp = 11;</code>
-       * @return The totalFinishTimestamp.
-       */
-      @java.lang.Override
-      public int getTotalFinishTimestamp() {
-        return totalFinishTimestamp_;
-      }
-      /**
-       * <code>uint32 total_finish_timestamp = 11;</code>
-       * @param value The totalFinishTimestamp to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTotalFinishTimestamp(int value) {
-        
-        totalFinishTimestamp_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 total_finish_timestamp = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTotalFinishTimestamp() {
-        
-        totalFinishTimestamp_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int nextFinishTimestamp_ ;
       /**
-       * <code>uint32 next_finish_timestamp = 4;</code>
+       * <code>uint32 next_finish_timestamp = 11;</code>
        * @return The nextFinishTimestamp.
        */
       @java.lang.Override
@@ -826,7 +795,7 @@ public final class ForgeQueueDataOuterClass {
         return nextFinishTimestamp_;
       }
       /**
-       * <code>uint32 next_finish_timestamp = 4;</code>
+       * <code>uint32 next_finish_timestamp = 11;</code>
        * @param value The nextFinishTimestamp to set.
        * @return This builder for chaining.
        */
@@ -837,7 +806,7 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 next_finish_timestamp = 4;</code>
+       * <code>uint32 next_finish_timestamp = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearNextFinishTimestamp() {
@@ -847,6 +816,37 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
 
+      private int unfinishCount_ ;
+      /**
+       * <code>uint32 unfinish_count = 4;</code>
+       * @return The unfinishCount.
+       */
+      @java.lang.Override
+      public int getUnfinishCount() {
+        return unfinishCount_;
+      }
+      /**
+       * <code>uint32 unfinish_count = 4;</code>
+       * @param value The unfinishCount to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnfinishCount(int value) {
+        
+        unfinishCount_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 unfinish_count = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnfinishCount() {
+        
+        unfinishCount_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int forgeId_ ;
       /**
        * <code>uint32 forge_id = 15;</code>
@@ -945,10 +945,10 @@ public final class ForgeQueueDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024ForgeQueueData.proto\"\264\001\n\016ForgeQueueDat" +
-      "a\022\020\n\010queue_id\030\r \001(\r\022\021\n\tavatar_id\030\010 \001(\r\022\024" +
+      "a\022\036\n\026total_finish_timestamp\030\r \001(\r\022\021\n\tava" +
-      "\n\014finish_count\030\003 \001(\r\022\026\n\016unfinish_count\030\016" +
+      "tar_id\030\010 \001(\r\022\020\n\010queue_id\030\003 \001(\r\022\024\n\014finish" +
-      " \001(\r\022\036\n\026total_finish_timestamp\030\013 \001(\r\022\035\n\025" +
+      "_count\030\016 \001(\r\022\035\n\025next_finish_timestamp\030\013 " +
-      "next_finish_timestamp\030\004 \001(\r\022\020\n\010forge_id\030" +
+      "\001(\r\022\026\n\016unfinish_count\030\004 \001(\r\022\020\n\010forge_id\030" +
       "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
@@ -961,7 +961,7 @@ public final class ForgeQueueDataOuterClass {
     internal_static_ForgeQueueData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ForgeQueueData_descriptor,
-        new java.lang.String[] { "QueueId", "AvatarId", "FinishCount", "UnfinishCount", "TotalFinishTimestamp", "NextFinishTimestamp", "ForgeId", });
+        new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "QueueId", "FinishCount", "NextFinishTimestamp", "UnfinishCount", "ForgeId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -76,10 +76,10 @@ public final class GetPlayerTokenRspOuterClass {
     int getPlatformType();
 
     /**
-     * <code>uint32 EMFDHANIAHH = 1241;</code>
+     * <code>uint32 reg_platform = 1241;</code>
-     * @return The eMFDHANIAHH.
+     * @return The regPlatform.
      */
-    int getEMFDHANIAHH();
+    int getRegPlatform();
 
     /**
      * <code>string account_uid = 3;</code>
@@ -504,7 +504,7 @@ public final class GetPlayerTokenRspOuterClass {
             }
             case 9928: {
 
-              eMFDHANIAHH_ = input.readUInt32();
+              regPlatform_ = input.readUInt32();
               break;
             }
             case 10336: {
@@ -710,15 +710,15 @@ public final class GetPlayerTokenRspOuterClass {
       return platformType_;
     }
 
-    public static final int EMFDHANIAHH_FIELD_NUMBER = 1241;
+    public static final int REG_PLATFORM_FIELD_NUMBER = 1241;
-    private int eMFDHANIAHH_;
+    private int regPlatform_;
     /**
-     * <code>uint32 EMFDHANIAHH = 1241;</code>
+     * <code>uint32 reg_platform = 1241;</code>
-     * @return The eMFDHANIAHH.
+     * @return The regPlatform.
      */
     @java.lang.Override
-    public int getEMFDHANIAHH() {
+    public int getRegPlatform() {
-      return eMFDHANIAHH_;
+      return regPlatform_;
     }
 
     public static final int ACCOUNT_UID_FIELD_NUMBER = 3;
@@ -1357,8 +1357,8 @@ public final class GetPlayerTokenRspOuterClass {
       if (stopServer_ != null) {
         output.writeMessage(875, getStopServer());
       }
-      if (eMFDHANIAHH_ != 0) {
+      if (regPlatform_ != 0) {
-        output.writeUInt32(1241, eMFDHANIAHH_);
+        output.writeUInt32(1241, regPlatform_);
       }
       if (pELBMOHDKHJ_ != false) {
         output.writeBool(1292, pELBMOHDKHJ_);
@@ -1487,9 +1487,9 @@ public final class GetPlayerTokenRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(875, getStopServer());
       }
-      if (eMFDHANIAHH_ != 0) {
+      if (regPlatform_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1241, eMFDHANIAHH_);
+          .computeUInt32Size(1241, regPlatform_);
       }
       if (pELBMOHDKHJ_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -1555,8 +1555,8 @@ public final class GetPlayerTokenRspOuterClass {
           != other.getChannelId()) return false;
       if (getPlatformType()
           != other.getPlatformType()) return false;
-      if (getEMFDHANIAHH()
+      if (getRegPlatform()
-          != other.getEMFDHANIAHH()) return false;
+          != other.getRegPlatform()) return false;
       if (!getAccountUid()
           .equals(other.getAccountUid())) return false;
       if (getUid()
@@ -1635,8 +1635,8 @@ public final class GetPlayerTokenRspOuterClass {
       hash = (53 * hash) + getChannelId();
       hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getPlatformType();
-      hash = (37 * hash) + EMFDHANIAHH_FIELD_NUMBER;
+      hash = (37 * hash) + REG_PLATFORM_FIELD_NUMBER;
-      hash = (53 * hash) + getEMFDHANIAHH();
+      hash = (53 * hash) + getRegPlatform();
       hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER;
       hash = (53 * hash) + getAccountUid().hashCode();
       hash = (37 * hash) + UID_FIELD_NUMBER;
@@ -1845,7 +1845,7 @@ public final class GetPlayerTokenRspOuterClass {
 
         platformType_ = 0;
 
-        eMFDHANIAHH_ = 0;
+        regPlatform_ = 0;
 
         accountUid_ = "";
 
@@ -1933,7 +1933,7 @@ public final class GetPlayerTokenRspOuterClass {
         }
         result.channelId_ = channelId_;
         result.platformType_ = platformType_;
-        result.eMFDHANIAHH_ = eMFDHANIAHH_;
+        result.regPlatform_ = regPlatform_;
         result.accountUid_ = accountUid_;
         result.uid_ = uid_;
         result.tag_ = tag_;
@@ -2032,8 +2032,8 @@ public final class GetPlayerTokenRspOuterClass {
         if (other.getPlatformType() != 0) {
           setPlatformType(other.getPlatformType());
         }
-        if (other.getEMFDHANIAHH() != 0) {
+        if (other.getRegPlatform() != 0) {
-          setEMFDHANIAHH(other.getEMFDHANIAHH());
+          setRegPlatform(other.getRegPlatform());
         }
         if (!other.getAccountUid().isEmpty()) {
           accountUid_ = other.accountUid_;
@@ -2504,33 +2504,33 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
 
-      private int eMFDHANIAHH_ ;
+      private int regPlatform_ ;
       /**
-       * <code>uint32 EMFDHANIAHH = 1241;</code>
+       * <code>uint32 reg_platform = 1241;</code>
-       * @return The eMFDHANIAHH.
+       * @return The regPlatform.
        */
       @java.lang.Override
-      public int getEMFDHANIAHH() {
+      public int getRegPlatform() {
-        return eMFDHANIAHH_;
+        return regPlatform_;
       }
       /**
-       * <code>uint32 EMFDHANIAHH = 1241;</code>
+       * <code>uint32 reg_platform = 1241;</code>
-       * @param value The eMFDHANIAHH to set.
+       * @param value The regPlatform to set.
        * @return This builder for chaining.
        */
-      public Builder setEMFDHANIAHH(int value) {
+      public Builder setRegPlatform(int value) {
         
-        eMFDHANIAHH_ = value;
+        regPlatform_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 EMFDHANIAHH = 1241;</code>
+       * <code>uint32 reg_platform = 1241;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEMFDHANIAHH() {
+      public Builder clearRegPlatform() {
         
-        eMFDHANIAHH_ = 0;
+        regPlatform_ = 0;
         onChanged();
         return this;
       }
@@ -3850,26 +3850,26 @@ public final class GetPlayerTokenRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027GetPlayerTokenRsp.proto\032\024StopServerInf" +
-      "o.proto\"\341\005\n\021GetPlayerTokenRsp\022\024\n\013PELBMOH" +
+      "o.proto\"\342\005\n\021GetPlayerTokenRsp\022\024\n\013PELBMOH" +
       "DKHJ\030\214\n \001(\010\022\024\n\013ILGBPPMFHIF\030\252\017 \001(\010\022\027\n\017sec" +
       "ret_key_seed\030\r \001(\004\022\"\n\031client_version_ran" +
       "dom_key\030\246\005 \001(\t\022%\n\013stop_server\030\353\006 \001(\0132\017.S" +
       "topServerInfo\022\023\n\nchannel_id\030\203\002 \001(\r\022\025\n\rpl" +
-      "atform_type\030\005 \001(\r\022\024\n\013EMFDHANIAHH\030\331\t \001(\r\022" +
+      "atform_type\030\005 \001(\r\022\025\n\014reg_platform\030\331\t \001(\r" +
-      "\023\n\013account_uid\030\003 \001(\t\022\013\n\003uid\030\007 \001(\r\022\014\n\003tag" +
+      "\022\023\n\013account_uid\030\003 \001(\t\022\013\n\003uid\030\007 \001(\r\022\014\n\003ta" +
-      "\030\244\014 \001(\r\022\021\n\010birthday\030\235\013 \001(\t\022\017\n\006key_id\030\214\r " +
+      "g\030\244\014 \001(\r\022\021\n\010birthday\030\235\013 \001(\t\022\017\n\006key_id\030\214\r" +
-      "\001(\r\022\017\n\007retcode\030\004 \001(\005\022\020\n\010is_guest\030\002 \001(\010\022\"" +
+      " \001(\r\022\017\n\007retcode\030\004 \001(\005\022\020\n\010is_guest\030\002 \001(\010\022" +
-      "\n\031finish_collection_id_list\030\303\003 \003(\r\022\030\n\017se" +
+      "\"\n\031finish_collection_id_list\030\303\003 \003(\r\022\030\n\017s" +
-      "rver_rand_key\030\205\004 \001(\t\022\033\n\023security_cmd_buf" +
+      "erver_rand_key\030\205\004 \001(\t\022\033\n\023security_cmd_bu" +
-      "fer\030\017 \001(\014\022\013\n\003msg\030\014 \001(\t\022\034\n\024is_proficient_" +
+      "ffer\030\017 \001(\014\022\013\n\003msg\030\014 \001(\t\022\034\n\024is_proficient" +
-      "player\030\010 \001(\010\022\r\n\005token\030\013 \001(\t\022\r\n\004sign\030\212\003 \001" +
+      "_player\030\010 \001(\010\022\r\n\005token\030\013 \001(\t\022\r\n\004sign\030\212\003 " +
-      "(\t\022\025\n\014account_type\030\261\014 \001(\r\022\026\n\016extra_bin_d" +
+      "\001(\t\022\025\n\014account_type\030\261\014 \001(\r\022\026\n\016extra_bin_" +
-      "ata\030\001 \001(\014\022\017\n\006psn_id\030\376\r \001(\t\022\026\n\016sub_channe" +
+      "data\030\001 \001(\014\022\017\n\006psn_id\030\376\r \001(\t\022\026\n\016sub_chann" +
-      "l_id\030\016 \001(\r\022\022\n\nsecret_key\030\t \001(\t\022\026\n\rclient" +
+      "el_id\030\016 \001(\r\022\022\n\nsecret_key\030\t \001(\t\022\026\n\rclien" +
-      "_ip_str\030\201\017 \001(\t\022\027\n\017blackUidEndTime\030\n \001(\r\022" +
+      "t_ip_str\030\201\017 \001(\t\022\027\n\017blackUidEndTime\030\n \001(\r" +
-      "\023\n\013KCFIGJAPNIB\030\006 \001(\r\022\025\n\014country_code\030\204\013 " +
+      "\022\023\n\013KCFIGJAPNIB\030\006 \001(\r\022\025\n\014country_code\030\204\013" +
-      "\001(\t\022\026\n\rcloudClientIp\030\374\003 \001(\rB\033\n\031emu.grass" +
+      " \001(\t\022\026\n\rcloudClientIp\030\374\003 \001(\rB\033\n\031emu.gras" +
-      "cutter.net.protob\006proto3"
+      "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3881,7 +3881,7 @@ public final class GetPlayerTokenRspOuterClass {
     internal_static_GetPlayerTokenRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerTokenRsp_descriptor,
-        new java.lang.String[] { "PELBMOHDKHJ", "ILGBPPMFHIF", "SecretKeySeed", "ClientVersionRandomKey", "StopServer", "ChannelId", "PlatformType", "EMFDHANIAHH", "AccountUid", "Uid", "Tag", "Birthday", "KeyId", "Retcode", "IsGuest", "FinishCollectionIdList", "ServerRandKey", "SecurityCmdBuffer", "Msg", "IsProficientPlayer", "Token", "Sign", "AccountType", "ExtraBinData", "PsnId", "SubChannelId", "SecretKey", "ClientIpStr", "BlackUidEndTime", "KCFIGJAPNIB", "CountryCode", "CloudClientIp", });
+        new java.lang.String[] { "PELBMOHDKHJ", "ILGBPPMFHIF", "SecretKeySeed", "ClientVersionRandomKey", "StopServer", "ChannelId", "PlatformType", "RegPlatform", "AccountUid", "Uid", "Tag", "Birthday", "KeyId", "Retcode", "IsGuest", "FinishCollectionIdList", "ServerRandKey", "SecurityCmdBuffer", "Msg", "IsProficientPlayer", "Token", "Sign", "AccountType", "ExtraBinData", "PsnId", "SubChannelId", "SecretKey", "ClientIpStr", "BlackUidEndTime", "KCFIGJAPNIB", "CountryCode", "CloudClientIp", });
     emu.grasscutter.net.proto.StopServerInfoOuterClass.getDescriptor();
   }
 

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

@@ -43,19 +43,19 @@ public final class HomeMarkPointSceneDataOuterClass {
         int index);
 
     /**
-     * <code>.Vector safe_point_pos = 8;</code>
+     * <code>.Vector teapot_spirit_pos = 8;</code>
-     * @return Whether the safePointPos field is set.
+     * @return Whether the teapotSpiritPos field is set.
      */
-    boolean hasSafePointPos();
+    boolean hasTeapotSpiritPos();
     /**
-     * <code>.Vector safe_point_pos = 8;</code>
+     * <code>.Vector teapot_spirit_pos = 8;</code>
-     * @return The safePointPos.
+     * @return The teapotSpiritPos.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos();
     /**
-     * <code>.Vector safe_point_pos = 8;</code>
+     * <code>.Vector teapot_spirit_pos = 8;</code>
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder();
 
     /**
      * <code>uint32 module_id = 9;</code>
@@ -70,19 +70,19 @@ public final class HomeMarkPointSceneDataOuterClass {
     int getSceneId();
 
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector safe_point_pos = 3;</code>
-     * @return Whether the teapotSpiritPos field is set.
+     * @return Whether the safePointPos field is set.
      */
-    boolean hasTeapotSpiritPos();
+    boolean hasSafePointPos();
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector safe_point_pos = 3;</code>
-     * @return The teapotSpiritPos.
+     * @return The safePointPos.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos();
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector safe_point_pos = 3;</code>
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder();
   }
   /**
    * <pre>
@@ -137,13 +137,13 @@ public final class HomeMarkPointSceneDataOuterClass {
               break;
             case 26: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (teapotSpiritPos_ != null) {
+              if (safePointPos_ != null) {
-                subBuilder = teapotSpiritPos_.toBuilder();
+                subBuilder = safePointPos_.toBuilder();
               }
-              teapotSpiritPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              safePointPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(teapotSpiritPos_);
+                subBuilder.mergeFrom(safePointPos_);
-                teapotSpiritPos_ = subBuilder.buildPartial();
+                safePointPos_ = subBuilder.buildPartial();
               }
 
               break;
@@ -164,13 +164,13 @@ public final class HomeMarkPointSceneDataOuterClass {
             }
             case 66: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (safePointPos_ != null) {
+              if (teapotSpiritPos_ != null) {
-                subBuilder = safePointPos_.toBuilder();
+                subBuilder = teapotSpiritPos_.toBuilder();
               }
-              safePointPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              teapotSpiritPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(safePointPos_);
+                subBuilder.mergeFrom(teapotSpiritPos_);
-                safePointPos_ = subBuilder.buildPartial();
+                teapotSpiritPos_ = subBuilder.buildPartial();
               }
 
               break;
@@ -255,30 +255,30 @@ public final class HomeMarkPointSceneDataOuterClass {
       return furnitureList_.get(index);
     }
 
-    public static final int SAFE_POINT_POS_FIELD_NUMBER = 8;
+    public static final int TEAPOT_SPIRIT_POS_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
     /**
-     * <code>.Vector safe_point_pos = 8;</code>
+     * <code>.Vector teapot_spirit_pos = 8;</code>
-     * @return Whether the safePointPos field is set.
+     * @return Whether the teapotSpiritPos field is set.
      */
     @java.lang.Override
-    public boolean hasSafePointPos() {
+    public boolean hasTeapotSpiritPos() {
-      return safePointPos_ != null;
+      return teapotSpiritPos_ != null;
     }
     /**
-     * <code>.Vector safe_point_pos = 8;</code>
+     * <code>.Vector teapot_spirit_pos = 8;</code>
-     * @return The safePointPos.
+     * @return The teapotSpiritPos.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
-      return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+      return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
     }
     /**
-     * <code>.Vector safe_point_pos = 8;</code>
+     * <code>.Vector teapot_spirit_pos = 8;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
-      return getSafePointPos();
+      return getTeapotSpiritPos();
     }
 
     public static final int MODULE_ID_FIELD_NUMBER = 9;
@@ -303,30 +303,30 @@ public final class HomeMarkPointSceneDataOuterClass {
       return sceneId_;
     }
 
-    public static final int TEAPOT_SPIRIT_POS_FIELD_NUMBER = 3;
+    public static final int SAFE_POINT_POS_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector safe_point_pos = 3;</code>
-     * @return Whether the teapotSpiritPos field is set.
+     * @return Whether the safePointPos field is set.
      */
     @java.lang.Override
-    public boolean hasTeapotSpiritPos() {
+    public boolean hasSafePointPos() {
-      return teapotSpiritPos_ != null;
+      return safePointPos_ != null;
     }
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector safe_point_pos = 3;</code>
-     * @return The teapotSpiritPos.
+     * @return The safePointPos.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
-      return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
+      return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
     }
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector safe_point_pos = 3;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
-      return getTeapotSpiritPos();
+      return getSafePointPos();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -343,8 +343,8 @@ public final class HomeMarkPointSceneDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (teapotSpiritPos_ != null) {
+      if (safePointPos_ != null) {
-        output.writeMessage(3, getTeapotSpiritPos());
+        output.writeMessage(3, getSafePointPos());
       }
       if (sceneId_ != 0) {
         output.writeUInt32(5, sceneId_);
@@ -352,8 +352,8 @@ public final class HomeMarkPointSceneDataOuterClass {
       for (int i = 0; i < furnitureList_.size(); i++) {
         output.writeMessage(7, furnitureList_.get(i));
       }
-      if (safePointPos_ != null) {
+      if (teapotSpiritPos_ != null) {
-        output.writeMessage(8, getSafePointPos());
+        output.writeMessage(8, getTeapotSpiritPos());
       }
       if (moduleId_ != 0) {
         output.writeUInt32(9, moduleId_);
@@ -367,9 +367,9 @@ public final class HomeMarkPointSceneDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (teapotSpiritPos_ != null) {
+      if (safePointPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getTeapotSpiritPos());
+          .computeMessageSize(3, getSafePointPos());
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -379,9 +379,9 @@ public final class HomeMarkPointSceneDataOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, furnitureList_.get(i));
       }
-      if (safePointPos_ != null) {
+      if (teapotSpiritPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getSafePointPos());
+          .computeMessageSize(8, getTeapotSpiritPos());
       }
       if (moduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -404,19 +404,19 @@ public final class HomeMarkPointSceneDataOuterClass {
 
       if (!getFurnitureListList()
           .equals(other.getFurnitureListList())) return false;
-      if (hasSafePointPos() != other.hasSafePointPos()) return false;
+      if (hasTeapotSpiritPos() != other.hasTeapotSpiritPos()) return false;
-      if (hasSafePointPos()) {
+      if (hasTeapotSpiritPos()) {
-        if (!getSafePointPos()
+        if (!getTeapotSpiritPos()
-            .equals(other.getSafePointPos())) return false;
+            .equals(other.getTeapotSpiritPos())) return false;
       }
       if (getModuleId()
           != other.getModuleId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (hasTeapotSpiritPos() != other.hasTeapotSpiritPos()) return false;
+      if (hasSafePointPos() != other.hasSafePointPos()) return false;
-      if (hasTeapotSpiritPos()) {
+      if (hasSafePointPos()) {
-        if (!getTeapotSpiritPos()
+        if (!getSafePointPos()
-            .equals(other.getTeapotSpiritPos())) return false;
+            .equals(other.getSafePointPos())) return false;
       }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -433,17 +433,17 @@ public final class HomeMarkPointSceneDataOuterClass {
         hash = (37 * hash) + FURNITURE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFurnitureListList().hashCode();
       }
-      if (hasSafePointPos()) {
+      if (hasTeapotSpiritPos()) {
-        hash = (37 * hash) + SAFE_POINT_POS_FIELD_NUMBER;
+        hash = (37 * hash) + TEAPOT_SPIRIT_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getSafePointPos().hashCode();
+        hash = (53 * hash) + getTeapotSpiritPos().hashCode();
       }
       hash = (37 * hash) + MODULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getModuleId();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
-      if (hasTeapotSpiritPos()) {
+      if (hasSafePointPos()) {
-        hash = (37 * hash) + TEAPOT_SPIRIT_POS_FIELD_NUMBER;
+        hash = (37 * hash) + SAFE_POINT_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getTeapotSpiritPos().hashCode();
+        hash = (53 * hash) + getSafePointPos().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -589,22 +589,22 @@ public final class HomeMarkPointSceneDataOuterClass {
         } else {
           furnitureListBuilder_.clear();
         }
-        if (safePointPosBuilder_ == null) {
-          safePointPos_ = null;
-        } else {
-          safePointPos_ = null;
-          safePointPosBuilder_ = null;
-        }
-        moduleId_ = 0;
-
-        sceneId_ = 0;
-
         if (teapotSpiritPosBuilder_ == null) {
           teapotSpiritPos_ = null;
         } else {
           teapotSpiritPos_ = null;
           teapotSpiritPosBuilder_ = null;
         }
+        moduleId_ = 0;
+
+        sceneId_ = 0;
+
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = null;
+        } else {
+          safePointPos_ = null;
+          safePointPosBuilder_ = null;
+        }
         return this;
       }
 
@@ -641,18 +641,18 @@ public final class HomeMarkPointSceneDataOuterClass {
         } else {
           result.furnitureList_ = furnitureListBuilder_.build();
         }
-        if (safePointPosBuilder_ == null) {
-          result.safePointPos_ = safePointPos_;
-        } else {
-          result.safePointPos_ = safePointPosBuilder_.build();
-        }
-        result.moduleId_ = moduleId_;
-        result.sceneId_ = sceneId_;
         if (teapotSpiritPosBuilder_ == null) {
           result.teapotSpiritPos_ = teapotSpiritPos_;
         } else {
           result.teapotSpiritPos_ = teapotSpiritPosBuilder_.build();
         }
+        result.moduleId_ = moduleId_;
+        result.sceneId_ = sceneId_;
+        if (safePointPosBuilder_ == null) {
+          result.safePointPos_ = safePointPos_;
+        } else {
+          result.safePointPos_ = safePointPosBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -727,8 +727,8 @@ public final class HomeMarkPointSceneDataOuterClass {
             }
           }
         }
-        if (other.hasSafePointPos()) {
+        if (other.hasTeapotSpiritPos()) {
-          mergeSafePointPos(other.getSafePointPos());
+          mergeTeapotSpiritPos(other.getTeapotSpiritPos());
         }
         if (other.getModuleId() != 0) {
           setModuleId(other.getModuleId());
@@ -736,8 +736,8 @@ public final class HomeMarkPointSceneDataOuterClass {
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (other.hasTeapotSpiritPos()) {
+        if (other.hasSafePointPos()) {
-          mergeTeapotSpiritPos(other.getTeapotSpiritPos());
+          mergeSafePointPos(other.getSafePointPos());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1009,123 +1009,123 @@ public final class HomeMarkPointSceneDataOuterClass {
         return furnitureListBuilder_;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> safePointPosBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> teapotSpiritPosBuilder_;
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
-       * @return Whether the safePointPos field is set.
+       * @return Whether the teapotSpiritPos field is set.
        */
-      public boolean hasSafePointPos() {
+      public boolean hasTeapotSpiritPos() {
-        return safePointPosBuilder_ != null || safePointPos_ != null;
+        return teapotSpiritPosBuilder_ != null || teapotSpiritPos_ != null;
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
-       * @return The safePointPos.
+       * @return The teapotSpiritPos.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
-        if (safePointPosBuilder_ == null) {
+        if (teapotSpiritPosBuilder_ == null) {
-          return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+          return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
         } else {
-          return safePointPosBuilder_.getMessage();
+          return teapotSpiritPosBuilder_.getMessage();
         }
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
        */
-      public Builder setSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+      public Builder setTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (safePointPosBuilder_ == null) {
+        if (teapotSpiritPosBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          safePointPos_ = value;
+          teapotSpiritPos_ = value;
           onChanged();
         } else {
-          safePointPosBuilder_.setMessage(value);
+          teapotSpiritPosBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
        */
-      public Builder setSafePointPos(
+      public Builder setTeapotSpiritPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (safePointPosBuilder_ == null) {
+        if (teapotSpiritPosBuilder_ == null) {
-          safePointPos_ = builderForValue.build();
+          teapotSpiritPos_ = builderForValue.build();
           onChanged();
         } else {
-          safePointPosBuilder_.setMessage(builderForValue.build());
+          teapotSpiritPosBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
        */
-      public Builder mergeSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+      public Builder mergeTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (safePointPosBuilder_ == null) {
+        if (teapotSpiritPosBuilder_ == null) {
-          if (safePointPos_ != null) {
+          if (teapotSpiritPos_ != null) {
-            safePointPos_ =
+            teapotSpiritPos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(safePointPos_).mergeFrom(value).buildPartial();
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(teapotSpiritPos_).mergeFrom(value).buildPartial();
           } else {
-            safePointPos_ = value;
+            teapotSpiritPos_ = value;
           }
           onChanged();
         } else {
-          safePointPosBuilder_.mergeFrom(value);
+          teapotSpiritPosBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
        */
-      public Builder clearSafePointPos() {
+      public Builder clearTeapotSpiritPos() {
-        if (safePointPosBuilder_ == null) {
+        if (teapotSpiritPosBuilder_ == null) {
-          safePointPos_ = null;
+          teapotSpiritPos_ = null;
           onChanged();
         } else {
-          safePointPos_ = null;
+          teapotSpiritPos_ = null;
-          safePointPosBuilder_ = null;
+          teapotSpiritPosBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSafePointPosBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTeapotSpiritPosBuilder() {
         
         onChanged();
-        return getSafePointPosFieldBuilder().getBuilder();
+        return getTeapotSpiritPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
-        if (safePointPosBuilder_ != null) {
+        if (teapotSpiritPosBuilder_ != null) {
-          return safePointPosBuilder_.getMessageOrBuilder();
+          return teapotSpiritPosBuilder_.getMessageOrBuilder();
         } else {
-          return safePointPos_ == null ?
+          return teapotSpiritPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
         }
       }
       /**
-       * <code>.Vector safe_point_pos = 8;</code>
+       * <code>.Vector teapot_spirit_pos = 8;</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> 
-          getSafePointPosFieldBuilder() {
+          getTeapotSpiritPosFieldBuilder() {
-        if (safePointPosBuilder_ == null) {
+        if (teapotSpiritPosBuilder_ == null) {
-          safePointPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          teapotSpiritPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getSafePointPos(),
+                  getTeapotSpiritPos(),
                   getParentForChildren(),
                   isClean());
-          safePointPos_ = null;
+          teapotSpiritPos_ = null;
         }
-        return safePointPosBuilder_;
+        return teapotSpiritPosBuilder_;
       }
 
       private int moduleId_ ;
@@ -1190,123 +1190,123 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> teapotSpiritPosBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> safePointPosBuilder_;
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
-       * @return Whether the teapotSpiritPos field is set.
+       * @return Whether the safePointPos field is set.
        */
-      public boolean hasTeapotSpiritPos() {
+      public boolean hasSafePointPos() {
-        return teapotSpiritPosBuilder_ != null || teapotSpiritPos_ != null;
+        return safePointPosBuilder_ != null || safePointPos_ != null;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
-       * @return The teapotSpiritPos.
+       * @return The safePointPos.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
-        if (teapotSpiritPosBuilder_ == null) {
+        if (safePointPosBuilder_ == null) {
-          return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
+          return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
         } else {
-          return teapotSpiritPosBuilder_.getMessage();
+          return safePointPosBuilder_.getMessage();
         }
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
        */
-      public Builder setTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+      public Builder setSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (teapotSpiritPosBuilder_ == null) {
+        if (safePointPosBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          teapotSpiritPos_ = value;
+          safePointPos_ = value;
           onChanged();
         } else {
-          teapotSpiritPosBuilder_.setMessage(value);
+          safePointPosBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
        */
-      public Builder setTeapotSpiritPos(
+      public Builder setSafePointPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (teapotSpiritPosBuilder_ == null) {
+        if (safePointPosBuilder_ == null) {
-          teapotSpiritPos_ = builderForValue.build();
+          safePointPos_ = builderForValue.build();
           onChanged();
         } else {
-          teapotSpiritPosBuilder_.setMessage(builderForValue.build());
+          safePointPosBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
        */
-      public Builder mergeTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+      public Builder mergeSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (teapotSpiritPosBuilder_ == null) {
+        if (safePointPosBuilder_ == null) {
-          if (teapotSpiritPos_ != null) {
+          if (safePointPos_ != null) {
-            teapotSpiritPos_ =
+            safePointPos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(teapotSpiritPos_).mergeFrom(value).buildPartial();
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(safePointPos_).mergeFrom(value).buildPartial();
           } else {
-            teapotSpiritPos_ = value;
+            safePointPos_ = value;
           }
           onChanged();
         } else {
-          teapotSpiritPosBuilder_.mergeFrom(value);
+          safePointPosBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
        */
-      public Builder clearTeapotSpiritPos() {
+      public Builder clearSafePointPos() {
-        if (teapotSpiritPosBuilder_ == null) {
+        if (safePointPosBuilder_ == null) {
-          teapotSpiritPos_ = null;
+          safePointPos_ = null;
           onChanged();
         } else {
-          teapotSpiritPos_ = null;
+          safePointPos_ = null;
-          teapotSpiritPosBuilder_ = null;
+          safePointPosBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTeapotSpiritPosBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSafePointPosBuilder() {
         
         onChanged();
-        return getTeapotSpiritPosFieldBuilder().getBuilder();
+        return getSafePointPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
-        if (teapotSpiritPosBuilder_ != null) {
+        if (safePointPosBuilder_ != null) {
-          return teapotSpiritPosBuilder_.getMessageOrBuilder();
+          return safePointPosBuilder_.getMessageOrBuilder();
         } else {
-          return teapotSpiritPos_ == null ?
+          return safePointPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
         }
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector safe_point_pos = 3;</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> 
-          getTeapotSpiritPosFieldBuilder() {
+          getSafePointPosFieldBuilder() {
-        if (teapotSpiritPosBuilder_ == null) {
+        if (safePointPosBuilder_ == null) {
-          teapotSpiritPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          safePointPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getTeapotSpiritPos(),
+                  getSafePointPos(),
                   getParentForChildren(),
                   isClean());
-          teapotSpiritPos_ = null;
+          safePointPos_ = null;
         }
-        return teapotSpiritPosBuilder_;
+        return safePointPosBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1378,10 +1378,10 @@ public final class HomeMarkPointSceneDataOuterClass {
       "\n\034HomeMarkPointSceneData.proto\032 HomeMark" +
       "PointFurnitureData.proto\032\014Vector.proto\"\267" +
       "\001\n\026HomeMarkPointSceneData\0223\n\016furniture_l" +
-      "ist\030\007 \003(\0132\033.HomeMarkPointFurnitureData\022\037" +
+      "ist\030\007 \003(\0132\033.HomeMarkPointFurnitureData\022\"" +
-      "\n\016safe_point_pos\030\010 \001(\0132\007.Vector\022\021\n\tmodul" +
+      "\n\021teapot_spirit_pos\030\010 \001(\0132\007.Vector\022\021\n\tmo" +
-      "e_id\030\t \001(\r\022\020\n\010scene_id\030\005 \001(\r\022\"\n\021teapot_s" +
+      "dule_id\030\t \001(\r\022\020\n\010scene_id\030\005 \001(\r\022\037\n\016safe_" +
-      "pirit_pos\030\003 \001(\0132\007.VectorB\033\n\031emu.grasscut" +
+      "point_pos\030\003 \001(\0132\007.VectorB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1395,7 +1395,7 @@ public final class HomeMarkPointSceneDataOuterClass {
     internal_static_HomeMarkPointSceneData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeMarkPointSceneData_descriptor,
-        new java.lang.String[] { "FurnitureList", "SafePointPos", "ModuleId", "SceneId", "TeapotSpiritPos", });
+        new java.lang.String[] { "FurnitureList", "TeapotSpiritPos", "ModuleId", "SceneId", "SafePointPos", });
     emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }

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

@@ -19,10 +19,10 @@ public final class HomeResourceOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 store_value = 1;</code>
+     * <code>uint32 store_limit = 1;</code>
-     * @return The storeValue.
+     * @return The storeLimit.
      */
-    int getStoreValue();
+    int getStoreLimit();
 
     /**
      * <code>fixed32 next_refresh_time = 5;</code>
@@ -31,10 +31,10 @@ public final class HomeResourceOuterClass {
     int getNextRefreshTime();
 
     /**
-     * <code>uint32 store_limit = 3;</code>
+     * <code>uint32 store_value = 3;</code>
-     * @return The storeLimit.
+     * @return The storeValue.
      */
-    int getStoreLimit();
+    int getStoreValue();
   }
   /**
    * <pre>
@@ -87,12 +87,12 @@ public final class HomeResourceOuterClass {
               break;
             case 8: {
 
-              storeValue_ = input.readUInt32();
+              storeLimit_ = input.readUInt32();
               break;
             }
             case 24: {
 
-              storeLimit_ = input.readUInt32();
+              storeValue_ = input.readUInt32();
               break;
             }
             case 45: {
@@ -132,15 +132,15 @@ public final class HomeResourceOuterClass {
               emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.class, emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder.class);
     }
 
-    public static final int STORE_VALUE_FIELD_NUMBER = 1;
+    public static final int STORE_LIMIT_FIELD_NUMBER = 1;
-    private int storeValue_;
+    private int storeLimit_;
     /**
-     * <code>uint32 store_value = 1;</code>
+     * <code>uint32 store_limit = 1;</code>
-     * @return The storeValue.
+     * @return The storeLimit.
      */
     @java.lang.Override
-    public int getStoreValue() {
+    public int getStoreLimit() {
-      return storeValue_;
+      return storeLimit_;
     }
 
     public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 5;
@@ -154,15 +154,15 @@ public final class HomeResourceOuterClass {
       return nextRefreshTime_;
     }
 
-    public static final int STORE_LIMIT_FIELD_NUMBER = 3;
+    public static final int STORE_VALUE_FIELD_NUMBER = 3;
-    private int storeLimit_;
+    private int storeValue_;
     /**
-     * <code>uint32 store_limit = 3;</code>
+     * <code>uint32 store_value = 3;</code>
-     * @return The storeLimit.
+     * @return The storeValue.
      */
     @java.lang.Override
-    public int getStoreLimit() {
+    public int getStoreValue() {
-      return storeLimit_;
+      return storeValue_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -179,11 +179,11 @@ public final class HomeResourceOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (storeValue_ != 0) {
-        output.writeUInt32(1, storeValue_);
-      }
       if (storeLimit_ != 0) {
-        output.writeUInt32(3, storeLimit_);
+        output.writeUInt32(1, storeLimit_);
+      }
+      if (storeValue_ != 0) {
+        output.writeUInt32(3, storeValue_);
       }
       if (nextRefreshTime_ != 0) {
         output.writeFixed32(5, nextRefreshTime_);
@@ -197,13 +197,13 @@ public final class HomeResourceOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (storeValue_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, storeValue_);
-      }
       if (storeLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, storeLimit_);
+          .computeUInt32Size(1, storeLimit_);
+      }
+      if (storeValue_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, storeValue_);
       }
       if (nextRefreshTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -224,12 +224,12 @@ public final class HomeResourceOuterClass {
       }
       emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource other = (emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource) obj;
 
-      if (getStoreValue()
-          != other.getStoreValue()) return false;
-      if (getNextRefreshTime()
-          != other.getNextRefreshTime()) return false;
       if (getStoreLimit()
           != other.getStoreLimit()) return false;
+      if (getNextRefreshTime()
+          != other.getNextRefreshTime()) return false;
+      if (getStoreValue()
+          != other.getStoreValue()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,12 +241,12 @@ public final class HomeResourceOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + STORE_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getStoreValue();
-      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getNextRefreshTime();
       hash = (37 * hash) + STORE_LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getStoreLimit();
+      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + STORE_VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getStoreValue();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -384,11 +384,11 @@ public final class HomeResourceOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        storeValue_ = 0;
+        storeLimit_ = 0;
 
         nextRefreshTime_ = 0;
 
-        storeLimit_ = 0;
+        storeValue_ = 0;
 
         return this;
       }
@@ -416,9 +416,9 @@ public final class HomeResourceOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource buildPartial() {
         emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource result = new emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource(this);
-        result.storeValue_ = storeValue_;
-        result.nextRefreshTime_ = nextRefreshTime_;
         result.storeLimit_ = storeLimit_;
+        result.nextRefreshTime_ = nextRefreshTime_;
+        result.storeValue_ = storeValue_;
         onBuilt();
         return result;
       }
@@ -467,14 +467,14 @@ public final class HomeResourceOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource other) {
         if (other == emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.getDefaultInstance()) return this;
-        if (other.getStoreValue() != 0) {
+        if (other.getStoreLimit() != 0) {
-          setStoreValue(other.getStoreValue());
+          setStoreLimit(other.getStoreLimit());
         }
         if (other.getNextRefreshTime() != 0) {
           setNextRefreshTime(other.getNextRefreshTime());
         }
-        if (other.getStoreLimit() != 0) {
+        if (other.getStoreValue() != 0) {
-          setStoreLimit(other.getStoreLimit());
+          setStoreValue(other.getStoreValue());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -505,33 +505,33 @@ public final class HomeResourceOuterClass {
         return this;
       }
 
-      private int storeValue_ ;
+      private int storeLimit_ ;
       /**
-       * <code>uint32 store_value = 1;</code>
+       * <code>uint32 store_limit = 1;</code>
-       * @return The storeValue.
+       * @return The storeLimit.
        */
       @java.lang.Override
-      public int getStoreValue() {
+      public int getStoreLimit() {
-        return storeValue_;
+        return storeLimit_;
       }
       /**
-       * <code>uint32 store_value = 1;</code>
+       * <code>uint32 store_limit = 1;</code>
-       * @param value The storeValue to set.
+       * @param value The storeLimit to set.
        * @return This builder for chaining.
        */
-      public Builder setStoreValue(int value) {
+      public Builder setStoreLimit(int value) {
         
-        storeValue_ = value;
+        storeLimit_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 store_value = 1;</code>
+       * <code>uint32 store_limit = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearStoreValue() {
+      public Builder clearStoreLimit() {
         
-        storeValue_ = 0;
+        storeLimit_ = 0;
         onChanged();
         return this;
       }
@@ -567,33 +567,33 @@ public final class HomeResourceOuterClass {
         return this;
       }
 
-      private int storeLimit_ ;
+      private int storeValue_ ;
       /**
-       * <code>uint32 store_limit = 3;</code>
+       * <code>uint32 store_value = 3;</code>
-       * @return The storeLimit.
+       * @return The storeValue.
        */
       @java.lang.Override
-      public int getStoreLimit() {
+      public int getStoreValue() {
-        return storeLimit_;
+        return storeValue_;
       }
       /**
-       * <code>uint32 store_limit = 3;</code>
+       * <code>uint32 store_value = 3;</code>
-       * @param value The storeLimit to set.
+       * @param value The storeValue to set.
        * @return This builder for chaining.
        */
-      public Builder setStoreLimit(int value) {
+      public Builder setStoreValue(int value) {
         
-        storeLimit_ = value;
+        storeValue_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 store_limit = 3;</code>
+       * <code>uint32 store_value = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearStoreLimit() {
+      public Builder clearStoreValue() {
         
-        storeLimit_ = 0;
+        storeValue_ = 0;
         onChanged();
         return this;
       }
@@ -665,8 +665,8 @@ public final class HomeResourceOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022HomeResource.proto\"S\n\014HomeResource\022\023\n\013" +
-      "store_value\030\001 \001(\r\022\031\n\021next_refresh_time\030\005" +
+      "store_limit\030\001 \001(\r\022\031\n\021next_refresh_time\030\005" +
-      " \001(\007\022\023\n\013store_limit\030\003 \001(\rB\033\n\031emu.grasscu" +
+      " \001(\007\022\023\n\013store_value\030\003 \001(\rB\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +678,7 @@ public final class HomeResourceOuterClass {
     internal_static_HomeResource_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeResource_descriptor,
-        new java.lang.String[] { "StoreValue", "NextRefreshTime", "StoreLimit", });
+        new java.lang.String[] { "StoreLimit", "NextRefreshTime", "StoreValue", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -70,10 +70,6 @@ public final class MapLayerInfoOuterClass {
     int getUnlockedMapLayerGroupIdList(int index);
   }
   /**
-   * <pre>
-   *obf NHFPBBLCHKH
-   * </pre>
-   *
    * Protobuf type {@code MapLayerInfo}
    */
   public static final class MapLayerInfo extends
@@ -537,10 +533,6 @@ public final class MapLayerInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     *obf NHFPBBLCHKH
-     * </pre>
-     *
      * Protobuf type {@code MapLayerInfo}
      */
     public static final class Builder extends

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

@@ -19,21 +19,21 @@ public final class PersonalLineAllDataRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+     * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-     * @return A list containing the ongoingPersonalLineList.
+     * @return A list containing the canBeUnlockedPersonalLineList.
      */
-    java.util.List<java.lang.Integer> getOngoingPersonalLineListList();
+    java.util.List<java.lang.Integer> getCanBeUnlockedPersonalLineListList();
     /**
-     * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+     * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-     * @return The count of ongoingPersonalLineList.
+     * @return The count of canBeUnlockedPersonalLineList.
      */
-    int getOngoingPersonalLineListCount();
+    int getCanBeUnlockedPersonalLineListCount();
     /**
-     * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+     * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
      * @param index The index of the element to return.
-     * @return The ongoingPersonalLineList at the given index.
+     * @return The canBeUnlockedPersonalLineList at the given index.
      */
-    int getOngoingPersonalLineList(int index);
+    int getCanBeUnlockedPersonalLineList(int index);
 
     /**
      * <code>int32 retcode = 3;</code>
@@ -54,21 +54,21 @@ public final class PersonalLineAllDataRspOuterClass {
     int getLegendaryKeyCount();
 
     /**
-     * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+     * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-     * @return A list containing the canBeUnlockedPersonalLineList.
+     * @return A list containing the ongoingPersonalLineList.
      */
-    java.util.List<java.lang.Integer> getCanBeUnlockedPersonalLineListList();
+    java.util.List<java.lang.Integer> getOngoingPersonalLineListList();
     /**
-     * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+     * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-     * @return The count of canBeUnlockedPersonalLineList.
+     * @return The count of ongoingPersonalLineList.
      */
-    int getCanBeUnlockedPersonalLineListCount();
+    int getOngoingPersonalLineListCount();
     /**
-     * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+     * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
      * @param index The index of the element to return.
-     * @return The canBeUnlockedPersonalLineList at the given index.
+     * @return The ongoingPersonalLineList at the given index.
      */
-    int getCanBeUnlockedPersonalLineList(int index);
+    int getOngoingPersonalLineList(int index);
 
     /**
      * <code>repeated .LockedPersonallineData locked_personal_line_list = 8;</code>
@@ -112,8 +112,8 @@ public final class PersonalLineAllDataRspOuterClass {
       super(builder);
     }
     private PersonalLineAllDataRsp() {
-      ongoingPersonalLineList_ = emptyIntList();
       canBeUnlockedPersonalLineList_ = emptyIntList();
+      ongoingPersonalLineList_ = emptyIntList();
       lockedPersonalLineList_ = java.util.Collections.emptyList();
     }
 
@@ -155,21 +155,21 @@ public final class PersonalLineAllDataRspOuterClass {
             }
             case 16: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                ongoingPersonalLineList_ = newIntList();
+                canBeUnlockedPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              ongoingPersonalLineList_.addInt(input.readUInt32());
+              canBeUnlockedPersonalLineList_.addInt(input.readUInt32());
               break;
             }
             case 18: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                ongoingPersonalLineList_ = newIntList();
+                canBeUnlockedPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                ongoingPersonalLineList_.addInt(input.readUInt32());
+                canBeUnlockedPersonalLineList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -181,21 +181,21 @@ public final class PersonalLineAllDataRspOuterClass {
             }
             case 48: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                canBeUnlockedPersonalLineList_ = newIntList();
+                ongoingPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              canBeUnlockedPersonalLineList_.addInt(input.readUInt32());
+              ongoingPersonalLineList_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                canBeUnlockedPersonalLineList_ = newIntList();
+                ongoingPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                canBeUnlockedPersonalLineList_.addInt(input.readUInt32());
+                ongoingPersonalLineList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -230,10 +230,10 @@ public final class PersonalLineAllDataRspOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          ongoingPersonalLineList_.makeImmutable(); // C
+          canBeUnlockedPersonalLineList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          canBeUnlockedPersonalLineList_.makeImmutable(); // C
+          ongoingPersonalLineList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
           lockedPersonalLineList_ = java.util.Collections.unmodifiableList(lockedPersonalLineList_);
@@ -255,33 +255,33 @@ public final class PersonalLineAllDataRspOuterClass {
               emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.class, emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.Builder.class);
     }
 
-    public static final int ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER = 2;
+    public static final int CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 2;
-    private com.google.protobuf.Internal.IntList ongoingPersonalLineList_;
+    private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_;
     /**
-     * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+     * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-     * @return A list containing the ongoingPersonalLineList.
+     * @return A list containing the canBeUnlockedPersonalLineList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getOngoingPersonalLineListList() {
+        getCanBeUnlockedPersonalLineListList() {
-      return ongoingPersonalLineList_;
+      return canBeUnlockedPersonalLineList_;
     }
     /**
-     * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+     * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-     * @return The count of ongoingPersonalLineList.
+     * @return The count of canBeUnlockedPersonalLineList.
      */
-    public int getOngoingPersonalLineListCount() {
+    public int getCanBeUnlockedPersonalLineListCount() {
-      return ongoingPersonalLineList_.size();
+      return canBeUnlockedPersonalLineList_.size();
     }
     /**
-     * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+     * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
      * @param index The index of the element to return.
-     * @return The ongoingPersonalLineList at the given index.
+     * @return The canBeUnlockedPersonalLineList at the given index.
      */
-    public int getOngoingPersonalLineList(int index) {
+    public int getCanBeUnlockedPersonalLineList(int index) {
-      return ongoingPersonalLineList_.getInt(index);
+      return canBeUnlockedPersonalLineList_.getInt(index);
     }
-    private int ongoingPersonalLineListMemoizedSerializedSize = -1;
+    private int canBeUnlockedPersonalLineListMemoizedSerializedSize = -1;
 
     public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
@@ -316,33 +316,33 @@ public final class PersonalLineAllDataRspOuterClass {
       return legendaryKeyCount_;
     }
 
-    public static final int CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 6;
+    public static final int ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_;
+    private com.google.protobuf.Internal.IntList ongoingPersonalLineList_;
     /**
-     * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+     * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-     * @return A list containing the canBeUnlockedPersonalLineList.
+     * @return A list containing the ongoingPersonalLineList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getCanBeUnlockedPersonalLineListList() {
+        getOngoingPersonalLineListList() {
-      return canBeUnlockedPersonalLineList_;
+      return ongoingPersonalLineList_;
     }
     /**
-     * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+     * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-     * @return The count of canBeUnlockedPersonalLineList.
+     * @return The count of ongoingPersonalLineList.
      */
-    public int getCanBeUnlockedPersonalLineListCount() {
+    public int getOngoingPersonalLineListCount() {
-      return canBeUnlockedPersonalLineList_.size();
+      return ongoingPersonalLineList_.size();
     }
     /**
-     * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+     * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
      * @param index The index of the element to return.
-     * @return The canBeUnlockedPersonalLineList at the given index.
+     * @return The ongoingPersonalLineList at the given index.
      */
-    public int getCanBeUnlockedPersonalLineList(int index) {
+    public int getOngoingPersonalLineList(int index) {
-      return canBeUnlockedPersonalLineList_.getInt(index);
+      return ongoingPersonalLineList_.getInt(index);
     }
-    private int canBeUnlockedPersonalLineListMemoizedSerializedSize = -1;
+    private int ongoingPersonalLineListMemoizedSerializedSize = -1;
 
     public static final int LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData> lockedPersonalLineList_;
@@ -402,23 +402,23 @@ public final class PersonalLineAllDataRspOuterClass {
       if (legendaryKeyCount_ != 0) {
         output.writeUInt32(1, legendaryKeyCount_);
       }
-      if (getOngoingPersonalLineListList().size() > 0) {
-        output.writeUInt32NoTag(18);
-        output.writeUInt32NoTag(ongoingPersonalLineListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < ongoingPersonalLineList_.size(); i++) {
-        output.writeUInt32NoTag(ongoingPersonalLineList_.getInt(i));
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
-      }
       if (getCanBeUnlockedPersonalLineListList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(18);
         output.writeUInt32NoTag(canBeUnlockedPersonalLineListMemoizedSerializedSize);
       }
       for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) {
         output.writeUInt32NoTag(canBeUnlockedPersonalLineList_.getInt(i));
       }
+      if (retcode_ != 0) {
+        output.writeInt32(3, retcode_);
+      }
+      if (getOngoingPersonalLineListList().size() > 0) {
+        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(ongoingPersonalLineListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < ongoingPersonalLineList_.size(); i++) {
+        output.writeUInt32NoTag(ongoingPersonalLineList_.getInt(i));
+      }
       for (int i = 0; i < lockedPersonalLineList_.size(); i++) {
         output.writeMessage(8, lockedPersonalLineList_.get(i));
       }
@@ -438,24 +438,6 @@ public final class PersonalLineAllDataRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1, legendaryKeyCount_);
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < ongoingPersonalLineList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(ongoingPersonalLineList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getOngoingPersonalLineListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        ongoingPersonalLineListMemoizedSerializedSize = dataSize;
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) {
@@ -470,6 +452,24 @@ public final class PersonalLineAllDataRspOuterClass {
         }
         canBeUnlockedPersonalLineListMemoizedSerializedSize = dataSize;
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(3, retcode_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < ongoingPersonalLineList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(ongoingPersonalLineList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getOngoingPersonalLineListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        ongoingPersonalLineListMemoizedSerializedSize = dataSize;
+      }
       for (int i = 0; i < lockedPersonalLineList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, lockedPersonalLineList_.get(i));
@@ -493,16 +493,16 @@ public final class PersonalLineAllDataRspOuterClass {
       }
       emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp other = (emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp) obj;
 
-      if (!getOngoingPersonalLineListList()
+      if (!getCanBeUnlockedPersonalLineListList()
-          .equals(other.getOngoingPersonalLineListList())) return false;
+          .equals(other.getCanBeUnlockedPersonalLineListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getCurFinishedDailyTaskCount()
           != other.getCurFinishedDailyTaskCount()) return false;
       if (getLegendaryKeyCount()
           != other.getLegendaryKeyCount()) return false;
-      if (!getCanBeUnlockedPersonalLineListList()
+      if (!getOngoingPersonalLineListList()
-          .equals(other.getCanBeUnlockedPersonalLineListList())) return false;
+          .equals(other.getOngoingPersonalLineListList())) return false;
       if (!getLockedPersonalLineListList()
           .equals(other.getLockedPersonalLineListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -516,9 +516,9 @@ public final class PersonalLineAllDataRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getOngoingPersonalLineListCount() > 0) {
+      if (getCanBeUnlockedPersonalLineListCount() > 0) {
-        hash = (37 * hash) + ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER;
+        hash = (37 * hash) + CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getOngoingPersonalLineListList().hashCode();
+        hash = (53 * hash) + getCanBeUnlockedPersonalLineListList().hashCode();
       }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
@@ -526,9 +526,9 @@ public final class PersonalLineAllDataRspOuterClass {
       hash = (53 * hash) + getCurFinishedDailyTaskCount();
       hash = (37 * hash) + LEGENDARY_KEY_COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getLegendaryKeyCount();
-      if (getCanBeUnlockedPersonalLineListCount() > 0) {
+      if (getOngoingPersonalLineListCount() > 0) {
-        hash = (37 * hash) + CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER;
+        hash = (37 * hash) + ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getCanBeUnlockedPersonalLineListList().hashCode();
+        hash = (53 * hash) + getOngoingPersonalLineListList().hashCode();
       }
       if (getLockedPersonalLineListCount() > 0) {
         hash = (37 * hash) + LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER;
@@ -673,7 +673,7 @@ public final class PersonalLineAllDataRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        ongoingPersonalLineList_ = emptyIntList();
+        canBeUnlockedPersonalLineList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
 
@@ -681,7 +681,7 @@ public final class PersonalLineAllDataRspOuterClass {
 
         legendaryKeyCount_ = 0;
 
-        canBeUnlockedPersonalLineList_ = emptyIntList();
+        ongoingPersonalLineList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         if (lockedPersonalLineListBuilder_ == null) {
           lockedPersonalLineList_ = java.util.Collections.emptyList();
@@ -717,18 +717,18 @@ public final class PersonalLineAllDataRspOuterClass {
         emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp result = new emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          ongoingPersonalLineList_.makeImmutable();
+          canBeUnlockedPersonalLineList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.ongoingPersonalLineList_ = ongoingPersonalLineList_;
+        result.canBeUnlockedPersonalLineList_ = canBeUnlockedPersonalLineList_;
         result.retcode_ = retcode_;
         result.curFinishedDailyTaskCount_ = curFinishedDailyTaskCount_;
         result.legendaryKeyCount_ = legendaryKeyCount_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          canBeUnlockedPersonalLineList_.makeImmutable();
+          ongoingPersonalLineList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.canBeUnlockedPersonalLineList_ = canBeUnlockedPersonalLineList_;
+        result.ongoingPersonalLineList_ = ongoingPersonalLineList_;
         if (lockedPersonalLineListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
             lockedPersonalLineList_ = java.util.Collections.unmodifiableList(lockedPersonalLineList_);
@@ -786,13 +786,13 @@ public final class PersonalLineAllDataRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp other) {
         if (other == emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.getDefaultInstance()) return this;
-        if (!other.ongoingPersonalLineList_.isEmpty()) {
+        if (!other.canBeUnlockedPersonalLineList_.isEmpty()) {
-          if (ongoingPersonalLineList_.isEmpty()) {
+          if (canBeUnlockedPersonalLineList_.isEmpty()) {
-            ongoingPersonalLineList_ = other.ongoingPersonalLineList_;
+            canBeUnlockedPersonalLineList_ = other.canBeUnlockedPersonalLineList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureOngoingPersonalLineListIsMutable();
+            ensureCanBeUnlockedPersonalLineListIsMutable();
-            ongoingPersonalLineList_.addAll(other.ongoingPersonalLineList_);
+            canBeUnlockedPersonalLineList_.addAll(other.canBeUnlockedPersonalLineList_);
           }
           onChanged();
         }
@@ -805,13 +805,13 @@ public final class PersonalLineAllDataRspOuterClass {
         if (other.getLegendaryKeyCount() != 0) {
           setLegendaryKeyCount(other.getLegendaryKeyCount());
         }
-        if (!other.canBeUnlockedPersonalLineList_.isEmpty()) {
+        if (!other.ongoingPersonalLineList_.isEmpty()) {
-          if (canBeUnlockedPersonalLineList_.isEmpty()) {
+          if (ongoingPersonalLineList_.isEmpty()) {
-            canBeUnlockedPersonalLineList_ = other.canBeUnlockedPersonalLineList_;
+            ongoingPersonalLineList_ = other.ongoingPersonalLineList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureCanBeUnlockedPersonalLineListIsMutable();
+            ensureOngoingPersonalLineListIsMutable();
-            canBeUnlockedPersonalLineList_.addAll(other.canBeUnlockedPersonalLineList_);
+            ongoingPersonalLineList_.addAll(other.ongoingPersonalLineList_);
           }
           onChanged();
         }
@@ -871,80 +871,80 @@ public final class PersonalLineAllDataRspOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList ongoingPersonalLineList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_ = emptyIntList();
-      private void ensureOngoingPersonalLineListIsMutable() {
+      private void ensureCanBeUnlockedPersonalLineListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          ongoingPersonalLineList_ = mutableCopy(ongoingPersonalLineList_);
+          canBeUnlockedPersonalLineList_ = mutableCopy(canBeUnlockedPersonalLineList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+       * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-       * @return A list containing the ongoingPersonalLineList.
+       * @return A list containing the canBeUnlockedPersonalLineList.
        */
       public java.util.List<java.lang.Integer>
-          getOngoingPersonalLineListList() {
+          getCanBeUnlockedPersonalLineListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(ongoingPersonalLineList_) : ongoingPersonalLineList_;
+                 java.util.Collections.unmodifiableList(canBeUnlockedPersonalLineList_) : canBeUnlockedPersonalLineList_;
       }
       /**
-       * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+       * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-       * @return The count of ongoingPersonalLineList.
+       * @return The count of canBeUnlockedPersonalLineList.
        */
-      public int getOngoingPersonalLineListCount() {
+      public int getCanBeUnlockedPersonalLineListCount() {
-        return ongoingPersonalLineList_.size();
+        return canBeUnlockedPersonalLineList_.size();
       }
       /**
-       * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+       * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
        * @param index The index of the element to return.
-       * @return The ongoingPersonalLineList at the given index.
+       * @return The canBeUnlockedPersonalLineList at the given index.
        */
-      public int getOngoingPersonalLineList(int index) {
+      public int getCanBeUnlockedPersonalLineList(int index) {
-        return ongoingPersonalLineList_.getInt(index);
+        return canBeUnlockedPersonalLineList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+       * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
        * @param index The index to set the value at.
-       * @param value The ongoingPersonalLineList to set.
+       * @param value The canBeUnlockedPersonalLineList to set.
        * @return This builder for chaining.
        */
-      public Builder setOngoingPersonalLineList(
+      public Builder setCanBeUnlockedPersonalLineList(
           int index, int value) {
-        ensureOngoingPersonalLineListIsMutable();
+        ensureCanBeUnlockedPersonalLineListIsMutable();
-        ongoingPersonalLineList_.setInt(index, value);
+        canBeUnlockedPersonalLineList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+       * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-       * @param value The ongoingPersonalLineList to add.
+       * @param value The canBeUnlockedPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addOngoingPersonalLineList(int value) {
+      public Builder addCanBeUnlockedPersonalLineList(int value) {
-        ensureOngoingPersonalLineListIsMutable();
+        ensureCanBeUnlockedPersonalLineListIsMutable();
-        ongoingPersonalLineList_.addInt(value);
+        canBeUnlockedPersonalLineList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+       * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
-       * @param values The ongoingPersonalLineList to add.
+       * @param values The canBeUnlockedPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllOngoingPersonalLineList(
+      public Builder addAllCanBeUnlockedPersonalLineList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureOngoingPersonalLineListIsMutable();
+        ensureCanBeUnlockedPersonalLineListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, ongoingPersonalLineList_);
+            values, canBeUnlockedPersonalLineList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 ongoing_personal_line_list = 2;</code>
+       * <code>repeated uint32 can_be_unlocked_personal_line_list = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOngoingPersonalLineList() {
+      public Builder clearCanBeUnlockedPersonalLineList() {
-        ongoingPersonalLineList_ = emptyIntList();
+        canBeUnlockedPersonalLineList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -1043,80 +1043,80 @@ public final class PersonalLineAllDataRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList ongoingPersonalLineList_ = emptyIntList();
-      private void ensureCanBeUnlockedPersonalLineListIsMutable() {
+      private void ensureOngoingPersonalLineListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          canBeUnlockedPersonalLineList_ = mutableCopy(canBeUnlockedPersonalLineList_);
+          ongoingPersonalLineList_ = mutableCopy(ongoingPersonalLineList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+       * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-       * @return A list containing the canBeUnlockedPersonalLineList.
+       * @return A list containing the ongoingPersonalLineList.
        */
       public java.util.List<java.lang.Integer>
-          getCanBeUnlockedPersonalLineListList() {
+          getOngoingPersonalLineListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(canBeUnlockedPersonalLineList_) : canBeUnlockedPersonalLineList_;
+                 java.util.Collections.unmodifiableList(ongoingPersonalLineList_) : ongoingPersonalLineList_;
       }
       /**
-       * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+       * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-       * @return The count of canBeUnlockedPersonalLineList.
+       * @return The count of ongoingPersonalLineList.
        */
-      public int getCanBeUnlockedPersonalLineListCount() {
+      public int getOngoingPersonalLineListCount() {
-        return canBeUnlockedPersonalLineList_.size();
+        return ongoingPersonalLineList_.size();
       }
       /**
-       * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+       * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
        * @param index The index of the element to return.
-       * @return The canBeUnlockedPersonalLineList at the given index.
+       * @return The ongoingPersonalLineList at the given index.
        */
-      public int getCanBeUnlockedPersonalLineList(int index) {
+      public int getOngoingPersonalLineList(int index) {
-        return canBeUnlockedPersonalLineList_.getInt(index);
+        return ongoingPersonalLineList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+       * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
        * @param index The index to set the value at.
-       * @param value The canBeUnlockedPersonalLineList to set.
+       * @param value The ongoingPersonalLineList to set.
        * @return This builder for chaining.
        */
-      public Builder setCanBeUnlockedPersonalLineList(
+      public Builder setOngoingPersonalLineList(
           int index, int value) {
-        ensureCanBeUnlockedPersonalLineListIsMutable();
+        ensureOngoingPersonalLineListIsMutable();
-        canBeUnlockedPersonalLineList_.setInt(index, value);
+        ongoingPersonalLineList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+       * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-       * @param value The canBeUnlockedPersonalLineList to add.
+       * @param value The ongoingPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addCanBeUnlockedPersonalLineList(int value) {
+      public Builder addOngoingPersonalLineList(int value) {
-        ensureCanBeUnlockedPersonalLineListIsMutable();
+        ensureOngoingPersonalLineListIsMutable();
-        canBeUnlockedPersonalLineList_.addInt(value);
+        ongoingPersonalLineList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+       * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
-       * @param values The canBeUnlockedPersonalLineList to add.
+       * @param values The ongoingPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllCanBeUnlockedPersonalLineList(
+      public Builder addAllOngoingPersonalLineList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureCanBeUnlockedPersonalLineListIsMutable();
+        ensureOngoingPersonalLineListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, canBeUnlockedPersonalLineList_);
+            values, ongoingPersonalLineList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 can_be_unlocked_personal_line_list = 6;</code>
+       * <code>repeated uint32 ongoing_personal_line_list = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCanBeUnlockedPersonalLineList() {
+      public Builder clearOngoingPersonalLineList() {
-        canBeUnlockedPersonalLineList_ = emptyIntList();
+        ongoingPersonalLineList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1430,10 +1430,10 @@ public final class PersonalLineAllDataRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034PersonalLineAllDataRsp.proto\032\034LockedPe" +
       "rsonallineData.proto\"\371\001\n\026PersonalLineAll" +
-      "DataRsp\022\"\n\032ongoing_personal_line_list\030\002 " +
+      "DataRsp\022*\n\"can_be_unlocked_personal_line" +
-      "\003(\r\022\017\n\007retcode\030\003 \001(\005\022%\n\035cur_finished_dai" +
+      "_list\030\002 \003(\r\022\017\n\007retcode\030\003 \001(\005\022%\n\035cur_fini" +
-      "ly_task_count\030\013 \001(\r\022\033\n\023legendary_key_cou" +
+      "shed_daily_task_count\030\013 \001(\r\022\033\n\023legendary" +
-      "nt\030\001 \001(\r\022*\n\"can_be_unlocked_personal_lin" +
+      "_key_count\030\001 \001(\r\022\"\n\032ongoing_personal_lin" +
       "e_list\030\006 \003(\r\022:\n\031locked_personal_line_lis" +
       "t\030\010 \003(\0132\027.LockedPersonallineDataB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
@@ -1448,7 +1448,7 @@ public final class PersonalLineAllDataRspOuterClass {
     internal_static_PersonalLineAllDataRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PersonalLineAllDataRsp_descriptor,
-        new java.lang.String[] { "OngoingPersonalLineList", "Retcode", "CurFinishedDailyTaskCount", "LegendaryKeyCount", "CanBeUnlockedPersonalLineList", "LockedPersonalLineList", });
+        new java.lang.String[] { "CanBeUnlockedPersonalLineList", "Retcode", "CurFinishedDailyTaskCount", "LegendaryKeyCount", "OngoingPersonalLineList", "LockedPersonalLineList", });
     emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.getDescriptor();
   }
 

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

@@ -0,0 +1,545 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: PlayerEnterChildMapLayerNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class PlayerEnterChildMapLayerNotifyOuterClass {
+  private PlayerEnterChildMapLayerNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface PlayerEnterChildMapLayerNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:PlayerEnterChildMapLayerNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 layer_id = 10;</code>
+     * @return The layerId.
+     */
+    int getLayerId();
+  }
+  /**
+   * <pre>
+   * CmdId: 2225
+   * </pre>
+   *
+   * Protobuf type {@code PlayerEnterChildMapLayerNotify}
+   */
+  public static final class PlayerEnterChildMapLayerNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:PlayerEnterChildMapLayerNotify)
+      PlayerEnterChildMapLayerNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use PlayerEnterChildMapLayerNotify.newBuilder() to construct.
+    private PlayerEnterChildMapLayerNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private PlayerEnterChildMapLayerNotify() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new PlayerEnterChildMapLayerNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PlayerEnterChildMapLayerNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 80: {
+
+              layerId_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.Builder.class);
+    }
+
+    public static final int LAYER_ID_FIELD_NUMBER = 10;
+    private int layerId_;
+    /**
+     * <code>uint32 layer_id = 10;</code>
+     * @return The layerId.
+     */
+    @java.lang.Override
+    public int getLayerId() {
+      return layerId_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (layerId_ != 0) {
+        output.writeUInt32(10, layerId_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (layerId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, layerId_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify other = (emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify) obj;
+
+      if (getLayerId()
+          != other.getLayerId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + LAYER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getLayerId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 2225
+     * </pre>
+     *
+     * Protobuf type {@code PlayerEnterChildMapLayerNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:PlayerEnterChildMapLayerNotify)
+        emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        layerId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify build() {
+        emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify buildPartial() {
+        emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify result = new emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify(this);
+        result.layerId_ = layerId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify other) {
+        if (other == emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.getDefaultInstance()) return this;
+        if (other.getLayerId() != 0) {
+          setLayerId(other.getLayerId());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int layerId_ ;
+      /**
+       * <code>uint32 layer_id = 10;</code>
+       * @return The layerId.
+       */
+      @java.lang.Override
+      public int getLayerId() {
+        return layerId_;
+      }
+      /**
+       * <code>uint32 layer_id = 10;</code>
+       * @param value The layerId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLayerId(int value) {
+        
+        layerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 layer_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLayerId() {
+        
+        layerId_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:PlayerEnterChildMapLayerNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:PlayerEnterChildMapLayerNotify)
+    private static final emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify();
+    }
+
+    public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<PlayerEnterChildMapLayerNotify>
+        PARSER = new com.google.protobuf.AbstractParser<PlayerEnterChildMapLayerNotify>() {
+      @java.lang.Override
+      public PlayerEnterChildMapLayerNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PlayerEnterChildMapLayerNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PlayerEnterChildMapLayerNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PlayerEnterChildMapLayerNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_PlayerEnterChildMapLayerNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n$PlayerEnterChildMapLayerNotify.proto\"2" +
+      "\n\036PlayerEnterChildMapLayerNotify\022\020\n\010laye" +
+      "r_id\030\n \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_PlayerEnterChildMapLayerNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_PlayerEnterChildMapLayerNotify_descriptor,
+        new java.lang.String[] { "LayerId", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -0,0 +1,544 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: PlayerEnterMapLayerNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class PlayerEnterMapLayerNotifyOuterClass {
+  private PlayerEnterMapLayerNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface PlayerEnterMapLayerNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:PlayerEnterMapLayerNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 layer_id = 13;</code>
+     * @return The layerId.
+     */
+    int getLayerId();
+  }
+  /**
+   * <pre>
+   * CmdId: 26672
+   * </pre>
+   *
+   * Protobuf type {@code PlayerEnterMapLayerNotify}
+   */
+  public static final class PlayerEnterMapLayerNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:PlayerEnterMapLayerNotify)
+      PlayerEnterMapLayerNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use PlayerEnterMapLayerNotify.newBuilder() to construct.
+    private PlayerEnterMapLayerNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private PlayerEnterMapLayerNotify() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new PlayerEnterMapLayerNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PlayerEnterMapLayerNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 104: {
+
+              layerId_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.Builder.class);
+    }
+
+    public static final int LAYER_ID_FIELD_NUMBER = 13;
+    private int layerId_;
+    /**
+     * <code>uint32 layer_id = 13;</code>
+     * @return The layerId.
+     */
+    @java.lang.Override
+    public int getLayerId() {
+      return layerId_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (layerId_ != 0) {
+        output.writeUInt32(13, layerId_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (layerId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, layerId_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify other = (emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify) obj;
+
+      if (getLayerId()
+          != other.getLayerId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + LAYER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getLayerId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 26672
+     * </pre>
+     *
+     * Protobuf type {@code PlayerEnterMapLayerNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:PlayerEnterMapLayerNotify)
+        emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        layerId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify build() {
+        emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify buildPartial() {
+        emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify result = new emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify(this);
+        result.layerId_ = layerId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify other) {
+        if (other == emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.getDefaultInstance()) return this;
+        if (other.getLayerId() != 0) {
+          setLayerId(other.getLayerId());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int layerId_ ;
+      /**
+       * <code>uint32 layer_id = 13;</code>
+       * @return The layerId.
+       */
+      @java.lang.Override
+      public int getLayerId() {
+        return layerId_;
+      }
+      /**
+       * <code>uint32 layer_id = 13;</code>
+       * @param value The layerId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLayerId(int value) {
+        
+        layerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 layer_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLayerId() {
+        
+        layerId_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:PlayerEnterMapLayerNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:PlayerEnterMapLayerNotify)
+    private static final emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify();
+    }
+
+    public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<PlayerEnterMapLayerNotify>
+        PARSER = new com.google.protobuf.AbstractParser<PlayerEnterMapLayerNotify>() {
+      @java.lang.Override
+      public PlayerEnterMapLayerNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PlayerEnterMapLayerNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PlayerEnterMapLayerNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PlayerEnterMapLayerNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_PlayerEnterMapLayerNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\037PlayerEnterMapLayerNotify.proto\"-\n\031Pla" +
+      "yerEnterMapLayerNotify\022\020\n\010layer_id\030\r \001(\r" +
+      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_PlayerEnterMapLayerNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_PlayerEnterMapLayerNotify_descriptor,
+        new java.lang.String[] { "LayerId", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -31,19 +31,19 @@ public final class PlayerEnterSceneNotifyOuterClass {
         getSceneTransactionBytes();
 
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return Whether the dCGPONECHMM field is set.
+     * @return Whether the mapLayerInfo field is set.
      */
-    boolean hasDCGPONECHMM();
+    boolean hasMapLayerInfo();
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return The dCGPONECHMM.
+     * @return The mapLayerInfo.
      */
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM();
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo();
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+     * <code>.MapLayerInfo map_layer_info = 897;</code>
      */
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder();
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder();
 
     /**
      * <code>bool is_skip_ui = 3;</code>
@@ -339,14 +339,14 @@ public final class PlayerEnterSceneNotifyOuterClass {
               break;
             }
             case 7178: {
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder subBuilder = null;
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null;
-              if (dCGPONECHMM_ != null) {
+              if (mapLayerInfo_ != null) {
-                subBuilder = dCGPONECHMM_.toBuilder();
+                subBuilder = mapLayerInfo_.toBuilder();
               }
-              dCGPONECHMM_ = input.readMessage(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.parser(), extensionRegistry);
+              mapLayerInfo_ = input.readMessage(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(dCGPONECHMM_);
+                subBuilder.mergeFrom(mapLayerInfo_);
-                dCGPONECHMM_ = subBuilder.buildPartial();
+                mapLayerInfo_ = subBuilder.buildPartial();
               }
 
               break;
@@ -445,30 +445,30 @@ public final class PlayerEnterSceneNotifyOuterClass {
       }
     }
 
-    public static final int DCGPONECHMM_FIELD_NUMBER = 897;
+    public static final int MAP_LAYER_INFO_FIELD_NUMBER = 897;
-    private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_;
+    private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return Whether the dCGPONECHMM field is set.
+     * @return Whether the mapLayerInfo field is set.
      */
     @java.lang.Override
-    public boolean hasDCGPONECHMM() {
+    public boolean hasMapLayerInfo() {
-      return dCGPONECHMM_ != null;
+      return mapLayerInfo_ != null;
     }
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return The dCGPONECHMM.
+     * @return The mapLayerInfo.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() {
+    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
-      return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
+      return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
     }
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+     * <code>.MapLayerInfo map_layer_info = 897;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() {
+    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
-      return getDCGPONECHMM();
+      return getMapLayerInfo();
     }
 
     public static final int IS_SKIP_UI_FIELD_NUMBER = 3;
@@ -774,8 +774,8 @@ public final class PlayerEnterSceneNotifyOuterClass {
       if (enterReason_ != 0) {
         output.writeUInt32(670, enterReason_);
       }
-      if (dCGPONECHMM_ != null) {
+      if (mapLayerInfo_ != null) {
-        output.writeMessage(897, getDCGPONECHMM());
+        output.writeMessage(897, getMapLayerInfo());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1319, sceneTransaction_);
@@ -864,9 +864,9 @@ public final class PlayerEnterSceneNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(670, enterReason_);
       }
-      if (dCGPONECHMM_ != null) {
+      if (mapLayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(897, getDCGPONECHMM());
+          .computeMessageSize(897, getMapLayerInfo());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1319, sceneTransaction_);
@@ -900,10 +900,10 @@ public final class PlayerEnterSceneNotifyOuterClass {
 
       if (!getSceneTransaction()
           .equals(other.getSceneTransaction())) return false;
-      if (hasDCGPONECHMM() != other.hasDCGPONECHMM()) return false;
+      if (hasMapLayerInfo() != other.hasMapLayerInfo()) return false;
-      if (hasDCGPONECHMM()) {
+      if (hasMapLayerInfo()) {
-        if (!getDCGPONECHMM()
+        if (!getMapLayerInfo()
-            .equals(other.getDCGPONECHMM())) return false;
+            .equals(other.getMapLayerInfo())) return false;
       }
       if (getIsSkipUi()
           != other.getIsSkipUi()) return false;
@@ -957,9 +957,9 @@ public final class PlayerEnterSceneNotifyOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + SCENE_TRANSACTION_FIELD_NUMBER;
       hash = (53 * hash) + getSceneTransaction().hashCode();
-      if (hasDCGPONECHMM()) {
+      if (hasMapLayerInfo()) {
-        hash = (37 * hash) + DCGPONECHMM_FIELD_NUMBER;
+        hash = (37 * hash) + MAP_LAYER_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getDCGPONECHMM().hashCode();
+        hash = (53 * hash) + getMapLayerInfo().hashCode();
       }
       hash = (37 * hash) + IS_SKIP_UI_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
@@ -1144,11 +1144,11 @@ public final class PlayerEnterSceneNotifyOuterClass {
         super.clear();
         sceneTransaction_ = "";
 
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
         } else {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
-          dCGPONECHMMBuilder_ = null;
+          mapLayerInfoBuilder_ = null;
         }
         isSkipUi_ = false;
 
@@ -1220,10 +1220,10 @@ public final class PlayerEnterSceneNotifyOuterClass {
         emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify result = new emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify(this);
         int from_bitField0_ = bitField0_;
         result.sceneTransaction_ = sceneTransaction_;
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          result.dCGPONECHMM_ = dCGPONECHMM_;
+          result.mapLayerInfo_ = mapLayerInfo_;
         } else {
-          result.dCGPONECHMM_ = dCGPONECHMMBuilder_.build();
+          result.mapLayerInfo_ = mapLayerInfoBuilder_.build();
         }
         result.isSkipUi_ = isSkipUi_;
         result.prevSceneId_ = prevSceneId_;
@@ -1306,8 +1306,8 @@ public final class PlayerEnterSceneNotifyOuterClass {
           sceneTransaction_ = other.sceneTransaction_;
           onChanged();
         }
-        if (other.hasDCGPONECHMM()) {
+        if (other.hasMapLayerInfo()) {
-          mergeDCGPONECHMM(other.getDCGPONECHMM());
+          mergeMapLayerInfo(other.getMapLayerInfo());
         }
         if (other.getIsSkipUi() != false) {
           setIsSkipUi(other.getIsSkipUi());
@@ -1473,123 +1473,123 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_;
+      private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> dCGPONECHMMBuilder_;
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> mapLayerInfoBuilder_;
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
-       * @return Whether the dCGPONECHMM field is set.
+       * @return Whether the mapLayerInfo field is set.
        */
-      public boolean hasDCGPONECHMM() {
+      public boolean hasMapLayerInfo() {
-        return dCGPONECHMMBuilder_ != null || dCGPONECHMM_ != null;
+        return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
-       * @return The dCGPONECHMM.
+       * @return The mapLayerInfo.
        */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() {
+      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
+          return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
         } else {
-          return dCGPONECHMMBuilder_.getMessage();
+          return mapLayerInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
        */
-      public Builder setDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) {
+      public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          dCGPONECHMM_ = value;
+          mapLayerInfo_ = value;
           onChanged();
         } else {
-          dCGPONECHMMBuilder_.setMessage(value);
+          mapLayerInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
        */
-      public Builder setDCGPONECHMM(
+      public Builder setMapLayerInfo(
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder builderForValue) {
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder builderForValue) {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMM_ = builderForValue.build();
+          mapLayerInfo_ = builderForValue.build();
           onChanged();
         } else {
-          dCGPONECHMMBuilder_.setMessage(builderForValue.build());
+          mapLayerInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
        */
-      public Builder mergeDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) {
+      public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          if (dCGPONECHMM_ != null) {
+          if (mapLayerInfo_ != null) {
-            dCGPONECHMM_ =
+            mapLayerInfo_ =
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.newBuilder(dCGPONECHMM_).mergeFrom(value).buildPartial();
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.newBuilder(mapLayerInfo_).mergeFrom(value).buildPartial();
           } else {
-            dCGPONECHMM_ = value;
+            mapLayerInfo_ = value;
           }
           onChanged();
         } else {
-          dCGPONECHMMBuilder_.mergeFrom(value);
+          mapLayerInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
        */
-      public Builder clearDCGPONECHMM() {
+      public Builder clearMapLayerInfo() {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
           onChanged();
         } else {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
-          dCGPONECHMMBuilder_ = null;
+          mapLayerInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
        */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder getDCGPONECHMMBuilder() {
+      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() {
         
         onChanged();
-        return getDCGPONECHMMFieldBuilder().getBuilder();
+        return getMapLayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
        */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() {
+      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
-        if (dCGPONECHMMBuilder_ != null) {
+        if (mapLayerInfoBuilder_ != null) {
-          return dCGPONECHMMBuilder_.getMessageOrBuilder();
+          return mapLayerInfoBuilder_.getMessageOrBuilder();
         } else {
-          return dCGPONECHMM_ == null ?
+          return mapLayerInfo_ == null ?
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
         }
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 897;</code>
+       * <code>.MapLayerInfo map_layer_info = 897;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> 
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> 
-          getDCGPONECHMMFieldBuilder() {
+          getMapLayerInfoFieldBuilder() {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMMBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          mapLayerInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder>(
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder>(
-                  getDCGPONECHMM(),
+                  getMapLayerInfo(),
                   getParentForChildren(),
                   isClean());
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
         }
-        return dCGPONECHMMBuilder_;
+        return mapLayerInfoBuilder_;
       }
 
       private boolean isSkipUi_ ;
@@ -2432,27 +2432,27 @@ public final class PlayerEnterSceneNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034PlayerEnterSceneNotify.proto\032\021NHFPBBLC" +
+      "\n\034PlayerEnterSceneNotify.proto\032\022MapLayer" +
-      "HKH.proto\032\014Vector.proto\032\017EnterType.proto" +
+      "Info.proto\032\014Vector.proto\032\017EnterType.prot" +
-      "\"\360\003\n\026PlayerEnterSceneNotify\022\032\n\021scene_tra" +
+      "o\"\364\003\n\026PlayerEnterSceneNotify\022\032\n\021scene_tr" +
-      "nsaction\030\247\n \001(\t\022\"\n\013DCGPONECHMM\030\201\007 \001(\0132\014." +
+      "ansaction\030\247\n \001(\t\022&\n\016map_layer_info\030\201\007 \001(" +
-      "NHFPBBLCHKH\022\022\n\nis_skip_ui\030\003 \001(\010\022\025\n\rprev_" +
+      "\0132\r.MapLayerInfo\022\022\n\nis_skip_ui\030\003 \001(\010\022\025\n\r" +
-      "scene_id\030\t \001(\r\022#\n\032is_first_login_enter_s" +
+      "prev_scene_id\030\t \001(\r\022#\n\032is_first_login_en" +
-      "cene\030\244\001 \001(\010\022\022\n\ntarget_uid\030\001 \001(\r\022\031\n\021scene" +
+      "ter_scene\030\244\001 \001(\010\022\022\n\ntarget_uid\030\001 \001(\r\022\031\n\021" +
-      "_tag_id_list\030\r \003(\r\022\031\n\010prev_pos\030\014 \001(\0132\007.V" +
+      "scene_tag_id_list\030\r \003(\r\022\031\n\010prev_pos\030\014 \001(" +
-      "ector\022\031\n\021enter_scene_token\030\007 \001(\r\022\023\n\nworl" +
+      "\0132\007.Vector\022\031\n\021enter_scene_token\030\007 \001(\r\022\023\n" +
-      "d_type\030\257\n \001(\r\022\030\n\004type\030\006 \001(\0162\n.EnterType\022" +
+      "\nworld_type\030\257\n \001(\r\022\030\n\004type\030\006 \001(\0162\n.Enter" +
-      "\025\n\014enter_reason\030\236\005 \001(\r\022\024\n\003pos\030\016 \001(\0132\007.Ve" +
+      "Type\022\025\n\014enter_reason\030\236\005 \001(\r\022\024\n\003pos\030\016 \001(\013" +
-      "ctor\022\030\n\020scene_begin_time\030\005 \001(\004\022\024\n\013LAJGLC" +
+      "2\007.Vector\022\030\n\020scene_begin_time\030\005 \001(\004\022\024\n\013L" +
-      "IFKCP\030\234\016 \001(\r\022\023\n\013world_level\030\004 \001(\r\022\022\n\ndun" +
+      "AJGLCIFKCP\030\234\016 \001(\r\022\023\n\013world_level\030\004 \001(\r\022\022" +
-      "geon_id\030\013 \001(\r\022\020\n\010scene_id\030\n \001(\r\022\032\n\021creat" +
+      "\n\ndungeon_id\030\013 \001(\r\022\020\n\010scene_id\030\n \001(\r\022\032\n\021" +
-      "e_player_uid\030\324\r \001(\rB\033\n\031emu.grasscutter.n" +
+      "create_player_uid\030\324\r \001(\rB\033\n\031emu.grasscut" +
-      "et.protob\006proto3"
+      "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.EnterTypeOuterClass.getDescriptor(),
         });
@@ -2461,8 +2461,8 @@ public final class PlayerEnterSceneNotifyOuterClass {
     internal_static_PlayerEnterSceneNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerEnterSceneNotify_descriptor,
-        new java.lang.String[] { "SceneTransaction", "DCGPONECHMM", "IsSkipUi", "PrevSceneId", "IsFirstLoginEnterScene", "TargetUid", "SceneTagIdList", "PrevPos", "EnterSceneToken", "WorldType", "Type", "EnterReason", "Pos", "SceneBeginTime", "LAJGLCIFKCP", "WorldLevel", "DungeonId", "SceneId", "CreatePlayerUid", });
+        new java.lang.String[] { "SceneTransaction", "MapLayerInfo", "IsSkipUi", "PrevSceneId", "IsFirstLoginEnterScene", "TargetUid", "SceneTagIdList", "PrevPos", "EnterSceneToken", "WorldType", "Type", "EnterReason", "Pos", "SceneBeginTime", "LAJGLCIFKCP", "WorldLevel", "DungeonId", "SceneId", "CreatePlayerUid", });
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.EnterTypeOuterClass.getDescriptor();
   }

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

@@ -19,39 +19,39 @@ public final class PlayerHomeCompInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
+     * <code>repeated uint32 unlocked_module_id_list = 3;</code>
-     * @return A list containing the levelupRewardGotLevelList.
-     */
-    java.util.List<java.lang.Integer> getLevelupRewardGotLevelListList();
-    /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @return The count of levelupRewardGotLevelList.
-     */
-    int getLevelupRewardGotLevelListCount();
-    /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The levelupRewardGotLevelList at the given index.
-     */
-    int getLevelupRewardGotLevelList(int index);
-
-    /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
      * @return A list containing the unlockedModuleIdList.
      */
     java.util.List<java.lang.Integer> getUnlockedModuleIdListList();
     /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+     * <code>repeated uint32 unlocked_module_id_list = 3;</code>
      * @return The count of unlockedModuleIdList.
      */
     int getUnlockedModuleIdListCount();
     /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+     * <code>repeated uint32 unlocked_module_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The unlockedModuleIdList at the given index.
      */
     int getUnlockedModuleIdList(int index);
 
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+     * @return A list containing the levelupRewardGotLevelList.
+     */
+    java.util.List<java.lang.Integer> getLevelupRewardGotLevelListList();
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+     * @return The count of levelupRewardGotLevelList.
+     */
+    int getLevelupRewardGotLevelListCount();
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+     * @param index The index of the element to return.
+     * @return The levelupRewardGotLevelList at the given index.
+     */
+    int getLevelupRewardGotLevelList(int index);
+
     /**
      * <code>repeated uint32 seen_module_id_list = 8;</code>
      * @return A list containing the seenModuleIdList.
@@ -97,8 +97,8 @@ public final class PlayerHomeCompInfoOuterClass {
       super(builder);
     }
     private PlayerHomeCompInfo() {
-      levelupRewardGotLevelList_ = emptyIntList();
       unlockedModuleIdList_ = emptyIntList();
+      levelupRewardGotLevelList_ = emptyIntList();
       seenModuleIdList_ = emptyIntList();
       friendEnterHomeOption_ = 0;
     }
@@ -136,21 +136,21 @@ public final class PlayerHomeCompInfoOuterClass {
               break;
             case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                levelupRewardGotLevelList_ = newIntList();
+                unlockedModuleIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              levelupRewardGotLevelList_.addInt(input.readUInt32());
+              unlockedModuleIdList_.addInt(input.readUInt32());
               break;
             }
             case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                levelupRewardGotLevelList_ = newIntList();
+                unlockedModuleIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                levelupRewardGotLevelList_.addInt(input.readUInt32());
+                unlockedModuleIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -178,21 +178,21 @@ public final class PlayerHomeCompInfoOuterClass {
             }
             case 80: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                unlockedModuleIdList_ = newIntList();
+                levelupRewardGotLevelList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              unlockedModuleIdList_.addInt(input.readUInt32());
+              levelupRewardGotLevelList_.addInt(input.readUInt32());
               break;
             }
             case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                unlockedModuleIdList_ = newIntList();
+                levelupRewardGotLevelList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unlockedModuleIdList_.addInt(input.readUInt32());
+                levelupRewardGotLevelList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -219,13 +219,13 @@ public final class PlayerHomeCompInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          levelupRewardGotLevelList_.makeImmutable(); // C
+          unlockedModuleIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
           seenModuleIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          unlockedModuleIdList_.makeImmutable(); // C
+          levelupRewardGotLevelList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -244,38 +244,10 @@ public final class PlayerHomeCompInfoOuterClass {
               emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.class, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder.class);
     }
 
-    public static final int LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER = 3;
+    public static final int UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_;
-    /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @return A list containing the levelupRewardGotLevelList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getLevelupRewardGotLevelListList() {
-      return levelupRewardGotLevelList_;
-    }
-    /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @return The count of levelupRewardGotLevelList.
-     */
-    public int getLevelupRewardGotLevelListCount() {
-      return levelupRewardGotLevelList_.size();
-    }
-    /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The levelupRewardGotLevelList at the given index.
-     */
-    public int getLevelupRewardGotLevelList(int index) {
-      return levelupRewardGotLevelList_.getInt(index);
-    }
-    private int levelupRewardGotLevelListMemoizedSerializedSize = -1;
-
-    public static final int UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList unlockedModuleIdList_;
     /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+     * <code>repeated uint32 unlocked_module_id_list = 3;</code>
      * @return A list containing the unlockedModuleIdList.
      */
     @java.lang.Override
@@ -284,14 +256,14 @@ public final class PlayerHomeCompInfoOuterClass {
       return unlockedModuleIdList_;
     }
     /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+     * <code>repeated uint32 unlocked_module_id_list = 3;</code>
      * @return The count of unlockedModuleIdList.
      */
     public int getUnlockedModuleIdListCount() {
       return unlockedModuleIdList_.size();
     }
     /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+     * <code>repeated uint32 unlocked_module_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The unlockedModuleIdList at the given index.
      */
@@ -300,6 +272,34 @@ public final class PlayerHomeCompInfoOuterClass {
     }
     private int unlockedModuleIdListMemoizedSerializedSize = -1;
 
+    public static final int LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER = 10;
+    private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_;
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+     * @return A list containing the levelupRewardGotLevelList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getLevelupRewardGotLevelListList() {
+      return levelupRewardGotLevelList_;
+    }
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+     * @return The count of levelupRewardGotLevelList.
+     */
+    public int getLevelupRewardGotLevelListCount() {
+      return levelupRewardGotLevelList_.size();
+    }
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+     * @param index The index of the element to return.
+     * @return The levelupRewardGotLevelList at the given index.
+     */
+    public int getLevelupRewardGotLevelList(int index) {
+      return levelupRewardGotLevelList_.getInt(index);
+    }
+    private int levelupRewardGotLevelListMemoizedSerializedSize = -1;
+
     public static final int SEEN_MODULE_ID_LIST_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList seenModuleIdList_;
     /**
@@ -362,12 +362,12 @@ public final class PlayerHomeCompInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getLevelupRewardGotLevelListList().size() > 0) {
+      if (getUnlockedModuleIdListList().size() > 0) {
         output.writeUInt32NoTag(26);
-        output.writeUInt32NoTag(levelupRewardGotLevelListMemoizedSerializedSize);
+        output.writeUInt32NoTag(unlockedModuleIdListMemoizedSerializedSize);
       }
-      for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
+      for (int i = 0; i < unlockedModuleIdList_.size(); i++) {
-        output.writeUInt32NoTag(levelupRewardGotLevelList_.getInt(i));
+        output.writeUInt32NoTag(unlockedModuleIdList_.getInt(i));
       }
       if (getSeenModuleIdListList().size() > 0) {
         output.writeUInt32NoTag(66);
@@ -376,12 +376,12 @@ public final class PlayerHomeCompInfoOuterClass {
       for (int i = 0; i < seenModuleIdList_.size(); i++) {
         output.writeUInt32NoTag(seenModuleIdList_.getInt(i));
       }
-      if (getUnlockedModuleIdListList().size() > 0) {
+      if (getLevelupRewardGotLevelListList().size() > 0) {
         output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(unlockedModuleIdListMemoizedSerializedSize);
+        output.writeUInt32NoTag(levelupRewardGotLevelListMemoizedSerializedSize);
       }
-      for (int i = 0; i < unlockedModuleIdList_.size(); i++) {
+      for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
-        output.writeUInt32NoTag(unlockedModuleIdList_.getInt(i));
+        output.writeUInt32NoTag(levelupRewardGotLevelList_.getInt(i));
       }
       if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
         output.writeEnum(15, friendEnterHomeOption_);
@@ -397,17 +397,17 @@ public final class PlayerHomeCompInfoOuterClass {
       size = 0;
       {
         int dataSize = 0;
-        for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
+        for (int i = 0; i < unlockedModuleIdList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(levelupRewardGotLevelList_.getInt(i));
+            .computeUInt32SizeNoTag(unlockedModuleIdList_.getInt(i));
         }
         size += dataSize;
-        if (!getLevelupRewardGotLevelListList().isEmpty()) {
+        if (!getUnlockedModuleIdListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        levelupRewardGotLevelListMemoizedSerializedSize = dataSize;
+        unlockedModuleIdListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -425,17 +425,17 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < unlockedModuleIdList_.size(); i++) {
+        for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(unlockedModuleIdList_.getInt(i));
+            .computeUInt32SizeNoTag(levelupRewardGotLevelList_.getInt(i));
         }
         size += dataSize;
-        if (!getUnlockedModuleIdListList().isEmpty()) {
+        if (!getLevelupRewardGotLevelListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        unlockedModuleIdListMemoizedSerializedSize = dataSize;
+        levelupRewardGotLevelListMemoizedSerializedSize = dataSize;
       }
       if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
@@ -456,10 +456,10 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo other = (emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo) obj;
 
-      if (!getLevelupRewardGotLevelListList()
-          .equals(other.getLevelupRewardGotLevelListList())) return false;
       if (!getUnlockedModuleIdListList()
           .equals(other.getUnlockedModuleIdListList())) return false;
+      if (!getLevelupRewardGotLevelListList()
+          .equals(other.getLevelupRewardGotLevelListList())) return false;
       if (!getSeenModuleIdListList()
           .equals(other.getSeenModuleIdListList())) return false;
       if (friendEnterHomeOption_ != other.friendEnterHomeOption_) return false;
@@ -474,14 +474,14 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getLevelupRewardGotLevelListCount() > 0) {
-        hash = (37 * hash) + LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getLevelupRewardGotLevelListList().hashCode();
-      }
       if (getUnlockedModuleIdListCount() > 0) {
         hash = (37 * hash) + UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedModuleIdListList().hashCode();
       }
+      if (getLevelupRewardGotLevelListCount() > 0) {
+        hash = (37 * hash) + LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getLevelupRewardGotLevelListList().hashCode();
+      }
       if (getSeenModuleIdListCount() > 0) {
         hash = (37 * hash) + SEEN_MODULE_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getSeenModuleIdListList().hashCode();
@@ -625,9 +625,9 @@ public final class PlayerHomeCompInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        levelupRewardGotLevelList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         unlockedModuleIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        levelupRewardGotLevelList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         seenModuleIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -661,15 +661,15 @@ public final class PlayerHomeCompInfoOuterClass {
         emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo result = new emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          levelupRewardGotLevelList_.makeImmutable();
+          unlockedModuleIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.levelupRewardGotLevelList_ = levelupRewardGotLevelList_;
+        result.unlockedModuleIdList_ = unlockedModuleIdList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          unlockedModuleIdList_.makeImmutable();
+          levelupRewardGotLevelList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.unlockedModuleIdList_ = unlockedModuleIdList_;
+        result.levelupRewardGotLevelList_ = levelupRewardGotLevelList_;
         if (((bitField0_ & 0x00000004) != 0)) {
           seenModuleIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
@@ -724,26 +724,26 @@ public final class PlayerHomeCompInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo other) {
         if (other == emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.getDefaultInstance()) return this;
-        if (!other.levelupRewardGotLevelList_.isEmpty()) {
-          if (levelupRewardGotLevelList_.isEmpty()) {
-            levelupRewardGotLevelList_ = other.levelupRewardGotLevelList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureLevelupRewardGotLevelListIsMutable();
-            levelupRewardGotLevelList_.addAll(other.levelupRewardGotLevelList_);
-          }
-          onChanged();
-        }
         if (!other.unlockedModuleIdList_.isEmpty()) {
           if (unlockedModuleIdList_.isEmpty()) {
             unlockedModuleIdList_ = other.unlockedModuleIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureUnlockedModuleIdListIsMutable();
             unlockedModuleIdList_.addAll(other.unlockedModuleIdList_);
           }
           onChanged();
         }
+        if (!other.levelupRewardGotLevelList_.isEmpty()) {
+          if (levelupRewardGotLevelList_.isEmpty()) {
+            levelupRewardGotLevelList_ = other.levelupRewardGotLevelList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureLevelupRewardGotLevelListIsMutable();
+            levelupRewardGotLevelList_.addAll(other.levelupRewardGotLevelList_);
+          }
+          onChanged();
+        }
         if (!other.seenModuleIdList_.isEmpty()) {
           if (seenModuleIdList_.isEmpty()) {
             seenModuleIdList_ = other.seenModuleIdList_;
@@ -787,110 +787,31 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList unlockedModuleIdList_ = emptyIntList();
-      private void ensureLevelupRewardGotLevelListIsMutable() {
+      private void ensureUnlockedModuleIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          levelupRewardGotLevelList_ = mutableCopy(levelupRewardGotLevelList_);
+          unlockedModuleIdList_ = mutableCopy(unlockedModuleIdList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
+       * <code>repeated uint32 unlocked_module_id_list = 3;</code>
-       * @return A list containing the levelupRewardGotLevelList.
-       */
-      public java.util.List<java.lang.Integer>
-          getLevelupRewardGotLevelListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(levelupRewardGotLevelList_) : levelupRewardGotLevelList_;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @return The count of levelupRewardGotLevelList.
-       */
-      public int getLevelupRewardGotLevelListCount() {
-        return levelupRewardGotLevelList_.size();
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param index The index of the element to return.
-       * @return The levelupRewardGotLevelList at the given index.
-       */
-      public int getLevelupRewardGotLevelList(int index) {
-        return levelupRewardGotLevelList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param index The index to set the value at.
-       * @param value The levelupRewardGotLevelList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLevelupRewardGotLevelList(
-          int index, int value) {
-        ensureLevelupRewardGotLevelListIsMutable();
-        levelupRewardGotLevelList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param value The levelupRewardGotLevelList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addLevelupRewardGotLevelList(int value) {
-        ensureLevelupRewardGotLevelListIsMutable();
-        levelupRewardGotLevelList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param values The levelupRewardGotLevelList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllLevelupRewardGotLevelList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLevelupRewardGotLevelListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, levelupRewardGotLevelList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLevelupRewardGotLevelList() {
-        levelupRewardGotLevelList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList unlockedModuleIdList_ = emptyIntList();
-      private void ensureUnlockedModuleIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          unlockedModuleIdList_ = mutableCopy(unlockedModuleIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
        * @return A list containing the unlockedModuleIdList.
        */
       public java.util.List<java.lang.Integer>
           getUnlockedModuleIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(unlockedModuleIdList_) : unlockedModuleIdList_;
       }
       /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+       * <code>repeated uint32 unlocked_module_id_list = 3;</code>
        * @return The count of unlockedModuleIdList.
        */
       public int getUnlockedModuleIdListCount() {
         return unlockedModuleIdList_.size();
       }
       /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+       * <code>repeated uint32 unlocked_module_id_list = 3;</code>
        * @param index The index of the element to return.
        * @return The unlockedModuleIdList at the given index.
        */
@@ -898,7 +819,7 @@ public final class PlayerHomeCompInfoOuterClass {
         return unlockedModuleIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+       * <code>repeated uint32 unlocked_module_id_list = 3;</code>
        * @param index The index to set the value at.
        * @param value The unlockedModuleIdList to set.
        * @return This builder for chaining.
@@ -911,7 +832,7 @@ public final class PlayerHomeCompInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+       * <code>repeated uint32 unlocked_module_id_list = 3;</code>
        * @param value The unlockedModuleIdList to add.
        * @return This builder for chaining.
        */
@@ -922,7 +843,7 @@ public final class PlayerHomeCompInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+       * <code>repeated uint32 unlocked_module_id_list = 3;</code>
        * @param values The unlockedModuleIdList to add.
        * @return This builder for chaining.
        */
@@ -935,11 +856,90 @@ public final class PlayerHomeCompInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
+       * <code>repeated uint32 unlocked_module_id_list = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearUnlockedModuleIdList() {
         unlockedModuleIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_ = emptyIntList();
+      private void ensureLevelupRewardGotLevelListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          levelupRewardGotLevelList_ = mutableCopy(levelupRewardGotLevelList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+       * @return A list containing the levelupRewardGotLevelList.
+       */
+      public java.util.List<java.lang.Integer>
+          getLevelupRewardGotLevelListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(levelupRewardGotLevelList_) : levelupRewardGotLevelList_;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+       * @return The count of levelupRewardGotLevelList.
+       */
+      public int getLevelupRewardGotLevelListCount() {
+        return levelupRewardGotLevelList_.size();
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+       * @param index The index of the element to return.
+       * @return The levelupRewardGotLevelList at the given index.
+       */
+      public int getLevelupRewardGotLevelList(int index) {
+        return levelupRewardGotLevelList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+       * @param index The index to set the value at.
+       * @param value The levelupRewardGotLevelList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLevelupRewardGotLevelList(
+          int index, int value) {
+        ensureLevelupRewardGotLevelListIsMutable();
+        levelupRewardGotLevelList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+       * @param value The levelupRewardGotLevelList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addLevelupRewardGotLevelList(int value) {
+        ensureLevelupRewardGotLevelListIsMutable();
+        levelupRewardGotLevelList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+       * @param values The levelupRewardGotLevelList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllLevelupRewardGotLevelList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureLevelupRewardGotLevelListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, levelupRewardGotLevelList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLevelupRewardGotLevelList() {
+        levelupRewardGotLevelList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1145,9 +1145,9 @@ public final class PlayerHomeCompInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030PlayerHomeCompInfo.proto\032\033FriendEnterH" +
-      "omeOption.proto\"\263\001\n\022PlayerHomeCompInfo\022%" +
+      "omeOption.proto\"\263\001\n\022PlayerHomeCompInfo\022\037" +
-      "\n\035levelup_reward_got_level_list\030\003 \003(\r\022\037\n" +
+      "\n\027unlocked_module_id_list\030\003 \003(\r\022%\n\035level" +
-      "\027unlocked_module_id_list\030\n \003(\r\022\033\n\023seen_m" +
+      "up_reward_got_level_list\030\n \003(\r\022\033\n\023seen_m" +
       "odule_id_list\030\010 \003(\r\0228\n\030friend_enter_home" +
       "_option\030\017 \001(\0162\026.FriendEnterHomeOptionB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
@@ -1162,7 +1162,7 @@ public final class PlayerHomeCompInfoOuterClass {
     internal_static_PlayerHomeCompInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerHomeCompInfo_descriptor,
-        new java.lang.String[] { "LevelupRewardGotLevelList", "UnlockedModuleIdList", "SeenModuleIdList", "FriendEnterHomeOption", });
+        new java.lang.String[] { "UnlockedModuleIdList", "LevelupRewardGotLevelList", "SeenModuleIdList", "FriendEnterHomeOption", });
     emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.getDescriptor();
   }
 

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

@@ -131,10 +131,10 @@ public final class PlayerLoginRspOuterClass {
     boolean getFBFJPEPMAOF();
 
     /**
-     * <code>bool DHMNOPIMOOE = 14;</code>
+     * <code>bool is_use_ability_hash = 14;</code>
-     * @return The dHMNOPIMOOE.
+     * @return The isUseAbilityHash.
      */
-    boolean getDHMNOPIMOOE();
+    boolean getIsUseAbilityHash();
 
     /**
      * <code>bool is_audit = 335;</code>
@@ -203,10 +203,10 @@ public final class PlayerLoginRspOuterClass {
     int getClientSilenceDataVersion();
 
     /**
-     * <code>bool is_use_ability_hash = 2;</code>
+     * <code>bool PKKKINOCFMJ = 2;</code>
-     * @return The isUseAbilityHash.
+     * @return The pKKKINOCFMJ.
      */
-    boolean getIsUseAbilityHash();
+    boolean getPKKKINOCFMJ();
 
     /**
      * <code>int32 retcode = 8;</code>
@@ -486,7 +486,7 @@ public final class PlayerLoginRspOuterClass {
               break;
             case 16: {
 
-              isUseAbilityHash_ = input.readBool();
+              pKKKINOCFMJ_ = input.readBool();
               break;
             }
             case 24: {
@@ -550,7 +550,7 @@ public final class PlayerLoginRspOuterClass {
             }
             case 112: {
 
-              dHMNOPIMOOE_ = input.readBool();
+              isUseAbilityHash_ = input.readBool();
               break;
             }
             case 120: {
@@ -1031,15 +1031,15 @@ public final class PlayerLoginRspOuterClass {
       return fBFJPEPMAOF_;
     }
 
-    public static final int DHMNOPIMOOE_FIELD_NUMBER = 14;
+    public static final int IS_USE_ABILITY_HASH_FIELD_NUMBER = 14;
-    private boolean dHMNOPIMOOE_;
+    private boolean isUseAbilityHash_;
     /**
-     * <code>bool DHMNOPIMOOE = 14;</code>
+     * <code>bool is_use_ability_hash = 14;</code>
-     * @return The dHMNOPIMOOE.
+     * @return The isUseAbilityHash.
      */
     @java.lang.Override
-    public boolean getDHMNOPIMOOE() {
+    public boolean getIsUseAbilityHash() {
-      return dHMNOPIMOOE_;
+      return isUseAbilityHash_;
     }
 
     public static final int IS_AUDIT_FIELD_NUMBER = 335;
@@ -1191,15 +1191,15 @@ public final class PlayerLoginRspOuterClass {
       return clientSilenceDataVersion_;
     }
 
-    public static final int IS_USE_ABILITY_HASH_FIELD_NUMBER = 2;
+    public static final int PKKKINOCFMJ_FIELD_NUMBER = 2;
-    private boolean isUseAbilityHash_;
+    private boolean pKKKINOCFMJ_;
     /**
-     * <code>bool is_use_ability_hash = 2;</code>
+     * <code>bool PKKKINOCFMJ = 2;</code>
-     * @return The isUseAbilityHash.
+     * @return The pKKKINOCFMJ.
      */
     @java.lang.Override
-    public boolean getIsUseAbilityHash() {
+    public boolean getPKKKINOCFMJ() {
-      return isUseAbilityHash_;
+      return pKKKINOCFMJ_;
     }
 
     public static final int RETCODE_FIELD_NUMBER = 8;
@@ -1713,8 +1713,8 @@ public final class PlayerLoginRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isUseAbilityHash_ != false) {
+      if (pKKKINOCFMJ_ != false) {
-        output.writeBool(2, isUseAbilityHash_);
+        output.writeBool(2, pKKKINOCFMJ_);
       }
       if (loginRand_ != 0L) {
         output.writeUInt64(3, loginRand_);
@@ -1749,8 +1749,8 @@ public final class PlayerLoginRspOuterClass {
       if (!playerData_.isEmpty()) {
         output.writeBytes(13, playerData_);
       }
-      if (dHMNOPIMOOE_ != false) {
+      if (isUseAbilityHash_ != false) {
-        output.writeBool(14, dHMNOPIMOOE_);
+        output.writeBool(14, isUseAbilityHash_);
       }
       if (fBFJPEPMAOF_ != false) {
         output.writeBool(15, fBFJPEPMAOF_);
@@ -1839,9 +1839,9 @@ public final class PlayerLoginRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isUseAbilityHash_ != false) {
+      if (pKKKINOCFMJ_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isUseAbilityHash_);
+          .computeBoolSize(2, pKKKINOCFMJ_);
       }
       if (loginRand_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
@@ -1888,9 +1888,9 @@ public final class PlayerLoginRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(13, playerData_);
       }
-      if (dHMNOPIMOOE_ != false) {
+      if (isUseAbilityHash_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, dHMNOPIMOOE_);
+          .computeBoolSize(14, isUseAbilityHash_);
       }
       if (fBFJPEPMAOF_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -2022,8 +2022,8 @@ public final class PlayerLoginRspOuterClass {
           .equals(other.getShortAbilityHashMapList())) return false;
       if (getFBFJPEPMAOF()
           != other.getFBFJPEPMAOF()) return false;
-      if (getDHMNOPIMOOE()
+      if (getIsUseAbilityHash()
-          != other.getDHMNOPIMOOE()) return false;
+          != other.getIsUseAbilityHash()) return false;
       if (getIsAudit()
           != other.getIsAudit()) return false;
       if (!getClientSilenceMd5()
@@ -2036,8 +2036,8 @@ public final class PlayerLoginRspOuterClass {
           != other.getDNHHIMENOLD()) return false;
       if (getClientSilenceDataVersion()
           != other.getClientSilenceDataVersion()) return false;
-      if (getIsUseAbilityHash()
+      if (getPKKKINOCFMJ()
-          != other.getIsUseAbilityHash()) return false;
+          != other.getPKKKINOCFMJ()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getClientDataVersion()
@@ -2124,9 +2124,9 @@ public final class PlayerLoginRspOuterClass {
       hash = (37 * hash) + FBFJPEPMAOF_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getFBFJPEPMAOF());
-      hash = (37 * hash) + DHMNOPIMOOE_FIELD_NUMBER;
+      hash = (37 * hash) + IS_USE_ABILITY_HASH_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getDHMNOPIMOOE());
+          getIsUseAbilityHash());
       hash = (37 * hash) + IS_AUDIT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsAudit());
@@ -2143,9 +2143,9 @@ public final class PlayerLoginRspOuterClass {
           getDNHHIMENOLD());
       hash = (37 * hash) + CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER;
       hash = (53 * hash) + getClientSilenceDataVersion();
-      hash = (37 * hash) + IS_USE_ABILITY_HASH_FIELD_NUMBER;
+      hash = (37 * hash) + PKKKINOCFMJ_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsUseAbilityHash());
+          getPKKKINOCFMJ());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
@@ -2385,7 +2385,7 @@ public final class PlayerLoginRspOuterClass {
         }
         fBFJPEPMAOF_ = false;
 
-        dHMNOPIMOOE_ = false;
+        isUseAbilityHash_ = false;
 
         isAudit_ = false;
 
@@ -2403,7 +2403,7 @@ public final class PlayerLoginRspOuterClass {
 
         clientSilenceDataVersion_ = 0;
 
-        isUseAbilityHash_ = false;
+        pKKKINOCFMJ_ = false;
 
         retcode_ = 0;
 
@@ -2501,7 +2501,7 @@ public final class PlayerLoginRspOuterClass {
           result.shortAbilityHashMap_ = shortAbilityHashMapBuilder_.build();
         }
         result.fBFJPEPMAOF_ = fBFJPEPMAOF_;
-        result.dHMNOPIMOOE_ = dHMNOPIMOOE_;
+        result.isUseAbilityHash_ = isUseAbilityHash_;
         result.isAudit_ = isAudit_;
         result.clientSilenceMd5_ = clientSilenceMd5_;
         result.msg_ = msg_;
@@ -2516,7 +2516,7 @@ public final class PlayerLoginRspOuterClass {
         }
         result.dNHHIMENOLD_ = dNHHIMENOLD_;
         result.clientSilenceDataVersion_ = clientSilenceDataVersion_;
-        result.isUseAbilityHash_ = isUseAbilityHash_;
+        result.pKKKINOCFMJ_ = pKKKINOCFMJ_;
         result.retcode_ = retcode_;
         result.clientDataVersion_ = clientDataVersion_;
         result.birthday_ = birthday_;
@@ -2649,8 +2649,8 @@ public final class PlayerLoginRspOuterClass {
         if (other.getFBFJPEPMAOF() != false) {
           setFBFJPEPMAOF(other.getFBFJPEPMAOF());
         }
-        if (other.getDHMNOPIMOOE() != false) {
+        if (other.getIsUseAbilityHash() != false) {
-          setDHMNOPIMOOE(other.getDHMNOPIMOOE());
+          setIsUseAbilityHash(other.getIsUseAbilityHash());
         }
         if (other.getIsAudit() != false) {
           setIsAudit(other.getIsAudit());
@@ -2695,8 +2695,8 @@ public final class PlayerLoginRspOuterClass {
         if (other.getClientSilenceDataVersion() != 0) {
           setClientSilenceDataVersion(other.getClientSilenceDataVersion());
         }
-        if (other.getIsUseAbilityHash() != false) {
+        if (other.getPKKKINOCFMJ() != false) {
-          setIsUseAbilityHash(other.getIsUseAbilityHash());
+          setPKKKINOCFMJ(other.getPKKKINOCFMJ());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
@@ -3468,33 +3468,33 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
 
-      private boolean dHMNOPIMOOE_ ;
+      private boolean isUseAbilityHash_ ;
       /**
-       * <code>bool DHMNOPIMOOE = 14;</code>
+       * <code>bool is_use_ability_hash = 14;</code>
-       * @return The dHMNOPIMOOE.
+       * @return The isUseAbilityHash.
        */
       @java.lang.Override
-      public boolean getDHMNOPIMOOE() {
+      public boolean getIsUseAbilityHash() {
-        return dHMNOPIMOOE_;
+        return isUseAbilityHash_;
       }
       /**
-       * <code>bool DHMNOPIMOOE = 14;</code>
+       * <code>bool is_use_ability_hash = 14;</code>
-       * @param value The dHMNOPIMOOE to set.
+       * @param value The isUseAbilityHash to set.
        * @return This builder for chaining.
        */
-      public Builder setDHMNOPIMOOE(boolean value) {
+      public Builder setIsUseAbilityHash(boolean value) {
         
-        dHMNOPIMOOE_ = value;
+        isUseAbilityHash_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool DHMNOPIMOOE = 14;</code>
+       * <code>bool is_use_ability_hash = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDHMNOPIMOOE() {
+      public Builder clearIsUseAbilityHash() {
         
-        dHMNOPIMOOE_ = false;
+        isUseAbilityHash_ = false;
         onChanged();
         return this;
       }
@@ -3984,33 +3984,33 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
 
-      private boolean isUseAbilityHash_ ;
+      private boolean pKKKINOCFMJ_ ;
       /**
-       * <code>bool is_use_ability_hash = 2;</code>
+       * <code>bool PKKKINOCFMJ = 2;</code>
-       * @return The isUseAbilityHash.
+       * @return The pKKKINOCFMJ.
        */
       @java.lang.Override
-      public boolean getIsUseAbilityHash() {
+      public boolean getPKKKINOCFMJ() {
-        return isUseAbilityHash_;
+        return pKKKINOCFMJ_;
       }
       /**
-       * <code>bool is_use_ability_hash = 2;</code>
+       * <code>bool PKKKINOCFMJ = 2;</code>
-       * @param value The isUseAbilityHash to set.
+       * @param value The pKKKINOCFMJ to set.
        * @return This builder for chaining.
        */
-      public Builder setIsUseAbilityHash(boolean value) {
+      public Builder setPKKKINOCFMJ(boolean value) {
         
-        isUseAbilityHash_ = value;
+        pKKKINOCFMJ_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_use_ability_hash = 2;</code>
+       * <code>bool PKKKINOCFMJ = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsUseAbilityHash() {
+      public Builder clearPKKKINOCFMJ() {
         
-        isUseAbilityHash_ = false;
+        pKKKINOCFMJ_ = false;
         onChanged();
         return this;
       }
@@ -5359,12 +5359,12 @@ public final class PlayerLoginRspOuterClass {
       "d_relogin\030\311\017 \001(\010\022\020\n\010game_biz\030\004 \001(\t\022\031\n\021ab" +
       "ility_hash_code\030\005 \001(\005\0226\n\026short_ability_h" +
       "ash_map\030\335\n \003(\0132\025.ShortAbilityHashPair\022\023\n" +
-      "\013FBFJPEPMAOF\030\017 \001(\010\022\023\n\013DHMNOPIMOOE\030\016 \001(\010\022" +
+      "\013FBFJPEPMAOF\030\017 \001(\010\022\033\n\023is_use_ability_has" +
-      "\021\n\010is_audit\030\317\002 \001(\010\022\033\n\022client_silence_md5" +
+      "h\030\016 \001(\010\022\021\n\010is_audit\030\317\002 \001(\010\022\033\n\022client_sil" +
-      "\030\220\006 \001(\t\022\013\n\003msg\030+ \001(\t\0223\n\027feature_block_in" +
+      "ence_md5\030\220\006 \001(\t\022\013\n\003msg\030+ \001(\t\0223\n\027feature_" +
-      "fo_list\030\333\014 \003(\0132\021.FeatureBlockInfo\022\024\n\013DNH" +
+      "block_info_list\030\333\014 \003(\0132\021.FeatureBlockInf" +
-      "HIMENOLD\030\333\n \001(\010\022#\n\033client_silence_data_v" +
+      "o\022\024\n\013DNHHIMENOLD\030\333\n \001(\010\022#\n\033client_silenc" +
-      "ersion\030\006 \001(\r\022\033\n\023is_use_ability_hash\030\002 \001(" +
+      "e_data_version\030\006 \001(\r\022\023\n\013PKKKINOCFMJ\030\002 \001(" +
       "\010\022\017\n\007retcode\030\010 \001(\005\022\033\n\023client_data_versio" +
       "n\030\014 \001(\r\022\021\n\010birthday\030\230\r \001(\t\022\024\n\013BOKKNHEOKP" +
       "D\030\354\004 \001(\010\022\022\n\ntarget_uid\030\t \001(\r\022:\n\016block_in" +
@@ -5399,7 +5399,7 @@ public final class PlayerLoginRspOuterClass {
     internal_static_PlayerLoginRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLoginRsp_descriptor,
-        new java.lang.String[] { "ClientVersionSuffix", "AbilityHashMap", "IsTransfer", "TargetHomeOwnerUid", "IsDataNeedRelogin", "GameBiz", "AbilityHashCode", "ShortAbilityHashMap", "FBFJPEPMAOF", "DHMNOPIMOOE", "IsAudit", "ClientSilenceMd5", "Msg", "FeatureBlockInfoList", "DNHHIMENOLD", "ClientSilenceDataVersion", "IsUseAbilityHash", "Retcode", "ClientDataVersion", "Birthday", "BOKKNHEOKPD", "TargetUid", "BlockInfoMap", "GOFGOCDJDND", "NextResourceUrl", "ResVersionConfig", "TotalTickTime", "PlayerData", "ScInfo", "LoginRand", "ENNOCBNIHIK", "CountryCode", "PlayerDataVersion", "ClientSilenceVersionSuffix", "ECKNMCACJKG", "ClientMd5", "NextResVersionConfig", });
+        new java.lang.String[] { "ClientVersionSuffix", "AbilityHashMap", "IsTransfer", "TargetHomeOwnerUid", "IsDataNeedRelogin", "GameBiz", "AbilityHashCode", "ShortAbilityHashMap", "FBFJPEPMAOF", "IsUseAbilityHash", "IsAudit", "ClientSilenceMd5", "Msg", "FeatureBlockInfoList", "DNHHIMENOLD", "ClientSilenceDataVersion", "PKKKINOCFMJ", "Retcode", "ClientDataVersion", "Birthday", "BOKKNHEOKPD", "TargetUid", "BlockInfoMap", "GOFGOCDJDND", "NextResourceUrl", "ResVersionConfig", "TotalTickTime", "PlayerData", "ScInfo", "LoginRand", "ENNOCBNIHIK", "CountryCode", "PlayerDataVersion", "ClientSilenceVersionSuffix", "ECKNMCACJKG", "ClientMd5", "NextResVersionConfig", });
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_descriptor =
       internal_static_PlayerLoginRsp_descriptor.getNestedTypes().get(0);
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_fieldAccessorTable = new

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

@@ -19,19 +19,19 @@ public final class PlayerWorldSceneInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return Whether the dCGPONECHMM field is set.
+     * @return Whether the mapLayerInfo field is set.
      */
-    boolean hasDCGPONECHMM();
+    boolean hasMapLayerInfo();
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return The dCGPONECHMM.
+     * @return The mapLayerInfo.
      */
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM();
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo();
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+     * <code>.MapLayerInfo map_layer_info = 1;</code>
      */
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder();
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder();
 
     /**
      * <code>uint32 scene_id = 12;</code>
@@ -114,14 +114,14 @@ public final class PlayerWorldSceneInfoOuterClass {
               done = true;
               break;
             case 10: {
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder subBuilder = null;
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null;
-              if (dCGPONECHMM_ != null) {
+              if (mapLayerInfo_ != null) {
-                subBuilder = dCGPONECHMM_.toBuilder();
+                subBuilder = mapLayerInfo_.toBuilder();
               }
-              dCGPONECHMM_ = input.readMessage(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.parser(), extensionRegistry);
+              mapLayerInfo_ = input.readMessage(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(dCGPONECHMM_);
+                subBuilder.mergeFrom(mapLayerInfo_);
-                dCGPONECHMM_ = subBuilder.buildPartial();
+                mapLayerInfo_ = subBuilder.buildPartial();
               }
 
               break;
@@ -192,30 +192,30 @@ public final class PlayerWorldSceneInfoOuterClass {
               emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.class, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder.class);
     }
 
-    public static final int DCGPONECHMM_FIELD_NUMBER = 1;
+    public static final int MAP_LAYER_INFO_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_;
+    private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return Whether the dCGPONECHMM field is set.
+     * @return Whether the mapLayerInfo field is set.
      */
     @java.lang.Override
-    public boolean hasDCGPONECHMM() {
+    public boolean hasMapLayerInfo() {
-      return dCGPONECHMM_ != null;
+      return mapLayerInfo_ != null;
     }
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return The dCGPONECHMM.
+     * @return The mapLayerInfo.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() {
+    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
-      return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
+      return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
     }
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+     * <code>.MapLayerInfo map_layer_info = 1;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() {
+    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
-      return getDCGPONECHMM();
+      return getMapLayerInfo();
     }
 
     public static final int SCENE_ID_FIELD_NUMBER = 12;
@@ -283,8 +283,8 @@ public final class PlayerWorldSceneInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (dCGPONECHMM_ != null) {
+      if (mapLayerInfo_ != null) {
-        output.writeMessage(1, getDCGPONECHMM());
+        output.writeMessage(1, getMapLayerInfo());
       }
       if (isLocked_ != false) {
         output.writeBool(2, isLocked_);
@@ -308,9 +308,9 @@ public final class PlayerWorldSceneInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dCGPONECHMM_ != null) {
+      if (mapLayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getDCGPONECHMM());
+          .computeMessageSize(1, getMapLayerInfo());
       }
       if (isLocked_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -349,10 +349,10 @@ public final class PlayerWorldSceneInfoOuterClass {
       }
       emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo other = (emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo) obj;
 
-      if (hasDCGPONECHMM() != other.hasDCGPONECHMM()) return false;
+      if (hasMapLayerInfo() != other.hasMapLayerInfo()) return false;
-      if (hasDCGPONECHMM()) {
+      if (hasMapLayerInfo()) {
-        if (!getDCGPONECHMM()
+        if (!getMapLayerInfo()
-            .equals(other.getDCGPONECHMM())) return false;
+            .equals(other.getMapLayerInfo())) return false;
       }
       if (getSceneId()
           != other.getSceneId()) return false;
@@ -371,9 +371,9 @@ public final class PlayerWorldSceneInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasDCGPONECHMM()) {
+      if (hasMapLayerInfo()) {
-        hash = (37 * hash) + DCGPONECHMM_FIELD_NUMBER;
+        hash = (37 * hash) + MAP_LAYER_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getDCGPONECHMM().hashCode();
+        hash = (53 * hash) + getMapLayerInfo().hashCode();
       }
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
@@ -521,11 +521,11 @@ public final class PlayerWorldSceneInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
         } else {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
-          dCGPONECHMMBuilder_ = null;
+          mapLayerInfoBuilder_ = null;
         }
         sceneId_ = 0;
 
@@ -560,10 +560,10 @@ public final class PlayerWorldSceneInfoOuterClass {
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo buildPartial() {
         emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo result = new emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo(this);
         int from_bitField0_ = bitField0_;
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          result.dCGPONECHMM_ = dCGPONECHMM_;
+          result.mapLayerInfo_ = mapLayerInfo_;
         } else {
-          result.dCGPONECHMM_ = dCGPONECHMMBuilder_.build();
+          result.mapLayerInfo_ = mapLayerInfoBuilder_.build();
         }
         result.sceneId_ = sceneId_;
         result.isLocked_ = isLocked_;
@@ -620,8 +620,8 @@ public final class PlayerWorldSceneInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo other) {
         if (other == emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.getDefaultInstance()) return this;
-        if (other.hasDCGPONECHMM()) {
+        if (other.hasMapLayerInfo()) {
-          mergeDCGPONECHMM(other.getDCGPONECHMM());
+          mergeMapLayerInfo(other.getMapLayerInfo());
         }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
@@ -669,123 +669,123 @@ public final class PlayerWorldSceneInfoOuterClass {
       }
       private int bitField0_;
 
-      private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_;
+      private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> dCGPONECHMMBuilder_;
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> mapLayerInfoBuilder_;
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
-       * @return Whether the dCGPONECHMM field is set.
+       * @return Whether the mapLayerInfo field is set.
        */
-      public boolean hasDCGPONECHMM() {
+      public boolean hasMapLayerInfo() {
-        return dCGPONECHMMBuilder_ != null || dCGPONECHMM_ != null;
+        return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
-       * @return The dCGPONECHMM.
+       * @return The mapLayerInfo.
        */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() {
+      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
+          return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
         } else {
-          return dCGPONECHMMBuilder_.getMessage();
+          return mapLayerInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
        */
-      public Builder setDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) {
+      public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          dCGPONECHMM_ = value;
+          mapLayerInfo_ = value;
           onChanged();
         } else {
-          dCGPONECHMMBuilder_.setMessage(value);
+          mapLayerInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
        */
-      public Builder setDCGPONECHMM(
+      public Builder setMapLayerInfo(
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder builderForValue) {
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder builderForValue) {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMM_ = builderForValue.build();
+          mapLayerInfo_ = builderForValue.build();
           onChanged();
         } else {
-          dCGPONECHMMBuilder_.setMessage(builderForValue.build());
+          mapLayerInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
        */
-      public Builder mergeDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) {
+      public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          if (dCGPONECHMM_ != null) {
+          if (mapLayerInfo_ != null) {
-            dCGPONECHMM_ =
+            mapLayerInfo_ =
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.newBuilder(dCGPONECHMM_).mergeFrom(value).buildPartial();
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.newBuilder(mapLayerInfo_).mergeFrom(value).buildPartial();
           } else {
-            dCGPONECHMM_ = value;
+            mapLayerInfo_ = value;
           }
           onChanged();
         } else {
-          dCGPONECHMMBuilder_.mergeFrom(value);
+          mapLayerInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
        */
-      public Builder clearDCGPONECHMM() {
+      public Builder clearMapLayerInfo() {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
           onChanged();
         } else {
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
-          dCGPONECHMMBuilder_ = null;
+          mapLayerInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
        */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder getDCGPONECHMMBuilder() {
+      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() {
         
         onChanged();
-        return getDCGPONECHMMFieldBuilder().getBuilder();
+        return getMapLayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
        */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() {
+      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
-        if (dCGPONECHMMBuilder_ != null) {
+        if (mapLayerInfoBuilder_ != null) {
-          return dCGPONECHMMBuilder_.getMessageOrBuilder();
+          return mapLayerInfoBuilder_.getMessageOrBuilder();
         } else {
-          return dCGPONECHMM_ == null ?
+          return mapLayerInfo_ == null ?
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
         }
       }
       /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> 
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> 
-          getDCGPONECHMMFieldBuilder() {
+          getMapLayerInfoFieldBuilder() {
-        if (dCGPONECHMMBuilder_ == null) {
+        if (mapLayerInfoBuilder_ == null) {
-          dCGPONECHMMBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          mapLayerInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder>(
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder>(
-                  getDCGPONECHMM(),
+                  getMapLayerInfo(),
                   getParentForChildren(),
                   isClean());
-          dCGPONECHMM_ = null;
+          mapLayerInfo_ = null;
         }
-        return dCGPONECHMMBuilder_;
+        return mapLayerInfoBuilder_;
       }
 
       private int sceneId_ ;
@@ -995,25 +995,25 @@ public final class PlayerWorldSceneInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032PlayerWorldSceneInfo.proto\032\021NHFPBBLCHK" +
+      "\n\032PlayerWorldSceneInfo.proto\032\022MapLayerIn" +
-      "H.proto\"y\n\024PlayerWorldSceneInfo\022!\n\013DCGPO" +
+      "fo.proto\"}\n\024PlayerWorldSceneInfo\022%\n\016map_" +
-      "NECHMM\030\001 \001(\0132\014.NHFPBBLCHKH\022\020\n\010scene_id\030\014" +
+      "layer_info\030\001 \001(\0132\r.MapLayerInfo\022\020\n\010scene" +
-      " \001(\r\022\021\n\tis_locked\030\002 \001(\010\022\031\n\021scene_tag_id_" +
+      "_id\030\014 \001(\r\022\021\n\tis_locked\030\002 \001(\010\022\031\n\021scene_ta" +
-      "list\030\007 \003(\rB\033\n\031emu.grasscutter.net.protob" +
+      "g_id_list\030\007 \003(\rB\033\n\031emu.grasscutter.net.p" +
-      "\006proto3"
+      "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor(),
         });
     internal_static_PlayerWorldSceneInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PlayerWorldSceneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerWorldSceneInfo_descriptor,
-        new java.lang.String[] { "DCGPONECHMM", "SceneId", "IsLocked", "SceneTagIdList", });
+        new java.lang.String[] { "MapLayerInfo", "SceneId", "IsLocked", "SceneTagIdList", });
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -19,39 +19,39 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 be_captured_num_list = 12;</code>
+     * <code>repeated uint32 be_killed_num_list = 12;</code>
-     * @return A list containing the beCapturedNumList.
-     */
-    java.util.List<java.lang.Integer> getBeCapturedNumListList();
-    /**
-     * <code>repeated uint32 be_captured_num_list = 12;</code>
-     * @return The count of beCapturedNumList.
-     */
-    int getBeCapturedNumListCount();
-    /**
-     * <code>repeated uint32 be_captured_num_list = 12;</code>
-     * @param index The index of the element to return.
-     * @return The beCapturedNumList at the given index.
-     */
-    int getBeCapturedNumList(int index);
-
-    /**
-     * <code>repeated uint32 be_killed_num_list = 8;</code>
      * @return A list containing the beKilledNumList.
      */
     java.util.List<java.lang.Integer> getBeKilledNumListList();
     /**
-     * <code>repeated uint32 be_killed_num_list = 8;</code>
+     * <code>repeated uint32 be_killed_num_list = 12;</code>
      * @return The count of beKilledNumList.
      */
     int getBeKilledNumListCount();
     /**
-     * <code>repeated uint32 be_killed_num_list = 8;</code>
+     * <code>repeated uint32 be_killed_num_list = 12;</code>
      * @param index The index of the element to return.
      * @return The beKilledNumList at the given index.
      */
     int getBeKilledNumList(int index);
 
+    /**
+     * <code>repeated uint32 be_captured_num_list = 8;</code>
+     * @return A list containing the beCapturedNumList.
+     */
+    java.util.List<java.lang.Integer> getBeCapturedNumListList();
+    /**
+     * <code>repeated uint32 be_captured_num_list = 8;</code>
+     * @return The count of beCapturedNumList.
+     */
+    int getBeCapturedNumListCount();
+    /**
+     * <code>repeated uint32 be_captured_num_list = 8;</code>
+     * @param index The index of the element to return.
+     * @return The beCapturedNumList at the given index.
+     */
+    int getBeCapturedNumList(int index);
+
     /**
      * <code>int32 retcode = 15;</code>
      * @return The retcode.
@@ -93,8 +93,8 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       super(builder);
     }
     private QueryCodexMonsterBeKilledNumRsp() {
-      beCapturedNumList_ = emptyIntList();
       beKilledNumList_ = emptyIntList();
+      beCapturedNumList_ = emptyIntList();
       codexIdList_ = emptyIntList();
     }
 
@@ -152,42 +152,42 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
             }
             case 64: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                beKilledNumList_ = newIntList();
+                beCapturedNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              beKilledNumList_.addInt(input.readUInt32());
+              beCapturedNumList_.addInt(input.readUInt32());
               break;
             }
             case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                beKilledNumList_ = newIntList();
+                beCapturedNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                beKilledNumList_.addInt(input.readUInt32());
+                beCapturedNumList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 96: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                beCapturedNumList_ = newIntList();
+                beKilledNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              beCapturedNumList_.addInt(input.readUInt32());
+              beKilledNumList_.addInt(input.readUInt32());
               break;
             }
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                beCapturedNumList_ = newIntList();
+                beKilledNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                beCapturedNumList_.addInt(input.readUInt32());
+                beKilledNumList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -216,10 +216,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
           codexIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          beKilledNumList_.makeImmutable(); // C
+          beCapturedNumList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          beCapturedNumList_.makeImmutable(); // C
+          beKilledNumList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -238,38 +238,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
               emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.class, emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.Builder.class);
     }
 
-    public static final int BE_CAPTURED_NUM_LIST_FIELD_NUMBER = 12;
+    public static final int BE_KILLED_NUM_LIST_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList beCapturedNumList_;
-    /**
-     * <code>repeated uint32 be_captured_num_list = 12;</code>
-     * @return A list containing the beCapturedNumList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getBeCapturedNumListList() {
-      return beCapturedNumList_;
-    }
-    /**
-     * <code>repeated uint32 be_captured_num_list = 12;</code>
-     * @return The count of beCapturedNumList.
-     */
-    public int getBeCapturedNumListCount() {
-      return beCapturedNumList_.size();
-    }
-    /**
-     * <code>repeated uint32 be_captured_num_list = 12;</code>
-     * @param index The index of the element to return.
-     * @return The beCapturedNumList at the given index.
-     */
-    public int getBeCapturedNumList(int index) {
-      return beCapturedNumList_.getInt(index);
-    }
-    private int beCapturedNumListMemoizedSerializedSize = -1;
-
-    public static final int BE_KILLED_NUM_LIST_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList beKilledNumList_;
     /**
-     * <code>repeated uint32 be_killed_num_list = 8;</code>
+     * <code>repeated uint32 be_killed_num_list = 12;</code>
      * @return A list containing the beKilledNumList.
      */
     @java.lang.Override
@@ -278,14 +250,14 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       return beKilledNumList_;
     }
     /**
-     * <code>repeated uint32 be_killed_num_list = 8;</code>
+     * <code>repeated uint32 be_killed_num_list = 12;</code>
      * @return The count of beKilledNumList.
      */
     public int getBeKilledNumListCount() {
       return beKilledNumList_.size();
     }
     /**
-     * <code>repeated uint32 be_killed_num_list = 8;</code>
+     * <code>repeated uint32 be_killed_num_list = 12;</code>
      * @param index The index of the element to return.
      * @return The beKilledNumList at the given index.
      */
@@ -294,6 +266,34 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
     }
     private int beKilledNumListMemoizedSerializedSize = -1;
 
+    public static final int BE_CAPTURED_NUM_LIST_FIELD_NUMBER = 8;
+    private com.google.protobuf.Internal.IntList beCapturedNumList_;
+    /**
+     * <code>repeated uint32 be_captured_num_list = 8;</code>
+     * @return A list containing the beCapturedNumList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getBeCapturedNumListList() {
+      return beCapturedNumList_;
+    }
+    /**
+     * <code>repeated uint32 be_captured_num_list = 8;</code>
+     * @return The count of beCapturedNumList.
+     */
+    public int getBeCapturedNumListCount() {
+      return beCapturedNumList_.size();
+    }
+    /**
+     * <code>repeated uint32 be_captured_num_list = 8;</code>
+     * @param index The index of the element to return.
+     * @return The beCapturedNumList at the given index.
+     */
+    public int getBeCapturedNumList(int index) {
+      return beCapturedNumList_.getInt(index);
+    }
+    private int beCapturedNumListMemoizedSerializedSize = -1;
+
     public static final int RETCODE_FIELD_NUMBER = 15;
     private int retcode_;
     /**
@@ -355,20 +355,20 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       for (int i = 0; i < codexIdList_.size(); i++) {
         output.writeUInt32NoTag(codexIdList_.getInt(i));
       }
-      if (getBeKilledNumListList().size() > 0) {
-        output.writeUInt32NoTag(66);
-        output.writeUInt32NoTag(beKilledNumListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < beKilledNumList_.size(); i++) {
-        output.writeUInt32NoTag(beKilledNumList_.getInt(i));
-      }
       if (getBeCapturedNumListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(beCapturedNumListMemoizedSerializedSize);
       }
       for (int i = 0; i < beCapturedNumList_.size(); i++) {
         output.writeUInt32NoTag(beCapturedNumList_.getInt(i));
       }
+      if (getBeKilledNumListList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(beKilledNumListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < beKilledNumList_.size(); i++) {
+        output.writeUInt32NoTag(beKilledNumList_.getInt(i));
+      }
       if (retcode_ != 0) {
         output.writeInt32(15, retcode_);
       }
@@ -395,20 +395,6 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
         }
         codexIdListMemoizedSerializedSize = dataSize;
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < beKilledNumList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(beKilledNumList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getBeKilledNumListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        beKilledNumListMemoizedSerializedSize = dataSize;
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < beCapturedNumList_.size(); i++) {
@@ -423,6 +409,20 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
         }
         beCapturedNumListMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < beKilledNumList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(beKilledNumList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getBeKilledNumListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        beKilledNumListMemoizedSerializedSize = dataSize;
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(15, retcode_);
@@ -442,10 +442,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       }
       emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp other = (emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp) obj;
 
-      if (!getBeCapturedNumListList()
-          .equals(other.getBeCapturedNumListList())) return false;
       if (!getBeKilledNumListList()
           .equals(other.getBeKilledNumListList())) return false;
+      if (!getBeCapturedNumListList()
+          .equals(other.getBeCapturedNumListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!getCodexIdListList()
@@ -461,14 +461,14 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getBeCapturedNumListCount() > 0) {
-        hash = (37 * hash) + BE_CAPTURED_NUM_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getBeCapturedNumListList().hashCode();
-      }
       if (getBeKilledNumListCount() > 0) {
         hash = (37 * hash) + BE_KILLED_NUM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getBeKilledNumListList().hashCode();
       }
+      if (getBeCapturedNumListCount() > 0) {
+        hash = (37 * hash) + BE_CAPTURED_NUM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getBeCapturedNumListList().hashCode();
+      }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       if (getCodexIdListCount() > 0) {
@@ -613,9 +613,9 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        beCapturedNumList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         beKilledNumList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        beCapturedNumList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         retcode_ = 0;
 
@@ -649,15 +649,15 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
         emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp result = new emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          beCapturedNumList_.makeImmutable();
+          beKilledNumList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.beCapturedNumList_ = beCapturedNumList_;
+        result.beKilledNumList_ = beKilledNumList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          beKilledNumList_.makeImmutable();
+          beCapturedNumList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.beKilledNumList_ = beKilledNumList_;
+        result.beCapturedNumList_ = beCapturedNumList_;
         result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000004) != 0)) {
           codexIdList_.makeImmutable();
@@ -712,26 +712,26 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp other) {
         if (other == emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.getDefaultInstance()) return this;
-        if (!other.beCapturedNumList_.isEmpty()) {
-          if (beCapturedNumList_.isEmpty()) {
-            beCapturedNumList_ = other.beCapturedNumList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureBeCapturedNumListIsMutable();
-            beCapturedNumList_.addAll(other.beCapturedNumList_);
-          }
-          onChanged();
-        }
         if (!other.beKilledNumList_.isEmpty()) {
           if (beKilledNumList_.isEmpty()) {
             beKilledNumList_ = other.beKilledNumList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureBeKilledNumListIsMutable();
             beKilledNumList_.addAll(other.beKilledNumList_);
           }
           onChanged();
         }
+        if (!other.beCapturedNumList_.isEmpty()) {
+          if (beCapturedNumList_.isEmpty()) {
+            beCapturedNumList_ = other.beCapturedNumList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureBeCapturedNumListIsMutable();
+            beCapturedNumList_.addAll(other.beCapturedNumList_);
+          }
+          onChanged();
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -775,110 +775,31 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList beCapturedNumList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList beKilledNumList_ = emptyIntList();
-      private void ensureBeCapturedNumListIsMutable() {
+      private void ensureBeKilledNumListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          beCapturedNumList_ = mutableCopy(beCapturedNumList_);
+          beKilledNumList_ = mutableCopy(beKilledNumList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 be_captured_num_list = 12;</code>
+       * <code>repeated uint32 be_killed_num_list = 12;</code>
-       * @return A list containing the beCapturedNumList.
-       */
-      public java.util.List<java.lang.Integer>
-          getBeCapturedNumListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(beCapturedNumList_) : beCapturedNumList_;
-      }
-      /**
-       * <code>repeated uint32 be_captured_num_list = 12;</code>
-       * @return The count of beCapturedNumList.
-       */
-      public int getBeCapturedNumListCount() {
-        return beCapturedNumList_.size();
-      }
-      /**
-       * <code>repeated uint32 be_captured_num_list = 12;</code>
-       * @param index The index of the element to return.
-       * @return The beCapturedNumList at the given index.
-       */
-      public int getBeCapturedNumList(int index) {
-        return beCapturedNumList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 be_captured_num_list = 12;</code>
-       * @param index The index to set the value at.
-       * @param value The beCapturedNumList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBeCapturedNumList(
-          int index, int value) {
-        ensureBeCapturedNumListIsMutable();
-        beCapturedNumList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 be_captured_num_list = 12;</code>
-       * @param value The beCapturedNumList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addBeCapturedNumList(int value) {
-        ensureBeCapturedNumListIsMutable();
-        beCapturedNumList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 be_captured_num_list = 12;</code>
-       * @param values The beCapturedNumList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllBeCapturedNumList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureBeCapturedNumListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, beCapturedNumList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 be_captured_num_list = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBeCapturedNumList() {
-        beCapturedNumList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList beKilledNumList_ = emptyIntList();
-      private void ensureBeKilledNumListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          beKilledNumList_ = mutableCopy(beKilledNumList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 be_killed_num_list = 8;</code>
        * @return A list containing the beKilledNumList.
        */
       public java.util.List<java.lang.Integer>
           getBeKilledNumListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(beKilledNumList_) : beKilledNumList_;
       }
       /**
-       * <code>repeated uint32 be_killed_num_list = 8;</code>
+       * <code>repeated uint32 be_killed_num_list = 12;</code>
        * @return The count of beKilledNumList.
        */
       public int getBeKilledNumListCount() {
         return beKilledNumList_.size();
       }
       /**
-       * <code>repeated uint32 be_killed_num_list = 8;</code>
+       * <code>repeated uint32 be_killed_num_list = 12;</code>
        * @param index The index of the element to return.
        * @return The beKilledNumList at the given index.
        */
@@ -886,7 +807,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
         return beKilledNumList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 be_killed_num_list = 8;</code>
+       * <code>repeated uint32 be_killed_num_list = 12;</code>
        * @param index The index to set the value at.
        * @param value The beKilledNumList to set.
        * @return This builder for chaining.
@@ -899,7 +820,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 be_killed_num_list = 8;</code>
+       * <code>repeated uint32 be_killed_num_list = 12;</code>
        * @param value The beKilledNumList to add.
        * @return This builder for chaining.
        */
@@ -910,7 +831,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 be_killed_num_list = 8;</code>
+       * <code>repeated uint32 be_killed_num_list = 12;</code>
        * @param values The beKilledNumList to add.
        * @return This builder for chaining.
        */
@@ -923,11 +844,90 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 be_killed_num_list = 8;</code>
+       * <code>repeated uint32 be_killed_num_list = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearBeKilledNumList() {
         beKilledNumList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList beCapturedNumList_ = emptyIntList();
+      private void ensureBeCapturedNumListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          beCapturedNumList_ = mutableCopy(beCapturedNumList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 be_captured_num_list = 8;</code>
+       * @return A list containing the beCapturedNumList.
+       */
+      public java.util.List<java.lang.Integer>
+          getBeCapturedNumListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(beCapturedNumList_) : beCapturedNumList_;
+      }
+      /**
+       * <code>repeated uint32 be_captured_num_list = 8;</code>
+       * @return The count of beCapturedNumList.
+       */
+      public int getBeCapturedNumListCount() {
+        return beCapturedNumList_.size();
+      }
+      /**
+       * <code>repeated uint32 be_captured_num_list = 8;</code>
+       * @param index The index of the element to return.
+       * @return The beCapturedNumList at the given index.
+       */
+      public int getBeCapturedNumList(int index) {
+        return beCapturedNumList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 be_captured_num_list = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The beCapturedNumList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBeCapturedNumList(
+          int index, int value) {
+        ensureBeCapturedNumListIsMutable();
+        beCapturedNumList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 be_captured_num_list = 8;</code>
+       * @param value The beCapturedNumList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addBeCapturedNumList(int value) {
+        ensureBeCapturedNumListIsMutable();
+        beCapturedNumList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 be_captured_num_list = 8;</code>
+       * @param values The beCapturedNumList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllBeCapturedNumList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureBeCapturedNumListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, beCapturedNumList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 be_captured_num_list = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBeCapturedNumList() {
+        beCapturedNumList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1110,8 +1110,8 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n%QueryCodexMonsterBeKilledNumRsp.proto\"" +
-      "\203\001\n\037QueryCodexMonsterBeKilledNumRsp\022\034\n\024b" +
+      "\203\001\n\037QueryCodexMonsterBeKilledNumRsp\022\032\n\022b" +
-      "e_captured_num_list\030\014 \003(\r\022\032\n\022be_killed_n" +
+      "e_killed_num_list\030\014 \003(\r\022\034\n\024be_captured_n" +
       "um_list\030\010 \003(\r\022\017\n\007retcode\030\017 \001(\005\022\025\n\rcodex_" +
       "id_list\030\005 \003(\rB\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
@@ -1125,7 +1125,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
     internal_static_QueryCodexMonsterBeKilledNumRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QueryCodexMonsterBeKilledNumRsp_descriptor,
-        new java.lang.String[] { "BeCapturedNumList", "BeKilledNumList", "Retcode", "CodexIdList", });
+        new java.lang.String[] { "BeKilledNumList", "BeCapturedNumList", "Retcode", "CodexIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -19,10 +19,6 @@ public final class QueryPathRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <pre>
-     * Obf: LFJGAFPHNNE
-     * </pre>
-     *
      * <code>int32 query_id = 6;</code>
      * @return The queryId.
      */
@@ -59,11 +55,19 @@ public final class QueryPathRspOuterClass {
     int getRetcode();
 
     /**
+     * <pre>
+     * Obf: LFJGAFPHNNE
+     * </pre>
+     *
      * <code>.PathStatusType query_status = 15;</code>
      * @return The enum numeric value on the wire for queryStatus.
      */
     int getQueryStatusValue();
     /**
+     * <pre>
+     * Obf: LFJGAFPHNNE
+     * </pre>
+     *
      * <code>.PathStatusType query_status = 15;</code>
      * @return The queryStatus.
      */
@@ -185,10 +189,6 @@ public final class QueryPathRspOuterClass {
     public static final int QUERY_ID_FIELD_NUMBER = 6;
     private int queryId_;
     /**
-     * <pre>
-     * Obf: LFJGAFPHNNE
-     * </pre>
-     *
      * <code>int32 query_id = 6;</code>
      * @return The queryId.
      */
@@ -251,6 +251,10 @@ public final class QueryPathRspOuterClass {
     public static final int QUERY_STATUS_FIELD_NUMBER = 15;
     private int queryStatus_;
     /**
+     * <pre>
+     * Obf: LFJGAFPHNNE
+     * </pre>
+     *
      * <code>.PathStatusType query_status = 15;</code>
      * @return The enum numeric value on the wire for queryStatus.
      */
@@ -258,6 +262,10 @@ public final class QueryPathRspOuterClass {
       return queryStatus_;
     }
     /**
+     * <pre>
+     * Obf: LFJGAFPHNNE
+     * </pre>
+     *
      * <code>.PathStatusType query_status = 15;</code>
      * @return The queryStatus.
      */
@@ -666,10 +674,6 @@ public final class QueryPathRspOuterClass {
 
       private int queryId_ ;
       /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
        * <code>int32 query_id = 6;</code>
        * @return The queryId.
        */
@@ -678,10 +682,6 @@ public final class QueryPathRspOuterClass {
         return queryId_;
       }
       /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
        * <code>int32 query_id = 6;</code>
        * @param value The queryId to set.
        * @return This builder for chaining.
@@ -693,10 +693,6 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
        * <code>int32 query_id = 6;</code>
        * @return This builder for chaining.
        */
@@ -980,6 +976,10 @@ public final class QueryPathRspOuterClass {
 
       private int queryStatus_ = 0;
       /**
+       * <pre>
+       * Obf: LFJGAFPHNNE
+       * </pre>
+       *
        * <code>.PathStatusType query_status = 15;</code>
        * @return The enum numeric value on the wire for queryStatus.
        */
@@ -987,6 +987,10 @@ public final class QueryPathRspOuterClass {
         return queryStatus_;
       }
       /**
+       * <pre>
+       * Obf: LFJGAFPHNNE
+       * </pre>
+       *
        * <code>.PathStatusType query_status = 15;</code>
        * @param value The enum numeric value on the wire for queryStatus to set.
        * @return This builder for chaining.
@@ -998,6 +1002,10 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
+       * <pre>
+       * Obf: LFJGAFPHNNE
+       * </pre>
+       *
        * <code>.PathStatusType query_status = 15;</code>
        * @return The queryStatus.
        */
@@ -1008,6 +1016,10 @@ public final class QueryPathRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
       }
       /**
+       * <pre>
+       * Obf: LFJGAFPHNNE
+       * </pre>
+       *
        * <code>.PathStatusType query_status = 15;</code>
        * @param value The queryStatus to set.
        * @return This builder for chaining.
@@ -1022,6 +1034,10 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
+       * <pre>
+       * Obf: LFJGAFPHNNE
+       * </pre>
+       *
        * <code>.PathStatusType query_status = 15;</code>
        * @return This builder for chaining.
        */
@@ -1098,8 +1114,8 @@ public final class QueryPathRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022QueryPathRsp.proto\032\014Vector.proto\032\024Path" +
+      "\n\022QueryPathRsp.proto\032\024PathStatusType.pro" +
-      "StatusType.proto\"r\n\014QueryPathRsp\022\020\n\010quer" +
+      "to\032\014Vector.proto\"r\n\014QueryPathRsp\022\020\n\010quer" +
       "y_id\030\006 \001(\005\022\030\n\007corners\030\001 \003(\0132\007.Vector\022\017\n\007" +
       "retcode\030\010 \001(\005\022%\n\014query_status\030\017 \001(\0162\017.Pa" +
       "thStatusTypeB\033\n\031emu.grasscutter.net.prot" +
@@ -1108,8 +1124,8 @@ public final class QueryPathRspOuterClass {
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
         });
     internal_static_QueryPathRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -1117,8 +1133,8 @@ public final class QueryPathRspOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QueryPathRsp_descriptor,
         new java.lang.String[] { "QueryId", "Corners", "Retcode", "QueryStatus", });
-    emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -31,21 +31,21 @@ public final class ReliquaryUpgradeRspOuterClass {
     int getPowerUpRate();
 
     /**
-     * <code>repeated uint32 cur_append_prop_list = 14;</code>
+     * <code>repeated uint32 old_append_prop_list = 14;</code>
-     * @return A list containing the curAppendPropList.
+     * @return A list containing the oldAppendPropList.
      */
-    java.util.List<java.lang.Integer> getCurAppendPropListList();
+    java.util.List<java.lang.Integer> getOldAppendPropListList();
     /**
-     * <code>repeated uint32 cur_append_prop_list = 14;</code>
+     * <code>repeated uint32 old_append_prop_list = 14;</code>
-     * @return The count of curAppendPropList.
+     * @return The count of oldAppendPropList.
      */
-    int getCurAppendPropListCount();
+    int getOldAppendPropListCount();
     /**
-     * <code>repeated uint32 cur_append_prop_list = 14;</code>
+     * <code>repeated uint32 old_append_prop_list = 14;</code>
      * @param index The index of the element to return.
-     * @return The curAppendPropList at the given index.
+     * @return The oldAppendPropList at the given index.
      */
-    int getCurAppendPropList(int index);
+    int getOldAppendPropList(int index);
 
     /**
      * <code>uint32 old_level = 8;</code>
@@ -54,21 +54,21 @@ public final class ReliquaryUpgradeRspOuterClass {
     int getOldLevel();
 
     /**
-     * <code>repeated uint32 old_append_prop_list = 15;</code>
+     * <code>repeated uint32 cur_append_prop_list = 15;</code>
-     * @return A list containing the oldAppendPropList.
+     * @return A list containing the curAppendPropList.
      */
-    java.util.List<java.lang.Integer> getOldAppendPropListList();
+    java.util.List<java.lang.Integer> getCurAppendPropListList();
     /**
-     * <code>repeated uint32 old_append_prop_list = 15;</code>
+     * <code>repeated uint32 cur_append_prop_list = 15;</code>
-     * @return The count of oldAppendPropList.
+     * @return The count of curAppendPropList.
      */
-    int getOldAppendPropListCount();
+    int getCurAppendPropListCount();
     /**
-     * <code>repeated uint32 old_append_prop_list = 15;</code>
+     * <code>repeated uint32 cur_append_prop_list = 15;</code>
      * @param index The index of the element to return.
-     * @return The oldAppendPropList at the given index.
+     * @return The curAppendPropList at the given index.
      */
-    int getOldAppendPropList(int index);
+    int getCurAppendPropList(int index);
 
     /**
      * <code>uint64 target_reliquary_guid = 5;</code>
@@ -100,8 +100,8 @@ public final class ReliquaryUpgradeRspOuterClass {
       super(builder);
     }
     private ReliquaryUpgradeRsp() {
-      curAppendPropList_ = emptyIntList();
       oldAppendPropList_ = emptyIntList();
+      curAppendPropList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -162,42 +162,42 @@ public final class ReliquaryUpgradeRspOuterClass {
             }
             case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                curAppendPropList_ = newIntList();
+                oldAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              curAppendPropList_.addInt(input.readUInt32());
+              oldAppendPropList_.addInt(input.readUInt32());
               break;
             }
             case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                curAppendPropList_ = newIntList();
+                oldAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                curAppendPropList_.addInt(input.readUInt32());
+                oldAppendPropList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 120: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                oldAppendPropList_ = newIntList();
+                curAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              oldAppendPropList_.addInt(input.readUInt32());
+              curAppendPropList_.addInt(input.readUInt32());
               break;
             }
             case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                oldAppendPropList_ = newIntList();
+                curAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                oldAppendPropList_.addInt(input.readUInt32());
+                curAppendPropList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -218,10 +218,10 @@ public final class ReliquaryUpgradeRspOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          curAppendPropList_.makeImmutable(); // C
+          oldAppendPropList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          oldAppendPropList_.makeImmutable(); // C
+          curAppendPropList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -262,33 +262,33 @@ public final class ReliquaryUpgradeRspOuterClass {
       return powerUpRate_;
     }
 
-    public static final int CUR_APPEND_PROP_LIST_FIELD_NUMBER = 14;
+    public static final int OLD_APPEND_PROP_LIST_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList curAppendPropList_;
+    private com.google.protobuf.Internal.IntList oldAppendPropList_;
     /**
-     * <code>repeated uint32 cur_append_prop_list = 14;</code>
+     * <code>repeated uint32 old_append_prop_list = 14;</code>
-     * @return A list containing the curAppendPropList.
+     * @return A list containing the oldAppendPropList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getCurAppendPropListList() {
+        getOldAppendPropListList() {
-      return curAppendPropList_;
+      return oldAppendPropList_;
     }
     /**
-     * <code>repeated uint32 cur_append_prop_list = 14;</code>
+     * <code>repeated uint32 old_append_prop_list = 14;</code>
-     * @return The count of curAppendPropList.
+     * @return The count of oldAppendPropList.
      */
-    public int getCurAppendPropListCount() {
+    public int getOldAppendPropListCount() {
-      return curAppendPropList_.size();
+      return oldAppendPropList_.size();
     }
     /**
-     * <code>repeated uint32 cur_append_prop_list = 14;</code>
+     * <code>repeated uint32 old_append_prop_list = 14;</code>
      * @param index The index of the element to return.
-     * @return The curAppendPropList at the given index.
+     * @return The oldAppendPropList at the given index.
      */
-    public int getCurAppendPropList(int index) {
+    public int getOldAppendPropList(int index) {
-      return curAppendPropList_.getInt(index);
+      return oldAppendPropList_.getInt(index);
     }
-    private int curAppendPropListMemoizedSerializedSize = -1;
+    private int oldAppendPropListMemoizedSerializedSize = -1;
 
     public static final int OLD_LEVEL_FIELD_NUMBER = 8;
     private int oldLevel_;
@@ -301,33 +301,33 @@ public final class ReliquaryUpgradeRspOuterClass {
       return oldLevel_;
     }
 
-    public static final int OLD_APPEND_PROP_LIST_FIELD_NUMBER = 15;
+    public static final int CUR_APPEND_PROP_LIST_FIELD_NUMBER = 15;
-    private com.google.protobuf.Internal.IntList oldAppendPropList_;
+    private com.google.protobuf.Internal.IntList curAppendPropList_;
     /**
-     * <code>repeated uint32 old_append_prop_list = 15;</code>
+     * <code>repeated uint32 cur_append_prop_list = 15;</code>
-     * @return A list containing the oldAppendPropList.
+     * @return A list containing the curAppendPropList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getOldAppendPropListList() {
+        getCurAppendPropListList() {
-      return oldAppendPropList_;
+      return curAppendPropList_;
     }
     /**
-     * <code>repeated uint32 old_append_prop_list = 15;</code>
+     * <code>repeated uint32 cur_append_prop_list = 15;</code>
-     * @return The count of oldAppendPropList.
+     * @return The count of curAppendPropList.
      */
-    public int getOldAppendPropListCount() {
+    public int getCurAppendPropListCount() {
-      return oldAppendPropList_.size();
+      return curAppendPropList_.size();
     }
     /**
-     * <code>repeated uint32 old_append_prop_list = 15;</code>
+     * <code>repeated uint32 cur_append_prop_list = 15;</code>
      * @param index The index of the element to return.
-     * @return The oldAppendPropList at the given index.
+     * @return The curAppendPropList at the given index.
      */
-    public int getOldAppendPropList(int index) {
+    public int getCurAppendPropList(int index) {
-      return oldAppendPropList_.getInt(index);
+      return curAppendPropList_.getInt(index);
     }
-    private int oldAppendPropListMemoizedSerializedSize = -1;
+    private int curAppendPropListMemoizedSerializedSize = -1;
 
     public static final int TARGET_RELIQUARY_GUID_FIELD_NUMBER = 5;
     private long targetReliquaryGuid_;
@@ -381,20 +381,20 @@ public final class ReliquaryUpgradeRspOuterClass {
       if (curLevel_ != 0) {
         output.writeUInt32(13, curLevel_);
       }
-      if (getCurAppendPropListList().size() > 0) {
-        output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(curAppendPropListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < curAppendPropList_.size(); i++) {
-        output.writeUInt32NoTag(curAppendPropList_.getInt(i));
-      }
       if (getOldAppendPropListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(114);
         output.writeUInt32NoTag(oldAppendPropListMemoizedSerializedSize);
       }
       for (int i = 0; i < oldAppendPropList_.size(); i++) {
         output.writeUInt32NoTag(oldAppendPropList_.getInt(i));
       }
+      if (getCurAppendPropListList().size() > 0) {
+        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(curAppendPropListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < curAppendPropList_.size(); i++) {
+        output.writeUInt32NoTag(curAppendPropList_.getInt(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -424,20 +424,6 @@ public final class ReliquaryUpgradeRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(13, curLevel_);
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < curAppendPropList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(curAppendPropList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getCurAppendPropListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        curAppendPropListMemoizedSerializedSize = dataSize;
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < oldAppendPropList_.size(); i++) {
@@ -452,6 +438,20 @@ public final class ReliquaryUpgradeRspOuterClass {
         }
         oldAppendPropListMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < curAppendPropList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(curAppendPropList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getCurAppendPropListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        curAppendPropListMemoizedSerializedSize = dataSize;
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -471,12 +471,12 @@ public final class ReliquaryUpgradeRspOuterClass {
           != other.getCurLevel()) return false;
       if (getPowerUpRate()
           != other.getPowerUpRate()) return false;
-      if (!getCurAppendPropListList()
-          .equals(other.getCurAppendPropListList())) return false;
-      if (getOldLevel()
-          != other.getOldLevel()) return false;
       if (!getOldAppendPropListList()
           .equals(other.getOldAppendPropListList())) return false;
+      if (getOldLevel()
+          != other.getOldLevel()) return false;
+      if (!getCurAppendPropListList()
+          .equals(other.getCurAppendPropListList())) return false;
       if (getTargetReliquaryGuid()
           != other.getTargetReliquaryGuid()) return false;
       if (getRetcode()
@@ -496,16 +496,16 @@ public final class ReliquaryUpgradeRspOuterClass {
       hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + POWER_UP_RATE_FIELD_NUMBER;
       hash = (53 * hash) + getPowerUpRate();
-      if (getCurAppendPropListCount() > 0) {
-        hash = (37 * hash) + CUR_APPEND_PROP_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getCurAppendPropListList().hashCode();
-      }
-      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getOldLevel();
       if (getOldAppendPropListCount() > 0) {
         hash = (37 * hash) + OLD_APPEND_PROP_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getOldAppendPropListList().hashCode();
       }
+      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOldLevel();
+      if (getCurAppendPropListCount() > 0) {
+        hash = (37 * hash) + CUR_APPEND_PROP_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getCurAppendPropListList().hashCode();
+      }
       hash = (37 * hash) + TARGET_RELIQUARY_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getTargetReliquaryGuid());
@@ -653,11 +653,11 @@ public final class ReliquaryUpgradeRspOuterClass {
 
         powerUpRate_ = 0;
 
-        curAppendPropList_ = emptyIntList();
+        oldAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         oldLevel_ = 0;
 
-        oldAppendPropList_ = emptyIntList();
+        curAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         targetReliquaryGuid_ = 0L;
 
@@ -693,16 +693,16 @@ public final class ReliquaryUpgradeRspOuterClass {
         result.curLevel_ = curLevel_;
         result.powerUpRate_ = powerUpRate_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          curAppendPropList_.makeImmutable();
+          oldAppendPropList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.curAppendPropList_ = curAppendPropList_;
+        result.oldAppendPropList_ = oldAppendPropList_;
         result.oldLevel_ = oldLevel_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          oldAppendPropList_.makeImmutable();
+          curAppendPropList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.oldAppendPropList_ = oldAppendPropList_;
+        result.curAppendPropList_ = curAppendPropList_;
         result.targetReliquaryGuid_ = targetReliquaryGuid_;
         result.retcode_ = retcode_;
         onBuilt();
@@ -759,26 +759,26 @@ public final class ReliquaryUpgradeRspOuterClass {
         if (other.getPowerUpRate() != 0) {
           setPowerUpRate(other.getPowerUpRate());
         }
-        if (!other.curAppendPropList_.isEmpty()) {
+        if (!other.oldAppendPropList_.isEmpty()) {
-          if (curAppendPropList_.isEmpty()) {
+          if (oldAppendPropList_.isEmpty()) {
-            curAppendPropList_ = other.curAppendPropList_;
+            oldAppendPropList_ = other.oldAppendPropList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureCurAppendPropListIsMutable();
+            ensureOldAppendPropListIsMutable();
-            curAppendPropList_.addAll(other.curAppendPropList_);
+            oldAppendPropList_.addAll(other.oldAppendPropList_);
           }
           onChanged();
         }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
-        if (!other.oldAppendPropList_.isEmpty()) {
+        if (!other.curAppendPropList_.isEmpty()) {
-          if (oldAppendPropList_.isEmpty()) {
+          if (curAppendPropList_.isEmpty()) {
-            oldAppendPropList_ = other.oldAppendPropList_;
+            curAppendPropList_ = other.curAppendPropList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureOldAppendPropListIsMutable();
+            ensureCurAppendPropListIsMutable();
-            oldAppendPropList_.addAll(other.oldAppendPropList_);
+            curAppendPropList_.addAll(other.curAppendPropList_);
           }
           onChanged();
         }
@@ -880,80 +880,80 @@ public final class ReliquaryUpgradeRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList curAppendPropList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList oldAppendPropList_ = emptyIntList();
-      private void ensureCurAppendPropListIsMutable() {
+      private void ensureOldAppendPropListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          curAppendPropList_ = mutableCopy(curAppendPropList_);
+          oldAppendPropList_ = mutableCopy(oldAppendPropList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 cur_append_prop_list = 14;</code>
+       * <code>repeated uint32 old_append_prop_list = 14;</code>
-       * @return A list containing the curAppendPropList.
+       * @return A list containing the oldAppendPropList.
        */
       public java.util.List<java.lang.Integer>
-          getCurAppendPropListList() {
+          getOldAppendPropListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(curAppendPropList_) : curAppendPropList_;
+                 java.util.Collections.unmodifiableList(oldAppendPropList_) : oldAppendPropList_;
       }
       /**
-       * <code>repeated uint32 cur_append_prop_list = 14;</code>
+       * <code>repeated uint32 old_append_prop_list = 14;</code>
-       * @return The count of curAppendPropList.
+       * @return The count of oldAppendPropList.
        */
-      public int getCurAppendPropListCount() {
+      public int getOldAppendPropListCount() {
-        return curAppendPropList_.size();
+        return oldAppendPropList_.size();
       }
       /**
-       * <code>repeated uint32 cur_append_prop_list = 14;</code>
+       * <code>repeated uint32 old_append_prop_list = 14;</code>
        * @param index The index of the element to return.
-       * @return The curAppendPropList at the given index.
+       * @return The oldAppendPropList at the given index.
        */
-      public int getCurAppendPropList(int index) {
+      public int getOldAppendPropList(int index) {
-        return curAppendPropList_.getInt(index);
+        return oldAppendPropList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 cur_append_prop_list = 14;</code>
+       * <code>repeated uint32 old_append_prop_list = 14;</code>
        * @param index The index to set the value at.
-       * @param value The curAppendPropList to set.
+       * @param value The oldAppendPropList to set.
        * @return This builder for chaining.
        */
-      public Builder setCurAppendPropList(
+      public Builder setOldAppendPropList(
           int index, int value) {
-        ensureCurAppendPropListIsMutable();
+        ensureOldAppendPropListIsMutable();
-        curAppendPropList_.setInt(index, value);
+        oldAppendPropList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 cur_append_prop_list = 14;</code>
+       * <code>repeated uint32 old_append_prop_list = 14;</code>
-       * @param value The curAppendPropList to add.
+       * @param value The oldAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addCurAppendPropList(int value) {
+      public Builder addOldAppendPropList(int value) {
-        ensureCurAppendPropListIsMutable();
+        ensureOldAppendPropListIsMutable();
-        curAppendPropList_.addInt(value);
+        oldAppendPropList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 cur_append_prop_list = 14;</code>
+       * <code>repeated uint32 old_append_prop_list = 14;</code>
-       * @param values The curAppendPropList to add.
+       * @param values The oldAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllCurAppendPropList(
+      public Builder addAllOldAppendPropList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureCurAppendPropListIsMutable();
+        ensureOldAppendPropListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, curAppendPropList_);
+            values, oldAppendPropList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 cur_append_prop_list = 14;</code>
+       * <code>repeated uint32 old_append_prop_list = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurAppendPropList() {
+      public Builder clearOldAppendPropList() {
-        curAppendPropList_ = emptyIntList();
+        oldAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -990,80 +990,80 @@ public final class ReliquaryUpgradeRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList oldAppendPropList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList curAppendPropList_ = emptyIntList();
-      private void ensureOldAppendPropListIsMutable() {
+      private void ensureCurAppendPropListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          oldAppendPropList_ = mutableCopy(oldAppendPropList_);
+          curAppendPropList_ = mutableCopy(curAppendPropList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * <code>repeated uint32 old_append_prop_list = 15;</code>
+       * <code>repeated uint32 cur_append_prop_list = 15;</code>
-       * @return A list containing the oldAppendPropList.
+       * @return A list containing the curAppendPropList.
        */
       public java.util.List<java.lang.Integer>
-          getOldAppendPropListList() {
+          getCurAppendPropListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(oldAppendPropList_) : oldAppendPropList_;
+                 java.util.Collections.unmodifiableList(curAppendPropList_) : curAppendPropList_;
       }
       /**
-       * <code>repeated uint32 old_append_prop_list = 15;</code>
+       * <code>repeated uint32 cur_append_prop_list = 15;</code>
-       * @return The count of oldAppendPropList.
+       * @return The count of curAppendPropList.
        */
-      public int getOldAppendPropListCount() {
+      public int getCurAppendPropListCount() {
-        return oldAppendPropList_.size();
+        return curAppendPropList_.size();
       }
       /**
-       * <code>repeated uint32 old_append_prop_list = 15;</code>
+       * <code>repeated uint32 cur_append_prop_list = 15;</code>
        * @param index The index of the element to return.
-       * @return The oldAppendPropList at the given index.
+       * @return The curAppendPropList at the given index.
        */
-      public int getOldAppendPropList(int index) {
+      public int getCurAppendPropList(int index) {
-        return oldAppendPropList_.getInt(index);
+        return curAppendPropList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 old_append_prop_list = 15;</code>
+       * <code>repeated uint32 cur_append_prop_list = 15;</code>
        * @param index The index to set the value at.
-       * @param value The oldAppendPropList to set.
+       * @param value The curAppendPropList to set.
        * @return This builder for chaining.
        */
-      public Builder setOldAppendPropList(
+      public Builder setCurAppendPropList(
           int index, int value) {
-        ensureOldAppendPropListIsMutable();
+        ensureCurAppendPropListIsMutable();
-        oldAppendPropList_.setInt(index, value);
+        curAppendPropList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 old_append_prop_list = 15;</code>
+       * <code>repeated uint32 cur_append_prop_list = 15;</code>
-       * @param value The oldAppendPropList to add.
+       * @param value The curAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addOldAppendPropList(int value) {
+      public Builder addCurAppendPropList(int value) {
-        ensureOldAppendPropListIsMutable();
+        ensureCurAppendPropListIsMutable();
-        oldAppendPropList_.addInt(value);
+        curAppendPropList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 old_append_prop_list = 15;</code>
+       * <code>repeated uint32 cur_append_prop_list = 15;</code>
-       * @param values The oldAppendPropList to add.
+       * @param values The curAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllOldAppendPropList(
+      public Builder addAllCurAppendPropList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureOldAppendPropListIsMutable();
+        ensureCurAppendPropListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, oldAppendPropList_);
+            values, curAppendPropList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 old_append_prop_list = 15;</code>
+       * <code>repeated uint32 cur_append_prop_list = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOldAppendPropList() {
+      public Builder clearCurAppendPropList() {
-        oldAppendPropList_ = emptyIntList();
+        curAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1199,8 +1199,8 @@ public final class ReliquaryUpgradeRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031ReliquaryUpgradeRsp.proto\"\276\001\n\023Reliquar" +
       "yUpgradeRsp\022\021\n\tcur_level\030\r \001(\r\022\025\n\rpower_" +
-      "up_rate\030\013 \001(\r\022\034\n\024cur_append_prop_list\030\016 " +
+      "up_rate\030\013 \001(\r\022\034\n\024old_append_prop_list\030\016 " +
-      "\003(\r\022\021\n\told_level\030\010 \001(\r\022\034\n\024old_append_pro" +
+      "\003(\r\022\021\n\told_level\030\010 \001(\r\022\034\n\024cur_append_pro" +
       "p_list\030\017 \003(\r\022\035\n\025target_reliquary_guid\030\005 " +
       "\001(\004\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
@@ -1214,7 +1214,7 @@ public final class ReliquaryUpgradeRspOuterClass {
     internal_static_ReliquaryUpgradeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ReliquaryUpgradeRsp_descriptor,
-        new java.lang.String[] { "CurLevel", "PowerUpRate", "CurAppendPropList", "OldLevel", "OldAppendPropList", "TargetReliquaryGuid", "Retcode", });
+        new java.lang.String[] { "CurLevel", "PowerUpRate", "OldAppendPropList", "OldLevel", "CurAppendPropList", "TargetReliquaryGuid", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -405,16 +405,28 @@ public final class SceneGadgetInfoOuterClass {
     emu.grasscutter.net.proto.CoinCollectOperatorInfoOuterClass.CoinCollectOperatorInfoOrBuilder getCoinCollectOperatorInfoOrBuilder();
 
     /**
+     * <pre>
+     *Item trifle_item = 67;
+     * </pre>
+     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return Whether the trifleGadget field is set.
      */
     boolean hasTrifleGadget();
     /**
+     * <pre>
+     *Item trifle_item = 67;
+     * </pre>
+     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return The trifleGadget.
      */
     emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget getTrifleGadget();
     /**
+     * <pre>
+     *Item trifle_item = 67;
+     * </pre>
+     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      */
     emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadgetOrBuilder getTrifleGadgetOrBuilder();
@@ -1985,6 +1997,10 @@ public final class SceneGadgetInfoOuterClass {
 
     public static final int TRIFLE_GADGET_FIELD_NUMBER = 67;
     /**
+     * <pre>
+     *Item trifle_item = 67;
+     * </pre>
+     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return Whether the trifleGadget field is set.
      */
@@ -1993,6 +2009,10 @@ public final class SceneGadgetInfoOuterClass {
       return contentCase_ == 67;
     }
     /**
+     * <pre>
+     *Item trifle_item = 67;
+     * </pre>
+     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return The trifleGadget.
      */
@@ -2004,6 +2024,10 @@ public final class SceneGadgetInfoOuterClass {
       return emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.getDefaultInstance();
     }
     /**
+     * <pre>
+     *Item trifle_item = 67;
+     * </pre>
+     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      */
     @java.lang.Override
@@ -6946,6 +6970,10 @@ public final class SceneGadgetInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget, emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.Builder, emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadgetOrBuilder> trifleGadgetBuilder_;
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        * @return Whether the trifleGadget field is set.
        */
@@ -6954,6 +6982,10 @@ public final class SceneGadgetInfoOuterClass {
         return contentCase_ == 67;
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        * @return The trifleGadget.
        */
@@ -6972,6 +7004,10 @@ public final class SceneGadgetInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder setTrifleGadget(emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget value) {
@@ -6988,6 +7024,10 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder setTrifleGadget(
@@ -7002,6 +7042,10 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder mergeTrifleGadget(emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget value) {
@@ -7024,6 +7068,10 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder clearTrifleGadget() {
@@ -7043,12 +7091,20 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.Builder getTrifleGadgetBuilder() {
         return getTrifleGadgetFieldBuilder().getBuilder();
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       @java.lang.Override
@@ -7063,6 +7119,10 @@ public final class SceneGadgetInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *Item trifle_item = 67;
+       * </pre>
+       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
@@ -8068,69 +8128,70 @@ public final class SceneGadgetInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025SceneGadgetInfo.proto\032\024GadgetBornType." +
-      "proto\032\026GatherGadgetInfo.proto\032\021WorktopIn" +
+      "proto\032\nItem.proto\032\026GatherGadgetInfo.prot" +
-      "fo.proto\032\026ClientGadgetInfo.proto\032\021Weathe" +
+      "o\032\021WorktopInfo.proto\032\026ClientGadgetInfo.p" +
-      "rInfo.proto\032\027AbilityGadgetInfo.proto\032\026St" +
+      "roto\032\021WeatherInfo.proto\032\027AbilityGadgetIn" +
-      "atueGadgetInfo.proto\032\023BossChestInfo.prot" +
+      "fo.proto\032\026StatueGadgetInfo.proto\032\023BossCh" +
-      "o\032\026BlossomChestInfo.proto\032\026MpPlayRewardI" +
+      "estInfo.proto\032\026BlossomChestInfo.proto\032\026M" +
-      "nfo.proto\032\035GadgetGeneralRewardInfo.proto" +
+      "pPlayRewardInfo.proto\032\035GadgetGeneralRewa" +
-      "\032\022OfferingInfo.proto\032\024FoundationInfo.pro" +
+      "rdInfo.proto\032\022OfferingInfo.proto\032\024Founda" +
-      "to\032\021VehicleInfo.proto\032\023EchoShellInfo.pro" +
+      "tionInfo.proto\032\021VehicleInfo.proto\032\023EchoS" +
-      "to\032\020ScreenInfo.proto\032\022FishPoolInfo.proto" +
+      "hellInfo.proto\032\020ScreenInfo.proto\032\022FishPo" +
-      "\032\032CustomGadgetTreeInfo.proto\032\031RoguelikeG" +
+      "olInfo.proto\032\032CustomGadgetTreeInfo.proto" +
-      "adgetInfo.proto\032\031NightCrowGadgetInfo.pro" +
+      "\032\031RoguelikeGadgetInfo.proto\032\031NightCrowGa" +
-      "to\032\036DeshretObeliskGadgetInfo.proto\032\035Coin" +
+      "dgetInfo.proto\032\036DeshretObeliskGadgetInfo" +
-      "CollectOperatorInfo.proto\032\022TrifleGadget." +
+      ".proto\032\035CoinCollectOperatorInfo.proto\032\022T" +
-      "proto\032\022PlatformInfo.proto\032\021JMFPBNKNHED.p" +
+      "rifleGadget.proto\032\022PlatformInfo.proto\032\021J" +
-      "roto\032\024GadgetPlayInfo.proto\032\021GDGKKLFMJKH." +
+      "MFPBNKNHED.proto\032\024GadgetPlayInfo.proto\032\021" +
-      "proto\032\021OMBIJJLAHFB.proto\032\021BDOCPDNCIEF.pr" +
+      "GDGKKLFMJKH.proto\032\021OMBIJJLAHFB.proto\032\021BD" +
-      "oto\"\315\014\n\017SceneGadgetInfo\022\021\n\tgadget_id\030\001 \001" +
+      "OCPDNCIEF.proto\"\315\014\n\017SceneGadgetInfo\022\021\n\tg" +
-      "(\r\022\020\n\010group_id\030\002 \001(\r\022\021\n\tconfig_id\030\003 \001(\r\022" +
+      "adget_id\030\001 \001(\r\022\020\n\010group_id\030\002 \001(\r\022\021\n\tconf" +
-      "\027\n\017owner_entity_id\030\004 \001(\r\022\"\n\tborn_type\030\005 " +
+      "ig_id\030\003 \001(\r\022\027\n\017owner_entity_id\030\004 \001(\r\022\"\n\t" +
-      "\001(\0162\017.GadgetBornType\022\024\n\014gadget_state\030\006 \001" +
+      "born_type\030\005 \001(\0162\017.GadgetBornType\022\024\n\014gadg" +
-      "(\r\022\023\n\013KPKNNJLPMFP\030\007 \001(\r\022\030\n\020is_show_cutsc" +
+      "et_state\030\006 \001(\r\022\023\n\013KPKNNJLPMFP\030\007 \001(\r\022\030\n\020i" +
-      "ene\030\010 \001(\010\022\031\n\021authority_peer_id\030\t \001(\r\022\032\n\022" +
+      "s_show_cutscene\030\010 \001(\010\022\031\n\021authority_peer_" +
-      "is_enable_interact\030\n \001(\010\022\023\n\013CLICILNBKDD\030" +
+      "id\030\t \001(\r\022\032\n\022is_enable_interact\030\n \001(\010\022\023\n\013" +
-      "\013 \001(\r\022*\n\rgather_gadget\030\r \001(\0132\021.GatherGad" +
+      "CLICILNBKDD\030\013 \001(\r\022*\n\rgather_gadget\030\r \001(\013" +
-      "getInfoH\000\022\037\n\007worktop\030\016 \001(\0132\014.WorktopInfo" +
+      "2\021.GatherGadgetInfoH\000\022\037\n\007worktop\030\016 \001(\0132\014" +
-      "H\000\022*\n\rclient_gadget\030\017 \001(\0132\021.ClientGadget" +
+      ".WorktopInfoH\000\022*\n\rclient_gadget\030\017 \001(\0132\021." +
-      "InfoH\000\022\037\n\007weather\030\021 \001(\0132\014.WeatherInfoH\000\022" +
+      "ClientGadgetInfoH\000\022\037\n\007weather\030\021 \001(\0132\014.We" +
-      ",\n\016ability_gadget\030\022 \001(\0132\022.AbilityGadgetI" +
+      "atherInfoH\000\022,\n\016ability_gadget\030\022 \001(\0132\022.Ab" +
-      "nfoH\000\022*\n\rstatue_gadget\030\023 \001(\0132\021.StatueGad" +
+      "ilityGadgetInfoH\000\022*\n\rstatue_gadget\030\023 \001(\013" +
-      "getInfoH\000\022$\n\nboss_chest\030\024 \001(\0132\016.BossChes" +
+      "2\021.StatueGadgetInfoH\000\022$\n\nboss_chest\030\024 \001(" +
-      "tInfoH\000\022*\n\rblossom_chest\030) \001(\0132\021.Blossom" +
+      "\0132\016.BossChestInfoH\000\022*\n\rblossom_chest\030) \001" +
-      "ChestInfoH\000\022+\n\016mp_play_reward\030* \001(\0132\021.Mp" +
+      "(\0132\021.BlossomChestInfoH\000\022+\n\016mp_play_rewar" +
-      "PlayRewardInfoH\000\0222\n\016general_reward\030+ \001(\013" +
+      "d\030* \001(\0132\021.MpPlayRewardInfoH\000\0222\n\016general_" +
-      "2\030.GadgetGeneralRewardInfoH\000\022&\n\roffering" +
+      "reward\030+ \001(\0132\030.GadgetGeneralRewardInfoH\000" +
-      "_info\030, \001(\0132\r.OfferingInfoH\000\022*\n\017foundati" +
+      "\022&\n\roffering_info\030, \001(\0132\r.OfferingInfoH\000" +
-      "on_info\030- \001(\0132\017.FoundationInfoH\000\022$\n\014vehi" +
+      "\022*\n\017foundation_info\030- \001(\0132\017.FoundationIn" +
-      "cle_info\030. \001(\0132\014.VehicleInfoH\000\022$\n\nshell_" +
+      "foH\000\022$\n\014vehicle_info\030. \001(\0132\014.VehicleInfo" +
-      "info\030/ \001(\0132\016.EchoShellInfoH\000\022\"\n\013screen_i" +
+      "H\000\022$\n\nshell_info\030/ \001(\0132\016.EchoShellInfoH\000" +
-      "nfo\0300 \001(\0132\013.ScreenInfoH\000\022\'\n\016fish_pool_in" +
+      "\022\"\n\013screen_info\0300 \001(\0132\013.ScreenInfoH\000\022\'\n\016" +
-      "fo\030; \001(\0132\r.FishPoolInfoH\000\0228\n\027custom_gadg" +
+      "fish_pool_info\030; \001(\0132\r.FishPoolInfoH\000\0228\n" +
-      "et_tree_info\030< \001(\0132\025.CustomGadgetTreeInf" +
+      "\027custom_gadget_tree_info\030< \001(\0132\025.CustomG" +
-      "oH\000\0225\n\025roguelike_gadget_info\030= \001(\0132\024.Rog" +
+      "adgetTreeInfoH\000\0225\n\025roguelike_gadget_info" +
-      "uelikeGadgetInfoH\000\0226\n\026night_crow_gadget_" +
+      "\030= \001(\0132\024.RoguelikeGadgetInfoH\000\0226\n\026night_" +
-      "info\030> \001(\0132\024.NightCrowGadgetInfoH\000\022@\n\033de" +
+      "crow_gadget_info\030> \001(\0132\024.NightCrowGadget" +
-      "shret_obelisk_gadget_info\030? \001(\0132\031.Deshre" +
+      "InfoH\000\022@\n\033deshret_obelisk_gadget_info\030? " +
-      "tObeliskGadgetInfoH\000\022>\n\032coin_collect_ope" +
+      "\001(\0132\031.DeshretObeliskGadgetInfoH\000\022>\n\032coin" +
-      "rator_info\030@ \001(\0132\030.CoinCollectOperatorIn" +
+      "_collect_operator_info\030@ \001(\0132\030.CoinColle" +
-      "foH\000\022&\n\rtrifle_gadget\030C \001(\0132\r.TrifleGadg" +
+      "ctOperatorInfoH\000\022&\n\rtrifle_gadget\030C \001(\0132" +
-      "etH\000\022\021\n\tmark_flag\030\025 \001(\r\022\034\n\024prop_owner_en" +
+      "\r.TrifleGadgetH\000\022\021\n\tmark_flag\030\025 \001(\r\022\034\n\024p" +
-      "tity_id\030\026 \001(\r\022\037\n\010platform\030\027 \001(\0132\r.Platfo" +
+      "rop_owner_entity_id\030\026 \001(\r\022\037\n\010platform\030\027 " +
-      "rmInfo\022\031\n\021interact_uid_list\030\030 \003(\r\022\020\n\010dra" +
+      "\001(\0132\r.PlatformInfo\022\031\n\021interact_uid_list\030" +
-      "ft_id\030\031 \001(\r\022\023\n\013KHICBPFFAII\030\032 \001(\r\022!\n\013GPOH" +
+      "\030 \003(\r\022\020\n\010draft_id\030\031 \001(\r\022\023\n\013KHICBPFFAII\030\032" +
-      "BBPBBEC\030\033 \001(\0132\014.JMFPBNKNHED\022\"\n\tplay_info" +
+      " \001(\r\022!\n\013GPOHBBPBBEC\030\033 \001(\0132\014.JMFPBNKNHED\022" +
-      "\030d \001(\0132\017.GadgetPlayInfo\022!\n\013DPJFGJDHGGJ\030e" +
+      "\"\n\tplay_info\030d \001(\0132\017.GadgetPlayInfo\022!\n\013D" +
-      " \001(\0132\014.GDGKKLFMJKH\022!\n\013PBBAFKFGHIB\030f \001(\0132" +
+      "PJFGJDHGGJ\030e \001(\0132\014.GDGKKLFMJKH\022!\n\013PBBAFK" +
-      "\014.OMBIJJLAHFB\022!\n\013FDKBHOCNBPH\030g \001(\0132\014.BDO" +
+      "FGHIB\030f \001(\0132\014.OMBIJJLAHFB\022!\n\013FDKBHOCNBPH" +
-      "CPDNCIEFB\t\n\007contentB\033\n\031emu.grasscutter.n" +
+      "\030g \001(\0132\014.BDOCPDNCIEFB\t\n\007contentB\033\n\031emu.g" +
-      "et.protob\006proto3"
+      "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ItemOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.WorktopInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ClientGadgetInfoOuterClass.getDescriptor(),
@@ -8167,6 +8228,7 @@ public final class SceneGadgetInfoOuterClass {
         internal_static_SceneGadgetInfo_descriptor,
         new java.lang.String[] { "GadgetId", "GroupId", "ConfigId", "OwnerEntityId", "BornType", "GadgetState", "KPKNNJLPMFP", "IsShowCutscene", "AuthorityPeerId", "IsEnableInteract", "CLICILNBKDD", "GatherGadget", "Worktop", "ClientGadget", "Weather", "AbilityGadget", "StatueGadget", "BossChest", "BlossomChest", "MpPlayReward", "GeneralReward", "OfferingInfo", "FoundationInfo", "VehicleInfo", "ShellInfo", "ScreenInfo", "FishPoolInfo", "CustomGadgetTreeInfo", "RoguelikeGadgetInfo", "NightCrowGadgetInfo", "DeshretObeliskGadgetInfo", "CoinCollectOperatorInfo", "TrifleGadget", "MarkFlag", "PropOwnerEntityId", "Platform", "InteractUidList", "DraftId", "KHICBPFFAII", "GPOHBBPBBEC", "PlayInfo", "DPJFGJDHGGJ", "PBBAFKFGHIB", "FDKBHOCNBPH", "Content", });
     emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ItemOuterClass.getDescriptor();
     emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.WorktopInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ClientGadgetInfoOuterClass.getDescriptor();

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

@@ -46,10 +46,10 @@ public final class SceneTeamAvatarOuterClass {
     int getPlayerUid();
 
     /**
-     * <code>bool is_on_scene = 15;</code>
+     * <code>bool is_reconnect = 15;</code>
-     * @return The isOnScene.
+     * @return The isReconnect.
      */
-    boolean getIsOnScene();
+    boolean getIsReconnect();
 
     /**
      * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
@@ -181,10 +181,10 @@ public final class SceneTeamAvatarOuterClass {
     boolean getIsPlayerCurAvatar();
 
     /**
-     * <code>bool is_reconnect = 13;</code>
+     * <code>bool is_on_scene = 13;</code>
-     * @return The isReconnect.
+     * @return The isOnScene.
      */
-    boolean getIsReconnect();
+    boolean getIsOnScene();
   }
   /**
    * <pre>
@@ -343,7 +343,7 @@ public final class SceneTeamAvatarOuterClass {
             }
             case 104: {
 
-              isReconnect_ = input.readBool();
+              isOnScene_ = input.readBool();
               break;
             }
             case 114: {
@@ -361,7 +361,7 @@ public final class SceneTeamAvatarOuterClass {
             }
             case 120: {
 
-              isOnScene_ = input.readBool();
+              isReconnect_ = input.readBool();
               break;
             }
             case 14120: {
@@ -452,15 +452,15 @@ public final class SceneTeamAvatarOuterClass {
       return playerUid_;
     }
 
-    public static final int IS_ON_SCENE_FIELD_NUMBER = 15;
+    public static final int IS_RECONNECT_FIELD_NUMBER = 15;
-    private boolean isOnScene_;
+    private boolean isReconnect_;
     /**
-     * <code>bool is_on_scene = 15;</code>
+     * <code>bool is_reconnect = 15;</code>
-     * @return The isOnScene.
+     * @return The isReconnect.
      */
     @java.lang.Override
-    public boolean getIsOnScene() {
+    public boolean getIsReconnect() {
-      return isOnScene_;
+      return isReconnect_;
     }
 
     public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 11;
@@ -688,15 +688,15 @@ public final class SceneTeamAvatarOuterClass {
       return isPlayerCurAvatar_;
     }
 
-    public static final int IS_RECONNECT_FIELD_NUMBER = 13;
+    public static final int IS_ON_SCENE_FIELD_NUMBER = 13;
-    private boolean isReconnect_;
+    private boolean isOnScene_;
     /**
-     * <code>bool is_reconnect = 13;</code>
+     * <code>bool is_on_scene = 13;</code>
-     * @return The isReconnect.
+     * @return The isOnScene.
      */
     @java.lang.Override
-    public boolean getIsReconnect() {
+    public boolean getIsOnScene() {
-      return isReconnect_;
+      return isOnScene_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -749,14 +749,14 @@ public final class SceneTeamAvatarOuterClass {
       if (avatarGuid_ != 0L) {
         output.writeUInt64(12, avatarGuid_);
       }
-      if (isReconnect_ != false) {
+      if (isOnScene_ != false) {
-        output.writeBool(13, isReconnect_);
+        output.writeBool(13, isOnScene_);
       }
       if (sceneAvatarInfo_ != null) {
         output.writeMessage(14, getSceneAvatarInfo());
       }
-      if (isOnScene_ != false) {
+      if (isReconnect_ != false) {
-        output.writeBool(15, isOnScene_);
+        output.writeBool(15, isReconnect_);
       }
       if (isPlayerCurAvatar_ != false) {
         output.writeBool(1765, isPlayerCurAvatar_);
@@ -818,17 +818,17 @@ public final class SceneTeamAvatarOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(12, avatarGuid_);
       }
-      if (isReconnect_ != false) {
+      if (isOnScene_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isReconnect_);
+          .computeBoolSize(13, isOnScene_);
       }
       if (sceneAvatarInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(14, getSceneAvatarInfo());
       }
-      if (isOnScene_ != false) {
+      if (isReconnect_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isOnScene_);
+          .computeBoolSize(15, isReconnect_);
       }
       if (isPlayerCurAvatar_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -858,8 +858,8 @@ public final class SceneTeamAvatarOuterClass {
           != other.getWeaponEntityId()) return false;
       if (getPlayerUid()
           != other.getPlayerUid()) return false;
-      if (getIsOnScene()
+      if (getIsReconnect()
-          != other.getIsOnScene()) return false;
+          != other.getIsReconnect()) return false;
       if (hasWeaponAbilityInfo() != other.hasWeaponAbilityInfo()) return false;
       if (hasWeaponAbilityInfo()) {
         if (!getWeaponAbilityInfo()
@@ -897,8 +897,8 @@ public final class SceneTeamAvatarOuterClass {
       }
       if (getIsPlayerCurAvatar()
           != other.getIsPlayerCurAvatar()) return false;
-      if (getIsReconnect()
+      if (getIsOnScene()
-          != other.getIsReconnect()) return false;
+          != other.getIsOnScene()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -918,9 +918,9 @@ public final class SceneTeamAvatarOuterClass {
       hash = (53 * hash) + getWeaponEntityId();
       hash = (37 * hash) + PLAYER_UID_FIELD_NUMBER;
       hash = (53 * hash) + getPlayerUid();
-      hash = (37 * hash) + IS_ON_SCENE_FIELD_NUMBER;
+      hash = (37 * hash) + IS_RECONNECT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsOnScene());
+          getIsReconnect());
       if (hasWeaponAbilityInfo()) {
         hash = (37 * hash) + WEAPON_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getWeaponAbilityInfo().hashCode();
@@ -958,9 +958,9 @@ public final class SceneTeamAvatarOuterClass {
       hash = (37 * hash) + IS_PLAYER_CUR_AVATAR_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsPlayerCurAvatar());
-      hash = (37 * hash) + IS_RECONNECT_FIELD_NUMBER;
+      hash = (37 * hash) + IS_ON_SCENE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsReconnect());
+          getIsOnScene());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1109,7 +1109,7 @@ public final class SceneTeamAvatarOuterClass {
 
         playerUid_ = 0;
 
-        isOnScene_ = false;
+        isReconnect_ = false;
 
         if (weaponAbilityInfoBuilder_ == null) {
           weaponAbilityInfo_ = null;
@@ -1157,7 +1157,7 @@ public final class SceneTeamAvatarOuterClass {
         }
         isPlayerCurAvatar_ = false;
 
-        isReconnect_ = false;
+        isOnScene_ = false;
 
         return this;
       }
@@ -1193,7 +1193,7 @@ public final class SceneTeamAvatarOuterClass {
         }
         result.weaponEntityId_ = weaponEntityId_;
         result.playerUid_ = playerUid_;
-        result.isOnScene_ = isOnScene_;
+        result.isReconnect_ = isReconnect_;
         if (weaponAbilityInfoBuilder_ == null) {
           result.weaponAbilityInfo_ = weaponAbilityInfo_;
         } else {
@@ -1233,7 +1233,7 @@ public final class SceneTeamAvatarOuterClass {
           result.sceneAvatarInfo_ = sceneAvatarInfoBuilder_.build();
         }
         result.isPlayerCurAvatar_ = isPlayerCurAvatar_;
-        result.isReconnect_ = isReconnect_;
+        result.isOnScene_ = isOnScene_;
         onBuilt();
         return result;
       }
@@ -1291,8 +1291,8 @@ public final class SceneTeamAvatarOuterClass {
         if (other.getPlayerUid() != 0) {
           setPlayerUid(other.getPlayerUid());
         }
-        if (other.getIsOnScene() != false) {
+        if (other.getIsReconnect() != false) {
-          setIsOnScene(other.getIsOnScene());
+          setIsReconnect(other.getIsReconnect());
         }
         if (other.hasWeaponAbilityInfo()) {
           mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
@@ -1350,8 +1350,8 @@ public final class SceneTeamAvatarOuterClass {
         if (other.getIsPlayerCurAvatar() != false) {
           setIsPlayerCurAvatar(other.getIsPlayerCurAvatar());
         }
-        if (other.getIsReconnect() != false) {
+        if (other.getIsOnScene() != false) {
-          setIsReconnect(other.getIsReconnect());
+          setIsOnScene(other.getIsOnScene());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1564,33 +1564,33 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
-      private boolean isOnScene_ ;
+      private boolean isReconnect_ ;
       /**
-       * <code>bool is_on_scene = 15;</code>
+       * <code>bool is_reconnect = 15;</code>
-       * @return The isOnScene.
+       * @return The isReconnect.
        */
       @java.lang.Override
-      public boolean getIsOnScene() {
+      public boolean getIsReconnect() {
-        return isOnScene_;
+        return isReconnect_;
       }
       /**
-       * <code>bool is_on_scene = 15;</code>
+       * <code>bool is_reconnect = 15;</code>
-       * @param value The isOnScene to set.
+       * @param value The isReconnect to set.
        * @return This builder for chaining.
        */
-      public Builder setIsOnScene(boolean value) {
+      public Builder setIsReconnect(boolean value) {
         
-        isOnScene_ = value;
+        isReconnect_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_on_scene = 15;</code>
+       * <code>bool is_reconnect = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsOnScene() {
+      public Builder clearIsReconnect() {
         
-        isOnScene_ = false;
+        isReconnect_ = false;
         onChanged();
         return this;
       }
@@ -2585,33 +2585,33 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
-      private boolean isReconnect_ ;
+      private boolean isOnScene_ ;
       /**
-       * <code>bool is_reconnect = 13;</code>
+       * <code>bool is_on_scene = 13;</code>
-       * @return The isReconnect.
+       * @return The isOnScene.
        */
       @java.lang.Override
-      public boolean getIsReconnect() {
+      public boolean getIsOnScene() {
-        return isReconnect_;
+        return isOnScene_;
       }
       /**
-       * <code>bool is_reconnect = 13;</code>
+       * <code>bool is_on_scene = 13;</code>
-       * @param value The isReconnect to set.
+       * @param value The isOnScene to set.
        * @return This builder for chaining.
        */
-      public Builder setIsReconnect(boolean value) {
+      public Builder setIsOnScene(boolean value) {
         
-        isReconnect_ = value;
+        isOnScene_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_reconnect = 13;</code>
+       * <code>bool is_on_scene = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsReconnect() {
+      public Builder clearIsOnScene() {
         
-        isReconnect_ = false;
+        isOnScene_ = false;
         onChanged();
         return this;
       }
@@ -2688,18 +2688,18 @@ public final class SceneTeamAvatarOuterClass {
       "ontrolBlock.proto\032\025SceneAvatarInfo.proto" +
       "\"\230\004\n\017SceneTeamAvatar\022+\n\021scene_entity_inf" +
       "o\030\004 \001(\0132\020.SceneEntityInfo\022\030\n\020weapon_enti" +
-      "ty_id\030\010 \001(\r\022\022\n\nplayer_uid\030\003 \001(\r\022\023\n\013is_on" +
+      "ty_id\030\010 \001(\r\022\022\n\nplayer_uid\030\003 \001(\r\022\024\n\014is_re" +
-      "_scene\030\017 \001(\010\0222\n\023weapon_ability_info\030\013 \001(" +
+      "connect\030\017 \001(\010\0222\n\023weapon_ability_info\030\013 \001" +
-      "\0132\025.AbilitySyncStateInfo\022%\n\020server_buff_" +
+      "(\0132\025.AbilitySyncStateInfo\022%\n\020server_buff" +
-      "list\030\n \003(\0132\013.ServerBuff\0222\n\023avatar_abilit" +
+      "_list\030\n \003(\0132\013.ServerBuff\0222\n\023avatar_abili" +
-      "y_info\030\007 \001(\0132\025.AbilitySyncStateInfo\022\023\n\013w" +
+      "ty_info\030\007 \001(\0132\025.AbilitySyncStateInfo\022\023\n\013" +
-      "eapon_guid\030\005 \001(\004\022 \n\013avatar_info\030\006 \001(\0132\013." +
+      "weapon_guid\030\005 \001(\004\022 \n\013avatar_info\030\006 \001(\0132\013" +
-      "AvatarInfo\022\021\n\tentity_id\030\t \001(\r\022\023\n\013avatar_" +
+      ".AvatarInfo\022\021\n\tentity_id\030\t \001(\r\022\023\n\013avatar" +
-      "guid\030\014 \001(\004\0223\n\025ability_control_block\030\001 \001(" +
+      "_guid\030\014 \001(\004\0223\n\025ability_control_block\030\001 \001" +
-      "\0132\024.AbilityControlBlock\022\020\n\010scene_id\030\002 \001(" +
+      "(\0132\024.AbilityControlBlock\022\020\n\010scene_id\030\002 \001" +
-      "\r\022+\n\021scene_avatar_info\030\016 \001(\0132\020.SceneAvat" +
+      "(\r\022+\n\021scene_avatar_info\030\016 \001(\0132\020.SceneAva" +
-      "arInfo\022\035\n\024is_player_cur_avatar\030\345\r \001(\010\022\024\n" +
+      "tarInfo\022\035\n\024is_player_cur_avatar\030\345\r \001(\010\022\023" +
-      "\014is_reconnect\030\r \001(\010B\033\n\031emu.grasscutter.n" +
+      "\n\013is_on_scene\030\r \001(\010B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -2717,7 +2717,7 @@ public final class SceneTeamAvatarOuterClass {
     internal_static_SceneTeamAvatar_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTeamAvatar_descriptor,
-        new java.lang.String[] { "SceneEntityInfo", "WeaponEntityId", "PlayerUid", "IsOnScene", "WeaponAbilityInfo", "ServerBuffList", "AvatarAbilityInfo", "WeaponGuid", "AvatarInfo", "EntityId", "AvatarGuid", "AbilityControlBlock", "SceneId", "SceneAvatarInfo", "IsPlayerCurAvatar", "IsReconnect", });
+        new java.lang.String[] { "SceneEntityInfo", "WeaponEntityId", "PlayerUid", "IsReconnect", "WeaponAbilityInfo", "ServerBuffList", "AvatarAbilityInfo", "WeaponGuid", "AvatarInfo", "EntityId", "AvatarGuid", "AbilityControlBlock", "SceneId", "SceneAvatarInfo", "IsPlayerCurAvatar", "IsOnScene", });
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();

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

@@ -19,38 +19,38 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 add_quest_id_list = 6;</code>
+     * <code>repeated uint32 del_quest_id_list = 6;</code>
-     * @return A list containing the addQuestIdList.
-     */
-    java.util.List<java.lang.Integer> getAddQuestIdListList();
-    /**
-     * <code>repeated uint32 add_quest_id_list = 6;</code>
-     * @return The count of addQuestIdList.
-     */
-    int getAddQuestIdListCount();
-    /**
-     * <code>repeated uint32 add_quest_id_list = 6;</code>
-     * @param index The index of the element to return.
-     * @return The addQuestIdList at the given index.
-     */
-    int getAddQuestIdList(int index);
-
-    /**
-     * <code>repeated uint32 del_quest_id_list = 9;</code>
      * @return A list containing the delQuestIdList.
      */
     java.util.List<java.lang.Integer> getDelQuestIdListList();
     /**
-     * <code>repeated uint32 del_quest_id_list = 9;</code>
+     * <code>repeated uint32 del_quest_id_list = 6;</code>
      * @return The count of delQuestIdList.
      */
     int getDelQuestIdListCount();
     /**
-     * <code>repeated uint32 del_quest_id_list = 9;</code>
+     * <code>repeated uint32 del_quest_id_list = 6;</code>
      * @param index The index of the element to return.
      * @return The delQuestIdList at the given index.
      */
     int getDelQuestIdList(int index);
+
+    /**
+     * <code>repeated uint32 add_quest_id_list = 9;</code>
+     * @return A list containing the addQuestIdList.
+     */
+    java.util.List<java.lang.Integer> getAddQuestIdListList();
+    /**
+     * <code>repeated uint32 add_quest_id_list = 9;</code>
+     * @return The count of addQuestIdList.
+     */
+    int getAddQuestIdListCount();
+    /**
+     * <code>repeated uint32 add_quest_id_list = 9;</code>
+     * @param index The index of the element to return.
+     * @return The addQuestIdList at the given index.
+     */
+    int getAddQuestIdList(int index);
   }
   /**
    * <pre>
@@ -70,8 +70,8 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       super(builder);
     }
     private ServerCondMeetQuestListUpdateNotify() {
-      addQuestIdList_ = emptyIntList();
       delQuestIdList_ = emptyIntList();
+      addQuestIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -107,42 +107,42 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
               break;
             case 48: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                addQuestIdList_ = newIntList();
+                delQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              addQuestIdList_.addInt(input.readUInt32());
+              delQuestIdList_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                addQuestIdList_ = newIntList();
+                delQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                addQuestIdList_.addInt(input.readUInt32());
+                delQuestIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 72: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                delQuestIdList_ = newIntList();
+                addQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              delQuestIdList_.addInt(input.readUInt32());
+              addQuestIdList_.addInt(input.readUInt32());
               break;
             }
             case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                delQuestIdList_ = newIntList();
+                addQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                delQuestIdList_.addInt(input.readUInt32());
+                addQuestIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -163,10 +163,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          addQuestIdList_.makeImmutable(); // C
+          delQuestIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          delQuestIdList_.makeImmutable(); // C
+          addQuestIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -185,38 +185,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.class, emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.Builder.class);
     }
 
-    public static final int ADD_QUEST_ID_LIST_FIELD_NUMBER = 6;
+    public static final int DEL_QUEST_ID_LIST_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList addQuestIdList_;
-    /**
-     * <code>repeated uint32 add_quest_id_list = 6;</code>
-     * @return A list containing the addQuestIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getAddQuestIdListList() {
-      return addQuestIdList_;
-    }
-    /**
-     * <code>repeated uint32 add_quest_id_list = 6;</code>
-     * @return The count of addQuestIdList.
-     */
-    public int getAddQuestIdListCount() {
-      return addQuestIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 add_quest_id_list = 6;</code>
-     * @param index The index of the element to return.
-     * @return The addQuestIdList at the given index.
-     */
-    public int getAddQuestIdList(int index) {
-      return addQuestIdList_.getInt(index);
-    }
-    private int addQuestIdListMemoizedSerializedSize = -1;
-
-    public static final int DEL_QUEST_ID_LIST_FIELD_NUMBER = 9;
     private com.google.protobuf.Internal.IntList delQuestIdList_;
     /**
-     * <code>repeated uint32 del_quest_id_list = 9;</code>
+     * <code>repeated uint32 del_quest_id_list = 6;</code>
      * @return A list containing the delQuestIdList.
      */
     @java.lang.Override
@@ -225,14 +197,14 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       return delQuestIdList_;
     }
     /**
-     * <code>repeated uint32 del_quest_id_list = 9;</code>
+     * <code>repeated uint32 del_quest_id_list = 6;</code>
      * @return The count of delQuestIdList.
      */
     public int getDelQuestIdListCount() {
       return delQuestIdList_.size();
     }
     /**
-     * <code>repeated uint32 del_quest_id_list = 9;</code>
+     * <code>repeated uint32 del_quest_id_list = 6;</code>
      * @param index The index of the element to return.
      * @return The delQuestIdList at the given index.
      */
@@ -241,6 +213,34 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     }
     private int delQuestIdListMemoizedSerializedSize = -1;
 
+    public static final int ADD_QUEST_ID_LIST_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.IntList addQuestIdList_;
+    /**
+     * <code>repeated uint32 add_quest_id_list = 9;</code>
+     * @return A list containing the addQuestIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getAddQuestIdListList() {
+      return addQuestIdList_;
+    }
+    /**
+     * <code>repeated uint32 add_quest_id_list = 9;</code>
+     * @return The count of addQuestIdList.
+     */
+    public int getAddQuestIdListCount() {
+      return addQuestIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 add_quest_id_list = 9;</code>
+     * @param index The index of the element to return.
+     * @return The addQuestIdList at the given index.
+     */
+    public int getAddQuestIdList(int index) {
+      return addQuestIdList_.getInt(index);
+    }
+    private int addQuestIdListMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -256,20 +256,20 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getAddQuestIdListList().size() > 0) {
-        output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(addQuestIdListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < addQuestIdList_.size(); i++) {
-        output.writeUInt32NoTag(addQuestIdList_.getInt(i));
-      }
       if (getDelQuestIdListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(50);
         output.writeUInt32NoTag(delQuestIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < delQuestIdList_.size(); i++) {
         output.writeUInt32NoTag(delQuestIdList_.getInt(i));
       }
+      if (getAddQuestIdListList().size() > 0) {
+        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(addQuestIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < addQuestIdList_.size(); i++) {
+        output.writeUInt32NoTag(addQuestIdList_.getInt(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -279,20 +279,6 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      {
-        int dataSize = 0;
-        for (int i = 0; i < addQuestIdList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(addQuestIdList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getAddQuestIdListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        addQuestIdListMemoizedSerializedSize = dataSize;
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < delQuestIdList_.size(); i++) {
@@ -307,6 +293,20 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         }
         delQuestIdListMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < addQuestIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(addQuestIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getAddQuestIdListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        addQuestIdListMemoizedSerializedSize = dataSize;
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -322,10 +322,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify other = (emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify) obj;
 
-      if (!getAddQuestIdListList()
-          .equals(other.getAddQuestIdListList())) return false;
       if (!getDelQuestIdListList()
           .equals(other.getDelQuestIdListList())) return false;
+      if (!getAddQuestIdListList()
+          .equals(other.getAddQuestIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -337,14 +337,14 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getAddQuestIdListCount() > 0) {
-        hash = (37 * hash) + ADD_QUEST_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getAddQuestIdListList().hashCode();
-      }
       if (getDelQuestIdListCount() > 0) {
         hash = (37 * hash) + DEL_QUEST_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getDelQuestIdListList().hashCode();
       }
+      if (getAddQuestIdListCount() > 0) {
+        hash = (37 * hash) + ADD_QUEST_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAddQuestIdListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -483,9 +483,9 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        addQuestIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         delQuestIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        addQuestIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -515,15 +515,15 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify result = new emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          addQuestIdList_.makeImmutable();
+          delQuestIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.addQuestIdList_ = addQuestIdList_;
+        result.delQuestIdList_ = delQuestIdList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          delQuestIdList_.makeImmutable();
+          addQuestIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.delQuestIdList_ = delQuestIdList_;
+        result.addQuestIdList_ = addQuestIdList_;
         onBuilt();
         return result;
       }
@@ -572,26 +572,26 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.getDefaultInstance()) return this;
-        if (!other.addQuestIdList_.isEmpty()) {
-          if (addQuestIdList_.isEmpty()) {
-            addQuestIdList_ = other.addQuestIdList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureAddQuestIdListIsMutable();
-            addQuestIdList_.addAll(other.addQuestIdList_);
-          }
-          onChanged();
-        }
         if (!other.delQuestIdList_.isEmpty()) {
           if (delQuestIdList_.isEmpty()) {
             delQuestIdList_ = other.delQuestIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureDelQuestIdListIsMutable();
             delQuestIdList_.addAll(other.delQuestIdList_);
           }
           onChanged();
         }
+        if (!other.addQuestIdList_.isEmpty()) {
+          if (addQuestIdList_.isEmpty()) {
+            addQuestIdList_ = other.addQuestIdList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureAddQuestIdListIsMutable();
+            addQuestIdList_.addAll(other.addQuestIdList_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -622,110 +622,31 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList addQuestIdList_ = emptyIntList();
+      private com.google.protobuf.Internal.IntList delQuestIdList_ = emptyIntList();
-      private void ensureAddQuestIdListIsMutable() {
+      private void ensureDelQuestIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          addQuestIdList_ = mutableCopy(addQuestIdList_);
+          delQuestIdList_ = mutableCopy(delQuestIdList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 add_quest_id_list = 6;</code>
+       * <code>repeated uint32 del_quest_id_list = 6;</code>
-       * @return A list containing the addQuestIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getAddQuestIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(addQuestIdList_) : addQuestIdList_;
-      }
-      /**
-       * <code>repeated uint32 add_quest_id_list = 6;</code>
-       * @return The count of addQuestIdList.
-       */
-      public int getAddQuestIdListCount() {
-        return addQuestIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 add_quest_id_list = 6;</code>
-       * @param index The index of the element to return.
-       * @return The addQuestIdList at the given index.
-       */
-      public int getAddQuestIdList(int index) {
-        return addQuestIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 add_quest_id_list = 6;</code>
-       * @param index The index to set the value at.
-       * @param value The addQuestIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAddQuestIdList(
-          int index, int value) {
-        ensureAddQuestIdListIsMutable();
-        addQuestIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 add_quest_id_list = 6;</code>
-       * @param value The addQuestIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAddQuestIdList(int value) {
-        ensureAddQuestIdListIsMutable();
-        addQuestIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 add_quest_id_list = 6;</code>
-       * @param values The addQuestIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllAddQuestIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureAddQuestIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, addQuestIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 add_quest_id_list = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAddQuestIdList() {
-        addQuestIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList delQuestIdList_ = emptyIntList();
-      private void ensureDelQuestIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          delQuestIdList_ = mutableCopy(delQuestIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 del_quest_id_list = 9;</code>
        * @return A list containing the delQuestIdList.
        */
       public java.util.List<java.lang.Integer>
           getDelQuestIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(delQuestIdList_) : delQuestIdList_;
       }
       /**
-       * <code>repeated uint32 del_quest_id_list = 9;</code>
+       * <code>repeated uint32 del_quest_id_list = 6;</code>
        * @return The count of delQuestIdList.
        */
       public int getDelQuestIdListCount() {
         return delQuestIdList_.size();
       }
       /**
-       * <code>repeated uint32 del_quest_id_list = 9;</code>
+       * <code>repeated uint32 del_quest_id_list = 6;</code>
        * @param index The index of the element to return.
        * @return The delQuestIdList at the given index.
        */
@@ -733,7 +654,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return delQuestIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 del_quest_id_list = 9;</code>
+       * <code>repeated uint32 del_quest_id_list = 6;</code>
        * @param index The index to set the value at.
        * @param value The delQuestIdList to set.
        * @return This builder for chaining.
@@ -746,7 +667,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 del_quest_id_list = 9;</code>
+       * <code>repeated uint32 del_quest_id_list = 6;</code>
        * @param value The delQuestIdList to add.
        * @return This builder for chaining.
        */
@@ -757,7 +678,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 del_quest_id_list = 9;</code>
+       * <code>repeated uint32 del_quest_id_list = 6;</code>
        * @param values The delQuestIdList to add.
        * @return This builder for chaining.
        */
@@ -770,11 +691,90 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 del_quest_id_list = 9;</code>
+       * <code>repeated uint32 del_quest_id_list = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearDelQuestIdList() {
         delQuestIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList addQuestIdList_ = emptyIntList();
+      private void ensureAddQuestIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          addQuestIdList_ = mutableCopy(addQuestIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 add_quest_id_list = 9;</code>
+       * @return A list containing the addQuestIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getAddQuestIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(addQuestIdList_) : addQuestIdList_;
+      }
+      /**
+       * <code>repeated uint32 add_quest_id_list = 9;</code>
+       * @return The count of addQuestIdList.
+       */
+      public int getAddQuestIdListCount() {
+        return addQuestIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 add_quest_id_list = 9;</code>
+       * @param index The index of the element to return.
+       * @return The addQuestIdList at the given index.
+       */
+      public int getAddQuestIdList(int index) {
+        return addQuestIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 add_quest_id_list = 9;</code>
+       * @param index The index to set the value at.
+       * @param value The addQuestIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAddQuestIdList(
+          int index, int value) {
+        ensureAddQuestIdListIsMutable();
+        addQuestIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 add_quest_id_list = 9;</code>
+       * @param value The addQuestIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAddQuestIdList(int value) {
+        ensureAddQuestIdListIsMutable();
+        addQuestIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 add_quest_id_list = 9;</code>
+       * @param values The addQuestIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllAddQuestIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureAddQuestIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, addQuestIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 add_quest_id_list = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAddQuestIdList() {
+        addQuestIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -848,7 +848,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n)ServerCondMeetQuestListUpdateNotify.pr" +
       "oto\"[\n#ServerCondMeetQuestListUpdateNoti" +
-      "fy\022\031\n\021add_quest_id_list\030\006 \003(\r\022\031\n\021del_que" +
+      "fy\022\031\n\021del_quest_id_list\030\006 \003(\r\022\031\n\021add_que" +
       "st_id_list\030\t \003(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
@@ -861,7 +861,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     internal_static_ServerCondMeetQuestListUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ServerCondMeetQuestListUpdateNotify_descriptor,
-        new java.lang.String[] { "AddQuestIdList", "DelQuestIdList", });
+        new java.lang.String[] { "DelQuestIdList", "AddQuestIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -182,6 +182,14 @@ public final class TrialAvatarGrantRecordOuterClass {
        * <code>GRANT_REASON_BY_CHAR_AMUSEMENT = 13;</code>
        */
       GRANT_REASON_BY_CHAR_AMUSEMENT(13),
+      /**
+       * <code>FJBKKFJNBHD_HMLDNDBKNFL = 14;</code>
+       */
+      FJBKKFJNBHD_HMLDNDBKNFL(14),
+      /**
+       * <code>FJBKKFJNBHD_PJDEJIHFCPP = 15;</code>
+       */
+      FJBKKFJNBHD_PJDEJIHFCPP(15),
       UNRECOGNIZED(-1),
       ;
 
@@ -241,6 +249,14 @@ public final class TrialAvatarGrantRecordOuterClass {
        * <code>GRANT_REASON_BY_CHAR_AMUSEMENT = 13;</code>
        */
       public static final int GRANT_REASON_BY_CHAR_AMUSEMENT_VALUE = 13;
+      /**
+       * <code>FJBKKFJNBHD_HMLDNDBKNFL = 14;</code>
+       */
+      public static final int FJBKKFJNBHD_HMLDNDBKNFL_VALUE = 14;
+      /**
+       * <code>FJBKKFJNBHD_PJDEJIHFCPP = 15;</code>
+       */
+      public static final int FJBKKFJNBHD_PJDEJIHFCPP_VALUE = 15;
 
 
       public final int getNumber() {
@@ -281,6 +297,8 @@ public final class TrialAvatarGrantRecordOuterClass {
           case 11: return GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY;
           case 12: return GRANT_REASON_BY_VINTAGE_HUNTING;
           case 13: return GRANT_REASON_BY_CHAR_AMUSEMENT;
+          case 14: return FJBKKFJNBHD_HMLDNDBKNFL;
+          case 15: return FJBKKFJNBHD_PJDEJIHFCPP;
           default: return null;
         }
       }
@@ -810,9 +828,9 @@ public final class TrialAvatarGrantRecordOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034TrialAvatarGrantRecord.proto\"\346\004\n\026Trial" +
+      "\n\034TrialAvatarGrantRecord.proto\"\240\005\n\026Trial" +
       "AvatarGrantRecord\022\024\n\014grant_reason\030\001 \001(\r\022" +
-      "\034\n\024from_parent_quest_id\030\002 \001(\r\"\227\004\n\013GrantR" +
+      "\034\n\024from_parent_quest_id\030\002 \001(\r\"\321\004\n\013GrantR" +
       "eason\022\030\n\024GRANT_REASON_INVALID\020\000\022\031\n\025GRANT" +
       "_REASON_BY_QUEST\020\001\022)\n%GRANT_REASON_BY_TR" +
       "IAL_AVATAR_ACTIVITY\020\002\022-\n)GRANT_REASON_BY" +
@@ -826,8 +844,9 @@ public final class TrialAvatarGrantRecordOuterClass {
       "CTIVITY\020\n\022+\n\'GRANT_REASON_BY_MUQADAS_POT" +
       "ION_ACTIVITY\020\013\022#\n\037GRANT_REASON_BY_VINTAG" +
       "E_HUNTING\020\014\022\"\n\036GRANT_REASON_BY_CHAR_AMUS" +
-      "EMENT\020\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "EMENT\020\r\022\033\n\027FJBKKFJNBHD_HMLDNDBKNFL\020\016\022\033\n\027" +
-      "oto3"
+      "FJBKKFJNBHD_PJDEJIHFCPP\020\017B\033\n\031emu.grasscu" +
+      "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

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

@@ -19,17 +19,17 @@ public final class WeaponPromoteRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 old_promote_level = 4;</code>
+     * <code>uint32 cur_promote_level = 4;</code>
-     * @return The oldPromoteLevel.
-     */
-    int getOldPromoteLevel();
-
-    /**
-     * <code>uint32 cur_promote_level = 14;</code>
      * @return The curPromoteLevel.
      */
     int getCurPromoteLevel();
 
+    /**
+     * <code>uint32 old_promote_level = 14;</code>
+     * @return The oldPromoteLevel.
+     */
+    int getOldPromoteLevel();
+
     /**
      * <code>int32 retcode = 6;</code>
      * @return The retcode.
@@ -99,7 +99,7 @@ public final class WeaponPromoteRspOuterClass {
             }
             case 32: {
 
-              oldPromoteLevel_ = input.readUInt32();
+              curPromoteLevel_ = input.readUInt32();
               break;
             }
             case 48: {
@@ -109,7 +109,7 @@ public final class WeaponPromoteRspOuterClass {
             }
             case 112: {
 
-              curPromoteLevel_ = input.readUInt32();
+              oldPromoteLevel_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,21 +144,10 @@ public final class WeaponPromoteRspOuterClass {
               emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.class, emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.Builder.class);
     }
 
-    public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 4;
+    public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 4;
-    private int oldPromoteLevel_;
-    /**
-     * <code>uint32 old_promote_level = 4;</code>
-     * @return The oldPromoteLevel.
-     */
-    @java.lang.Override
-    public int getOldPromoteLevel() {
-      return oldPromoteLevel_;
-    }
-
-    public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 14;
     private int curPromoteLevel_;
     /**
-     * <code>uint32 cur_promote_level = 14;</code>
+     * <code>uint32 cur_promote_level = 4;</code>
      * @return The curPromoteLevel.
      */
     @java.lang.Override
@@ -166,6 +155,17 @@ public final class WeaponPromoteRspOuterClass {
       return curPromoteLevel_;
     }
 
+    public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 14;
+    private int oldPromoteLevel_;
+    /**
+     * <code>uint32 old_promote_level = 14;</code>
+     * @return The oldPromoteLevel.
+     */
+    @java.lang.Override
+    public int getOldPromoteLevel() {
+      return oldPromoteLevel_;
+    }
+
     public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
@@ -205,14 +205,14 @@ public final class WeaponPromoteRspOuterClass {
       if (targetWeaponGuid_ != 0L) {
         output.writeUInt64(3, targetWeaponGuid_);
       }
-      if (oldPromoteLevel_ != 0) {
+      if (curPromoteLevel_ != 0) {
-        output.writeUInt32(4, oldPromoteLevel_);
+        output.writeUInt32(4, curPromoteLevel_);
       }
       if (retcode_ != 0) {
         output.writeInt32(6, retcode_);
       }
-      if (curPromoteLevel_ != 0) {
+      if (oldPromoteLevel_ != 0) {
-        output.writeUInt32(14, curPromoteLevel_);
+        output.writeUInt32(14, oldPromoteLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -227,17 +227,17 @@ public final class WeaponPromoteRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(3, targetWeaponGuid_);
       }
-      if (oldPromoteLevel_ != 0) {
+      if (curPromoteLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, oldPromoteLevel_);
+          .computeUInt32Size(4, curPromoteLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(6, retcode_);
       }
-      if (curPromoteLevel_ != 0) {
+      if (oldPromoteLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, curPromoteLevel_);
+          .computeUInt32Size(14, oldPromoteLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,10 +254,10 @@ public final class WeaponPromoteRspOuterClass {
       }
       emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other = (emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp) obj;
 
-      if (getOldPromoteLevel()
-          != other.getOldPromoteLevel()) return false;
       if (getCurPromoteLevel()
           != other.getCurPromoteLevel()) return false;
+      if (getOldPromoteLevel()
+          != other.getOldPromoteLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getTargetWeaponGuid()
@@ -273,10 +273,10 @@ public final class WeaponPromoteRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getOldPromoteLevel();
       hash = (37 * hash) + CUR_PROMOTE_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getCurPromoteLevel();
+      hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOldPromoteLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
@@ -420,10 +420,10 @@ public final class WeaponPromoteRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        oldPromoteLevel_ = 0;
-
         curPromoteLevel_ = 0;
 
+        oldPromoteLevel_ = 0;
+
         retcode_ = 0;
 
         targetWeaponGuid_ = 0L;
@@ -454,8 +454,8 @@ public final class WeaponPromoteRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp buildPartial() {
         emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp result = new emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp(this);
-        result.oldPromoteLevel_ = oldPromoteLevel_;
         result.curPromoteLevel_ = curPromoteLevel_;
+        result.oldPromoteLevel_ = oldPromoteLevel_;
         result.retcode_ = retcode_;
         result.targetWeaponGuid_ = targetWeaponGuid_;
         onBuilt();
@@ -506,12 +506,12 @@ public final class WeaponPromoteRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other) {
         if (other == emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.getDefaultInstance()) return this;
-        if (other.getOldPromoteLevel() != 0) {
-          setOldPromoteLevel(other.getOldPromoteLevel());
-        }
         if (other.getCurPromoteLevel() != 0) {
           setCurPromoteLevel(other.getCurPromoteLevel());
         }
+        if (other.getOldPromoteLevel() != 0) {
+          setOldPromoteLevel(other.getOldPromoteLevel());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -547,40 +547,9 @@ public final class WeaponPromoteRspOuterClass {
         return this;
       }
 
-      private int oldPromoteLevel_ ;
-      /**
-       * <code>uint32 old_promote_level = 4;</code>
-       * @return The oldPromoteLevel.
-       */
-      @java.lang.Override
-      public int getOldPromoteLevel() {
-        return oldPromoteLevel_;
-      }
-      /**
-       * <code>uint32 old_promote_level = 4;</code>
-       * @param value The oldPromoteLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldPromoteLevel(int value) {
-        
-        oldPromoteLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 old_promote_level = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldPromoteLevel() {
-        
-        oldPromoteLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int curPromoteLevel_ ;
       /**
-       * <code>uint32 cur_promote_level = 14;</code>
+       * <code>uint32 cur_promote_level = 4;</code>
        * @return The curPromoteLevel.
        */
       @java.lang.Override
@@ -588,7 +557,7 @@ public final class WeaponPromoteRspOuterClass {
         return curPromoteLevel_;
       }
       /**
-       * <code>uint32 cur_promote_level = 14;</code>
+       * <code>uint32 cur_promote_level = 4;</code>
        * @param value The curPromoteLevel to set.
        * @return This builder for chaining.
        */
@@ -599,7 +568,7 @@ public final class WeaponPromoteRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cur_promote_level = 14;</code>
+       * <code>uint32 cur_promote_level = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurPromoteLevel() {
@@ -609,6 +578,37 @@ public final class WeaponPromoteRspOuterClass {
         return this;
       }
 
+      private int oldPromoteLevel_ ;
+      /**
+       * <code>uint32 old_promote_level = 14;</code>
+       * @return The oldPromoteLevel.
+       */
+      @java.lang.Override
+      public int getOldPromoteLevel() {
+        return oldPromoteLevel_;
+      }
+      /**
+       * <code>uint32 old_promote_level = 14;</code>
+       * @param value The oldPromoteLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldPromoteLevel(int value) {
+        
+        oldPromoteLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 old_promote_level = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldPromoteLevel() {
+        
+        oldPromoteLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
        * <code>int32 retcode = 6;</code>
@@ -738,7 +738,7 @@ public final class WeaponPromoteRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WeaponPromoteRsp.proto\"u\n\020WeaponPromot" +
-      "eRsp\022\031\n\021old_promote_level\030\004 \001(\r\022\031\n\021cur_p" +
+      "eRsp\022\031\n\021cur_promote_level\030\004 \001(\r\022\031\n\021old_p" +
       "romote_level\030\016 \001(\r\022\017\n\007retcode\030\006 \001(\005\022\032\n\022t" +
       "arget_weapon_guid\030\003 \001(\004B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
@@ -752,7 +752,7 @@ public final class WeaponPromoteRspOuterClass {
     internal_static_WeaponPromoteRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WeaponPromoteRsp_descriptor,
-        new java.lang.String[] { "OldPromoteLevel", "CurPromoteLevel", "Retcode", "TargetWeaponGuid", });
+        new java.lang.String[] { "CurPromoteLevel", "OldPromoteLevel", "Retcode", "TargetWeaponGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -19,16 +19,16 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 PFDDEKLPFJL = 3;</code>
+     * <code>uint32 filter_city_id = 3;</code>
-     * @return The pFDDEKLPFJL.
+     * @return The filterCityId.
      */
-    int getPFDDEKLPFJL();
+    int getFilterCityId();
 
     /**
-     * <code>uint32 PIOIDLPAJIN = 4;</code>
+     * <code>uint32 finished_daily_task_num = 4;</code>
-     * @return The pIOIDLPAJIN.
+     * @return The finishedDailyTaskNum.
      */
-    int getPIOIDLPAJIN();
+    int getFinishedDailyTaskNum();
 
     /**
      * <code>repeated .DailyTaskInfo task_list = 8;</code>
@@ -108,12 +108,12 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
               break;
             case 24: {
 
-              pFDDEKLPFJL_ = input.readUInt32();
+              filterCityId_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              pIOIDLPAJIN_ = input.readUInt32();
+              finishedDailyTaskNum_ = input.readUInt32();
               break;
             }
             case 66: {
@@ -160,26 +160,26 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
               emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify.class, emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify.Builder.class);
     }
 
-    public static final int PFDDEKLPFJL_FIELD_NUMBER = 3;
+    public static final int FILTER_CITY_ID_FIELD_NUMBER = 3;
-    private int pFDDEKLPFJL_;
+    private int filterCityId_;
     /**
-     * <code>uint32 PFDDEKLPFJL = 3;</code>
+     * <code>uint32 filter_city_id = 3;</code>
-     * @return The pFDDEKLPFJL.
+     * @return The filterCityId.
      */
     @java.lang.Override
-    public int getPFDDEKLPFJL() {
+    public int getFilterCityId() {
-      return pFDDEKLPFJL_;
+      return filterCityId_;
     }
 
-    public static final int PIOIDLPAJIN_FIELD_NUMBER = 4;
+    public static final int FINISHED_DAILY_TASK_NUM_FIELD_NUMBER = 4;
-    private int pIOIDLPAJIN_;
+    private int finishedDailyTaskNum_;
     /**
-     * <code>uint32 PIOIDLPAJIN = 4;</code>
+     * <code>uint32 finished_daily_task_num = 4;</code>
-     * @return The pIOIDLPAJIN.
+     * @return The finishedDailyTaskNum.
      */
     @java.lang.Override
-    public int getPIOIDLPAJIN() {
+    public int getFinishedDailyTaskNum() {
-      return pIOIDLPAJIN_;
+      return finishedDailyTaskNum_;
     }
 
     public static final int TASK_LIST_FIELD_NUMBER = 8;
@@ -236,11 +236,11 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pFDDEKLPFJL_ != 0) {
+      if (filterCityId_ != 0) {
-        output.writeUInt32(3, pFDDEKLPFJL_);
+        output.writeUInt32(3, filterCityId_);
       }
-      if (pIOIDLPAJIN_ != 0) {
+      if (finishedDailyTaskNum_ != 0) {
-        output.writeUInt32(4, pIOIDLPAJIN_);
+        output.writeUInt32(4, finishedDailyTaskNum_);
       }
       for (int i = 0; i < taskList_.size(); i++) {
         output.writeMessage(8, taskList_.get(i));
@@ -254,13 +254,13 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pFDDEKLPFJL_ != 0) {
+      if (filterCityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, pFDDEKLPFJL_);
+          .computeUInt32Size(3, filterCityId_);
       }
-      if (pIOIDLPAJIN_ != 0) {
+      if (finishedDailyTaskNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, pIOIDLPAJIN_);
+          .computeUInt32Size(4, finishedDailyTaskNum_);
       }
       for (int i = 0; i < taskList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -281,10 +281,10 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify other = (emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify) obj;
 
-      if (getPFDDEKLPFJL()
+      if (getFilterCityId()
-          != other.getPFDDEKLPFJL()) return false;
+          != other.getFilterCityId()) return false;
-      if (getPIOIDLPAJIN()
+      if (getFinishedDailyTaskNum()
-          != other.getPIOIDLPAJIN()) return false;
+          != other.getFinishedDailyTaskNum()) return false;
       if (!getTaskListList()
           .equals(other.getTaskListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -298,10 +298,10 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PFDDEKLPFJL_FIELD_NUMBER;
+      hash = (37 * hash) + FILTER_CITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPFDDEKLPFJL();
+      hash = (53 * hash) + getFilterCityId();
-      hash = (37 * hash) + PIOIDLPAJIN_FIELD_NUMBER;
+      hash = (37 * hash) + FINISHED_DAILY_TASK_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getPIOIDLPAJIN();
+      hash = (53 * hash) + getFinishedDailyTaskNum();
       if (getTaskListCount() > 0) {
         hash = (37 * hash) + TASK_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getTaskListList().hashCode();
@@ -445,9 +445,9 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pFDDEKLPFJL_ = 0;
+        filterCityId_ = 0;
 
-        pIOIDLPAJIN_ = 0;
+        finishedDailyTaskNum_ = 0;
 
         if (taskListBuilder_ == null) {
           taskList_ = java.util.Collections.emptyList();
@@ -482,8 +482,8 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       public emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify buildPartial() {
         emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify result = new emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify(this);
         int from_bitField0_ = bitField0_;
-        result.pFDDEKLPFJL_ = pFDDEKLPFJL_;
+        result.filterCityId_ = filterCityId_;
-        result.pIOIDLPAJIN_ = pIOIDLPAJIN_;
+        result.finishedDailyTaskNum_ = finishedDailyTaskNum_;
         if (taskListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             taskList_ = java.util.Collections.unmodifiableList(taskList_);
@@ -541,11 +541,11 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify other) {
         if (other == emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify.getDefaultInstance()) return this;
-        if (other.getPFDDEKLPFJL() != 0) {
+        if (other.getFilterCityId() != 0) {
-          setPFDDEKLPFJL(other.getPFDDEKLPFJL());
+          setFilterCityId(other.getFilterCityId());
         }
-        if (other.getPIOIDLPAJIN() != 0) {
+        if (other.getFinishedDailyTaskNum() != 0) {
-          setPIOIDLPAJIN(other.getPIOIDLPAJIN());
+          setFinishedDailyTaskNum(other.getFinishedDailyTaskNum());
         }
         if (taskListBuilder_ == null) {
           if (!other.taskList_.isEmpty()) {
@@ -603,64 +603,64 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int pFDDEKLPFJL_ ;
+      private int filterCityId_ ;
       /**
-       * <code>uint32 PFDDEKLPFJL = 3;</code>
+       * <code>uint32 filter_city_id = 3;</code>
-       * @return The pFDDEKLPFJL.
+       * @return The filterCityId.
        */
       @java.lang.Override
-      public int getPFDDEKLPFJL() {
+      public int getFilterCityId() {
-        return pFDDEKLPFJL_;
+        return filterCityId_;
       }
       /**
-       * <code>uint32 PFDDEKLPFJL = 3;</code>
+       * <code>uint32 filter_city_id = 3;</code>
-       * @param value The pFDDEKLPFJL to set.
+       * @param value The filterCityId to set.
        * @return This builder for chaining.
        */
-      public Builder setPFDDEKLPFJL(int value) {
+      public Builder setFilterCityId(int value) {
         
-        pFDDEKLPFJL_ = value;
+        filterCityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 PFDDEKLPFJL = 3;</code>
+       * <code>uint32 filter_city_id = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPFDDEKLPFJL() {
+      public Builder clearFilterCityId() {
         
-        pFDDEKLPFJL_ = 0;
+        filterCityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int pIOIDLPAJIN_ ;
+      private int finishedDailyTaskNum_ ;
       /**
-       * <code>uint32 PIOIDLPAJIN = 4;</code>
+       * <code>uint32 finished_daily_task_num = 4;</code>
-       * @return The pIOIDLPAJIN.
+       * @return The finishedDailyTaskNum.
        */
       @java.lang.Override
-      public int getPIOIDLPAJIN() {
+      public int getFinishedDailyTaskNum() {
-        return pIOIDLPAJIN_;
+        return finishedDailyTaskNum_;
       }
       /**
-       * <code>uint32 PIOIDLPAJIN = 4;</code>
+       * <code>uint32 finished_daily_task_num = 4;</code>
-       * @param value The pIOIDLPAJIN to set.
+       * @param value The finishedDailyTaskNum to set.
        * @return This builder for chaining.
        */
-      public Builder setPIOIDLPAJIN(int value) {
+      public Builder setFinishedDailyTaskNum(int value) {
         
-        pIOIDLPAJIN_ = value;
+        finishedDailyTaskNum_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 PIOIDLPAJIN = 4;</code>
+       * <code>uint32 finished_daily_task_num = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPIOIDLPAJIN() {
+      public Builder clearFinishedDailyTaskNum() {
         
-        pIOIDLPAJIN_ = 0;
+        finishedDailyTaskNum_ = 0;
         onChanged();
         return this;
       }
@@ -972,10 +972,11 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037WorldOwnerDailyTaskNotify.proto\032\023Daily" +
-      "TaskInfo.proto\"h\n\031WorldOwnerDailyTaskNot" +
+      "TaskInfo.proto\"w\n\031WorldOwnerDailyTaskNot" +
-      "ify\022\023\n\013PFDDEKLPFJL\030\003 \001(\r\022\023\n\013PIOIDLPAJIN\030" +
+      "ify\022\026\n\016filter_city_id\030\003 \001(\r\022\037\n\027finished_" +
-      "\004 \001(\r\022!\n\ttask_list\030\010 \003(\0132\016.DailyTaskInfo" +
+      "daily_task_num\030\004 \001(\r\022!\n\ttask_list\030\010 \003(\0132" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\016.DailyTaskInfoB\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -987,7 +988,7 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
     internal_static_WorldOwnerDailyTaskNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldOwnerDailyTaskNotify_descriptor,
-        new java.lang.String[] { "PFDDEKLPFJL", "PIOIDLPAJIN", "TaskList", });
+        new java.lang.String[] { "FilterCityId", "FinishedDailyTaskNum", "TaskList", });
     emu.grasscutter.net.proto.DailyTaskInfoOuterClass.getDescriptor();
   }
 

src/main/java/emu/grasscutter/data/GameData.java

@@ -27,11 +27,10 @@ import emu.grasscutter.game.quest.enums.QuestCond;
 import emu.grasscutter.game.world.GroupReplacementData;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
-import javax.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.util.*;
+import javax.annotation.Nullable;
+import lombok.*;
 
 @SuppressWarnings({"unused", "MismatchedQueryAndUpdateOfCollection"})
 public final class GameData {
@@ -142,8 +141,7 @@ public final class GameData {
             new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap<BargainData> bargainDataMap
+    private static final Int2ObjectMap<BargainData> bargainDataMap = new Int2ObjectOpenHashMap<>();
-        = new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<BattlePassMissionData> battlePassMissionDataMap =
@@ -250,7 +248,8 @@ public final class GameData {
     private static final Int2ObjectMap<GivingData> givingDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap<GivingGroupData> givingGroupDataMap = new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap<GivingGroupData> givingGroupDataMap =
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     @Deprecated // This is to prevent people from using this map. This is for the resource loader
@@ -270,17 +269,18 @@ public final class GameData {
     private static final Int2ObjectMap<InvestigationMonsterData> investigationMonsterDataMap =
             new Int2ObjectOpenHashMap<>();
 
-    @Getter
+    @Getter private static final Int2ObjectMap<ItemData> itemDataMap = new Int2ObjectOpenHashMap<>();
-    private static final Int2ObjectMap<ItemData> itemDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<MapLayerData> mapLayerDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap<MapLayerFloorData> mapLayerFloorDataMap = new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap<MapLayerFloorData> mapLayerFloorDataMap =
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap<MapLayerGroupData> mapLayerGroupDataMap = new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap<MapLayerGroupData> mapLayerGroupDataMap =
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<MonsterCurveData> monsterCurveDataMap =
@@ -347,16 +347,18 @@ public final class GameData {
 
     @Getter
     private static final Int2ObjectMap<SceneData> sceneDataMap = new Int2ObjectLinkedOpenHashMap<>();
+
     @Getter
-    private static final Int2ObjectMap<SceneTagData> sceneTagDataMap = new Int2ObjectLinkedOpenHashMap<>();
+    private static final Int2ObjectMap<SceneTagData> sceneTagDataMap =
+            new Int2ObjectLinkedOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<TalkConfigData> talkConfigDataMap =
-        new Int2ObjectOpenHashMap<>();
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<TowerFloorData> towerFloorDataMap =
-        new Int2ObjectOpenHashMap<>();
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<TowerLevelData> towerLevelDataMap =

src/main/java/emu/grasscutter/data/excels/BargainData.java

@@ -1,9 +1,8 @@
 package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.*;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @Getter
 @ResourceType(name = "BargainExcelConfigData.json")
@@ -14,11 +13,11 @@ public final class BargainData extends GameResource {
     private List<Integer> dialogId;
 
     /**
-     * This is a list of 2 integers.
+     * This is a list of 2 integers. The first integer is the minimum value of the bargain. The second
-     * The first integer is the minimum value of the bargain.
+     * integer is the maximum value of the bargain.
-     * The second integer is the maximum value of the bargain.
      */
     private List<Integer> expectedValue;
+
     private int space;
 
     private List<Integer> successTalkId;
@@ -26,11 +25,11 @@ public final class BargainData extends GameResource {
     private int moodNpcId;
 
     /**
-     * This is a list of 2 integers.
+     * This is a list of 2 integers. The first integer is the minimum value of the mood. The second
-     * The first integer is the minimum value of the mood.
+     * integer is the maximum value of the mood.
-     * The second integer is the maximum value of the mood.
      */
     private List<Integer> randomMood;
+
     private int moodAlertLimit;
     private int moodLowLimit;
     private int singleFailMoodDeduction;

src/main/java/emu/grasscutter/data/excels/giving/GivingData.java

@@ -4,9 +4,8 @@ import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.inventory.BagTab;
-import lombok.*;
-
 import java.util.List;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -14,6 +13,7 @@ import java.util.List;
 public final class GivingData extends GameResource {
     @SerializedName(value = "id", alternate = "Id")
     private int id;
+
     private int talkId;
     private int mistakeTalkId;
 
@@ -40,7 +40,9 @@ public final class GivingData extends GameResource {
     }
 
     public enum GiveType {
-        @SerializedName("GIVING_TYPE_QUEST") QUEST,
+        @SerializedName("GIVING_TYPE_QUEST")
-        @SerializedName("GIVING_TYPE_GROUP") GROUP
+        QUEST,
+        @SerializedName("GIVING_TYPE_GROUP")
+        GROUP
     }
 }

src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java

@@ -2,9 +2,8 @@ package emu.grasscutter.data.excels.giving;
 
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
-import lombok.*;
-
 import java.util.List;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java

@@ -13,7 +13,7 @@ public final class MapLayerData extends GameResource {
 
     @SerializedName("NLPFIGAEBFP")
     private int idk1;
-    @SerializedName("GCBPOOPNLLD")
-    private float level;    //how deep thoronium is in me
 
+    @SerializedName("GCBPOOPNLLD")
+    private float level; // how deep thoronium is in me
 }

src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java

@@ -3,22 +3,26 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.experimental.FieldDefaults;
 
-import java.util.List;
-
 @ResourceType(name = "MapLayerFloorExcelConfigData.json")
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public final class MapLayerFloorData extends GameResource {
     @Getter(onMethod_ = @Override)
     int id;
+
     int PJDGAAAGOPO;
     int LCGNJBLMDHA;
-    @SerializedName(value = "floorNameTextMapHash", alternate = {"NDAGFKELEAP"})
+
+    @SerializedName(
+            value = "floorNameTextMapHash",
+            alternate = {"NDAGFKELEAP"})
     long floorNameTextMapHash;
+
     CKNDNKLCAHC CKNDNKLCAHC;
     long BHEMLJCFHPI;
 

src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java

@@ -3,9 +3,8 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @ResourceType(name = "MapLayerGroupExcelConfigData.json")
 @Getter
@@ -15,7 +14,7 @@ public final class MapLayerGroupData extends GameResource {
 
     @SerializedName("FIIAHPKBCDE")
     private List<Integer> areaIds;
-    @SerializedName("ODEFCAMHKNK")
-    private float mapFloorId;    //MapLayerFloorExcel (first level of the maplayer)
 
+    @SerializedName("ODEFCAMHKNK")
+    private float mapFloorId; // MapLayerFloorExcel (first level of the maplayer)
 }

src/main/java/emu/grasscutter/data/excels/scene/SceneData.java

@@ -3,9 +3,8 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.SceneType;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @ResourceType(name = "SceneExcelConfigData.json")
 @Getter

src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java

@@ -3,9 +3,8 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @ResourceType(name = "SceneTagConfigData.json")
 @Getter
@@ -15,6 +14,7 @@ public final class SceneTagData extends GameResource {
 
     @SerializedName("DJCOAOBDIHP")
     private boolean idk1;
+
     @SerializedName("LOLNNMPKHIB")
     private boolean idk2;
 

src/main/java/emu/grasscutter/database/DatabaseHelper.java

@@ -21,10 +21,10 @@ import emu.grasscutter.game.quest.GameMainQuest;
 import emu.grasscutter.game.world.SceneGroupInstance;
 import emu.grasscutter.utils.objects.Returnable;
 import io.netty.util.concurrent.FastThreadLocalThread;
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import lombok.Getter;
 
 public final class DatabaseHelper {
@@ -542,18 +542,16 @@ public final class DatabaseHelper {
         DatabaseHelper.saveGameAsync(musicGameBeatmap);
     }
 
-    @Nullable
+    @Nullable public static Achievements getAchievementData(int uid) {
-    public static Achievements getAchievementData(int uid) {
         try {
             return DatabaseManager.getGameDatastore()
-                .find(Achievements.class)
+                    .find(Achievements.class)
-                .filter(Filters.and(Filters.eq("uid", uid)))
+                    .filter(Filters.and(Filters.eq("uid", uid)))
-                .first();
+                    .first();
         } catch (IllegalArgumentException e) {
-            Grasscutter.getLogger().debug("Error occurred while getting uid " + uid + "'s achievement data", e);
+            Grasscutter.getLogger()
-            DatabaseManager.getGameDatabase()
+                    .debug("Error occurred while getting uid " + uid + "'s achievement data", e);
-                .getCollection("achievements")
+            DatabaseManager.getGameDatabase().getCollection("achievements").deleteMany(eq("uid", uid));
-                .deleteMany(eq("uid", uid));
             return null;
         }
     }

src/main/java/emu/grasscutter/game/ability/AbilityManager.java

@@ -19,11 +19,10 @@ import emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType;
 import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
 import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
 import io.netty.util.concurrent.FastThreadLocalThread;
-import lombok.Getter;
-import org.reflections.Reflections;
-
 import java.util.HashMap;
 import java.util.concurrent.*;
+import lombok.Getter;
+import org.reflections.Reflections;
 
 public final class AbilityManager extends BasePlayerManager {
     private static final HashMap<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers =
@@ -93,7 +92,7 @@ public final class AbilityManager extends BasePlayerManager {
         if (handler == null || ability == null) {
             if (DebugConstants.LOG_ABILITIES) {
                 Grasscutter.getLogger()
-                    .debug("Could not execute ability action {} at {}", action.type, ability);
+                        .debug("Could not execute ability action {} at {}", action.type, ability);
             }
 
             return;

src/main/java/emu/grasscutter/game/achievement/Achievement.java

@@ -1,22 +1,21 @@
 package emu.grasscutter.game.achievement;
 
 import dev.morphia.annotations.Entity;
-import emu.grasscutter.net.proto.AchievementOuterClass;
+import emu.grasscutter.net.proto.*;
-import emu.grasscutter.net.proto.StatusOuterClass;
+import emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status;
-import lombok.Getter;
+import lombok.*;
-import lombok.Setter;
 
 @Entity
 @Getter
 public class Achievement {
-    @Setter private StatusOuterClass.Status status;
+    @Setter private Status status;
     private int id;
     private int totalProgress;
     @Setter private int curProgress;
     @Setter private int finishTimestampSec;
 
     public Achievement(
-            StatusOuterClass.Status status,
+            Status status,
             int id,
             int totalProgress,
             int curProgress,

src/main/java/emu/grasscutter/game/achievement/Achievements.java

@@ -1,9 +1,7 @@
 package emu.grasscutter.game.achievement;
 
 import com.github.davidmoten.guavamini.Lists;
-import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.*;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Transient;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.achievement.AchievementData;
@@ -11,22 +9,15 @@ import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.proto.StatusOuterClass;
+import emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status;
-import emu.grasscutter.server.packet.send.PacketAchievementAllDataNotify;
+import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.server.packet.send.PacketAchievementUpdateNotify;
+import lombok.*;
-import emu.grasscutter.server.packet.send.PacketTakeAchievementGoalRewardRsp;
+import org.bson.types.ObjectId;
-import emu.grasscutter.server.packet.send.PacketTakeAchievementRewardRsp;
+
-import java.util.HashMap;
+import javax.annotation.Nullable;
-import java.util.List;
+import java.util.*;
-import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.IntSupplier;
-import javax.annotation.Nullable;
-import lombok.Builder;
-import lombok.Data;
-import lombok.Getter;
-import org.bson.types.ObjectId;
 
 @Entity("achievements")
 @Data
@@ -35,7 +26,7 @@ public class Achievements {
     private static final IntSupplier currentTimeSecs =
             () -> (int) (System.currentTimeMillis() / 1000L);
     private static final Achievement INVALID =
-            new Achievement(StatusOuterClass.Status.STATUS_INVALID, -1, 0, 0, 0);
+            new Achievement(Status.STATUS_INVALID, -1, 0, 0, 0);
     @Id private ObjectId id;
     private int uid;
     @Transient private Player player;
@@ -75,7 +66,7 @@ public class Achievements {
                             map.put(
                                     a.getId(),
                                     new Achievement(
-                                            StatusOuterClass.Status.STATUS_UNFINISHED, a.getId(), a.getProgress(), 0, 0));
+                                            Status.STATUS_UNFINISHED, a.getId(), a.getProgress(), 0, 0));
                         });
         return map;
     }
@@ -135,13 +126,13 @@ public class Achievements {
     }
 
     private boolean update(Achievement a) {
-        if (a.getStatus() == StatusOuterClass.Status.STATUS_UNFINISHED
+        if (a.getStatus() == Status.STATUS_UNFINISHED
                 && a.getCurProgress() >= a.getTotalProgress()) {
-            a.setStatus(StatusOuterClass.Status.STATUS_FINISHED);
+            a.setStatus(Status.STATUS_FINISHED);
             a.setFinishTimestampSec(currentTimeSecs.getAsInt());
             return true;
         } else if (this.isFinished(a.getId()) && a.getCurProgress() < a.getTotalProgress()) {
-            a.setStatus(StatusOuterClass.Status.STATUS_UNFINISHED);
+            a.setStatus(Status.STATUS_UNFINISHED);
             a.setFinishTimestampSec(0);
             return true;
         }
@@ -187,7 +178,7 @@ public class Achievements {
                         achievementId,
                         id -> {
                             return new Achievement(
-                                    StatusOuterClass.Status.STATUS_UNFINISHED,
+                                    Status.STATUS_UNFINISHED,
                                     id,
                                     GameData.getAchievementDataMap().get(id.intValue()).getProgress(),
                                     0,
@@ -200,14 +191,14 @@ public class Achievements {
         return data == null || data.isDisuse();
     }
 
-    public StatusOuterClass.Status getStatus(int achievementId) {
+    public Status getStatus(int achievementId) {
         return this.getAchievementList().getOrDefault(achievementId, INVALID).getStatus();
     }
 
     public boolean isFinished(int achievementId) {
         var status = this.getStatus(achievementId);
-        return status == StatusOuterClass.Status.STATUS_FINISHED
+        return status == Status.STATUS_FINISHED
-                || status == StatusOuterClass.Status.STATUS_REWARD_TAKEN;
+                || status == Status.STATUS_REWARD_TAKEN;
     }
 
     public void takeReward(List<Integer> ids) {
@@ -244,7 +235,7 @@ public class Achievements {
                             });
 
             var a = this.getAchievement(i);
-            a.setStatus(StatusOuterClass.Status.STATUS_REWARD_TAKEN);
+            a.setStatus(Status.STATUS_REWARD_TAKEN);
             this.save();
             this.sendUpdatePacket(a);
         }
@@ -298,11 +289,11 @@ public class Achievements {
     }
 
     public boolean isRewardTaken(int achievementId) {
-        return this.getStatus(achievementId) == StatusOuterClass.Status.STATUS_REWARD_TAKEN;
+        return this.getStatus(achievementId) == Status.STATUS_REWARD_TAKEN;
     }
 
     public boolean isRewardLeft(int achievementId) {
-        return this.getStatus(achievementId) == StatusOuterClass.Status.STATUS_FINISHED;
+        return this.getStatus(achievementId) == Status.STATUS_FINISHED;
     }
 
     private boolean isPacketSendable() {
@@ -324,12 +315,15 @@ public class Achievements {
 
     private void registerNewAchievementsIfExist() {
         GameData.getAchievementDataMap().values().stream()
-            .filter(AchievementData::isUsed)
+                .filter(AchievementData::isUsed)
-            .filter(a -> !this.achievementList.containsKey(a.getId()))
+                .filter(a -> !this.achievementList.containsKey(a.getId()))
-            .forEach(a -> {
+                .forEach(
-                Grasscutter.getLogger().info("Registering a new achievement (id: {})", a.getId());
+                        a -> {
-                this.achievementList.put(a.getId(), new Achievement(AchievementStatus.UNFINISHED, a.getId(), a.getProgress(), 0, 0));
+                            Grasscutter.getLogger().trace("Registering a new achievement (id: {})", a.getId());
-            });
+                            this.achievementList.put(
+                                    a.getId(),
+                                    new Achievement(Status.STATUS_UNFINISHED, a.getId(), a.getProgress(), 0, 0));
+                        });
         this.save();
     }
 }

src/main/java/emu/grasscutter/game/avatar/Avatar.java

@@ -828,11 +828,11 @@ public class Avatar {
                 switch (entry.getExtraTalentIndex()) {
                     case 9 -> this.skillDepot.getEnergySkill(); // Ult skill
                     case 2 -> (this.skillDepot.getSkills().size() >= 2)
-                        ? this.skillDepot.getSkills().get(1)
+                            ? this.skillDepot.getSkills().get(1)
-                        : 0; // E skill
+                            : 0; // E skill
                     case 1 -> (this.skillDepot.getSkills().size() >= 1)
-                        ? this.skillDepot.getSkills().get(0)
+                            ? this.skillDepot.getSkills().get(0)
-                        : 0; // Normal Attack (Liney)
+                            : 0; // Normal Attack (Liney)
                     default -> 0;
                 };
         // Sanity check

src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java

@@ -3,20 +3,16 @@ package emu.grasscutter.game.dungeons.challenge;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
 import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
-import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.*;
-import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.SceneGroup;
+import emu.grasscutter.scripts.data.*;
-import emu.grasscutter.scripts.data.SceneTrigger;
+import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.scripts.data.ScriptArgs;
+import lombok.*;
-import emu.grasscutter.server.packet.send.PacketDungeonChallengeBeginNotify;
+
-import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 @Setter
@@ -81,7 +77,7 @@ public class WorldChallenge {
 
     public void start() {
         if (inProgress()) {
-            Grasscutter.getLogger().info("Could not start a in progress challenge.");
+            Grasscutter.getLogger().debug("Could not start a in progress challenge.");
             return;
         }
         this.progress = true;

src/main/java/emu/grasscutter/game/inventory/BagTab.java

@@ -1,10 +1,9 @@
 package emu.grasscutter.game.inventory;
 
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
 import java.util.*;
 import java.util.stream.Stream;
+import lombok.*;
 
 @RequiredArgsConstructor
 public enum BagTab {
@@ -24,11 +23,11 @@ public enum BagTab {
 
     static {
         Stream.of(BagTab.values())
-            .forEach(
+                .forEach(
-                entry -> {
+                        entry -> {
-                    map.put(entry.getValue(), entry);
+                            map.put(entry.getValue(), entry);
-                    stringMap.put(entry.name(), entry);
+                            stringMap.put(entry.name(), entry);
-                });
+                        });
     }
 
     @Getter private final int value;

src/main/java/emu/grasscutter/game/inventory/Inventory.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.game.inventory;
 
+import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
@@ -15,13 +17,10 @@ import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.longs.*;
-
 import java.util.*;
 import javax.annotation.Nullable;
 import lombok.val;
 
-import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
-
 public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
     private final Long2ObjectMap<GameItem> store;
     private final Int2ObjectMap<InventoryTab> inventoryTypes;
@@ -185,8 +184,8 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
     }
 
     /**
-     * Checks to see if the player has the item in their inventory.
+     * Checks to see if the player has the item in their inventory. This will succeed if the player
-     * This will succeed if the player has at least the minimum count of the item.
+     * has at least the minimum count of the item.
      *
      * @param itemId The item id to check for.
      * @param minCount The minimum count of the item to check for.
@@ -201,30 +200,26 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
      *
      * @param itemId The item id to check for.
      * @param count The count of the item to check for.
-     * @param enforce If true, the player must have the exact amount.
+     * @param enforce If true, the player must have the exact amount. If false, the player must have
-     *                If false, the player must have at least the amount.
+     *     at least the amount.
      * @return True if the player has the item, false otherwise.
      */
     public boolean hasItem(int itemId, int count, boolean enforce) {
         var item = this.getFirstItem(itemId);
         if (item == null) return false;
 
-        return enforce ?
+        return enforce ? item.getCount() == count : item.getCount() >= count;
-            item.getCount() == count :
-            item.getCount() >= count;
     }
 
     /**
-     * Checks to see if the player has the item in their inventory.
+     * Checks to see if the player has the item in their inventory. This is exact.
-     * This is exact.
      *
      * @param items A map of item game IDs to their count.
      * @return True if the player has the items, false otherwise.
      */
     public boolean hasAllItems(Collection<ItemParam> items) {
         for (var item : items) {
-            if (!this.hasItem(item.getItemId(), item.getCount(), true))
+            if (!this.hasItem(item.getItemId(), item.getCount(), true)) return false;
-                return false;
         }
 
         return true;
@@ -530,22 +525,18 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
     }
 
     /**
-     * Removes an item from the player's inventory.
+     * Removes an item from the player's inventory. This uses the item ID to find the first stack of
-     * This uses the item ID to find the first stack of the item's type.
+     * the item's type.
      *
      * @param itemId The ID of the item to remove.
      * @param count The amount of items to remove.
      * @return True if the item was removed, false otherwise.
      */
     public synchronized boolean removeItem(int itemId, int count) {
-        var item = this.getItems().values().stream()
+        var item = this.getItems().values().stream().filter(i -> i.getItemId() == itemId).findFirst();
-            .filter(i -> i.getItemId() == itemId)
-            .findFirst();
 
         // Check if the item is in the player's inventory.
-        return item
+        return item.filter(gameItem -> this.removeItem(gameItem, count)).isPresent();
-            .filter(gameItem -> this.removeItem(gameItem, count))
-            .isPresent();
     }
 
     public synchronized boolean removeItem(long guid, int count) {
@@ -566,14 +557,10 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
      * @return True if the item was removed, false otherwise.
      */
     public synchronized boolean removeItemById(int itemId, int count) {
-        var item = this.getItems().values().stream()
+        var item = this.getItems().values().stream().filter(i -> i.getItemId() == itemId).findFirst();
-            .filter(i -> i.getItemId() == itemId)
-            .findFirst();
 
         // Check if the item is in the player's inventory.
-        return item
+        return item.filter(gameItem -> this.removeItem(gameItem, count)).isPresent();
-            .filter(gameItem -> this.removeItem(gameItem, count))
-            .isPresent();
     }
 
     public synchronized boolean removeItem(GameItem item) {

src/main/java/emu/grasscutter/game/player/PlayerProgress.java

@@ -5,10 +5,9 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import lombok.*;
 
 /** Tracks progress the player made in the world, like obtained items, seen characters and more */
 @Getter

src/main/java/emu/grasscutter/game/props/ClimateType.java

@@ -2,7 +2,6 @@ package emu.grasscutter.game.props;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -22,10 +21,10 @@ public enum ClimateType {
 
     static {
         Stream.of(values())
-            .forEach(
+                .forEach(
-                e -> {
+                        e -> {
-                    map.put(e.getValue(), e);
+                            map.put(e.getValue(), e);
-                    stringMap.put(e.name(), e);
+                            stringMap.put(e.name(), e);
                         });
     }
 

src/main/java/emu/grasscutter/game/quest/BargainRecord.java

@@ -13,20 +13,17 @@ import lombok.*;
 @Builder
 public final class BargainRecord {
     /**
-     * Provides an instance of a bargain record.
+     * Provides an instance of a bargain record. Uses information from game resources.
-     * Uses information from game resources.
      *
      * @param bargainId The ID of the bargain.
      * @return An instance of a bargain record.
      */
     public static BargainRecord resolve(int bargainId) {
         var bargainData = GameData.getBargainDataMap().get(bargainId);
-        if (bargainData == null) throw new RuntimeException("No bargain data found for " + bargainId + ".");
+        if (bargainData == null)
+            throw new RuntimeException("No bargain data found for " + bargainId + ".");
 
-        return BargainRecord.builder()
+        return BargainRecord.builder().bargainId(bargainId).build().determineBase(bargainData);
-            .bargainId(bargainId)
-            .build()
-            .determineBase(bargainData);
     }
 
     private int bargainId;
@@ -38,21 +35,17 @@ public final class BargainRecord {
     private boolean finished;
     private BargainResultType result;
 
-    /**
+    /** Determines the price of the bargain. */
-     * Determines the price of the bargain.
-     */
     public BargainRecord determineBase(BargainData data) {
         // Set the expected price.
         var price = data.getExpectedValue();
-        this.setExpectedPrice(Utils.randomRange(
+        this.setExpectedPrice(Utils.randomRange(price.get(0), price.get(1)));
-            price.get(0), price.get(1)));
         // Set the lowest price.
         this.setLowestPrice(price.get(0));
 
         // Set the base mood.
         var mood = data.getRandomMood();
-        this.setCurrentMood(Utils.randomRange(
+        this.setCurrentMood(Utils.randomRange(mood.get(0), mood.get(1)));
-            mood.get(0), mood.get(1)));
 
         return this;
     }
@@ -100,10 +93,10 @@ public final class BargainRecord {
      */
     public BargainSnapshot toSnapshot() {
         return BargainSnapshot.newBuilder()
-            .setBargainId(this.getBargainId())
+                .setBargainId(this.getBargainId())
-            .setCurMood(this.getCurrentMood())
+                .setCurMood(this.getCurrentMood())
-            .setBALOPACHCDB(this.getExpectedPrice())
+                .setBALOPACHCDB(this.getExpectedPrice())
-            .setIOCNPJJNHLD(this.getLowestPrice())
+                .setIOCNPJJNHLD(this.getLowestPrice())
-            .build();
+                .build();
     }
 }

src/main/java/emu/grasscutter/game/quest/GameQuest.java

@@ -15,10 +15,9 @@ import emu.grasscutter.scripts.data.SceneGroup;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.IntIntImmutablePair;
-import lombok.*;
-
-import javax.script.Bindings;
 import java.util.*;
+import javax.script.Bindings;
+import lombok.*;
 
 @Entity
 public class GameQuest {

src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java

@@ -4,49 +4,45 @@ import dev.morphia.annotations.Entity;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.giving.GivingData.GiveMethod;
 import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
-import lombok.*;
-
 import java.util.*;
+import lombok.*;
 
 @Data
 @Entity
 @Builder
 public final class ItemGiveRecord {
     /**
-     * Provides a builder for an item give record.
+     * Provides a builder for an item give record. Uses information from game resources.
-     * Uses information from game resources.
      *
      * @param givingId The ID of the giving action.
      * @return A builder for an item give record.
      */
     public static ItemGiveRecord resolve(int givingId) {
         var givingData = GameData.getGivingDataMap().get(givingId);
-        if (givingData == null) throw new RuntimeException("No giving data found for " + givingId + ".");
+        if (givingData == null)
+            throw new RuntimeException("No giving data found for " + givingId + ".");
 
-        var builder = ItemGiveRecord.builder()
+        var builder = ItemGiveRecord.builder().givingId(givingId).finished(false);
-            .givingId(givingId)
-            .finished(false);
 
         // Create a map.
         var givenItems = new HashMap<Integer, Integer>();
         if (givingData.getGivingMethod() == GiveMethod.GIVING_METHOD_EXACT) {
-            givingData.getExactItems().forEach(item ->
+            givingData.getExactItems().forEach(item -> givenItems.put(item.getItemId(), 0));
-                givenItems.put(item.getItemId(), 0));
         } else {
-            givingData.getGivingGroupIds().forEach(groupId -> {
+            givingData
-                var groupData = GameData.getGivingGroupDataMap().get((int) groupId);
+                    .getGivingGroupIds()
-                if (groupData == null) return;
+                    .forEach(
+                            groupId -> {
+                                var groupData = GameData.getGivingGroupDataMap().get((int) groupId);
+                                if (groupData == null) return;
 
-                // Add all items in the group.
+                                // Add all items in the group.
-                groupData.getItemIds().forEach(itemId ->
+                                groupData.getItemIds().forEach(itemId -> givenItems.put(itemId, 0));
-                    givenItems.put(itemId, 0));
+                                builder.groupId(groupId);
-                builder.groupId(groupId);
+                            });
-            });
         }
 
-        return builder
+        return builder.givenItems(givenItems).build();
-            .givenItems(givenItems)
-            .build();
     }
 
     private int givingId;
@@ -63,13 +59,13 @@ public final class ItemGiveRecord {
      */
     public GivingRecord toProto() {
         return GivingRecord.newBuilder()
-            .setGivingId(this.getGivingId())
+                .setGivingId(this.getGivingId())
-            .setConfigId(this.getConfigId())
+                .setConfigId(this.getConfigId())
-            .setGroupId(this.getGroupId())
+                .setGroupId(this.getGroupId())
-            .setLastGroupId(this.getLastGroupId())
+                .setLastGroupId(this.getLastGroupId())
-            .setIsFinished(this.isFinished())
+                .setIsFinished(this.isFinished())
-            .setIsGadgetGiving(false)
+                .setIsGadgetGiving(false)
-            .putAllMaterialCntMap(this.getGivenItems())
+                .putAllMaterialCntMap(this.getGivenItems())
-            .build();
+                .build();
     }
 }

src/main/java/emu/grasscutter/game/quest/QuestManager.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.game.quest;
 
+import static emu.grasscutter.GameConstants.DEBUG;
+import static emu.grasscutter.config.Configuration.*;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.*;
@@ -12,16 +15,12 @@ import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
 import emu.grasscutter.server.packet.send.*;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
-import javax.annotation.Nonnull;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-
+import javax.annotation.Nonnull;
-import static emu.grasscutter.GameConstants.DEBUG;
+import lombok.*;
-import static emu.grasscutter.config.Configuration.*;
 
 public final class QuestManager extends BasePlayerManager {
     @Getter private final Player player;
@@ -32,10 +31,15 @@ public final class QuestManager extends BasePlayerManager {
     private long lastHourCheck = 0;
     private long lastDayCheck = 0;
 
-    public static final ExecutorService eventExecutor
+    public static final ExecutorService eventExecutor =
-        = new ThreadPoolExecutor(4, 4,
+            new ThreadPoolExecutor(
-        60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(1000),
+                    4,
-        FastThreadLocalThread::new, new ThreadPoolExecutor.AbortPolicy());
+                    4,
+                    60,
+                    TimeUnit.SECONDS,
+                    new LinkedBlockingDeque<>(1000),
+                    FastThreadLocalThread::new,
+                    new ThreadPoolExecutor.AbortPolicy());
 
     public static long getQuestKey(int mainQuestId) {
         QuestEncryptionKey questEncryptionKey = GameData.getMainQuestEncryptionMap().get(mainQuestId);
@@ -50,37 +54,37 @@ public final class QuestManager extends BasePlayerManager {
         this.loggedQuests = new ArrayList<>();
 
         if (DEBUG) {
-            this.loggedQuests.addAll(List.of(
+            this.loggedQuests.addAll(
-                31101, // Quest which holds talks 30902 and 30904.
+                    List.of(
-                35001, // Quest which unlocks world border & starts act 2.
+                            31101, // Quest which holds talks 30902 and 30904.
-                30901, // Quest which is completed upon finishing all 3 initial dungeons.
+                            35001, // Quest which unlocks world border & starts act 2.
-                30903, // Quest which is finished when re-entering scene 3. (home world)
+                            30901, // Quest which is completed upon finishing all 3 initial dungeons.
-                30904, // Quest which unlocks the Adventurers' Guild
+                            30903, // Quest which is finished when re-entering scene 3. (home world)
+                            30904, // Quest which unlocks the Adventurers' Guild
+                            46904, // Quest which is required to be started, but not completed for 31101's talks
+                            // to begin.
+                            // This quest is related to obtaining your first Anemoculus.
 
-                46904, // Quest which is required to be started, but not completed for 31101's talks to begin.
+                            35104, // Quest which is required to be finished for 46904 to begin.
-                       // This quest is related to obtaining your first Anemoculus.
+                            // This quest requires 31101 not be finished.
+                            // This quest should be accepted when the account is created.
 
-                35104, // Quest which is required to be finished for 46904 to begin.
+                            // These quests currently have bugged triggers.
-                       // This quest requires 31101 not be finished.
+                            30700, // Quest which is responsible for unlocking Crash Course.
-                       // This quest should be accepted when the account is created.
+                            30800, // Quest which is responsible for unlocking Sparks Amongst the Pages.
-
+                            47001,
-                       // These quests currently have bugged triggers.
+                            47002,
-                30700, // Quest which is responsible for unlocking Crash Course.
+                            47003,
-                30800, // Quest which is responsible for unlocking Sparks Amongst the Pages.
+                            47004,
-
+                            2010103,
-                47001, 47002, 47003, 47004,
+                            2010144, // Prologue Act 2: Chasing Shadows,
-
+                            2012 // This is the main quest ID for Chapter 2 Act 1.
-                2010103, 2010144, // Prologue Act 2: Chasing Shadows,
+                            // Used for debugging giving items.
-
+                            ));
-                2012 // This is the main quest ID for Chapter 2 Act 1.
-                     // Used for debugging giving items.
-            ));
         }
     }
 
-    /**
+    /** Checks if questing can be enabled. */
-     * Checks if questing can be enabled.
-     */
     public boolean isQuestingEnabled() {
         // Check if scripts are enabled.
         if (!SERVER.game.enableScriptInBigWorld) {
@@ -97,8 +101,7 @@ public final class QuestManager extends BasePlayerManager {
      * @param givingId The giving action ID.
      * @throws IllegalStateException If the giving action is already active.
      */
-    public void addGiveItemAction(int givingId)
+    public void addGiveItemAction(int givingId) throws IllegalStateException {
-        throws IllegalStateException {
         var progress = this.player.getPlayerProgress();
         var givings = progress.getItemGivings();
 
@@ -163,10 +166,9 @@ public final class QuestManager extends BasePlayerManager {
      * @return Serialized giving records to be used in a packet.
      */
     public Collection<GivingRecord> getGivingRecords() {
-        return this.getPlayer().getPlayerProgress()
+        return this.getPlayer().getPlayerProgress().getItemGivings().values().stream()
-            .getItemGivings().values().stream()
+                .map(ItemGiveRecord::toProto)
-            .map(ItemGiveRecord::toProto)
+                .toList();
-            .toList();
     }
 
     /**
@@ -199,7 +201,7 @@ public final class QuestManager extends BasePlayerManager {
      * @param bargainId The bargain ID.
      */
     public void stopBargain(int bargainId) {
-            var progress = this.player.getPlayerProgress();
+        var progress = this.player.getPlayerProgress();
         var bargains = progress.getBargains();
 
         // Check if the bargain is already present.
@@ -216,14 +218,10 @@ public final class QuestManager extends BasePlayerManager {
         this.player.sendPacket(new PacketBargainTerminateNotify(bargainId));
     }
 
-    /**
+    /** Sends the giving records to the player. */
-     * Sends the giving records to the player.
-     */
     public void sendGivingRecords() {
         // Send the record to the player.
-        this.player.sendPacket(
+        this.player.sendPacket(new PacketGivingRecordNotify(this.getGivingRecords()));
-            new PacketGivingRecordNotify(
-                this.getGivingRecords()));
     }
 
     public void onPlayerBorn() {
@@ -244,9 +242,9 @@ public final class QuestManager extends BasePlayerManager {
                 getPlayer().getPosition().set(rewindPos.get(0));
                 getPlayer().getRotation().set(rewindPos.get(1));
             }
-            if(activeQuest!=null && rewindPos!=null){
+            if (activeQuest != null && rewindPos != null) {
-                //activeSubs.add(activeQuest);
+                // activeSubs.add(activeQuest);
-                //player.sendPacket(new PacketQuestProgressUpdateNotify(activeQuest));
+                // player.sendPacket(new PacketQuestProgressUpdateNotify(activeQuest));
             }
             quest.checkProgress();
         }
@@ -270,29 +268,32 @@ public final class QuestManager extends BasePlayerManager {
         boolean checkDays = currentDays != lastDayCheck;
         boolean checkHours = currentHours != lastHourCheck;
 
-        if(!checkDays && !checkHours){
+        if (!checkDays && !checkHours) {
             return;
         }
 
         this.lastDayCheck = currentDays;
         this.lastHourCheck = currentHours;
 
-        player.getActiveQuestTimers().forEach(mainQuestId -> {
+        player
-            if (checkHours) {
+                .getActiveQuestTimers()
-                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_GT_EQ, mainQuestId);
+                .forEach(
-                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ, mainQuestId);
+                        mainQuestId -> {
-            }
+                            if (checkHours) {
-            if (checkDays) {
+                                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_GT_EQ, mainQuestId);
-                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_PASS_DAY, mainQuestId);
+                                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ, mainQuestId);
-                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY, mainQuestId);
+                            }
-            }
+                            if (checkDays) {
-        });
+                                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_PASS_DAY, mainQuestId);
+                                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY, mainQuestId);
+                            }
+                        });
     }
 
     private List<GameMainQuest> addMultMainQuests(Set<Integer> mainQuestIds) {
         List<GameMainQuest> newQuests = new ArrayList<>();
         for (Integer id : mainQuestIds) {
-            getMainQuests().put(id.intValue(),new GameMainQuest(this.player, id));
+            getMainQuests().put(id.intValue(), new GameMainQuest(this.player, id));
             getMainQuestById(id).save();
             newQuests.add(getMainQuestById(id));
         }
@@ -319,27 +320,29 @@ public final class QuestManager extends BasePlayerManager {
      * Looking through mainQuests 72201-72208 and 72174, we can infer that a questGlobalVar's default value is 0
      */
     public Integer getQuestGlobalVarValue(Integer variable) {
-        return getPlayer().getQuestGlobalVariables()
+        return getPlayer()
-            .computeIfAbsent(variable, k -> this.getGlobalVarDefault(variable));
+                .getQuestGlobalVariables()
+                .computeIfAbsent(variable, k -> this.getGlobalVarDefault(variable));
     }
 
     public void setQuestGlobalVarValue(int variable, int setVal) {
         var prevVal = this.getPlayer().getQuestGlobalVariables().put(variable, setVal);
-        if (prevVal == null){
+        if (prevVal == null) {
             prevVal = this.getGlobalVarDefault(variable);
         }
         var newVal = this.getQuestGlobalVarValue(variable);
 
-        Grasscutter.getLogger().debug("Changed questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
+        Grasscutter.getLogger()
+                .debug("Changed questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
         this.triggerQuestGlobalVarAction(variable, setVal);
     }
 
     public void incQuestGlobalVarValue(int variable, int inc) {
         var prevVal = getQuestGlobalVarValue(variable);
-        var newVal = getPlayer().getQuestGlobalVariables()
+        var newVal = getPlayer().getQuestGlobalVariables().compute(variable, (k, v) -> prevVal + inc);
-            .compute(variable, (k, v) -> prevVal + inc);
 
-        Grasscutter.getLogger().debug("Incremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
+        Grasscutter.getLogger()
+                .debug("Incremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
         this.triggerQuestGlobalVarAction(variable, newVal);
     }
 
@@ -349,7 +352,8 @@ public final class QuestManager extends BasePlayerManager {
         this.getPlayer().getQuestGlobalVariables().put(variable, prevVal - dec);
         var newVal = getQuestGlobalVarValue(variable);
 
-        Grasscutter.getLogger().debug("Decremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
+        Grasscutter.getLogger()
+                .debug("Decremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
         this.triggerQuestGlobalVarAction(variable, newVal);
     }
 
@@ -422,7 +426,7 @@ public final class QuestManager extends BasePlayerManager {
             return null;
         }
 
-       return this.addQuest(questConfig);
+        return this.addQuest(questConfig);
     }
 
     public GameQuest addQuest(@Nonnull QuestData questConfig) {
@@ -452,10 +456,10 @@ public final class QuestManager extends BasePlayerManager {
         }
 
         Arrays.stream(mainQuestData.getSubQuests())
-            .min(Comparator.comparingInt(MainQuestData.SubQuestData::getOrder))
+                .min(Comparator.comparingInt(MainQuestData.SubQuestData::getOrder))
-            .map(MainQuestData.SubQuestData::getSubId)
+                .map(MainQuestData.SubQuestData::getSubId)
-            .ifPresent(this::addQuest);
+                .ifPresent(this::addQuest);
-        //TODO find a better way then hardcoding to detect needed required quests
+        // TODO find a better way then hardcoding to detect needed required quests
         // if (mainQuestId == 355){
         //     startMainQuest(361);
         //     startMainQuest(418);
@@ -463,9 +467,11 @@ public final class QuestManager extends BasePlayerManager {
         //     startMainQuest(20509);
         // }
     }
+
     public void queueEvent(QuestCond condType, int... params) {
         queueEvent(condType, "", params);
     }
+
     public void queueEvent(QuestContent condType, int... params) {
         queueEvent(condType, "", params);
     }
@@ -478,57 +484,69 @@ public final class QuestManager extends BasePlayerManager {
         eventExecutor.submit(() -> triggerEvent(condType, paramStr, params));
     }
 
-    //QUEST_EXEC are handled directly by each subQuest
+    // QUEST_EXEC are handled directly by each subQuest
 
     public void triggerEvent(QuestCond condType, String paramStr, int... params) {
         Grasscutter.getLogger().trace("Trigger Event {}, {}, {}", condType, paramStr, params);
         var potentialQuests = GameData.getQuestDataByConditions(condType, params[0], paramStr);
-        if(potentialQuests == null){
+        if (potentialQuests == null) {
             return;
         }
 
         var questSystem = getPlayer().getServer().getQuestSystem();
         var owner = getPlayer();
 
-        potentialQuests.forEach(questData -> {
+        potentialQuests.forEach(
-            if(this.wasSubQuestStarted(questData)){
+                questData -> {
-                return;
+                    if (this.wasSubQuestStarted(questData)) {
-            }
+                        return;
-            val acceptCond = questData.getAcceptCond();
+                    }
-            int[] accept = new int[acceptCond.size()];
+                    val acceptCond = questData.getAcceptCond();
-            for (int i = 0; i < acceptCond.size(); i++) {
+                    int[] accept = new int[acceptCond.size()];
-                val condition = acceptCond.get(i);
+                    for (int i = 0; i < acceptCond.size(); i++) {
-                boolean result = questSystem.triggerCondition(owner, questData, condition, paramStr, params);
+                        val condition = acceptCond.get(i);
-                accept[i] = result ? 1 : 0;
+                        boolean result =
-            }
+                                questSystem.triggerCondition(owner, questData, condition, paramStr, params);
+                        accept[i] = result ? 1 : 0;
+                    }
 
-            boolean shouldAccept = LogicType.calculate(questData.getAcceptCondComb(), accept);
+                    boolean shouldAccept = LogicType.calculate(questData.getAcceptCondComb(), accept);
-            if (this.loggedQuests.contains(questData.getId())) {
+                    if (this.loggedQuests.contains(questData.getId())) {
-                Grasscutter.getLogger().debug(">>> Quest {} will be {} as a result of event trigger {} ({}, {}).",
+                        Grasscutter.getLogger()
-                    questData.getId(), shouldAccept ? "accepted" : "not accepted", condType.name(), paramStr,
+                                .debug(
-                    Arrays.stream(params).mapToObj(String::valueOf).collect(Collectors.joining(", ")));
+                                        ">>> Quest {} will be {} as a result of event trigger {} ({}, {}).",
-                for (var i = 0; i < accept.length; i++) {
+                                        questData.getId(),
-                    var condition = acceptCond.get(i);
+                                        shouldAccept ? "accepted" : "not accepted",
-                    Grasscutter.getLogger().debug("^ Condition {} has params {} with result {}.",
+                                        condType.name(),
-                        condition.getType().name(),
+                                        paramStr,
-                        Arrays.stream(condition.getParam())
+                                        Arrays.stream(params)
-                            .filter(value -> value > 0)
+                                                .mapToObj(String::valueOf)
-                            .mapToObj(String::valueOf)
+                                                .collect(Collectors.joining(", ")));
-                            .collect(Collectors.joining(", ")),
+                        for (var i = 0; i < accept.length; i++) {
-                        accept[i] == 1 ? "success" : "failure");
+                            var condition = acceptCond.get(i);
-                }
+                            Grasscutter.getLogger()
-            }
+                                    .debug(
+                                            "^ Condition {} has params {} with result {}.",
+                                            condition.getType().name(),
+                                            Arrays.stream(condition.getParam())
+                                                    .filter(value -> value > 0)
+                                                    .mapToObj(String::valueOf)
+                                                    .collect(Collectors.joining(", ")),
+                                            accept[i] == 1 ? "success" : "failure");
+                        }
+                    }
 
-            if (shouldAccept) {
+                    if (shouldAccept) {
-                GameQuest quest = owner.getQuestManager().addQuest(questData);
+                        GameQuest quest = owner.getQuestManager().addQuest(questData);
-                Grasscutter.getLogger().debug("Added quest {} result {}", questData.getSubId(), quest != null);
+                        Grasscutter.getLogger()
-            }
+                                .debug("Added quest {} result {}", questData.getSubId(), quest != null);
-        });
+                    }
+                });
     }
 
     public boolean wasSubQuestStarted(QuestData questData) {
         var quest = getQuestById(questData.getId());
-        if(quest == null) return false;
+        if (quest == null) return false;
 
         return quest.state != QuestState.QUEST_STATE_UNSTARTED;
     }
@@ -536,9 +554,10 @@ public final class QuestManager extends BasePlayerManager {
     public void triggerEvent(QuestContent condType, String paramStr, int... params) {
         Grasscutter.getLogger().trace("Trigger Event {}, {}, {}", condType, paramStr, params);
 
-        List<GameMainQuest> checkMainQuests = this.getMainQuests().values().stream()
+        List<GameMainQuest> checkMainQuests =
-            .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
+                this.getMainQuests().values().stream()
-            .toList();
+                        .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
+                        .toList();
         for (GameMainQuest mainQuest : checkMainQuests) {
             mainQuest.tryFailSubQuests(condType, paramStr, params);
             mainQuest.tryFinishSubQuests(condType, paramStr, params);
@@ -546,46 +565,58 @@ public final class QuestManager extends BasePlayerManager {
     }
 
     /**
-     * TODO maybe trigger them delayed to allow basic communication finish first
+     * TODO maybe trigger them delayed to allow basic communication finish first TODO move content
-     * TODO move content checks to use static informations where possible to allow direct already fulfilled checking
+     * checks to use static informations where possible to allow direct already fulfilled checking
+     *
      * @param quest The ID of the quest.
      */
-    public void checkQuestAlreadyFulfilled(GameQuest quest){
+    public void checkQuestAlreadyFulfilled(GameQuest quest) {
-        Grasscutter.getThreadPool().submit(() -> {
+        Grasscutter.getThreadPool()
-            for (var condition : quest.getQuestData().getFinishCond()){
+                .submit(
-                switch (condition.getType()) {
+                        () -> {
-                    case QUEST_CONTENT_OBTAIN_ITEM, QUEST_CONTENT_ITEM_LESS_THAN -> {
+                            for (var condition : quest.getQuestData().getFinishCond()) {
-                        //check if we already own enough of the item
+                                switch (condition.getType()) {
-                        var item = getPlayer().getInventory().getItemByGuid(condition.getParam()[0]);
+                                    case QUEST_CONTENT_OBTAIN_ITEM, QUEST_CONTENT_ITEM_LESS_THAN -> {
-                        queueEvent(condition.getType(), condition.getParam()[0], item != null ? item.getCount() : 0);
+                                        // check if we already own enough of the item
-                    }
+                                        var item = getPlayer().getInventory().getItemByGuid(condition.getParam()[0]);
-                    case QUEST_CONTENT_UNLOCK_TRANS_POINT -> {
+                                        queueEvent(
-                        var scenePoints = getPlayer().getUnlockedScenePoints().get(condition.getParam()[0]);
+                                                condition.getType(),
-                        if (scenePoints != null && scenePoints.contains(condition.getParam()[1])) {
+                                                condition.getParam()[0],
-                            queueEvent(condition.getType(), condition.getParam()[0], condition.getParam()[1]);
+                                                item != null ? item.getCount() : 0);
-                        }
+                                    }
-                    }
+                                    case QUEST_CONTENT_UNLOCK_TRANS_POINT -> {
-                    case QUEST_CONTENT_UNLOCK_AREA -> {
+                                        var scenePoints =
-                        var sceneAreas = getPlayer().getUnlockedSceneAreas().get(condition.getParam()[0]);
+                                                getPlayer().getUnlockedScenePoints().get(condition.getParam()[0]);
-                        if (sceneAreas != null && sceneAreas.contains(condition.getParam()[1])) {
+                                        if (scenePoints != null && scenePoints.contains(condition.getParam()[1])) {
-                            queueEvent(condition.getType(), condition.getParam()[0], condition.getParam()[1]);
+                                            queueEvent(
-                        }
+                                                    condition.getType(), condition.getParam()[0], condition.getParam()[1]);
-                    }
+                                        }
-                    case QUEST_CONTENT_PLAYER_LEVEL_UP -> queueEvent(condition.getType(), player.getLevel());
+                                    }
-                }
+                                    case QUEST_CONTENT_UNLOCK_AREA -> {
-            }
+                                        var sceneAreas =
-        });
+                                                getPlayer().getUnlockedSceneAreas().get(condition.getParam()[0]);
+                                        if (sceneAreas != null && sceneAreas.contains(condition.getParam()[1])) {
+                                            queueEvent(
+                                                    condition.getType(), condition.getParam()[0], condition.getParam()[1]);
+                                        }
+                                    }
+                                    case QUEST_CONTENT_PLAYER_LEVEL_UP -> queueEvent(
+                                            condition.getType(), player.getLevel());
+                                }
+                            }
+                        });
     }
 
     public List<QuestGroupSuite> getSceneGroupSuite(int sceneId) {
         return getMainQuests().values().stream()
-            .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
+                .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
-            .map(GameMainQuest::getQuestGroupSuites)
+                .map(GameMainQuest::getQuestGroupSuites)
-            .filter(Objects::nonNull)
+                .filter(Objects::nonNull)
-            .flatMap(Collection::stream)
+                .flatMap(Collection::stream)
-            .filter(i -> i.getScene() == sceneId)
+                .filter(i -> i.getScene() == sceneId)
-            .toList();
+                .toList();
     }
+
     public void loadFromDatabase() {
         List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer());
 
@@ -626,24 +657,30 @@ public final class QuestManager extends BasePlayerManager {
         var pointId = point.getPointData().getId();
         // Get the active quests.
         return this.getActiveMainQuests().stream()
-            // Get the sub-quests of the main quest.
+                // Get the sub-quests of the main quest.
-            .map(GameMainQuest::getChildQuests)
+                .map(GameMainQuest::getChildQuests)
-            // Get the values of the sub-quests map.
+                // Get the values of the sub-quests map.
-            .map(Map::values)
+                .map(Map::values)
-            .map(quests -> quests.stream()
+                .map(
-                // Get the dungeon IDs of each quest.
+                        quests ->
-                .map(GameQuest::getDungeonIds)
+                                quests.stream()
-                .map(ids -> ids.stream()
+                                        // Get the dungeon IDs of each quest.
-                    // Find entry points which match this dungeon.
+                                        .map(GameQuest::getDungeonIds)
-                    .filter(id -> id.rightInt() == pointId)
+                                        .map(
-                    .toList())
+                                                ids ->
-                .map(ids -> ids.stream()
+                                                        ids.stream()
-                    // Of the remaining dungeons, find the ID of the quest dungeon.
+                                                                // Find entry points which match this dungeon.
-                    .map(IntIntImmutablePair::leftInt)
+                                                                .filter(id -> id.rightInt() == pointId)
-                    .toList())
+                                                                .toList())
+                                        .map(
+                                                ids ->
+                                                        ids.stream()
+                                                                // Of the remaining dungeons, find the ID of the quest dungeon.
+                                                                .map(IntIntImmutablePair::leftInt)
+                                                                .toList())
+                                        .flatMap(Collection::stream)
+                                        .toList())
                 .flatMap(Collection::stream)
-                .toList())
+                .toList();
-            .flatMap(Collection::stream)
-            .toList();
     }
 }

src/main/java/emu/grasscutter/game/quest/content/ContentBargainFail.java

@@ -3,13 +3,12 @@ package emu.grasscutter.game.quest.content;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.proto.BargainResultTypeOuterClass.BargainResultType;
 
 @QuestValueContent(QuestContent.QUEST_CONTENT_BARGAIN_FAIL)
 public final class ContentBargainFail extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+    public boolean execute(
-        return condition.getParam()[0] == params[0] &&
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-                condition.getParam()[1] == params[1];
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }

src/main/java/emu/grasscutter/game/quest/content/ContentBargainLessThan.java

@@ -3,13 +3,12 @@ package emu.grasscutter.game.quest.content;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.proto.BargainResultTypeOuterClass.BargainResultType;
 
 @QuestValueContent(QuestContent.QUEST_CONTENT_ITEM_LESS_THAN_BARGAIN)
 public final class ContentBargainLessThan extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+    public boolean execute(
-        return condition.getParam()[0] == params[0] &&
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-                condition.getParam()[1] == params[1];
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }

src/main/java/emu/grasscutter/game/quest/content/ContentBargainSuccess.java

@@ -7,8 +7,8 @@ import emu.grasscutter.game.quest.enums.QuestContent;
 @QuestValueContent(QuestContent.QUEST_CONTENT_BARGAIN_SUCC)
 public final class ContentBargainSuccess extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+    public boolean execute(
-        return condition.getParam()[0] == params[0] &&
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-                condition.getParam()[1] == params[1];
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }

src/main/java/emu/grasscutter/game/quest/content/ContentFinishGivingItem.java

@@ -7,8 +7,8 @@ import emu.grasscutter.game.quest.enums.QuestContent;
 @QuestValueContent(QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING)
 public final class ContentFinishGivingItem extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+    public boolean execute(
-        return condition.getParam()[0] == params[0] &&
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-                condition.getParam()[1] == params[1];
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }

src/main/java/emu/grasscutter/game/quest/exec/ExecActiveItemGiving.java

@@ -17,12 +17,12 @@ public final class ExecActiveItemGiving extends QuestExecHandler {
         try {
             questManager.addGiveItemAction(givingId);
 
-            Grasscutter.getLogger().debug("Quest {} added give action {}.",
+            Grasscutter.getLogger()
-                quest.getSubQuestId(), givingId);
+                    .debug("Quest {} added give action {}.", quest.getSubQuestId(), givingId);
             return true;
         } catch (IllegalStateException ignored) {
-            Grasscutter.getLogger().warn("Quest {} attempted to add give action {} twice.",
+            Grasscutter.getLogger()
-                quest.getSubQuestId(), givingId);
+                    .warn("Quest {} attempted to add give action {} twice.", quest.getSubQuestId(), givingId);
             return false;
         }
     }

src/main/java/emu/grasscutter/game/quest/exec/ExecDeactivateItemGiving.java

@@ -17,8 +17,11 @@ public final class ExecDeactivateItemGiving extends QuestExecHandler {
             questManager.removeGivingItemAction(givingId);
             return true;
         } catch (IllegalStateException ignored) {
-            Grasscutter.getLogger().warn("Quest {} attempted to remove give action {} twice.",
+            Grasscutter.getLogger()
-                quest.getSubQuestId(), givingId);
+                    .warn(
+                            "Quest {} attempted to remove give action {} twice.",
+                            quest.getSubQuestId(),
+                            givingId);
             return false;
         }
     }

src/main/java/emu/grasscutter/game/quest/exec/ExecStartBargain.java

@@ -15,8 +15,7 @@ public final class ExecStartBargain extends QuestExecHandler {
 
         try {
             // Start the bargain.
-            quest.getOwner().getQuestManager()
+            quest.getOwner().getQuestManager().startBargain(bargainId);
-                .startBargain(bargainId);
             Grasscutter.getLogger().debug("Bargain {} started.", bargainId);
             return true;
         } catch (RuntimeException ignored) {

src/main/java/emu/grasscutter/game/quest/exec/ExecStopBargain.java

@@ -15,8 +15,7 @@ public final class ExecStopBargain extends QuestExecHandler {
 
         try {
             // Start the bargain.
-            quest.getOwner().getQuestManager()
+            quest.getOwner().getQuestManager().stopBargain(bargainId);
-                .stopBargain(bargainId);
             Grasscutter.getLogger().debug("Bargain {} stopped.", bargainId);
             return true;
         } catch (RuntimeException ignored) {

src/main/java/emu/grasscutter/game/world/Scene.java

@@ -23,8 +23,8 @@ import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.QuestGroupSuite;
 import emu.grasscutter.game.world.data.TeleportProperties;
 import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
 import emu.grasscutter.net.proto.*;
+import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
 import emu.grasscutter.scripts.*;
 import emu.grasscutter.scripts.constants.EventType;
@@ -35,12 +35,11 @@ import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
 import emu.grasscutter.utils.objects.KahnsSort;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import lombok.*;
-
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import lombok.*;
 
 public final class Scene {
     @Getter private final World world;

src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java

@@ -6,7 +6,7 @@ public final class PacketOpcodes {
 
     // Opcodes
     public static final int ACCKLIOPBHN = 205;
-    public static final int ACDCLDJFDFK = 26672;
+    public static final int PlayerEnterMapLayerNotify = 26672;
     public static final int ACOPFPFIJHN = 6465;
     public static final int AEHOGBMFIDK = 21196;
     public static final int AGBOEIBCIHC = 1992;
@@ -185,7 +185,7 @@ public final class PacketOpcodes {
     public static final int BKNAMDDEIKH = 1557;
     public static final int BKOHLDCHKBL = 20475;
     public static final int BLDHOHDIBHB = 27514;
-    public static final int BMODMHEPOFF = 2225;
+    public static final int PlayerEnterChildMapLayerNotify = 2225;
     public static final int BMODNHIFDPI = 7195;
     public static final int BMPHGPCILIK = 22933;
     public static final int BOFOFKKOBNO = 273;

src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java

@@ -4,9 +4,8 @@ import emu.grasscutter.*;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.scripts.*;
-import org.luaj.vm2.*;
-
 import javax.script.*;
+import org.luaj.vm2.*;
 
 public class EntityController {
     private transient CompiledScript entityController;
@@ -38,8 +37,11 @@ public class EntityController {
     public int onClientExecuteRequest(GameEntity entity, int param1, int param2, int param3) {
         if (DebugConstants.LOG_LUA_SCRIPTS) {
             Grasscutter.getLogger()
-                .debug(
+                    .debug(
-                    "Request on {}, {}: {}", entity.getGroupId(), param1, entity.getPosition().toString());
+                            "Request on {}, {}: {}",
+                            entity.getGroupId(),
+                            param1,
+                            entity.getPosition().toString());
         }
         LuaValue value =
                 callControllerScriptFunc(

src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java

@@ -1,16 +1,15 @@
 package emu.grasscutter.server.game;
 
+import static emu.grasscutter.config.Configuration.GAME_INFO;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.event.game.ReceivePacketEvent;
 import emu.grasscutter.server.game.GameSession.SessionState;
 import it.unimi.dsi.fastutil.ints.*;
-import org.reflections.Reflections;
-
 import java.util.Set;
-
+import org.reflections.Reflections;
-import static emu.grasscutter.config.Configuration.GAME_INFO;
 
 @SuppressWarnings("unchecked")
 public class GameServerPacketHandler {

src/main/java/emu/grasscutter/server/game/GameSession.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.server.game;
 
+import static emu.grasscutter.config.Configuration.*;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.game.Account;
@@ -8,14 +11,10 @@ import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.event.game.SendPacketEvent;
 import emu.grasscutter.utils.*;
 import io.netty.buffer.*;
-import lombok.*;
-
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
-
+import lombok.*;
-import static emu.grasscutter.config.Configuration.*;
-import static emu.grasscutter.utils.lang.Language.translate;
 
 public class GameSession implements GameSessionManager.KcpChannel {
     private final GameServer server;

src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.server.http.dispatch;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem;
 import emu.grasscutter.auth.OAuthAuthenticator.ClientType;
@@ -10,8 +12,6 @@ import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 /** Handles requests related to authentication. */
 public final class AuthenticationHandler implements Router {
     /**

src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.server.http.dispatch;
 
+import static emu.grasscutter.config.Configuration.*;
+
 import com.google.gson.*;
 import com.google.protobuf.ByteString;
 import emu.grasscutter.*;
@@ -16,14 +18,11 @@ import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
 import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
-import org.slf4j.Logger;
-
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
-
+import org.slf4j.Logger;
-import static emu.grasscutter.config.Configuration.*;
 
 /** Handles requests related to region queries. */
 public final class RegionHandler implements Router {
@@ -114,8 +113,7 @@ public final class RegionHandler implements Router {
         customConfig.addProperty("sdkenv", "2");
         customConfig.addProperty("checkdevice", "false");
         customConfig.addProperty("loadPatch", "false");
-        customConfig.addProperty("showexception",
+        customConfig.addProperty("showexception", String.valueOf(GameConstants.DEBUG));
-            String.valueOf(GameConstants.DEBUG));
         customConfig.addProperty("regionConfig", "pm|fk|add");
         customConfig.addProperty("downloadMode", "0");
         customConfig.add("codeSwitch", codeSwitch);
@@ -254,11 +252,10 @@ public final class RegionHandler implements Router {
 
                 String key_id = ctx.queryParam("key_id");
 
-                if (
+                if (versionMajor != GameConstants.VERSION_PARTS[0]
-                    versionMajor != GameConstants.VERSION_PARTS[0] ||
+                        || versionMinor != GameConstants.VERSION_PARTS[1]
-                    versionMinor != GameConstants.VERSION_PARTS[1]
+                // The 'fix' or 'patch' version is not checked because it is only used
-                    // The 'fix' or 'patch' version is not checked because it is only used
+                // when miHoYo is desperate and fucks up big time.
-                    // when miHoYo is desperate and fucks up big time.
                 ) { // Reject clients when there is a version mismatch
 
                     boolean updateClient = GameConstants.VERSION.compareTo(clientVersion) > 0;

src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java

@@ -4,9 +4,9 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.scene.SceneData;
 import emu.grasscutter.data.excels.avatar.AvatarData;
 import emu.grasscutter.data.excels.monster.MonsterData;
+import emu.grasscutter.data.excels.scene.SceneData;
 import emu.grasscutter.utils.FileUtils;
 import emu.grasscutter.utils.lang.Language;
 import io.javalin.http.ContentType;

src/main/java/emu/grasscutter/server/packet/recv/HandlerBargainOfferPriceReq.java

@@ -9,8 +9,7 @@ import emu.grasscutter.server.packet.send.PacketBargainOfferPriceRsp;
 @Opcodes(PacketOpcodes.BargainOfferPriceReq)
 public final class HandlerBargainOfferPriceReq extends PacketHandler {
     @Override
-    public void handle(GameSession session, byte[] header, byte[] payload)
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        throws Exception {
         var packet = BargainOfferPriceReq.parseFrom(payload);
         var player = session.getPlayer();
 
@@ -27,14 +26,11 @@ public final class HandlerBargainOfferPriceReq extends PacketHandler {
         var questManager = player.getQuestManager();
         switch (result) {
             case BARGAIN_COMPLETE_SUCC -> questManager.queueEvent(
-                QuestContent.QUEST_CONTENT_BARGAIN_SUCC,
+                    QuestContent.QUEST_CONTENT_BARGAIN_SUCC, bargainId, 0);
-                bargainId, 0);
             case BARGAIN_SINGLE_FAIL -> questManager.queueEvent(
-                QuestContent.QUEST_CONTENT_ITEM_LESS_THAN_BARGAIN,
+                    QuestContent.QUEST_CONTENT_ITEM_LESS_THAN_BARGAIN, bargainId, 0);
-                bargainId, 0);
             case BARGAIN_COMPLETE_FAIL -> questManager.queueEvent(
-                QuestContent.QUEST_CONTENT_BARGAIN_FAIL,
+                    QuestContent.QUEST_CONTENT_BARGAIN_FAIL, bargainId, 0);
-                bargainId, 0);
         }
 
         // Return the resulting packet.

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllActivatedBargainDataReq.java

@@ -8,10 +8,8 @@ import emu.grasscutter.server.packet.send.PacketGetAllActivatedBargainDataRsp;
 public final class HandlerGetAllActivatedBargainDataReq extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) {
-        session.send(new PacketGetAllActivatedBargainDataRsp(
+        session.send(
-            session.getPlayer()
+                new PacketGetAllActivatedBargainDataRsp(
-                .getPlayerProgress()
+                        session.getPlayer().getPlayerProgress().getBargains().values()));
-                .getBargains()
-                .values()));
     }
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetBargainDataReq.java

@@ -9,18 +9,13 @@ import emu.grasscutter.server.packet.send.PacketGetBargainDataRsp;
 @Opcodes(PacketOpcodes.GetBargainDataReq)
 public final class HandlerGetBargainDataReq extends PacketHandler {
     @Override
-    public void handle(GameSession session, byte[] header, byte[] payload)
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        throws Exception {
         var packet = GetBargainDataReq.parseFrom(payload);
 
         var bargainId = packet.getBargainId();
-        var bargain = session.getPlayer()
+        var bargain = session.getPlayer().getPlayerProgress().getBargains().get(bargainId);
-            .getPlayerProgress()
-            .getBargains()
-            .get(bargainId);
         if (bargain == null) {
-            session.send(new PacketGetBargainDataRsp(
+            session.send(new PacketGetBargainDataRsp(Retcode.RET_BARGAIN_NOT_ACTIVATED));
-                Retcode.RET_BARGAIN_NOT_ACTIVATED));
             return;
         }
 

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java

@@ -1,5 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
@@ -11,12 +13,9 @@ import emu.grasscutter.server.game.GameSession.SessionState;
 import emu.grasscutter.server.packet.send.PacketGetPlayerTokenRsp;
 import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.helpers.ByteHelper;
-
-import javax.crypto.Cipher;
 import java.nio.ByteBuffer;
 import java.security.Signature;
-
+import javax.crypto.Cipher;
-import static emu.grasscutter.config.Configuration.ACCOUNT;
 
 @Opcodes(PacketOpcodes.GetPlayerTokenReq)
 public class HandlerGetPlayerTokenReq extends PacketHandler {

src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java

@@ -8,7 +8,6 @@ import emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketItemGivingRsp;
 import emu.grasscutter.server.packet.send.PacketItemGivingRsp.Mode;
-
 import java.util.*;
 
 @Opcodes(PacketOpcodes.ItemGivingReq)
@@ -31,7 +30,8 @@ public final class HandlerItemGivingReq extends PacketHandler {
 
                 // Check the items against the resources.
                 var data = GameData.getGivingDataMap().get(giveId);
-                if (data == null) throw new IllegalArgumentException("No giving data found for " + giveId + ".");
+                if (data == null)
+                    throw new IllegalArgumentException("No giving data found for " + giveId + ".");
 
                 switch (data.getGivingMethod()) {
                     case GIVING_METHOD_EXACT -> {
@@ -60,26 +60,28 @@ public final class HandlerItemGivingReq extends PacketHandler {
                         // Resolve potential item IDs.
                         var groupData = GameData.getGivingGroupDataMap();
                         data.getGivingGroupIds().stream()
-                            .map(groupId -> groupData.get((int) groupId))
+                                .map(groupId -> groupData.get((int) groupId))
-                            .filter(Objects::nonNull)
+                                .filter(Objects::nonNull)
-                            .forEach(group -> {
+                                .forEach(
-                                var itemIds = group.getItemIds();
+                                        group -> {
+                                            var itemIds = group.getItemIds();
 
-                                // Match item stacks to the group items.
+                                            // Match item stacks to the group items.
-                                items.forEach(param -> {
+                                            items.forEach(
-                                    // Get the item instance.
+                                                    param -> {
-                                    var itemInstance = inventory.getFirstItem(param.getItemId());
+                                                        // Get the item instance.
-                                    if (itemInstance == null) return;
+                                                        var itemInstance = inventory.getFirstItem(param.getItemId());
+                                                        if (itemInstance == null) return;
 
-                                    // Get the item ID.
+                                                        // Get the item ID.
-                                    var itemId = itemInstance.getItemId();
+                                                        var itemId = itemInstance.getItemId();
-                                    if (!itemIds.contains(itemId)) return;
+                                                        if (!itemIds.contains(itemId)) return;
 
-                                    // Add the item to the given items.
+                                                        // Add the item to the given items.
-                                    givenItems.put(itemId, param.getCount());
+                                                        givenItems.put(itemId, param.getCount());
-                                    matchedGroups.add(group.getId());
+                                                        matchedGroups.add(group.getId());
-                                });
+                                                    });
-                            });
+                                        });
 
                         // Check if the player has any items.
                         if (givenItems.isEmpty() && matchedGroups.isEmpty()) {

src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterChildMapLayerNotify.java

@@ -1,18 +1,15 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.net.packet.*;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.BMODMHEPOFFOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
-@Opcodes(PacketOpcodes.BMODMHEPOFF)
+@Opcodes(PacketOpcodes.PlayerEnterChildMapLayerNotify)
-public class HandlerPlayerEnterChildMapLayerNotify extends PacketHandler {
+public final class HandlerPlayerEnterChildMapLayerNotify extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var fromClient = BMODMHEPOFFOuterClass.BMODMHEPOFF.parseFrom(payload);
+        // var packet = PlayerEnterChildMapLayerNotify.parseFrom(payload);
         // probably
-        Grasscutter.getLogger().info("player entered child map layer: id {}", fromClient.getHJMMAOMEHOL());
+        // Grasscutter.getLogger()
+        //         .info("player entered child map layer: id {}", packet.getLayerId());
     }
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterMapLayerNotify.java

@@ -1,18 +1,14 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.net.packet.*;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass;
 import emu.grasscutter.server.game.GameSession;
 
-@Opcodes(PacketOpcodes.ACDCLDJFDFK)
+@Opcodes(PacketOpcodes.PlayerEnterMapLayerNotify)
-public class HandlerPlayerEnterMapLayerNotify extends PacketHandler {
+public final class HandlerPlayerEnterMapLayerNotify extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var fromClient = ACDCLDJFDFKOuterClass.ACDCLDJFDFK.parseFrom(payload);
+        // var packet = ACDCLDJFDFKOuterClass.ACDCLDJFDFK.parseFrom(payload);
-        Grasscutter.getLogger().info("[DEBUG] Player found new map layer: id {}", fromClient.getPPLHKCKDHEC());
+        // Grasscutter.getLogger()
-
+        //         .info("[DEBUG] Player found new map layer: id {}", packet.getLayerId());
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketBargainOfferPriceRsp.java

@@ -10,12 +10,14 @@ public final class PacketBargainOfferPriceRsp extends BasePacket {
     public PacketBargainOfferPriceRsp(BargainResultType result, BargainRecord record) {
         super(PacketOpcodes.BargainOfferPriceRsp);
 
-        this.setData(BargainOfferPriceRsp.newBuilder()
+        this.setData(
-            .setRetcode(record.isFinished() ?
+                BargainOfferPriceRsp.newBuilder()
-                Retcode.RET_BARGAIN_FINISHED.getNumber() :
+                        .setRetcode(
-                Retcode.RET_BARGAIN_NOT_ACTIVATED.getNumber())
+                                record.isFinished()
-            .setCurMood(record.getCurrentMood())
+                                        ? Retcode.RET_BARGAIN_FINISHED.getNumber()
-            .setBargainResult(result)
+                                        : Retcode.RET_BARGAIN_NOT_ACTIVATED.getNumber())
-            .setResultParam(0));
+                        .setCurMood(record.getCurrentMood())
+                        .setBargainResult(result)
+                        .setResultParam(0));
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketBargainStartNotify.java

@@ -8,8 +8,9 @@ public final class PacketBargainStartNotify extends BasePacket {
     public PacketBargainStartNotify(BargainRecord record) {
         super(PacketOpcodes.BargainStartNotify);
 
-        this.setData(BargainStartNotify.newBuilder()
+        this.setData(
-            .setBargainId(record.getBargainId())
+                BargainStartNotify.newBuilder()
-            .setSnapshot(record.toSnapshot()));
+                        .setBargainId(record.getBargainId())
+                        .setSnapshot(record.toSnapshot()));
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketBargainTerminateNotify.java

@@ -7,7 +7,6 @@ public final class PacketBargainTerminateNotify extends BasePacket {
     public PacketBargainTerminateNotify(int bargainId) {
         super(PacketOpcodes.BargainTerminateNotify);
 
-        this.setData(BargainTerminateNotify.newBuilder()
+        this.setData(BargainTerminateNotify.newBuilder().setBargainId(bargainId));
-            .setBargainId(bargainId));
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java

@@ -4,17 +4,15 @@ import emu.grasscutter.game.quest.BargainRecord;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetAllActivatedBargainDataRspOuterClass.GetAllActivatedBargainDataRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-
 import java.util.Collection;
 
 public final class PacketGetAllActivatedBargainDataRsp extends BasePacket {
     public PacketGetAllActivatedBargainDataRsp(Collection<BargainRecord> records) {
         super(PacketOpcodes.GetAllActivatedBargainDataRsp);
 
-        this.setData(GetAllActivatedBargainDataRsp.newBuilder()
+        this.setData(
-            .setRetcode(Retcode.RET_SUCC.getNumber())
+                GetAllActivatedBargainDataRsp.newBuilder()
-            .addAllSnapshotList(records.stream()
+                        .setRetcode(Retcode.RET_SUCC.getNumber())
-                .map(BargainRecord::toSnapshot)
+                        .addAllSnapshotList(records.stream().map(BargainRecord::toSnapshot).toList()));
-                .toList()));
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketGetBargainDataRsp.java

@@ -9,16 +9,16 @@ public final class PacketGetBargainDataRsp extends BasePacket {
     public PacketGetBargainDataRsp(Retcode retcode) {
         super(PacketOpcodes.GetBargainDataRsp);
 
-        this.setData(GetBargainDataRsp.newBuilder()
+        this.setData(GetBargainDataRsp.newBuilder().setRetcode(retcode.getNumber()));
-            .setRetcode(retcode.getNumber()));
     }
 
     public PacketGetBargainDataRsp(BargainRecord record) {
         super(PacketOpcodes.GetBargainDataRsp);
 
-        this.setData(GetBargainDataRsp.newBuilder()
+        this.setData(
-            .setRetcode(Retcode.RET_SUCC.getNumber())
+                GetBargainDataRsp.newBuilder()
-            .setBargainId(record.getBargainId())
+                        .setRetcode(Retcode.RET_SUCC.getNumber())
-            .setSnapshot(record.toSnapshot()));
+                        .setBargainId(record.getBargainId())
+                        .setSnapshot(record.toSnapshot()));
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java

@@ -27,7 +27,7 @@ public class PacketGetPlayerTokenRsp extends BasePacket {
                         .setChannelId(1)
                         .setCountryCode("US")
                         .setClientVersionRandomKey("c25-314dd05b0b5f")
-                        .setEMFDHANIAHH(3) // setRegPlatform
+                        .setRegPlatform(3)
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .build();
 
@@ -46,7 +46,7 @@ public class PacketGetPlayerTokenRsp extends BasePacket {
                         .setRetcode(retcode)
                         .setMsg(msg)
                         .setBlackUidEndTime(blackEndTime)
-                        .setEMFDHANIAHH(3) // setRegPlatform
+                        .setRegPlatform(3)
                         .setCountryCode("US")
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .build();
@@ -73,7 +73,7 @@ public class PacketGetPlayerTokenRsp extends BasePacket {
                         .setChannelId(1)
                         .setCountryCode("US")
                         .setClientVersionRandomKey("c25-314dd05b0b5f")
-                        .setEMFDHANIAHH(3) // setRegPlatform
+                        .setRegPlatform(3)
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .setServerRandKey(encryptedSeed)
                         .setSign(encryptedSeedSign)

src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java

@@ -14,13 +14,13 @@ public class PacketGetSceneAreaRsp extends BasePacket {
 
         GetSceneAreaRsp p =
                 GetSceneAreaRsp.newBuilder()
-                    .setSceneId(sceneId)
+                        .setSceneId(sceneId)
-                    .addAllAreaIdList(player.getUnlockedSceneAreas(sceneId))
+                        .addAllAreaIdList(player.getUnlockedSceneAreas(sceneId))
-                    .addCityInfoList(player.getSotsManager().getCityInfo(1).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(1).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(2).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(2).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(3).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(3).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(4).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(4).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(5).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(5).toProto())
                         .build();
 
         this.setData(p);

src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java

@@ -3,15 +3,12 @@ package emu.grasscutter.server.packet.send;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GivingRecordNotifyOuterClass.GivingRecordNotify;
 import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
-
 import java.util.Collection;
 
 public final class PacketGivingRecordNotify extends BasePacket {
     public PacketGivingRecordNotify(Collection<GivingRecord> records) {
         super(PacketOpcodes.GivingRecordNotify);
 
-        this.setData(GivingRecordNotify.newBuilder()
+        this.setData(GivingRecordNotify.newBuilder().addAllGivingRecordList(records).build());
-            .addAllGivingRecordList(records)
-            .build());
     }
 }

src/main/java/emu/grasscutter/server/packet/send/PacketItemGivingRsp.java

@@ -11,8 +11,7 @@ public final class PacketItemGivingRsp extends BasePacket {
     public PacketItemGivingRsp(int value, Mode mode) {
         super(PacketOpcodes.ItemGivingRsp);
 
-        var packet = ItemGivingRsp.newBuilder()
+        var packet = ItemGivingRsp.newBuilder().setRetcode(mode == Mode.FAILURE ? 1 : 0);
-            .setRetcode(mode == Mode.FAILURE ? 1 : 0);
         if (mode == Mode.EXACT_SUCCESS) {
             packet.setGivingId(value);
         } else if (mode == Mode.GROUP_SUCCESS) {

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java

@@ -7,7 +7,6 @@ import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.MapLayerInfoOuterClass;
 import emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify;
 import emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo;
-
 import java.util.stream.IntStream;
 
 public class PacketPlayerWorldSceneInfoListNotify extends BasePacket {
@@ -16,49 +15,66 @@ public class PacketPlayerWorldSceneInfoListNotify extends BasePacket {
         super(PacketOpcodes.PlayerWorldSceneInfoListNotify); // Rename opcode later
 
         PlayerWorldSceneInfoListNotify.Builder proto =
-            PlayerWorldSceneInfoListNotify.newBuilder()
+                PlayerWorldSceneInfoListNotify.newBuilder()
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(1).setIsLocked(false).build())
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(1).setIsLocked(false).build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder()
+                        .addInfoList(
-                    .setSceneId(3)
+                                PlayerWorldSceneInfo.newBuilder()
-                    .setIsLocked(false)
+                                        .setSceneId(3)
-                    .addAllSceneTagIdList(GameData.getSceneTagDataMap().values().stream()
+                                        .setIsLocked(false)
-                        .filter(sceneTag -> sceneTag.getSceneId() == 3)
+                                        .addAllSceneTagIdList(
-                        .filter(sceneTag -> sceneTag.isDefaultValid() || sceneTag.getCond().get(0).getCondType() != null)
+                                                GameData.getSceneTagDataMap().values().stream()
-                        .map(SceneTagData::getId)
+                                                        .filter(sceneTag -> sceneTag.getSceneId() == 3)
-                        .toList())
+                                                        .filter(
-                    //.addSceneTagIdList(102)  // Jade chamber (alr added)
+                                                                sceneTag ->
-                    //.addSceneTagIdList(113)
+                                                                        sceneTag.isDefaultValid()
-                    //.addSceneTagIdList(117)
+                                                                                || sceneTag.getCond().get(0).getCondType() != null)
-                    //.addSceneTagIdList(1093) // 3.0 Vana_real
+                                                        .map(SceneTagData::getId)
-                    .addSceneTagIdList(1094)   // 3.0 Vana_dream
+                                                        .toList())
-                    //.addSceneTagIdList(1095) // 3.0 Vana_first
+                                        // .addSceneTagIdList(102)  // Jade chamber (alr added)
-                    //.addSceneTagIdList(1096) // 3.0 Vana_festival
+                                        // .addSceneTagIdList(113)
-                    .addSceneTagIdList(152)    // 3.1 event
+                                        // .addSceneTagIdList(117)
-                    .addSceneTagIdList(153)    // 3.1 event
+                                        // .addSceneTagIdList(1093) // 3.0 Vana_real
-                    .addSceneTagIdList(1164)   // Desert Arena (XMSM_CWLTop)
+                                        .addSceneTagIdList(1094) // 3.0 Vana_dream
-                    .addSceneTagIdList(1166)   // Desert Pyramid (CWL_Trans_02)
+                                        // .addSceneTagIdList(1095) // 3.0 Vana_first
-                    .setMapLayerInfo(MapLayerInfoOuterClass.MapLayerInfo.newBuilder()
+                                        // .addSceneTagIdList(1096) // 3.0 Vana_festival
-                        .addAllUnlockedMapLayerIdList(GameData.getMapLayerDataMap().keySet())    // MapLayer Ids
+                                        .addSceneTagIdList(152) // 3.1 event
-                        .addAllUnlockedMapLayerFloorIdList(GameData.getMapLayerFloorDataMap().keySet())
+                                        .addSceneTagIdList(153) // 3.1 event
-                        .addAllUnlockedMapLayerGroupIdList(GameData.getMapLayerGroupDataMap().keySet())        // will show MapLayer options when hovered over
+                                        .addSceneTagIdList(1164) // Desert Arena (XMSM_CWLTop)
-                        .build())    //map layer test
+                                        .addSceneTagIdList(1166) // Desert Pyramid (CWL_Trans_02)
-                    .build())
+                                        .setMapLayerInfo(
-                .addInfoList(PlayerWorldSceneInfo.newBuilder()
+                                                MapLayerInfoOuterClass.MapLayerInfo.newBuilder()
-                    .setSceneId(4)
+                                                        .addAllUnlockedMapLayerIdList(
-                    .setIsLocked(false)
+                                                                GameData.getMapLayerDataMap().keySet()) // MapLayer Ids
-                    .addSceneTagIdList(106)
+                                                        .addAllUnlockedMapLayerFloorIdList(
-                    .addSceneTagIdList(109)
+                                                                GameData.getMapLayerFloorDataMap().keySet())
-                    .addSceneTagIdList(117)
+                                                        .addAllUnlockedMapLayerGroupIdList(
-                    .build())
+                                                                GameData.getMapLayerGroupDataMap()
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(5).setIsLocked(false).build())
+                                                                        .keySet()) // will show MapLayer options when hovered over
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(6).setIsLocked(false).build())
+                                                        .build()) // map layer test
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(7).setIsLocked(false).build())
+                                        .build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(9).setIsLocked(false)
+                        .addInfoList(
-                    .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
+                                PlayerWorldSceneInfo.newBuilder()
-                    .build())
+                                        .setSceneId(4)
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(10).setIsLocked(false)
+                                        .setIsLocked(false)
-                    .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
+                                        .addSceneTagIdList(106)
-                    .build());    //3.8
+                                        .addSceneTagIdList(109)
+                                        .addSceneTagIdList(117)
+                                        .build())
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(5).setIsLocked(false).build())
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(6).setIsLocked(false).build())
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(7).setIsLocked(false).build())
+                        .addInfoList(
+                                PlayerWorldSceneInfo.newBuilder()
+                                        .setSceneId(9)
+                                        .setIsLocked(false)
+                                        .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
+                                        .build())
+                        .addInfoList(
+                                PlayerWorldSceneInfo.newBuilder()
+                                        .setSceneId(10)
+                                        .setIsLocked(false)
+                                        .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
+                                        .build()); // 3.8
 
         this.setData(proto);
     }