diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionSetRandomOverrideMapValueOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionSetRandomOverrideMapValueOuterClass.java new file mode 100644 index 000000000..d0d9b5a89 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionSetRandomOverrideMapValueOuterClass.java @@ -0,0 +1,539 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: AbilityActionSetRandomOverrideMapValue.proto + +package emu.grasscutter.net.proto; + +public final class AbilityActionSetRandomOverrideMapValueOuterClass { + private AbilityActionSetRandomOverrideMapValueOuterClass() {} + 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 AbilityActionSetRandomOverrideMapValueOrBuilder extends + // @@protoc_insertion_point(interface_extends:AbilityActionSetRandomOverrideMapValue) + com.google.protobuf.MessageOrBuilder { + + /** + * float random_value = 1; + * @return The randomValue. + */ + float getRandomValue(); + } + /** + * Protobuf type {@code AbilityActionSetRandomOverrideMapValue} + */ + public static final class AbilityActionSetRandomOverrideMapValue extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:AbilityActionSetRandomOverrideMapValue) + AbilityActionSetRandomOverrideMapValueOrBuilder { + private static final long serialVersionUID = 0L; + // Use AbilityActionSetRandomOverrideMapValue.newBuilder() to construct. + private AbilityActionSetRandomOverrideMapValue(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private AbilityActionSetRandomOverrideMapValue() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new AbilityActionSetRandomOverrideMapValue(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private AbilityActionSetRandomOverrideMapValue( + 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 13: { + + randomValue_ = input.readFloat(); + 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.AbilityActionSetRandomOverrideMapValueOuterClass.internal_static_AbilityActionSetRandomOverrideMapValue_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.internal_static_AbilityActionSetRandomOverrideMapValue_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.class, emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.Builder.class); + } + + public static final int RANDOM_VALUE_FIELD_NUMBER = 1; + private float randomValue_; + /** + * float random_value = 1; + * @return The randomValue. + */ + @java.lang.Override + public float getRandomValue() { + return randomValue_; + } + + 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 (randomValue_ != 0F) { + output.writeFloat(1, randomValue_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (randomValue_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(1, randomValue_); + } + 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue other = (emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue) obj; + + if (java.lang.Float.floatToIntBits(getRandomValue()) + != java.lang.Float.floatToIntBits( + other.getRandomValue())) 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) + RANDOM_VALUE_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getRandomValue()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue 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 AbilityActionSetRandomOverrideMapValue} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:AbilityActionSetRandomOverrideMapValue) + emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValueOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.internal_static_AbilityActionSetRandomOverrideMapValue_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.internal_static_AbilityActionSetRandomOverrideMapValue_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.class, emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.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(); + randomValue_ = 0F; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.internal_static_AbilityActionSetRandomOverrideMapValue_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue getDefaultInstanceForType() { + return emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue build() { + emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue buildPartial() { + emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue result = new emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue(this); + result.randomValue_ = randomValue_; + 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue) { + return mergeFrom((emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue other) { + if (other == emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.getDefaultInstance()) return this; + if (other.getRandomValue() != 0F) { + setRandomValue(other.getRandomValue()); + } + 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.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private float randomValue_ ; + /** + * float random_value = 1; + * @return The randomValue. + */ + @java.lang.Override + public float getRandomValue() { + return randomValue_; + } + /** + * float random_value = 1; + * @param value The randomValue to set. + * @return This builder for chaining. + */ + public Builder setRandomValue(float value) { + + randomValue_ = value; + onChanged(); + return this; + } + /** + * float random_value = 1; + * @return This builder for chaining. + */ + public Builder clearRandomValue() { + + randomValue_ = 0F; + 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:AbilityActionSetRandomOverrideMapValue) + } + + // @@protoc_insertion_point(class_scope:AbilityActionSetRandomOverrideMapValue) + private static final emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue(); + } + + public static emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AbilityActionSetRandomOverrideMapValue parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new AbilityActionSetRandomOverrideMapValue(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_AbilityActionSetRandomOverrideMapValue_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_AbilityActionSetRandomOverrideMapValue_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,AbilityActionSetRandomOverrideMapValue" + + ".proto\">\n&AbilityActionSetRandomOverride" + + "MapValue\022\024\n\014random_value\030\001 \001(\002B\033\n\031emu.gr" + + "asscutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_AbilityActionSetRandomOverrideMapValue_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_AbilityActionSetRandomOverrideMapValue_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_AbilityActionSetRandomOverrideMapValue_descriptor, + new java.lang.String[] { "RandomValue", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetKilledStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetKilledStateOuterClass.java new file mode 100644 index 000000000..a294f4c03 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetKilledStateOuterClass.java @@ -0,0 +1,537 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: AbilityMetaSetKilledState.proto + +package emu.grasscutter.net.proto; + +public final class AbilityMetaSetKilledStateOuterClass { + private AbilityMetaSetKilledStateOuterClass() {} + 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 AbilityMetaSetKilledStateOrBuilder extends + // @@protoc_insertion_point(interface_extends:AbilityMetaSetKilledState) + com.google.protobuf.MessageOrBuilder { + + /** + * bool killed = 6; + * @return The killed. + */ + boolean getKilled(); + } + /** + * Protobuf type {@code AbilityMetaSetKilledState} + */ + public static final class AbilityMetaSetKilledState extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:AbilityMetaSetKilledState) + AbilityMetaSetKilledStateOrBuilder { + private static final long serialVersionUID = 0L; + // Use AbilityMetaSetKilledState.newBuilder() to construct. + private AbilityMetaSetKilledState(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private AbilityMetaSetKilledState() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new AbilityMetaSetKilledState(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private AbilityMetaSetKilledState( + 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 48: { + + killed_ = 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.AbilityMetaSetKilledStateOuterClass.internal_static_AbilityMetaSetKilledState_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.internal_static_AbilityMetaSetKilledState_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.class, emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.Builder.class); + } + + public static final int KILLED_FIELD_NUMBER = 6; + private boolean killed_; + /** + * bool killed = 6; + * @return The killed. + */ + @java.lang.Override + public boolean getKilled() { + return killed_; + } + + 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 (killed_ != false) { + output.writeBool(6, killed_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (killed_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(6, killed_); + } + 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState other = (emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState) obj; + + if (getKilled() + != other.getKilled()) 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) + KILLED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getKilled()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState 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 AbilityMetaSetKilledState} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:AbilityMetaSetKilledState) + emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledStateOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.internal_static_AbilityMetaSetKilledState_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.internal_static_AbilityMetaSetKilledState_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.class, emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.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(); + killed_ = false; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.internal_static_AbilityMetaSetKilledState_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState getDefaultInstanceForType() { + return emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState build() { + emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState buildPartial() { + emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState result = new emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState(this); + result.killed_ = killed_; + 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState) { + return mergeFrom((emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState other) { + if (other == emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.getDefaultInstance()) return this; + if (other.getKilled() != false) { + setKilled(other.getKilled()); + } + 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.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private boolean killed_ ; + /** + * bool killed = 6; + * @return The killed. + */ + @java.lang.Override + public boolean getKilled() { + return killed_; + } + /** + * bool killed = 6; + * @param value The killed to set. + * @return This builder for chaining. + */ + public Builder setKilled(boolean value) { + + killed_ = value; + onChanged(); + return this; + } + /** + * bool killed = 6; + * @return This builder for chaining. + */ + public Builder clearKilled() { + + killed_ = 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:AbilityMetaSetKilledState) + } + + // @@protoc_insertion_point(class_scope:AbilityMetaSetKilledState) + private static final emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState(); + } + + public static emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AbilityMetaSetKilledState parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new AbilityMetaSetKilledState(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_AbilityMetaSetKilledState_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_AbilityMetaSetKilledState_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\037AbilityMetaSetKilledState.proto\"+\n\031Abi" + + "lityMetaSetKilledState\022\016\n\006killed\030\006 \001(\010B\033" + + "\n\031emu.grasscutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_AbilityMetaSetKilledState_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_AbilityMetaSetKilledState_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_AbilityMetaSetKilledState_descriptor, + new java.lang.String[] { "Killed", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java index de0a50a52..ccc423c4c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java @@ -25,15 +25,15 @@ public final class AchievementOuterClass { int getFinishTimestamp(); /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @return The enum numeric value on the wire for status. */ int getStatusValue(); /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @return The status. */ - emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB getStatus(); + emu.grasscutter.net.proto.StatusOuterClass.Status getStatus(); /** * uint32 total_progress = 4; @@ -161,132 +161,6 @@ public final class AchievementOuterClass { emu.grasscutter.net.proto.AchievementOuterClass.Achievement.class, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder.class); } - /** - * Protobuf enum {@code Achievement.KNKEIELCCDB} - */ - public enum KNKEIELCCDB - implements com.google.protobuf.ProtocolMessageEnum { - /** - * OPFLKOJMOIG_Invalid = 0; - */ - OPFLKOJMOIG_Invalid(0), - /** - * OPFLKOJMOIG_Unfinished = 1; - */ - OPFLKOJMOIG_Unfinished(1), - /** - * OPFLKOJMOIG_Finished = 2; - */ - OPFLKOJMOIG_Finished(2), - /** - * OPFLKOJMOIG_RewardTaken = 3; - */ - OPFLKOJMOIG_RewardTaken(3), - UNRECOGNIZED(-1), - ; - - /** - * OPFLKOJMOIG_Invalid = 0; - */ - public static final int OPFLKOJMOIG_Invalid_VALUE = 0; - /** - * OPFLKOJMOIG_Unfinished = 1; - */ - public static final int OPFLKOJMOIG_Unfinished_VALUE = 1; - /** - * OPFLKOJMOIG_Finished = 2; - */ - public static final int OPFLKOJMOIG_Finished_VALUE = 2; - /** - * OPFLKOJMOIG_RewardTaken = 3; - */ - public static final int OPFLKOJMOIG_RewardTaken_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 KNKEIELCCDB 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 KNKEIELCCDB forNumber(int value) { - switch (value) { - case 0: return OPFLKOJMOIG_Invalid; - case 1: return OPFLKOJMOIG_Unfinished; - case 2: return OPFLKOJMOIG_Finished; - case 3: return OPFLKOJMOIG_RewardTaken; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static final com.google.protobuf.Internal.EnumLiteMap< - KNKEIELCCDB> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public KNKEIELCCDB findValueByNumber(int number) { - return KNKEIELCCDB.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 KNKEIELCCDB[] VALUES = values(); - - public static KNKEIELCCDB 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 KNKEIELCCDB(int value) { - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:Achievement.KNKEIELCCDB) - } - public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 15; private int finishTimestamp_; /** @@ -301,20 +175,20 @@ public final class AchievementOuterClass { public static final int STATUS_FIELD_NUMBER = 10; private int status_; /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @return The enum numeric value on the wire for status. */ @java.lang.Override public int getStatusValue() { return status_; } /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @return The status. */ - @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB getStatus() { + @java.lang.Override public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() { @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB.valueOf(status_); - return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB.UNRECOGNIZED : result; + emu.grasscutter.net.proto.StatusOuterClass.Status result = emu.grasscutter.net.proto.StatusOuterClass.Status.valueOf(status_); + return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result; } public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4; @@ -370,7 +244,7 @@ public final class AchievementOuterClass { if (id_ != 0) { output.writeUInt32(5, id_); } - if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB.OPFLKOJMOIG_Invalid.getNumber()) { + if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) { output.writeEnum(10, status_); } if (curProgress_ != 0) { @@ -396,7 +270,7 @@ public final class AchievementOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(5, id_); } - if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB.OPFLKOJMOIG_Invalid.getNumber()) { + if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(10, status_); } @@ -756,14 +630,14 @@ public final class AchievementOuterClass { private int status_ = 0; /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @return The enum numeric value on the wire for status. */ @java.lang.Override public int getStatusValue() { return status_; } /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @param value The enum numeric value on the wire for status to set. * @return This builder for chaining. */ @@ -774,21 +648,21 @@ public final class AchievementOuterClass { return this; } /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @return The status. */ @java.lang.Override - public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB getStatus() { + public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() { @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB.valueOf(status_); - return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB.UNRECOGNIZED : result; + emu.grasscutter.net.proto.StatusOuterClass.Status result = emu.grasscutter.net.proto.StatusOuterClass.Status.valueOf(status_); + return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result; } /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @param value The status to set. * @return This builder for chaining. */ - public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.KNKEIELCCDB value) { + public Builder setStatus(emu.grasscutter.net.proto.StatusOuterClass.Status value) { if (value == null) { throw new NullPointerException(); } @@ -798,7 +672,7 @@ public final class AchievementOuterClass { return this; } /** - * .Achievement.KNKEIELCCDB status = 10; + * .Status status = 10; * @return This builder for chaining. */ public Builder clearStatus() { @@ -967,19 +841,16 @@ public final class AchievementOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\021Achievement.proto\"\206\002\n\013Achievement\022\030\n\020f" + - "inish_timestamp\030\017 \001(\r\022(\n\006status\030\n \001(\0162\030." + - "Achievement.KNKEIELCCDB\022\026\n\016total_progres" + - "s\030\004 \001(\r\022\024\n\014cur_progress\030\016 \001(\r\022\n\n\002id\030\005 \001(" + - "\r\"y\n\013KNKEIELCCDB\022\027\n\023OPFLKOJMOIG_Invalid\020" + - "\000\022\032\n\026OPFLKOJMOIG_Unfinished\020\001\022\030\n\024OPFLKOJ" + - "MOIG_Finished\020\002\022\033\n\027OPFLKOJMOIG_RewardTak" + - "en\020\003B\033\n\031emu.grasscutter.net.protob\006proto" + - "3" + "\n\021Achievement.proto\032\014Status.proto\"z\n\013Ach" + + "ievement\022\030\n\020finish_timestamp\030\017 \001(\r\022\027\n\006st" + + "atus\030\n \001(\0162\007.Status\022\026\n\016total_progress\030\004 " + + "\001(\r\022\024\n\014cur_progress\030\016 \001(\r\022\n\n\002id\030\005 \001(\rB\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.StatusOuterClass.getDescriptor(), }); internal_static_Achievement_descriptor = getDescriptor().getMessageTypes().get(0); @@ -987,6 +858,7 @@ 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) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java index 029a77087..0f7c1f29b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java @@ -95,10 +95,10 @@ public final class ActivityInfoOuterClass { boolean getPJJKJGALLGD(); /** - * uint32 KPBFNEPJKEO = 1; - * @return The kPBFNEPJKEO. + * uint32 activity_type = 1; + * @return The activityType. */ - int getKPBFNEPJKEO(); + int getActivityType(); /** * uint32 schedule_id = 5; @@ -264,21 +264,21 @@ public final class ActivityInfoOuterClass { int key); /** - * repeated uint32 PHCOMIFAIJD = 4; - * @return A list containing the pHCOMIFAIJD. + * repeated uint32 meet_cond_list = 4; + * @return A list containing the meetCondList. */ - java.util.List getPHCOMIFAIJDList(); + java.util.List getMeetCondListList(); /** - * repeated uint32 PHCOMIFAIJD = 4; - * @return The count of pHCOMIFAIJD. + * repeated uint32 meet_cond_list = 4; + * @return The count of meetCondList. */ - int getPHCOMIFAIJDCount(); + int getMeetCondListCount(); /** - * repeated uint32 PHCOMIFAIJD = 4; + * repeated uint32 meet_cond_list = 4; * @param index The index of the element to return. - * @return The pHCOMIFAIJD at the given index. + * @return The meetCondList at the given index. */ - int getPHCOMIFAIJD(int index); + int getMeetCondList(int index); /** * repeated .ActivityPushTipsData activity_push_tips_data_list = 643; @@ -1602,7 +1602,7 @@ public final class ActivityInfoOuterClass { watcherInfoList_ = java.util.Collections.emptyList(); lJLDCLMAMNL_ = emptyIntList(); dCPENBLPKHK_ = emptyIntList(); - pHCOMIFAIJD_ = emptyIntList(); + meetCondList_ = emptyIntList(); activityPushTipsDataList_ = java.util.Collections.emptyList(); } @@ -1639,7 +1639,7 @@ public final class ActivityInfoOuterClass { break; case 8: { - kPBFNEPJKEO_ = input.readUInt32(); + activityType_ = input.readUInt32(); break; } case 16: { @@ -1654,21 +1654,21 @@ public final class ActivityInfoOuterClass { } case 32: { if (!((mutable_bitField0_ & 0x00000040) != 0)) { - pHCOMIFAIJD_ = newIntList(); + meetCondList_ = newIntList(); mutable_bitField0_ |= 0x00000040; } - pHCOMIFAIJD_.addInt(input.readUInt32()); + meetCondList_.addInt(input.readUInt32()); break; } case 34: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) { - pHCOMIFAIJD_ = newIntList(); + meetCondList_ = newIntList(); mutable_bitField0_ |= 0x00000040; } while (input.getBytesUntilLimit() > 0) { - pHCOMIFAIJD_.addInt(input.readUInt32()); + meetCondList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -3056,7 +3056,7 @@ public final class ActivityInfoOuterClass { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000040) != 0)) { - pHCOMIFAIJD_.makeImmutable(); // C + meetCondList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { watcherInfoList_ = java.util.Collections.unmodifiableList(watcherInfoList_); @@ -3440,15 +3440,15 @@ public final class ActivityInfoOuterClass { return pJJKJGALLGD_; } - public static final int KPBFNEPJKEO_FIELD_NUMBER = 1; - private int kPBFNEPJKEO_; + public static final int ACTIVITY_TYPE_FIELD_NUMBER = 1; + private int activityType_; /** - * uint32 KPBFNEPJKEO = 1; - * @return The kPBFNEPJKEO. + * uint32 activity_type = 1; + * @return The activityType. */ @java.lang.Override - public int getKPBFNEPJKEO() { - return kPBFNEPJKEO_; + public int getActivityType() { + return activityType_; } public static final int SCHEDULE_ID_FIELD_NUMBER = 5; @@ -3784,33 +3784,33 @@ public final class ActivityInfoOuterClass { return map.get(key); } - public static final int PHCOMIFAIJD_FIELD_NUMBER = 4; - private com.google.protobuf.Internal.IntList pHCOMIFAIJD_; + public static final int MEET_COND_LIST_FIELD_NUMBER = 4; + private com.google.protobuf.Internal.IntList meetCondList_; /** - * repeated uint32 PHCOMIFAIJD = 4; - * @return A list containing the pHCOMIFAIJD. + * repeated uint32 meet_cond_list = 4; + * @return A list containing the meetCondList. */ @java.lang.Override public java.util.List - getPHCOMIFAIJDList() { - return pHCOMIFAIJD_; + getMeetCondListList() { + return meetCondList_; } /** - * repeated uint32 PHCOMIFAIJD = 4; - * @return The count of pHCOMIFAIJD. + * repeated uint32 meet_cond_list = 4; + * @return The count of meetCondList. */ - public int getPHCOMIFAIJDCount() { - return pHCOMIFAIJD_.size(); + public int getMeetCondListCount() { + return meetCondList_.size(); } /** - * repeated uint32 PHCOMIFAIJD = 4; + * repeated uint32 meet_cond_list = 4; * @param index The index of the element to return. - * @return The pHCOMIFAIJD at the given index. + * @return The meetCondList at the given index. */ - public int getPHCOMIFAIJD(int index) { - return pHCOMIFAIJD_.getInt(index); + public int getMeetCondList(int index) { + return meetCondList_.getInt(index); } - private int pHCOMIFAIJDMemoizedSerializedSize = -1; + private int meetCondListMemoizedSerializedSize = -1; public static final int ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER = 643; private java.util.List activityPushTipsDataList_; @@ -6502,8 +6502,8 @@ public final class ActivityInfoOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (kPBFNEPJKEO_ != 0) { - output.writeUInt32(1, kPBFNEPJKEO_); + if (activityType_ != 0) { + output.writeUInt32(1, activityType_); } if (beginTime_ != 0) { output.writeUInt32(2, beginTime_); @@ -6511,12 +6511,12 @@ public final class ActivityInfoOuterClass { if (activityId_ != 0) { output.writeUInt32(3, activityId_); } - if (getPHCOMIFAIJDList().size() > 0) { + if (getMeetCondListList().size() > 0) { output.writeUInt32NoTag(34); - output.writeUInt32NoTag(pHCOMIFAIJDMemoizedSerializedSize); + output.writeUInt32NoTag(meetCondListMemoizedSerializedSize); } - for (int i = 0; i < pHCOMIFAIJD_.size(); i++) { - output.writeUInt32NoTag(pHCOMIFAIJD_.getInt(i)); + for (int i = 0; i < meetCondList_.size(); i++) { + output.writeUInt32NoTag(meetCondList_.getInt(i)); } if (scheduleId_ != 0) { output.writeUInt32(5, scheduleId_); @@ -6863,9 +6863,9 @@ public final class ActivityInfoOuterClass { if (size != -1) return size; size = 0; - if (kPBFNEPJKEO_ != 0) { + if (activityType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, kPBFNEPJKEO_); + .computeUInt32Size(1, activityType_); } if (beginTime_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -6877,17 +6877,17 @@ public final class ActivityInfoOuterClass { } { int dataSize = 0; - for (int i = 0; i < pHCOMIFAIJD_.size(); i++) { + for (int i = 0; i < meetCondList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(pHCOMIFAIJD_.getInt(i)); + .computeUInt32SizeNoTag(meetCondList_.getInt(i)); } size += dataSize; - if (!getPHCOMIFAIJDList().isEmpty()) { + if (!getMeetCondListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - pHCOMIFAIJDMemoizedSerializedSize = dataSize; + meetCondListMemoizedSerializedSize = dataSize; } if (scheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -7382,8 +7382,8 @@ public final class ActivityInfoOuterClass { .equals(other.getLJLDCLMAMNLList())) return false; if (getPJJKJGALLGD() != other.getPJJKJGALLGD()) return false; - if (getKPBFNEPJKEO() - != other.getKPBFNEPJKEO()) return false; + if (getActivityType() + != other.getActivityType()) return false; if (getScheduleId() != other.getScheduleId()) return false; if (!internalGetActivityCoinMap().equals( @@ -7416,8 +7416,8 @@ public final class ActivityInfoOuterClass { != other.getEndTime()) return false; if (!internalGetWishGiftNumMap().equals( other.internalGetWishGiftNumMap())) return false; - if (!getPHCOMIFAIJDList() - .equals(other.getPHCOMIFAIJDList())) return false; + if (!getMeetCondListList() + .equals(other.getMeetCondListList())) return false; if (!getActivityPushTipsDataListList() .equals(other.getActivityPushTipsDataListList())) return false; if (!getDetailCase().equals(other.getDetailCase())) return false; @@ -7796,8 +7796,8 @@ public final class ActivityInfoOuterClass { hash = (37 * hash) + PJJKJGALLGD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getPJJKJGALLGD()); - hash = (37 * hash) + KPBFNEPJKEO_FIELD_NUMBER; - hash = (53 * hash) + getKPBFNEPJKEO(); + hash = (37 * hash) + ACTIVITY_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getActivityType(); hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER; hash = (53 * hash) + getScheduleId(); if (!internalGetActivityCoinMap().getMap().isEmpty()) { @@ -7841,9 +7841,9 @@ public final class ActivityInfoOuterClass { hash = (37 * hash) + WISH_GIFT_NUM_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetWishGiftNumMap().hashCode(); } - if (getPHCOMIFAIJDCount() > 0) { - hash = (37 * hash) + PHCOMIFAIJD_FIELD_NUMBER; - hash = (53 * hash) + getPHCOMIFAIJDList().hashCode(); + if (getMeetCondListCount() > 0) { + hash = (37 * hash) + MEET_COND_LIST_FIELD_NUMBER; + hash = (53 * hash) + getMeetCondListList().hashCode(); } if (getActivityPushTipsDataListCount() > 0) { hash = (37 * hash) + ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER; @@ -8374,7 +8374,7 @@ public final class ActivityInfoOuterClass { bitField0_ = (bitField0_ & ~0x00000004); pJJKJGALLGD_ = false; - kPBFNEPJKEO_ = 0; + activityType_ = 0; scheduleId_ = 0; @@ -8406,7 +8406,7 @@ public final class ActivityInfoOuterClass { endTime_ = 0; internalGetMutableWishGiftNumMap().clear(); - pHCOMIFAIJD_ = emptyIntList(); + meetCondList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000040); if (activityPushTipsDataListBuilder_ == null) { activityPushTipsDataList_ = java.util.Collections.emptyList(); @@ -8465,7 +8465,7 @@ public final class ActivityInfoOuterClass { } result.lJLDCLMAMNL_ = lJLDCLMAMNL_; result.pJJKJGALLGD_ = pJJKJGALLGD_; - result.kPBFNEPJKEO_ = kPBFNEPJKEO_; + result.activityType_ = activityType_; result.scheduleId_ = scheduleId_; result.activityCoinMap_ = internalGetActivityCoinMap(); result.activityCoinMap_.makeImmutable(); @@ -8489,10 +8489,10 @@ public final class ActivityInfoOuterClass { result.wishGiftNumMap_ = internalGetWishGiftNumMap(); result.wishGiftNumMap_.makeImmutable(); if (((bitField0_ & 0x00000040) != 0)) { - pHCOMIFAIJD_.makeImmutable(); + meetCondList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000040); } - result.pHCOMIFAIJD_ = pHCOMIFAIJD_; + result.meetCondList_ = meetCondList_; if (activityPushTipsDataListBuilder_ == null) { if (((bitField0_ & 0x00000080) != 0)) { activityPushTipsDataList_ = java.util.Collections.unmodifiableList(activityPushTipsDataList_); @@ -9201,8 +9201,8 @@ public final class ActivityInfoOuterClass { if (other.getPJJKJGALLGD() != false) { setPJJKJGALLGD(other.getPJJKJGALLGD()); } - if (other.getKPBFNEPJKEO() != 0) { - setKPBFNEPJKEO(other.getKPBFNEPJKEO()); + if (other.getActivityType() != 0) { + setActivityType(other.getActivityType()); } if (other.getScheduleId() != 0) { setScheduleId(other.getScheduleId()); @@ -9257,13 +9257,13 @@ public final class ActivityInfoOuterClass { } internalGetMutableWishGiftNumMap().mergeFrom( other.internalGetWishGiftNumMap()); - if (!other.pHCOMIFAIJD_.isEmpty()) { - if (pHCOMIFAIJD_.isEmpty()) { - pHCOMIFAIJD_ = other.pHCOMIFAIJD_; + if (!other.meetCondList_.isEmpty()) { + if (meetCondList_.isEmpty()) { + meetCondList_ = other.meetCondList_; bitField0_ = (bitField0_ & ~0x00000040); } else { - ensurePHCOMIFAIJDIsMutable(); - pHCOMIFAIJD_.addAll(other.pHCOMIFAIJD_); + ensureMeetCondListIsMutable(); + meetCondList_.addAll(other.meetCondList_); } onChanged(); } @@ -10174,33 +10174,33 @@ public final class ActivityInfoOuterClass { return this; } - private int kPBFNEPJKEO_ ; + private int activityType_ ; /** - * uint32 KPBFNEPJKEO = 1; - * @return The kPBFNEPJKEO. + * uint32 activity_type = 1; + * @return The activityType. */ @java.lang.Override - public int getKPBFNEPJKEO() { - return kPBFNEPJKEO_; + public int getActivityType() { + return activityType_; } /** - * uint32 KPBFNEPJKEO = 1; - * @param value The kPBFNEPJKEO to set. + * uint32 activity_type = 1; + * @param value The activityType to set. * @return This builder for chaining. */ - public Builder setKPBFNEPJKEO(int value) { + public Builder setActivityType(int value) { - kPBFNEPJKEO_ = value; + activityType_ = value; onChanged(); return this; } /** - * uint32 KPBFNEPJKEO = 1; + * uint32 activity_type = 1; * @return This builder for chaining. */ - public Builder clearKPBFNEPJKEO() { + public Builder clearActivityType() { - kPBFNEPJKEO_ = 0; + activityType_ = 0; onChanged(); return this; } @@ -10943,80 +10943,80 @@ public final class ActivityInfoOuterClass { return this; } - private com.google.protobuf.Internal.IntList pHCOMIFAIJD_ = emptyIntList(); - private void ensurePHCOMIFAIJDIsMutable() { + private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList(); + private void ensureMeetCondListIsMutable() { if (!((bitField0_ & 0x00000040) != 0)) { - pHCOMIFAIJD_ = mutableCopy(pHCOMIFAIJD_); + meetCondList_ = mutableCopy(meetCondList_); bitField0_ |= 0x00000040; } } /** - * repeated uint32 PHCOMIFAIJD = 4; - * @return A list containing the pHCOMIFAIJD. + * repeated uint32 meet_cond_list = 4; + * @return A list containing the meetCondList. */ public java.util.List - getPHCOMIFAIJDList() { + getMeetCondListList() { return ((bitField0_ & 0x00000040) != 0) ? - java.util.Collections.unmodifiableList(pHCOMIFAIJD_) : pHCOMIFAIJD_; + java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_; } /** - * repeated uint32 PHCOMIFAIJD = 4; - * @return The count of pHCOMIFAIJD. + * repeated uint32 meet_cond_list = 4; + * @return The count of meetCondList. */ - public int getPHCOMIFAIJDCount() { - return pHCOMIFAIJD_.size(); + public int getMeetCondListCount() { + return meetCondList_.size(); } /** - * repeated uint32 PHCOMIFAIJD = 4; + * repeated uint32 meet_cond_list = 4; * @param index The index of the element to return. - * @return The pHCOMIFAIJD at the given index. + * @return The meetCondList at the given index. */ - public int getPHCOMIFAIJD(int index) { - return pHCOMIFAIJD_.getInt(index); + public int getMeetCondList(int index) { + return meetCondList_.getInt(index); } /** - * repeated uint32 PHCOMIFAIJD = 4; + * repeated uint32 meet_cond_list = 4; * @param index The index to set the value at. - * @param value The pHCOMIFAIJD to set. + * @param value The meetCondList to set. * @return This builder for chaining. */ - public Builder setPHCOMIFAIJD( + public Builder setMeetCondList( int index, int value) { - ensurePHCOMIFAIJDIsMutable(); - pHCOMIFAIJD_.setInt(index, value); + ensureMeetCondListIsMutable(); + meetCondList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 PHCOMIFAIJD = 4; - * @param value The pHCOMIFAIJD to add. + * repeated uint32 meet_cond_list = 4; + * @param value The meetCondList to add. * @return This builder for chaining. */ - public Builder addPHCOMIFAIJD(int value) { - ensurePHCOMIFAIJDIsMutable(); - pHCOMIFAIJD_.addInt(value); + public Builder addMeetCondList(int value) { + ensureMeetCondListIsMutable(); + meetCondList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 PHCOMIFAIJD = 4; - * @param values The pHCOMIFAIJD to add. + * repeated uint32 meet_cond_list = 4; + * @param values The meetCondList to add. * @return This builder for chaining. */ - public Builder addAllPHCOMIFAIJD( + public Builder addAllMeetCondList( java.lang.Iterable values) { - ensurePHCOMIFAIJDIsMutable(); + ensureMeetCondListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, pHCOMIFAIJD_); + values, meetCondList_); onChanged(); return this; } /** - * repeated uint32 PHCOMIFAIJD = 4; + * repeated uint32 meet_cond_list = 4; * @return This builder for chaining. */ - public Builder clearPHCOMIFAIJD() { - pHCOMIFAIJD_ = emptyIntList(); + public Builder clearMeetCondList() { + meetCondList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; @@ -23392,149 +23392,149 @@ public final class ActivityInfoOuterClass { "ivityMultiCharacterInfo.proto\032\030GcgPveInf" + "initeInfo.proto\032\023ToyBattleInfo.proto\032\027Ph" + "otoUnderseaInfo.proto\032\030FontaineGatherInf" + - "o.proto\032\026GcgPvePuzzleInfo.proto\"\200,\n\014Acti" + + "o.proto\032\026GcgPvePuzzleInfo.proto\"\205,\n\014Acti" + "vityInfo\022\023\n\013activity_id\030\003 \001(\r\022\024\n\013DNMOEAF" + "CDGC\030\310\r \003(\r\022/\n\021watcher_info_list\030\t \003(\0132\024" + ".ActivityWatcherInfo\022\023\n\013is_finished\030\016 \001(" + "\010\022\024\n\013LJLDCLMAMNL\030\342\003 \003(\r\022\023\n\013PJJKJGALLGD\030\020" + - " \001(\010\022\023\n\013KPBFNEPJKEO\030\001 \001(\r\022\023\n\013schedule_id" + - "\030\005 \001(\r\022>\n\021activity_coin_map\030\232\014 \003(\0132\".Act" + - "ivityInfo.ActivityCoinMapEntry\022\023\n\013DCPENB" + - "LPKHK\030\014 \003(\r\022\023\n\013DKJDABCNGBP\030\r \001(\010\022\022\n\nbegi" + - "n_time\030\002 \001(\r\022\024\n\013INGFNLLCDOL\030\335\005 \001(\r\022\023\n\013EN" + - "NDKMJIMHN\030\017 \001(\010\022\022\n\tcur_score\030\223\014 \001(\r\022\024\n\013B" + - "KJNDLLNAML\030\232\016 \001(\010\022\035\n\024first_day_start_tim" + - "e\030\322\007 \001(\r\022\024\n\013ABMOPKOIMPA\030\215\004 \001(\010\022\024\n\013FGFGEC" + - "AAKJM\030\247\r \001(\r\022\024\n\013GFEMIEBKKKL\030\335\010 \001(\010\022\024\n\013CE" + - "FIPNKPEKA\030\355\004 \001(\r\022\020\n\010end_time\030\013 \001(\r\022=\n\021wi" + - "sh_gift_num_map\030\234\007 \003(\0132!.ActivityInfo.Wi" + - "shGiftNumMapEntry\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_info\030\n " + - "\001(\0132\032.SeaLampActivityDetailInfoH\000\0224\n\rcru" + - "cible_info\030\007 \001(\0132\033.CrucibleActivityDetai" + - "lInfoH\000\0224\n\rsalesman_info\030\010 \001(\0132\033.Salesma" + - "nActivityDetailInfoH\000\022;\n\021trial_avatar_in" + - "fo\030\006 \001(\0132\036.TrialAvatarActivityDetailInfo" + - "H\000\0225\n\rdelivery_info\030\266\016 \001(\0132\033.DeliveryAct" + - "ivityDetailInfoH\000\022/\n\naster_info\030\204\002 \001(\0132\030" + - ".AsterActivityDetailInfoH\000\0221\n\013flight_inf" + - "o\030\272\006 \001(\0132\031.FlightActivityDetailInfoH\000\022;\n" + - "\021dragon_spine_info\030n \001(\0132\036.DragonSpineAc" + - "tivityDetailInfoH\000\0221\n\013effigy_info\030\362\007 \001(\013" + - "2\031.EffigyActivityDetailInfoH\000\022<\n\021treasur" + - "e_map_info\030\332\r \001(\0132\036.TreasureMapActivityD" + - "etailInfoH\000\0225\n\rblessing_info\030\313\002 \001(\0132\033.Bl" + - "essingActivityDetailInfoH\000\022.\n\rsea_lamp_i" + - "nfo\030\332\010 \001(\0132\024.SeaLampActivityInfoH\000\0229\n\017ex" + - "pedition_info\030\242\005 \001(\0132\035.ExpeditionActivit" + - "yDetailInfoH\000\022A\n\024arena_challenge_info\030\' " + - "\001(\0132!.ArenaChallengeActivityDetailInfoH\000" + - "\0228\n\017fleur_fair_info\030\245\002 \001(\0132\034.FleurFairAc" + - "tivityDetailInfoH\000\022<\n\021water_spirit_info\030" + - "\315\017 \001(\0132\036.WaterSpiritActivityDetailInfoH\000" + - "\022A\n\024challneler_slab_info\030\335\r \001(\0132 .Channe" + - "lerSlabActivityDetailInfoH\000\022A\n\030mist_tria" + - "l_activity_info\030\326\014 \001(\0132\034.MistTrialActivi" + - "tyDetailInfoH\000\022=\n\022hide_and_seek_info\030\323\r " + - "\001(\0132\036.HideAndSeekActivityDetailInfoH\000\0228\n" + - "\023find_hilichurl_info\030\204\n \001(\0132\030.FindHilich" + - "urlDetailInfoH\000\0222\n\020summer_time_info\030\266\007 \001" + - "(\0132\025.SummerTimeDetailInfoH\000\0228\n\023buoyant_c" + - "ombat_info\030\207\004 \001(\0132\030.BuoyantCombatDetailI" + - "nfoH\000\0220\n\017echo_shell_info\030\261\002 \001(\0132\024.EchoSh" + - "ellDetailInfoH\000\022D\n\025bounce_conjuring_info" + - "\030\310\016 \001(\0132\".BounceConjuringActivityDetailI" + - "nfoH\000\0228\n\017blitz_rush_info\030\223\007 \001(\0132\034.BlitzR" + - "ushActivityDetailInfoH\000\022/\n\nchess_info\030\277\010" + - " \001(\0132\030.ChessActivityDetailInfoH\000\022-\n\tsumo" + - "_info\030\330\017 \001(\0132\027.SumoActivityDetailInfoH\000\022" + - ">\n\022moonfin_trial_info\030\205\003 \001(\0132\037.MoonfinTr" + - "ialActivityDetailInfoH\000\022.\n\016luna_rite_inf" + - "o\030\263\017 \001(\0132\023.LunaRiteDetailInfoH\000\022<\n\021plant" + - "_flower_info\030\276\016 \001(\0132\036.PlantFlowerActivit" + - "yDetailInfoH\000\0228\n\017music_game_info\030\267\016 \001(\0132" + - "\034.MusicGameActivityDetailInfoH\000\022F\n\026rogue" + - "like_dungoen_info\030\201\010 \001(\0132#.RoguelikeDung" + - "eonActivityDetailInfoH\000\022+\n\010dig_info\030\277\016 \001" + - "(\0132\026.DigActivityDetailInfoH\000\022/\n\nhachi_in" + - "fo\030\230\t \001(\0132\030.HachiActivityDetailInfoH\000\022:\n" + - "\020winter_camp_info\030\336\017 \001(\0132\035.WinterCampAct" + - "ivityDetailInfoH\000\0221\n\013potion_info\030\315\013 \001(\0132" + - "\031.PotionActivityDetailInfoH\000\022G\n\033tanuki_t" + - "ravel_activity_info\030\260\007 \001(\0132\037.TanukiTrave" + - "lActivityDetailInfoH\000\022E\n\032lantern_rite_ac" + - "tivity_info\030\274\017 \001(\0132\036.LanternRiteActivity" + - "DetailInfoH\000\022A\n\024michiae_matsuri_info\030r \001" + - "(\0132!.MichiaeMatsuriActivityDetailInfoH\000\022" + - "7\n\016bartender_info\030\241\013 \001(\0132\034.BartenderActi" + - "vityDetailInfoH\000\022+\n\010ugc_info\030\203\016 \001(\0132\026.Ug" + - "cActivityDetailInfoH\000\022<\n\021crystal_link_in" + - "fo\030\225\n \001(\0132\036.CrystalLinkActivityDetailInf" + - "oH\000\0222\n\014irodori_info\0306 \001(\0132\032.IrodoriActiv" + - "ityDetailInfoH\000\022/\n\nphoto_info\030\324\013 \001(\0132\030.P" + - "hotoActivityDetailInfoH\000\022/\n\nspice_info\030\276" + - "\003 \001(\0132\030.SpiceActivityDetailInfoH\000\022/\n\ngac" + - "ha_info\030\250\t \001(\0132\030.GachaActivityDetailInfo" + - "H\000\022T\n\036luminance_stone_challenge_info\030& \001" + - "(\0132*.LuminanceStoneChallengeActivityDeta" + - "ilInfoH\000\022:\n\020rogue_diary_info\030\253\003 \001(\0132\035.Ro" + - "gueDiaryActivityDetailInfoH\000\0227\n\023summer_t" + - "ime_v2_info\030\216\007 \001(\0132\027.SummerTimeV2DetailI" + - "nfoH\000\0224\n\021island_party_info\030\224\010 \001(\0132\026.Isla" + - "ndPartyDetailInfoH\000\022-\n\tgear_info\030\357\t \001(\0132" + - "\027.GearActivityDetailInfoH\000\022<\n\025graven_inn" + - "ocence_info\030\344\002 \001(\0132\032.GravenInnocenceDeta" + - "ilInfoH\000\0228\n\023instable_spray_info\030\374\003 \001(\0132\030" + - ".InstableSprayDetailInfoH\000\022@\n\023muqadas_po" + - "tion_info\030\302\013 \001(\0132 .MuqadasPotionActivity" + - "DetailInfoH\000\022B\n\024treasure_seelie_info\030\343\t " + - "\001(\0132!.TreasureSeelieActivityDetailInfoH\000" + - "\022?\n\027rock_board_explore_info\030\204\010 \001(\0132\033.Roc" + - "kBoardExploreDetailInfoH\000\0223\n\014vintage_inf" + - "o\030\271\013 \001(\0132\032.VintageActivityDetailInfoH\000\0220" + - "\n\017wind_field_info\030\200\006 \001(\0132\024.WindFieldDeta" + - "ilInfoH\000\0228\n\023fungus_fighter_info\030\302\006 \001(\0132\030" + - ".FungusFighterDetailInfoH\000\0228\n\023char_amuse" + - "ment_info\030\306\t \001(\0132\030.CharAmusementDetailIn" + - "foH\000\022>\n\025effigy_challenge_info\030\373\t \001(\0132\034.E" + - "ffigyChallengeV2DetailInfoH\000\0224\n\021coin_col" + - "lect_info\030\307\006 \001(\0132\026.CoinCollectDetailInfo" + - "H\000\0226\n\022brick_breaker_info\030\247\004 \001(\0132\027.BrickB" + - "reakerDetailInfoH\000\0220\n\017duel_heart_info\030\206\r" + - " \001(\0132\024.DuelHeartDetailInfoH\000\0221\n\020sea_lamp" + - "_v3_info\030\301\006 \001(\0132\024.SeaLampV3DetailInfoH\000\022" + - "0\n\017team_chain_info\030\215\t \001(\0132\024.TeamChainDet" + - "ailInfoH\000\022H\n\033electrohercules_battle_info" + - "\030\325\007 \001(\0132 .ElectroherculesBattleDetailInf" + - "oH\000\0224\n\021gcg_festival_info\030\200\r \001(\0132\026.GCGFes" + - "tivalDetailInfoH\000\0225\n\022fleur_fair_v2_info\030" + - "\276\017 \001(\0132\026.FleurFairV2DetailInfoH\000\022=\n\026fung" + - "us_fighter_v2_info\030\205\014 \001(\0132\032.FungusFighte" + - "rV2DetailInfoH\000\022*\n\014aka_fes_info\030\364\013 \001(\0132\021" + - ".AkaFesDetailInfoH\000\022A\n\033sandworm_cannon_d" + - "etail_info\030\362\004 \001(\0132\031.SandwormCannonDetail" + - "InfoH\000\0224\n\021sorush_trial_info\030\265\010 \001(\0132\026.Sor" + - "ushTrialDetailInfoH\000\022%\n\014journey_info\030\315\016 " + - "\001(\0132\014.JourneyInfoH\000\022;\n\030effigy_challenge_" + - "v4_info\030\251\n \001(\0132\026.EffigyChallengeV4InfoH\000" + - "\022$\n\014gcg_pve_info\030\230\n \001(\0132\013.GcgPveInfoH\000\022\"" + - "\n\013ugc_v2_info\030\337\007 \001(\0132\n.UgcV2InfoH\000\022:\n\027pe" + - "numbra_adventure_info\030\262\002 \001(\0132\026.PenumbraA" + - "dventureInfoH\000\022,\n\020animal_view_info\030\263\007 \001(" + - "\0132\017.AnimalViewInfoH\000\022E\n\035activity_multi_c" + - "haracter_info\030\275\t \001(\0132\033.ActivityMultiChar" + - "acterInfoH\000\0224\n\025gcg_pve_infinite_info\030| \001" + - "(\0132\023.GcgPveInfiniteInfoH\000\022)\n\017toy_battle_" + - "info\030> \001(\0132\016.ToyBattleInfoH\000\0222\n\023photo_un" + - "dersea_info\030\342\001 \001(\0132\022.PhotoUnderseaInfoH\000" + - "\0224\n\024fontaine_gather_info\030\213\010 \001(\0132\023.Fontai" + - "neGatherInfoH\000\0221\n\023gcg_pve_puzzle_info\030\347\006" + - " \001(\0132\021.GcgPvePuzzleInfoH\000\0326\n\024ActivityCoi" + - "nMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028" + - "\001\0325\n\023WishGiftNumMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n" + - "\005value\030\002 \001(\r:\0028\001B\010\n\006detailB\033\n\031emu.grassc" + - "utter.net.protob\006proto3" + " \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" + + "NBLPKHK\030\014 \003(\r\022\023\n\013DKJDABCNGBP\030\r \001(\010\022\022\n\nbe" + + "gin_time\030\002 \001(\r\022\024\n\013INGFNLLCDOL\030\335\005 \001(\r\022\023\n\013" + + "ENNDKMJIMHN\030\017 \001(\010\022\022\n\tcur_score\030\223\014 \001(\r\022\024\n" + + "\013BKJNDLLNAML\030\232\016 \001(\010\022\035\n\024first_day_start_t" + + "ime\030\322\007 \001(\r\022\024\n\013ABMOPKOIMPA\030\215\004 \001(\010\022\024\n\013FGFG" + + "ECAAKJM\030\247\r \001(\r\022\024\n\013GFEMIEBKKKL\030\335\010 \001(\010\022\024\n\013" + + "CEFIPNKPEKA\030\355\004 \001(\r\022\020\n\010end_time\030\013 \001(\r\022=\n\021" + + "wish_gift_num_map\030\234\007 \003(\0132!.ActivityInfo." + + "WishGiftNumMapEntry\022\026\n\016meet_cond_list\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" + + "\n\rcrucible_info\030\007 \001(\0132\033.CrucibleActivity" + + "DetailInfoH\000\0224\n\rsalesman_info\030\010 \001(\0132\033.Sa" + + "lesmanActivityDetailInfoH\000\022;\n\021trial_avat" + + "ar_info\030\006 \001(\0132\036.TrialAvatarActivityDetai" + + "lInfoH\000\0225\n\rdelivery_info\030\266\016 \001(\0132\033.Delive" + + "ryActivityDetailInfoH\000\022/\n\naster_info\030\204\002 " + + "\001(\0132\030.AsterActivityDetailInfoH\000\0221\n\013fligh" + + "t_info\030\272\006 \001(\0132\031.FlightActivityDetailInfo" + + "H\000\022;\n\021dragon_spine_info\030n \001(\0132\036.DragonSp" + + "ineActivityDetailInfoH\000\0221\n\013effigy_info\030\362" + + "\007 \001(\0132\031.EffigyActivityDetailInfoH\000\022<\n\021tr" + + "easure_map_info\030\332\r \001(\0132\036.TreasureMapActi" + + "vityDetailInfoH\000\0225\n\rblessing_info\030\313\002 \001(\013" + + "2\033.BlessingActivityDetailInfoH\000\022.\n\rsea_l" + + "amp_info\030\332\010 \001(\0132\024.SeaLampActivityInfoH\000\022" + + "9\n\017expedition_info\030\242\005 \001(\0132\035.ExpeditionAc" + + "tivityDetailInfoH\000\022A\n\024arena_challenge_in" + + "fo\030\' \001(\0132!.ArenaChallengeActivityDetailI" + + "nfoH\000\0228\n\017fleur_fair_info\030\245\002 \001(\0132\034.FleurF" + + "airActivityDetailInfoH\000\022<\n\021water_spirit_" + + "info\030\315\017 \001(\0132\036.WaterSpiritActivityDetailI" + + "nfoH\000\022A\n\024challneler_slab_info\030\335\r \001(\0132 .C" + + "hannelerSlabActivityDetailInfoH\000\022A\n\030mist" + + "_trial_activity_info\030\326\014 \001(\0132\034.MistTrialA" + + "ctivityDetailInfoH\000\022=\n\022hide_and_seek_inf" + + "o\030\323\r \001(\0132\036.HideAndSeekActivityDetailInfo" + + "H\000\0228\n\023find_hilichurl_info\030\204\n \001(\0132\030.FindH" + + "ilichurlDetailInfoH\000\0222\n\020summer_time_info" + + "\030\266\007 \001(\0132\025.SummerTimeDetailInfoH\000\0228\n\023buoy" + + "ant_combat_info\030\207\004 \001(\0132\030.BuoyantCombatDe" + + "tailInfoH\000\0220\n\017echo_shell_info\030\261\002 \001(\0132\024.E" + + "choShellDetailInfoH\000\022D\n\025bounce_conjuring" + + "_info\030\310\016 \001(\0132\".BounceConjuringActivityDe" + + "tailInfoH\000\0228\n\017blitz_rush_info\030\223\007 \001(\0132\034.B" + + "litzRushActivityDetailInfoH\000\022/\n\nchess_in" + + "fo\030\277\010 \001(\0132\030.ChessActivityDetailInfoH\000\022-\n" + + "\tsumo_info\030\330\017 \001(\0132\027.SumoActivityDetailIn" + + "foH\000\022>\n\022moonfin_trial_info\030\205\003 \001(\0132\037.Moon" + + "finTrialActivityDetailInfoH\000\022.\n\016luna_rit" + + "e_info\030\263\017 \001(\0132\023.LunaRiteDetailInfoH\000\022<\n\021" + + "plant_flower_info\030\276\016 \001(\0132\036.PlantFlowerAc" + + "tivityDetailInfoH\000\0228\n\017music_game_info\030\267\016" + + " \001(\0132\034.MusicGameActivityDetailInfoH\000\022F\n\026" + + "roguelike_dungoen_info\030\201\010 \001(\0132#.Roguelik" + + "eDungeonActivityDetailInfoH\000\022+\n\010dig_info" + + "\030\277\016 \001(\0132\026.DigActivityDetailInfoH\000\022/\n\nhac" + + "hi_info\030\230\t \001(\0132\030.HachiActivityDetailInfo" + + "H\000\022:\n\020winter_camp_info\030\336\017 \001(\0132\035.WinterCa" + + "mpActivityDetailInfoH\000\0221\n\013potion_info\030\315\013" + + " \001(\0132\031.PotionActivityDetailInfoH\000\022G\n\033tan" + + "uki_travel_activity_info\030\260\007 \001(\0132\037.Tanuki" + + "TravelActivityDetailInfoH\000\022E\n\032lantern_ri" + + "te_activity_info\030\274\017 \001(\0132\036.LanternRiteAct" + + "ivityDetailInfoH\000\022A\n\024michiae_matsuri_inf" + + "o\030r \001(\0132!.MichiaeMatsuriActivityDetailIn" + + "foH\000\0227\n\016bartender_info\030\241\013 \001(\0132\034.Bartende" + + "rActivityDetailInfoH\000\022+\n\010ugc_info\030\203\016 \001(\013" + + "2\026.UgcActivityDetailInfoH\000\022<\n\021crystal_li" + + "nk_info\030\225\n \001(\0132\036.CrystalLinkActivityDeta" + + "ilInfoH\000\0222\n\014irodori_info\0306 \001(\0132\032.Irodori" + + "ActivityDetailInfoH\000\022/\n\nphoto_info\030\324\013 \001(" + + "\0132\030.PhotoActivityDetailInfoH\000\022/\n\nspice_i" + + "nfo\030\276\003 \001(\0132\030.SpiceActivityDetailInfoH\000\022/" + + "\n\ngacha_info\030\250\t \001(\0132\030.GachaActivityDetai" + + "lInfoH\000\022T\n\036luminance_stone_challenge_inf" + + "o\030& \001(\0132*.LuminanceStoneChallengeActivit" + + "yDetailInfoH\000\022:\n\020rogue_diary_info\030\253\003 \001(\013" + + "2\035.RogueDiaryActivityDetailInfoH\000\0227\n\023sum" + + "mer_time_v2_info\030\216\007 \001(\0132\027.SummerTimeV2De" + + "tailInfoH\000\0224\n\021island_party_info\030\224\010 \001(\0132\026" + + ".IslandPartyDetailInfoH\000\022-\n\tgear_info\030\357\t" + + " \001(\0132\027.GearActivityDetailInfoH\000\022<\n\025grave" + + "n_innocence_info\030\344\002 \001(\0132\032.GravenInnocenc" + + "eDetailInfoH\000\0228\n\023instable_spray_info\030\374\003 " + + "\001(\0132\030.InstableSprayDetailInfoH\000\022@\n\023muqad" + + "as_potion_info\030\302\013 \001(\0132 .MuqadasPotionAct" + + "ivityDetailInfoH\000\022B\n\024treasure_seelie_inf" + + "o\030\343\t \001(\0132!.TreasureSeelieActivityDetailI" + + "nfoH\000\022?\n\027rock_board_explore_info\030\204\010 \001(\0132" + + "\033.RockBoardExploreDetailInfoH\000\0223\n\014vintag" + + "e_info\030\271\013 \001(\0132\032.VintageActivityDetailInf" + + "oH\000\0220\n\017wind_field_info\030\200\006 \001(\0132\024.WindFiel" + + "dDetailInfoH\000\0228\n\023fungus_fighter_info\030\302\006 " + + "\001(\0132\030.FungusFighterDetailInfoH\000\0228\n\023char_" + + "amusement_info\030\306\t \001(\0132\030.CharAmusementDet" + + "ailInfoH\000\022>\n\025effigy_challenge_info\030\373\t \001(" + + "\0132\034.EffigyChallengeV2DetailInfoH\000\0224\n\021coi" + + "n_collect_info\030\307\006 \001(\0132\026.CoinCollectDetai" + + "lInfoH\000\0226\n\022brick_breaker_info\030\247\004 \001(\0132\027.B" + + "rickBreakerDetailInfoH\000\0220\n\017duel_heart_in" + + "fo\030\206\r \001(\0132\024.DuelHeartDetailInfoH\000\0221\n\020sea" + + "_lamp_v3_info\030\301\006 \001(\0132\024.SeaLampV3DetailIn" + + "foH\000\0220\n\017team_chain_info\030\215\t \001(\0132\024.TeamCha" + + "inDetailInfoH\000\022H\n\033electrohercules_battle" + + "_info\030\325\007 \001(\0132 .ElectroherculesBattleDeta" + + "ilInfoH\000\0224\n\021gcg_festival_info\030\200\r \001(\0132\026.G" + + "CGFestivalDetailInfoH\000\0225\n\022fleur_fair_v2_" + + "info\030\276\017 \001(\0132\026.FleurFairV2DetailInfoH\000\022=\n" + + "\026fungus_fighter_v2_info\030\205\014 \001(\0132\032.FungusF" + + "ighterV2DetailInfoH\000\022*\n\014aka_fes_info\030\364\013 " + + "\001(\0132\021.AkaFesDetailInfoH\000\022A\n\033sandworm_can" + + "non_detail_info\030\362\004 \001(\0132\031.SandwormCannonD" + + "etailInfoH\000\0224\n\021sorush_trial_info\030\265\010 \001(\0132" + + "\026.SorushTrialDetailInfoH\000\022%\n\014journey_inf" + + "o\030\315\016 \001(\0132\014.JourneyInfoH\000\022;\n\030effigy_chall" + + "enge_v4_info\030\251\n \001(\0132\026.EffigyChallengeV4I" + + "nfoH\000\022$\n\014gcg_pve_info\030\230\n \001(\0132\013.GcgPveInf" + + "oH\000\022\"\n\013ugc_v2_info\030\337\007 \001(\0132\n.UgcV2InfoH\000\022" + + ":\n\027penumbra_adventure_info\030\262\002 \001(\0132\026.Penu" + + "mbraAdventureInfoH\000\022,\n\020animal_view_info\030" + + "\263\007 \001(\0132\017.AnimalViewInfoH\000\022E\n\035activity_mu" + + "lti_character_info\030\275\t \001(\0132\033.ActivityMult" + + "iCharacterInfoH\000\0224\n\025gcg_pve_infinite_inf" + + "o\030| \001(\0132\023.GcgPveInfiniteInfoH\000\022)\n\017toy_ba" + + "ttle_info\030> \001(\0132\016.ToyBattleInfoH\000\0222\n\023pho" + + "to_undersea_info\030\342\001 \001(\0132\022.PhotoUnderseaI" + + "nfoH\000\0224\n\024fontaine_gather_info\030\213\010 \001(\0132\023.F" + + "ontaineGatherInfoH\000\0221\n\023gcg_pve_puzzle_in" + + "fo\030\347\006 \001(\0132\021.GcgPvePuzzleInfoH\000\0326\n\024Activi" + + "tyCoinMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001" + + "(\r:\0028\001\0325\n\023WishGiftNumMapEntry\022\013\n\003key\030\001 \001" + + "(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\010\n\006detailB\033\n\031emu.g" + + "rasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -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", "KPBFNEPJKEO", "ScheduleId", "ActivityCoinMap", "DCPENBLPKHK", "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", }); + 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", }); internal_static_ActivityInfo_ActivityCoinMapEntry_descriptor = internal_static_ActivityInfo_descriptor.getNestedTypes().get(0); internal_static_ActivityInfo_ActivityCoinMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java index 8b03b546d..7ab7a5598 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java @@ -19,10 +19,10 @@ public final class AddNoGachaAvatarCardNotifyOuterClass { com.google.protobuf.MessageOrBuilder { /** - * uint32 MGBKMNHIFOE = 15; - * @return The mGBKMNHIFOE. + * uint32 initial_level = 15; + * @return The initialLevel. */ - int getMGBKMNHIFOE(); + int getInitialLevel(); /** * uint32 avatar_id = 14; @@ -73,10 +73,10 @@ public final class AddNoGachaAvatarCardNotifyOuterClass { int index); /** - * uint32 CBBMIOFHCIC = 8; - * @return The cBBMIOFHCIC. + * uint32 initial_promote_level = 8; + * @return The initialPromoteLevel. */ - int getCBBMIOFHCIC(); + int getInitialPromoteLevel(); } /** * 
@@ -146,7 +146,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
             }
             case 64: {
 
-              cBBMIOFHCIC_ = input.readUInt32();
+              initialPromoteLevel_ = input.readUInt32();
               break;
             }
             case 72: {
@@ -166,7 +166,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
             }
             case 120: {
 
-              mGBKMNHIFOE_ = input.readUInt32();
+              initialLevel_ = input.readUInt32();
               break;
             }
             default: {
@@ -204,15 +204,15 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
               emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify.class, emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify.Builder.class);
     }
 
-    public static final int MGBKMNHIFOE_FIELD_NUMBER = 15;
-    private int mGBKMNHIFOE_;
+    public static final int INITIAL_LEVEL_FIELD_NUMBER = 15;
+    private int initialLevel_;
     /**
-     * uint32 MGBKMNHIFOE = 15;
-     * @return The mGBKMNHIFOE.
+     * uint32 initial_level = 15;
+     * @return The initialLevel.
      */
     @java.lang.Override
-    public int getMGBKMNHIFOE() {
-      return mGBKMNHIFOE_;
+    public int getInitialLevel() {
+      return initialLevel_;
     }
 
     public static final int AVATAR_ID_FIELD_NUMBER = 14;
@@ -299,15 +299,15 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       return transferItemList_.get(index);
     }
 
-    public static final int CBBMIOFHCIC_FIELD_NUMBER = 8;
-    private int cBBMIOFHCIC_;
+    public static final int INITIAL_PROMOTE_LEVEL_FIELD_NUMBER = 8;
+    private int initialPromoteLevel_;
     /**
-     * uint32 CBBMIOFHCIC = 8;
-     * @return The cBBMIOFHCIC.
+     * uint32 initial_promote_level = 8;
+     * @return The initialPromoteLevel.
      */
     @java.lang.Override
-    public int getCBBMIOFHCIC() {
-      return cBBMIOFHCIC_;
+    public int getInitialPromoteLevel() {
+      return initialPromoteLevel_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -330,8 +330,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       for (int i = 0; i < transferItemList_.size(); i++) {
         output.writeMessage(2, transferItemList_.get(i));
       }
-      if (cBBMIOFHCIC_ != 0) {
-        output.writeUInt32(8, cBBMIOFHCIC_);
+      if (initialPromoteLevel_ != 0) {
+        output.writeUInt32(8, initialPromoteLevel_);
       }
       if (isTransferToItem_ != false) {
         output.writeBool(9, isTransferToItem_);
@@ -342,8 +342,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       if (avatarId_ != 0) {
         output.writeUInt32(14, avatarId_);
       }
-      if (mGBKMNHIFOE_ != 0) {
-        output.writeUInt32(15, mGBKMNHIFOE_);
+      if (initialLevel_ != 0) {
+        output.writeUInt32(15, initialLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -362,9 +362,9 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, transferItemList_.get(i));
       }
-      if (cBBMIOFHCIC_ != 0) {
+      if (initialPromoteLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, cBBMIOFHCIC_);
+          .computeUInt32Size(8, initialPromoteLevel_);
       }
       if (isTransferToItem_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -378,9 +378,9 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(14, avatarId_);
       }
-      if (mGBKMNHIFOE_ != 0) {
+      if (initialLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, mGBKMNHIFOE_);
+          .computeUInt32Size(15, initialLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -397,8 +397,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify other = (emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify) obj;
 
-      if (getMGBKMNHIFOE()
-          != other.getMGBKMNHIFOE()) return false;
+      if (getInitialLevel()
+          != other.getInitialLevel()) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
       if (getReason()
@@ -409,8 +409,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
           != other.getItemId()) return false;
       if (!getTransferItemListList()
           .equals(other.getTransferItemListList())) return false;
-      if (getCBBMIOFHCIC()
-          != other.getCBBMIOFHCIC()) return false;
+      if (getInitialPromoteLevel()
+          != other.getInitialPromoteLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -422,8 +422,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MGBKMNHIFOE_FIELD_NUMBER;
-      hash = (53 * hash) + getMGBKMNHIFOE();
+      hash = (37 * hash) + INITIAL_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getInitialLevel();
       hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarId();
       hash = (37 * hash) + REASON_FIELD_NUMBER;
@@ -437,8 +437,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         hash = (37 * hash) + TRANSFER_ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getTransferItemListList().hashCode();
       }
-      hash = (37 * hash) + CBBMIOFHCIC_FIELD_NUMBER;
-      hash = (53 * hash) + getCBBMIOFHCIC();
+      hash = (37 * hash) + INITIAL_PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getInitialPromoteLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -578,7 +578,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        mGBKMNHIFOE_ = 0;
+        initialLevel_ = 0;
 
         avatarId_ = 0;
 
@@ -594,7 +594,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         } else {
           transferItemListBuilder_.clear();
         }
-        cBBMIOFHCIC_ = 0;
+        initialPromoteLevel_ = 0;
 
         return this;
       }
@@ -623,7 +623,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       public emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify buildPartial() {
         emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify result = new emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify(this);
         int from_bitField0_ = bitField0_;
-        result.mGBKMNHIFOE_ = mGBKMNHIFOE_;
+        result.initialLevel_ = initialLevel_;
         result.avatarId_ = avatarId_;
         result.reason_ = reason_;
         result.isTransferToItem_ = isTransferToItem_;
@@ -637,7 +637,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         } else {
           result.transferItemList_ = transferItemListBuilder_.build();
         }
-        result.cBBMIOFHCIC_ = cBBMIOFHCIC_;
+        result.initialPromoteLevel_ = initialPromoteLevel_;
         onBuilt();
         return result;
       }
@@ -686,8 +686,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify other) {
         if (other == emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify.getDefaultInstance()) return this;
-        if (other.getMGBKMNHIFOE() != 0) {
-          setMGBKMNHIFOE(other.getMGBKMNHIFOE());
+        if (other.getInitialLevel() != 0) {
+          setInitialLevel(other.getInitialLevel());
         }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
@@ -727,8 +727,8 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
             }
           }
         }
-        if (other.getCBBMIOFHCIC() != 0) {
-          setCBBMIOFHCIC(other.getCBBMIOFHCIC());
+        if (other.getInitialPromoteLevel() != 0) {
+          setInitialPromoteLevel(other.getInitialPromoteLevel());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -760,33 +760,33 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int mGBKMNHIFOE_ ;
+      private int initialLevel_ ;
       /**
-       * uint32 MGBKMNHIFOE = 15;
-       * @return The mGBKMNHIFOE.
+       * uint32 initial_level = 15;
+       * @return The initialLevel.
        */
       @java.lang.Override
-      public int getMGBKMNHIFOE() {
-        return mGBKMNHIFOE_;
+      public int getInitialLevel() {
+        return initialLevel_;
       }
       /**
-       * uint32 MGBKMNHIFOE = 15;
-       * @param value The mGBKMNHIFOE to set.
+       * uint32 initial_level = 15;
+       * @param value The initialLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setMGBKMNHIFOE(int value) {
+      public Builder setInitialLevel(int value) {
         
-        mGBKMNHIFOE_ = value;
+        initialLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 MGBKMNHIFOE = 15;
+       * uint32 initial_level = 15;
        * @return This builder for chaining.
        */
-      public Builder clearMGBKMNHIFOE() {
+      public Builder clearInitialLevel() {
         
-        mGBKMNHIFOE_ = 0;
+        initialLevel_ = 0;
         onChanged();
         return this;
       }
@@ -1155,33 +1155,33 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return transferItemListBuilder_;
       }
 
-      private int cBBMIOFHCIC_ ;
+      private int initialPromoteLevel_ ;
       /**
-       * uint32 CBBMIOFHCIC = 8;
-       * @return The cBBMIOFHCIC.
+       * uint32 initial_promote_level = 8;
+       * @return The initialPromoteLevel.
        */
       @java.lang.Override
-      public int getCBBMIOFHCIC() {
-        return cBBMIOFHCIC_;
+      public int getInitialPromoteLevel() {
+        return initialPromoteLevel_;
       }
       /**
-       * uint32 CBBMIOFHCIC = 8;
-       * @param value The cBBMIOFHCIC to set.
+       * uint32 initial_promote_level = 8;
+       * @param value The initialPromoteLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setCBBMIOFHCIC(int value) {
+      public Builder setInitialPromoteLevel(int value) {
         
-        cBBMIOFHCIC_ = value;
+        initialPromoteLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 CBBMIOFHCIC = 8;
+       * uint32 initial_promote_level = 8;
        * @return This builder for chaining.
        */
-      public Builder clearCBBMIOFHCIC() {
+      public Builder clearInitialPromoteLevel() {
         
-        cBBMIOFHCIC_ = 0;
+        initialPromoteLevel_ = 0;
         onChanged();
         return this;
       }
@@ -1253,14 +1253,14 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AddNoGachaAvatarCardNotify.proto\032&AddN" +
-      "oGachaAvatarCardTransferItem.proto\"\326\001\n\032A" +
-      "ddNoGachaAvatarCardNotify\022\023\n\013MGBKMNHIFOE" +
-      "\030\017 \001(\r\022\021\n\tavatar_id\030\016 \001(\r\022\016\n\006reason\030\014 \001(" +
-      "\r\022\033\n\023is_transfer_to_item\030\t \001(\010\022\017\n\007item_i" +
-      "d\030\001 \001(\r\022=\n\022transfer_item_list\030\002 \003(\0132!.Ad" +
-      "dNoGachaAvatarCardTransferItem\022\023\n\013CBBMIO" +
-      "FHCIC\030\010 \001(\rB\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "oGachaAvatarCardTransferItem.proto\"\342\001\n\032A" +
+      "ddNoGachaAvatarCardNotify\022\025\n\rinitial_lev" +
+      "el\030\017 \001(\r\022\021\n\tavatar_id\030\016 \001(\r\022\016\n\006reason\030\014 " +
+      "\001(\r\022\033\n\023is_transfer_to_item\030\t \001(\010\022\017\n\007item" +
+      "_id\030\001 \001(\r\022=\n\022transfer_item_list\030\002 \003(\0132!." +
+      "AddNoGachaAvatarCardTransferItem\022\035\n\025init" +
+      "ial_promote_level\030\010 \001(\rB\033\n\031emu.grasscutt" +
+      "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1272,7 +1272,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
     internal_static_AddNoGachaAvatarCardNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddNoGachaAvatarCardNotify_descriptor,
-        new java.lang.String[] { "MGBKMNHIFOE", "AvatarId", "Reason", "IsTransferToItem", "ItemId", "TransferItemList", "CBBMIOFHCIC", });
+        new java.lang.String[] { "InitialLevel", "AvatarId", "Reason", "IsTransferToItem", "ItemId", "TransferItemList", "InitialPromoteLevel", });
     emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AllWidgetDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AllWidgetDataNotifyOuterClass.java
index 0e8cad83a..59953a028 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AllWidgetDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AllWidgetDataNotifyOuterClass.java
@@ -73,27 +73,27 @@ public final class AllWidgetDataNotifyOuterClass {
     int getCMFPEOMAJLM();
 
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
     java.util.List 
-        getPEOHMDJKMKOList();
+        getCoolDownGroupDataListList();
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getPEOHMDJKMKO(int index);
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index);
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
-    int getPEOHMDJKMKOCount();
+    int getCoolDownGroupDataListCount();
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
     java.util.List 
-        getPEOHMDJKMKOOrBuilderList();
+        getCoolDownGroupDataListOrBuilderList();
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getPEOHMDJKMKOOrBuilder(
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder(
         int index);
 
     /**
@@ -136,27 +136,27 @@ public final class AllWidgetDataNotifyOuterClass {
     emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxDataOrBuilder getLunchBoxDataOrBuilder();
 
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
     java.util.List 
-        getMCMDFPAFOIGList();
+        getNormalCoolDownDataListList();
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getMCMDFPAFOIG(int index);
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index);
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
-    int getMCMDFPAFOIGCount();
+    int getNormalCoolDownDataListCount();
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
     java.util.List 
-        getMCMDFPAFOIGOrBuilderList();
+        getNormalCoolDownDataListOrBuilderList();
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getMCMDFPAFOIGOrBuilder(
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
         int index);
 
     /**
@@ -303,9 +303,9 @@ public final class AllWidgetDataNotifyOuterClass {
     private AllWidgetDataNotify() {
       oneoffGatherPointDetectorDataList_ = java.util.Collections.emptyList();
       clientCollectorDataList_ = java.util.Collections.emptyList();
-      pEOHMDJKMKO_ = java.util.Collections.emptyList();
+      coolDownGroupDataList_ = java.util.Collections.emptyList();
       anchorPointList_ = java.util.Collections.emptyList();
-      mCMDFPAFOIG_ = java.util.Collections.emptyList();
+      normalCoolDownDataList_ = java.util.Collections.emptyList();
       eMPBLGKLCOA_ = emptyIntList();
       slotList_ = java.util.Collections.emptyList();
       backgroundActiveWidgetList_ = emptyIntList();
@@ -400,10 +400,10 @@ public final class AllWidgetDataNotifyOuterClass {
             }
             case 66: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                pEOHMDJKMKO_ = new java.util.ArrayList();
+                coolDownGroupDataList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              pEOHMDJKMKO_.add(
+              coolDownGroupDataList_.add(
                   input.readMessage(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.parser(), extensionRegistry));
               break;
             }
@@ -458,10 +458,10 @@ public final class AllWidgetDataNotifyOuterClass {
             }
             case 114: {
               if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                mCMDFPAFOIG_ = new java.util.ArrayList();
+                normalCoolDownDataList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              mCMDFPAFOIG_.add(
+              normalCoolDownDataList_.add(
                   input.readMessage(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.parser(), extensionRegistry));
               break;
             }
@@ -535,7 +535,7 @@ public final class AllWidgetDataNotifyOuterClass {
           backgroundActiveWidgetList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          pEOHMDJKMKO_ = java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+          coolDownGroupDataList_ = java.util.Collections.unmodifiableList(coolDownGroupDataList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           clientCollectorDataList_ = java.util.Collections.unmodifiableList(clientCollectorDataList_);
@@ -544,7 +544,7 @@ public final class AllWidgetDataNotifyOuterClass {
           slotList_ = java.util.Collections.unmodifiableList(slotList_);
         }
         if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          mCMDFPAFOIG_ = java.util.Collections.unmodifiableList(mCMDFPAFOIG_);
+          normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
         }
         if (((mutable_bitField0_ & 0x00000008) != 0)) {
           anchorPointList_ = java.util.Collections.unmodifiableList(anchorPointList_);
@@ -660,44 +660,44 @@ public final class AllWidgetDataNotifyOuterClass {
       return cMFPEOMAJLM_;
     }
 
-    public static final int PEOHMDJKMKO_FIELD_NUMBER = 8;
-    private java.util.List pEOHMDJKMKO_;
+    public static final int COOL_DOWN_GROUP_DATA_LIST_FIELD_NUMBER = 8;
+    private java.util.List coolDownGroupDataList_;
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
     @java.lang.Override
-    public java.util.List getPEOHMDJKMKOList() {
-      return pEOHMDJKMKO_;
+    public java.util.List getCoolDownGroupDataListList() {
+      return coolDownGroupDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
     @java.lang.Override
     public java.util.List 
-        getPEOHMDJKMKOOrBuilderList() {
-      return pEOHMDJKMKO_;
+        getCoolDownGroupDataListOrBuilderList() {
+      return coolDownGroupDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
     @java.lang.Override
-    public int getPEOHMDJKMKOCount() {
-      return pEOHMDJKMKO_.size();
+    public int getCoolDownGroupDataListCount() {
+      return coolDownGroupDataList_.size();
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getPEOHMDJKMKO(int index) {
-      return pEOHMDJKMKO_.get(index);
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index) {
+      return coolDownGroupDataList_.get(index);
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+     * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getPEOHMDJKMKOOrBuilder(
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder(
         int index) {
-      return pEOHMDJKMKO_.get(index);
+      return coolDownGroupDataList_.get(index);
     }
 
     public static final int ANCHOR_POINT_LIST_FIELD_NUMBER = 15;
@@ -766,44 +766,44 @@ public final class AllWidgetDataNotifyOuterClass {
       return getLunchBoxData();
     }
 
-    public static final int MCMDFPAFOIG_FIELD_NUMBER = 14;
-    private java.util.List mCMDFPAFOIG_;
+    public static final int NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 14;
+    private java.util.List normalCoolDownDataList_;
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
     @java.lang.Override
-    public java.util.List getMCMDFPAFOIGList() {
-      return mCMDFPAFOIG_;
+    public java.util.List getNormalCoolDownDataListList() {
+      return normalCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
     @java.lang.Override
     public java.util.List 
-        getMCMDFPAFOIGOrBuilderList() {
-      return mCMDFPAFOIG_;
+        getNormalCoolDownDataListOrBuilderList() {
+      return normalCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
     @java.lang.Override
-    public int getMCMDFPAFOIGCount() {
-      return mCMDFPAFOIG_.size();
+    public int getNormalCoolDownDataListCount() {
+      return normalCoolDownDataList_.size();
     }
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getMCMDFPAFOIG(int index) {
-      return mCMDFPAFOIG_.get(index);
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
+      return normalCoolDownDataList_.get(index);
     }
     /**
-     * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getMCMDFPAFOIGOrBuilder(
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
         int index) {
-      return mCMDFPAFOIG_.get(index);
+      return normalCoolDownDataList_.get(index);
     }
 
     public static final int ELIOJBDGIMJ_FIELD_NUMBER = 12;
@@ -1048,8 +1048,8 @@ public final class AllWidgetDataNotifyOuterClass {
       for (int i = 0; i < backgroundActiveWidgetList_.size(); i++) {
         output.writeUInt32NoTag(backgroundActiveWidgetList_.getInt(i));
       }
-      for (int i = 0; i < pEOHMDJKMKO_.size(); i++) {
-        output.writeMessage(8, pEOHMDJKMKO_.get(i));
+      for (int i = 0; i < coolDownGroupDataList_.size(); i++) {
+        output.writeMessage(8, coolDownGroupDataList_.get(i));
       }
       for (int i = 0; i < clientCollectorDataList_.size(); i++) {
         output.writeMessage(9, clientCollectorDataList_.get(i));
@@ -1066,8 +1066,8 @@ public final class AllWidgetDataNotifyOuterClass {
       for (int i = 0; i < slotList_.size(); i++) {
         output.writeMessage(13, slotList_.get(i));
       }
-      for (int i = 0; i < mCMDFPAFOIG_.size(); i++) {
-        output.writeMessage(14, mCMDFPAFOIG_.get(i));
+      for (int i = 0; i < normalCoolDownDataList_.size(); i++) {
+        output.writeMessage(14, normalCoolDownDataList_.get(i));
       }
       for (int i = 0; i < anchorPointList_.size(); i++) {
         output.writeMessage(15, anchorPointList_.get(i));
@@ -1120,9 +1120,9 @@ public final class AllWidgetDataNotifyOuterClass {
         }
         backgroundActiveWidgetListMemoizedSerializedSize = dataSize;
       }
-      for (int i = 0; i < pEOHMDJKMKO_.size(); i++) {
+      for (int i = 0; i < coolDownGroupDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, pEOHMDJKMKO_.get(i));
+          .computeMessageSize(8, coolDownGroupDataList_.get(i));
       }
       for (int i = 0; i < clientCollectorDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -1144,9 +1144,9 @@ public final class AllWidgetDataNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(13, slotList_.get(i));
       }
-      for (int i = 0; i < mCMDFPAFOIG_.size(); i++) {
+      for (int i = 0; i < normalCoolDownDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, mCMDFPAFOIG_.get(i));
+          .computeMessageSize(14, normalCoolDownDataList_.get(i));
       }
       for (int i = 0; i < anchorPointList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -1195,8 +1195,8 @@ public final class AllWidgetDataNotifyOuterClass {
           .equals(other.getClientCollectorDataListList())) return false;
       if (getCMFPEOMAJLM()
           != other.getCMFPEOMAJLM()) return false;
-      if (!getPEOHMDJKMKOList()
-          .equals(other.getPEOHMDJKMKOList())) return false;
+      if (!getCoolDownGroupDataListList()
+          .equals(other.getCoolDownGroupDataListList())) return false;
       if (!getAnchorPointListList()
           .equals(other.getAnchorPointListList())) return false;
       if (hasLunchBoxData() != other.hasLunchBoxData()) return false;
@@ -1204,8 +1204,8 @@ public final class AllWidgetDataNotifyOuterClass {
         if (!getLunchBoxData()
             .equals(other.getLunchBoxData())) return false;
       }
-      if (!getMCMDFPAFOIGList()
-          .equals(other.getMCMDFPAFOIGList())) return false;
+      if (!getNormalCoolDownDataListList()
+          .equals(other.getNormalCoolDownDataListList())) return false;
       if (hasELIOJBDGIMJ() != other.hasELIOJBDGIMJ()) return false;
       if (hasELIOJBDGIMJ()) {
         if (!getELIOJBDGIMJ()
@@ -1255,9 +1255,9 @@ public final class AllWidgetDataNotifyOuterClass {
       }
       hash = (37 * hash) + CMFPEOMAJLM_FIELD_NUMBER;
       hash = (53 * hash) + getCMFPEOMAJLM();
-      if (getPEOHMDJKMKOCount() > 0) {
-        hash = (37 * hash) + PEOHMDJKMKO_FIELD_NUMBER;
-        hash = (53 * hash) + getPEOHMDJKMKOList().hashCode();
+      if (getCoolDownGroupDataListCount() > 0) {
+        hash = (37 * hash) + COOL_DOWN_GROUP_DATA_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getCoolDownGroupDataListList().hashCode();
       }
       if (getAnchorPointListCount() > 0) {
         hash = (37 * hash) + ANCHOR_POINT_LIST_FIELD_NUMBER;
@@ -1267,9 +1267,9 @@ public final class AllWidgetDataNotifyOuterClass {
         hash = (37 * hash) + LUNCH_BOX_DATA_FIELD_NUMBER;
         hash = (53 * hash) + getLunchBoxData().hashCode();
       }
-      if (getMCMDFPAFOIGCount() > 0) {
-        hash = (37 * hash) + MCMDFPAFOIG_FIELD_NUMBER;
-        hash = (53 * hash) + getMCMDFPAFOIGList().hashCode();
+      if (getNormalCoolDownDataListCount() > 0) {
+        hash = (37 * hash) + NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getNormalCoolDownDataListList().hashCode();
       }
       if (hasELIOJBDGIMJ()) {
         hash = (37 * hash) + ELIOJBDGIMJ_FIELD_NUMBER;
@@ -1436,9 +1436,9 @@ public final class AllWidgetDataNotifyOuterClass {
                 .alwaysUseFieldBuilders) {
           getOneoffGatherPointDetectorDataListFieldBuilder();
           getClientCollectorDataListFieldBuilder();
-          getPEOHMDJKMKOFieldBuilder();
+          getCoolDownGroupDataListFieldBuilder();
           getAnchorPointListFieldBuilder();
-          getMCMDFPAFOIGFieldBuilder();
+          getNormalCoolDownDataListFieldBuilder();
           getSlotListFieldBuilder();
         }
       }
@@ -1459,11 +1459,11 @@ public final class AllWidgetDataNotifyOuterClass {
         }
         cMFPEOMAJLM_ = 0;
 
-        if (pEOHMDJKMKOBuilder_ == null) {
-          pEOHMDJKMKO_ = java.util.Collections.emptyList();
+        if (coolDownGroupDataListBuilder_ == null) {
+          coolDownGroupDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
         } else {
-          pEOHMDJKMKOBuilder_.clear();
+          coolDownGroupDataListBuilder_.clear();
         }
         if (anchorPointListBuilder_ == null) {
           anchorPointList_ = java.util.Collections.emptyList();
@@ -1477,11 +1477,11 @@ public final class AllWidgetDataNotifyOuterClass {
           lunchBoxData_ = null;
           lunchBoxDataBuilder_ = null;
         }
-        if (mCMDFPAFOIGBuilder_ == null) {
-          mCMDFPAFOIG_ = java.util.Collections.emptyList();
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000010);
         } else {
-          mCMDFPAFOIGBuilder_.clear();
+          normalCoolDownDataListBuilder_.clear();
         }
         if (eLIOJBDGIMJBuilder_ == null) {
           eLIOJBDGIMJ_ = null;
@@ -1565,14 +1565,14 @@ public final class AllWidgetDataNotifyOuterClass {
           result.clientCollectorDataList_ = clientCollectorDataListBuilder_.build();
         }
         result.cMFPEOMAJLM_ = cMFPEOMAJLM_;
-        if (pEOHMDJKMKOBuilder_ == null) {
+        if (coolDownGroupDataListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
-            pEOHMDJKMKO_ = java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+            coolDownGroupDataList_ = java.util.Collections.unmodifiableList(coolDownGroupDataList_);
             bitField0_ = (bitField0_ & ~0x00000004);
           }
-          result.pEOHMDJKMKO_ = pEOHMDJKMKO_;
+          result.coolDownGroupDataList_ = coolDownGroupDataList_;
         } else {
-          result.pEOHMDJKMKO_ = pEOHMDJKMKOBuilder_.build();
+          result.coolDownGroupDataList_ = coolDownGroupDataListBuilder_.build();
         }
         if (anchorPointListBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0)) {
@@ -1588,14 +1588,14 @@ public final class AllWidgetDataNotifyOuterClass {
         } else {
           result.lunchBoxData_ = lunchBoxDataBuilder_.build();
         }
-        if (mCMDFPAFOIGBuilder_ == null) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0)) {
-            mCMDFPAFOIG_ = java.util.Collections.unmodifiableList(mCMDFPAFOIG_);
+            normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
             bitField0_ = (bitField0_ & ~0x00000010);
           }
-          result.mCMDFPAFOIG_ = mCMDFPAFOIG_;
+          result.normalCoolDownDataList_ = normalCoolDownDataList_;
         } else {
-          result.mCMDFPAFOIG_ = mCMDFPAFOIGBuilder_.build();
+          result.normalCoolDownDataList_ = normalCoolDownDataListBuilder_.build();
         }
         if (eLIOJBDGIMJBuilder_ == null) {
           result.eLIOJBDGIMJ_ = eLIOJBDGIMJ_;
@@ -1740,29 +1740,29 @@ public final class AllWidgetDataNotifyOuterClass {
         if (other.getCMFPEOMAJLM() != 0) {
           setCMFPEOMAJLM(other.getCMFPEOMAJLM());
         }
-        if (pEOHMDJKMKOBuilder_ == null) {
-          if (!other.pEOHMDJKMKO_.isEmpty()) {
-            if (pEOHMDJKMKO_.isEmpty()) {
-              pEOHMDJKMKO_ = other.pEOHMDJKMKO_;
+        if (coolDownGroupDataListBuilder_ == null) {
+          if (!other.coolDownGroupDataList_.isEmpty()) {
+            if (coolDownGroupDataList_.isEmpty()) {
+              coolDownGroupDataList_ = other.coolDownGroupDataList_;
               bitField0_ = (bitField0_ & ~0x00000004);
             } else {
-              ensurePEOHMDJKMKOIsMutable();
-              pEOHMDJKMKO_.addAll(other.pEOHMDJKMKO_);
+              ensureCoolDownGroupDataListIsMutable();
+              coolDownGroupDataList_.addAll(other.coolDownGroupDataList_);
             }
             onChanged();
           }
         } else {
-          if (!other.pEOHMDJKMKO_.isEmpty()) {
-            if (pEOHMDJKMKOBuilder_.isEmpty()) {
-              pEOHMDJKMKOBuilder_.dispose();
-              pEOHMDJKMKOBuilder_ = null;
-              pEOHMDJKMKO_ = other.pEOHMDJKMKO_;
+          if (!other.coolDownGroupDataList_.isEmpty()) {
+            if (coolDownGroupDataListBuilder_.isEmpty()) {
+              coolDownGroupDataListBuilder_.dispose();
+              coolDownGroupDataListBuilder_ = null;
+              coolDownGroupDataList_ = other.coolDownGroupDataList_;
               bitField0_ = (bitField0_ & ~0x00000004);
-              pEOHMDJKMKOBuilder_ = 
+              coolDownGroupDataListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getPEOHMDJKMKOFieldBuilder() : null;
+                   getCoolDownGroupDataListFieldBuilder() : null;
             } else {
-              pEOHMDJKMKOBuilder_.addAllMessages(other.pEOHMDJKMKO_);
+              coolDownGroupDataListBuilder_.addAllMessages(other.coolDownGroupDataList_);
             }
           }
         }
@@ -1795,29 +1795,29 @@ public final class AllWidgetDataNotifyOuterClass {
         if (other.hasLunchBoxData()) {
           mergeLunchBoxData(other.getLunchBoxData());
         }
-        if (mCMDFPAFOIGBuilder_ == null) {
-          if (!other.mCMDFPAFOIG_.isEmpty()) {
-            if (mCMDFPAFOIG_.isEmpty()) {
-              mCMDFPAFOIG_ = other.mCMDFPAFOIG_;
+        if (normalCoolDownDataListBuilder_ == null) {
+          if (!other.normalCoolDownDataList_.isEmpty()) {
+            if (normalCoolDownDataList_.isEmpty()) {
+              normalCoolDownDataList_ = other.normalCoolDownDataList_;
               bitField0_ = (bitField0_ & ~0x00000010);
             } else {
-              ensureMCMDFPAFOIGIsMutable();
-              mCMDFPAFOIG_.addAll(other.mCMDFPAFOIG_);
+              ensureNormalCoolDownDataListIsMutable();
+              normalCoolDownDataList_.addAll(other.normalCoolDownDataList_);
             }
             onChanged();
           }
         } else {
-          if (!other.mCMDFPAFOIG_.isEmpty()) {
-            if (mCMDFPAFOIGBuilder_.isEmpty()) {
-              mCMDFPAFOIGBuilder_.dispose();
-              mCMDFPAFOIGBuilder_ = null;
-              mCMDFPAFOIG_ = other.mCMDFPAFOIG_;
+          if (!other.normalCoolDownDataList_.isEmpty()) {
+            if (normalCoolDownDataListBuilder_.isEmpty()) {
+              normalCoolDownDataListBuilder_.dispose();
+              normalCoolDownDataListBuilder_ = null;
+              normalCoolDownDataList_ = other.normalCoolDownDataList_;
               bitField0_ = (bitField0_ & ~0x00000010);
-              mCMDFPAFOIGBuilder_ = 
+              normalCoolDownDataListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getMCMDFPAFOIGFieldBuilder() : null;
+                   getNormalCoolDownDataListFieldBuilder() : null;
             } else {
-              mCMDFPAFOIGBuilder_.addAllMessages(other.mCMDFPAFOIG_);
+              normalCoolDownDataListBuilder_.addAllMessages(other.normalCoolDownDataList_);
             }
           }
         }
@@ -2423,244 +2423,244 @@ public final class AllWidgetDataNotifyOuterClass {
         return this;
       }
 
-      private java.util.List pEOHMDJKMKO_ =
+      private java.util.List coolDownGroupDataList_ =
         java.util.Collections.emptyList();
-      private void ensurePEOHMDJKMKOIsMutable() {
+      private void ensureCoolDownGroupDataListIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          pEOHMDJKMKO_ = new java.util.ArrayList(pEOHMDJKMKO_);
+          coolDownGroupDataList_ = new java.util.ArrayList(coolDownGroupDataList_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> pEOHMDJKMKOBuilder_;
+          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> coolDownGroupDataListBuilder_;
 
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public java.util.List getPEOHMDJKMKOList() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+      public java.util.List getCoolDownGroupDataListList() {
+        if (coolDownGroupDataListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(coolDownGroupDataList_);
         } else {
-          return pEOHMDJKMKOBuilder_.getMessageList();
+          return coolDownGroupDataListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public int getPEOHMDJKMKOCount() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return pEOHMDJKMKO_.size();
+      public int getCoolDownGroupDataListCount() {
+        if (coolDownGroupDataListBuilder_ == null) {
+          return coolDownGroupDataList_.size();
         } else {
-          return pEOHMDJKMKOBuilder_.getCount();
+          return coolDownGroupDataListBuilder_.getCount();
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getPEOHMDJKMKO(int index) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return pEOHMDJKMKO_.get(index);
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index) {
+        if (coolDownGroupDataListBuilder_ == null) {
+          return coolDownGroupDataList_.get(index);
         } else {
-          return pEOHMDJKMKOBuilder_.getMessage(index);
+          return coolDownGroupDataListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder setPEOHMDJKMKO(
+      public Builder setCoolDownGroupDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (pEOHMDJKMKOBuilder_ == null) {
+        if (coolDownGroupDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.set(index, value);
+          ensureCoolDownGroupDataListIsMutable();
+          coolDownGroupDataList_.set(index, value);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.setMessage(index, value);
+          coolDownGroupDataListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder setPEOHMDJKMKO(
+      public Builder setCoolDownGroupDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.set(index, builderForValue.build());
+        if (coolDownGroupDataListBuilder_ == null) {
+          ensureCoolDownGroupDataListIsMutable();
+          coolDownGroupDataList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.setMessage(index, builderForValue.build());
+          coolDownGroupDataListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder addPEOHMDJKMKO(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (pEOHMDJKMKOBuilder_ == null) {
+      public Builder addCoolDownGroupDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
+        if (coolDownGroupDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(value);
+          ensureCoolDownGroupDataListIsMutable();
+          coolDownGroupDataList_.add(value);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(value);
+          coolDownGroupDataListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder addPEOHMDJKMKO(
+      public Builder addCoolDownGroupDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (pEOHMDJKMKOBuilder_ == null) {
+        if (coolDownGroupDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(index, value);
+          ensureCoolDownGroupDataListIsMutable();
+          coolDownGroupDataList_.add(index, value);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(index, value);
+          coolDownGroupDataListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder addPEOHMDJKMKO(
+      public Builder addCoolDownGroupDataList(
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(builderForValue.build());
+        if (coolDownGroupDataListBuilder_ == null) {
+          ensureCoolDownGroupDataListIsMutable();
+          coolDownGroupDataList_.add(builderForValue.build());
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(builderForValue.build());
+          coolDownGroupDataListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder addPEOHMDJKMKO(
+      public Builder addCoolDownGroupDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(index, builderForValue.build());
+        if (coolDownGroupDataListBuilder_ == null) {
+          ensureCoolDownGroupDataListIsMutable();
+          coolDownGroupDataList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(index, builderForValue.build());
+          coolDownGroupDataListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder addAllPEOHMDJKMKO(
+      public Builder addAllCoolDownGroupDataList(
           java.lang.Iterable values) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
+        if (coolDownGroupDataListBuilder_ == null) {
+          ensureCoolDownGroupDataListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, pEOHMDJKMKO_);
+              values, coolDownGroupDataList_);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addAllMessages(values);
+          coolDownGroupDataListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder clearPEOHMDJKMKO() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          pEOHMDJKMKO_ = java.util.Collections.emptyList();
+      public Builder clearCoolDownGroupDataList() {
+        if (coolDownGroupDataListBuilder_ == null) {
+          coolDownGroupDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.clear();
+          coolDownGroupDataListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public Builder removePEOHMDJKMKO(int index) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.remove(index);
+      public Builder removeCoolDownGroupDataList(int index) {
+        if (coolDownGroupDataListBuilder_ == null) {
+          ensureCoolDownGroupDataListIsMutable();
+          coolDownGroupDataList_.remove(index);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.remove(index);
+          coolDownGroupDataListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getPEOHMDJKMKOBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getCoolDownGroupDataListBuilder(
           int index) {
-        return getPEOHMDJKMKOFieldBuilder().getBuilder(index);
+        return getCoolDownGroupDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getPEOHMDJKMKOOrBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder(
           int index) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return pEOHMDJKMKO_.get(index);  } else {
-          return pEOHMDJKMKOBuilder_.getMessageOrBuilder(index);
+        if (coolDownGroupDataListBuilder_ == null) {
+          return coolDownGroupDataList_.get(index);  } else {
+          return coolDownGroupDataListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
       public java.util.List 
-           getPEOHMDJKMKOOrBuilderList() {
-        if (pEOHMDJKMKOBuilder_ != null) {
-          return pEOHMDJKMKOBuilder_.getMessageOrBuilderList();
+           getCoolDownGroupDataListOrBuilderList() {
+        if (coolDownGroupDataListBuilder_ != null) {
+          return coolDownGroupDataListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+          return java.util.Collections.unmodifiableList(coolDownGroupDataList_);
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addPEOHMDJKMKOBuilder() {
-        return getPEOHMDJKMKOFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addCoolDownGroupDataListBuilder() {
+        return getCoolDownGroupDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addPEOHMDJKMKOBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addCoolDownGroupDataListBuilder(
           int index) {
-        return getPEOHMDJKMKOFieldBuilder().addBuilder(
+        return getCoolDownGroupDataListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 8;
+       * repeated .WidgetCoolDownData cool_down_group_data_list = 8;
        */
       public java.util.List 
-           getPEOHMDJKMKOBuilderList() {
-        return getPEOHMDJKMKOFieldBuilder().getBuilderList();
+           getCoolDownGroupDataListBuilderList() {
+        return getCoolDownGroupDataListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> 
-          getPEOHMDJKMKOFieldBuilder() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          pEOHMDJKMKOBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getCoolDownGroupDataListFieldBuilder() {
+        if (coolDownGroupDataListBuilder_ == null) {
+          coolDownGroupDataListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder>(
-                  pEOHMDJKMKO_,
+                  coolDownGroupDataList_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
                   isClean());
-          pEOHMDJKMKO_ = null;
+          coolDownGroupDataList_ = null;
         }
-        return pEOHMDJKMKOBuilder_;
+        return coolDownGroupDataListBuilder_;
       }
 
       private java.util.List anchorPointList_ =
@@ -3022,244 +3022,244 @@ public final class AllWidgetDataNotifyOuterClass {
         return lunchBoxDataBuilder_;
       }
 
-      private java.util.List mCMDFPAFOIG_ =
+      private java.util.List normalCoolDownDataList_ =
         java.util.Collections.emptyList();
-      private void ensureMCMDFPAFOIGIsMutable() {
+      private void ensureNormalCoolDownDataListIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
-          mCMDFPAFOIG_ = new java.util.ArrayList(mCMDFPAFOIG_);
+          normalCoolDownDataList_ = new java.util.ArrayList(normalCoolDownDataList_);
           bitField0_ |= 0x00000010;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> mCMDFPAFOIGBuilder_;
+          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> normalCoolDownDataListBuilder_;
 
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public java.util.List getMCMDFPAFOIGList() {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(mCMDFPAFOIG_);
+      public java.util.List getNormalCoolDownDataListList() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
         } else {
-          return mCMDFPAFOIGBuilder_.getMessageList();
+          return normalCoolDownDataListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public int getMCMDFPAFOIGCount() {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          return mCMDFPAFOIG_.size();
+      public int getNormalCoolDownDataListCount() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.size();
         } else {
-          return mCMDFPAFOIGBuilder_.getCount();
+          return normalCoolDownDataListBuilder_.getCount();
         }
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getMCMDFPAFOIG(int index) {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          return mCMDFPAFOIG_.get(index);
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.get(index);
         } else {
-          return mCMDFPAFOIGBuilder_.getMessage(index);
+          return normalCoolDownDataListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder setMCMDFPAFOIG(
+      public Builder setNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (mCMDFPAFOIGBuilder_ == null) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureMCMDFPAFOIGIsMutable();
-          mCMDFPAFOIG_.set(index, value);
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.set(index, value);
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.setMessage(index, value);
+          normalCoolDownDataListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder setMCMDFPAFOIG(
+      public Builder setNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          ensureMCMDFPAFOIGIsMutable();
-          mCMDFPAFOIG_.set(index, builderForValue.build());
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.setMessage(index, builderForValue.build());
+          normalCoolDownDataListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder addMCMDFPAFOIG(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (mCMDFPAFOIGBuilder_ == null) {
+      public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureMCMDFPAFOIGIsMutable();
-          mCMDFPAFOIG_.add(value);
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(value);
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.addMessage(value);
+          normalCoolDownDataListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder addMCMDFPAFOIG(
+      public Builder addNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (mCMDFPAFOIGBuilder_ == null) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureMCMDFPAFOIGIsMutable();
-          mCMDFPAFOIG_.add(index, value);
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(index, value);
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.addMessage(index, value);
+          normalCoolDownDataListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder addMCMDFPAFOIG(
+      public Builder addNormalCoolDownDataList(
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          ensureMCMDFPAFOIGIsMutable();
-          mCMDFPAFOIG_.add(builderForValue.build());
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(builderForValue.build());
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.addMessage(builderForValue.build());
+          normalCoolDownDataListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder addMCMDFPAFOIG(
+      public Builder addNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          ensureMCMDFPAFOIGIsMutable();
-          mCMDFPAFOIG_.add(index, builderForValue.build());
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.addMessage(index, builderForValue.build());
+          normalCoolDownDataListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder addAllMCMDFPAFOIG(
+      public Builder addAllNormalCoolDownDataList(
           java.lang.Iterable values) {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          ensureMCMDFPAFOIGIsMutable();
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, mCMDFPAFOIG_);
+              values, normalCoolDownDataList_);
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.addAllMessages(values);
+          normalCoolDownDataListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder clearMCMDFPAFOIG() {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          mCMDFPAFOIG_ = java.util.Collections.emptyList();
+      public Builder clearNormalCoolDownDataList() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000010);
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.clear();
+          normalCoolDownDataListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public Builder removeMCMDFPAFOIG(int index) {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          ensureMCMDFPAFOIGIsMutable();
-          mCMDFPAFOIG_.remove(index);
+      public Builder removeNormalCoolDownDataList(int index) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.remove(index);
           onChanged();
         } else {
-          mCMDFPAFOIGBuilder_.remove(index);
+          normalCoolDownDataListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getMCMDFPAFOIGBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getNormalCoolDownDataListBuilder(
           int index) {
-        return getMCMDFPAFOIGFieldBuilder().getBuilder(index);
+        return getNormalCoolDownDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getMCMDFPAFOIGOrBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
           int index) {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          return mCMDFPAFOIG_.get(index);  } else {
-          return mCMDFPAFOIGBuilder_.getMessageOrBuilder(index);
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.get(index);  } else {
+          return normalCoolDownDataListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
       public java.util.List 
-           getMCMDFPAFOIGOrBuilderList() {
-        if (mCMDFPAFOIGBuilder_ != null) {
-          return mCMDFPAFOIGBuilder_.getMessageOrBuilderList();
+           getNormalCoolDownDataListOrBuilderList() {
+        if (normalCoolDownDataListBuilder_ != null) {
+          return normalCoolDownDataListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(mCMDFPAFOIG_);
+          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
         }
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addMCMDFPAFOIGBuilder() {
-        return getMCMDFPAFOIGFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder() {
+        return getNormalCoolDownDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addMCMDFPAFOIGBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder(
           int index) {
-        return getMCMDFPAFOIGFieldBuilder().addBuilder(
+        return getNormalCoolDownDataListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData MCMDFPAFOIG = 14;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 14;
        */
       public java.util.List 
-           getMCMDFPAFOIGBuilderList() {
-        return getMCMDFPAFOIGFieldBuilder().getBuilderList();
+           getNormalCoolDownDataListBuilderList() {
+        return getNormalCoolDownDataListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> 
-          getMCMDFPAFOIGFieldBuilder() {
-        if (mCMDFPAFOIGBuilder_ == null) {
-          mCMDFPAFOIGBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getNormalCoolDownDataListFieldBuilder() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder>(
-                  mCMDFPAFOIG_,
+                  normalCoolDownDataList_,
                   ((bitField0_ & 0x00000010) != 0),
                   getParentForChildren(),
                   isClean());
-          mCMDFPAFOIG_ = null;
+          normalCoolDownDataList_ = null;
         }
-        return mCMDFPAFOIGBuilder_;
+        return normalCoolDownDataListBuilder_;
       }
 
       private emu.grasscutter.net.proto.LANPHFCMEBNOuterClass.LANPHFCMEBN eLIOJBDGIMJ_;
@@ -4239,25 +4239,25 @@ public final class AllWidgetDataNotifyOuterClass {
       "nchorPointData.proto\032\022LunchBoxData.proto" +
       "\032\021LANPHFCMEBN.proto\032\034SkyCrystalDetectorD" +
       "ata.proto\032\021EPIAFADAJAN.proto\032\024WidgetSlot" +
-      "Data.proto\032\027WeatherWizardData.proto\"\207\005\n\023" +
+      "Data.proto\032\027WeatherWizardData.proto\"\244\005\n\023" +
       "AllWidgetDataNotify\022N\n&oneoff_gather_poi" +
       "nt_detector_data_list\030\004 \003(\0132\036.OneoffGath" +
       "erPointDetectorData\0228\n\032client_collector_" +
       "data_list\030\t \003(\0132\024.ClientCollectorData\022\023\n" +
-      "\013CMFPEOMAJLM\030\n \001(\r\022(\n\013PEOHMDJKMKO\030\010 \003(\0132" +
-      "\023.WidgetCoolDownData\022+\n\021anchor_point_lis" +
-      "t\030\017 \003(\0132\020.AnchorPointData\022%\n\016lunch_box_d" +
-      "ata\030\013 \001(\0132\r.LunchBoxData\022(\n\013MCMDFPAFOIG\030" +
-      "\016 \003(\0132\023.WidgetCoolDownData\022!\n\013ELIOJBDGIM" +
-      "J\030\014 \001(\0132\014.LANPHFCMEBN\022:\n\031sky_crystal_det" +
-      "ector_data\030\001 \001(\0132\027.SkyCrystalDetectorDat" +
-      "a\022\024\n\013EMPBLGKLCOA\030\376\r \003(\r\022\"\n\013NNPMMJCEJAO\030\263" +
-      "\r \001(\0132\014.EPIAFADAJAN\022\024\n\013HALAOGOBMKJ\030\230\016 \001(" +
-      "\r\022\"\n\tslot_list\030\r \003(\0132\017.WidgetSlotData\022%\n" +
-      "\035background_active_widget_list\030\006 \003(\r\022/\n\023" +
-      "weather_wizard_data\030\002 \001(\0132\022.WeatherWizar" +
-      "dDataB\033\n\031emu.grasscutter.net.protob\006prot" +
-      "o3"
+      "\013CMFPEOMAJLM\030\n \001(\r\0226\n\031cool_down_group_da" +
+      "ta_list\030\010 \003(\0132\023.WidgetCoolDownData\022+\n\021an" +
+      "chor_point_list\030\017 \003(\0132\020.AnchorPointData\022" +
+      "%\n\016lunch_box_data\030\013 \001(\0132\r.LunchBoxData\0227" +
+      "\n\032normal_cool_down_data_list\030\016 \003(\0132\023.Wid" +
+      "getCoolDownData\022!\n\013ELIOJBDGIMJ\030\014 \001(\0132\014.L" +
+      "ANPHFCMEBN\022:\n\031sky_crystal_detector_data\030" +
+      "\001 \001(\0132\027.SkyCrystalDetectorData\022\024\n\013EMPBLG" +
+      "KLCOA\030\376\r \003(\r\022\"\n\013NNPMMJCEJAO\030\263\r \001(\0132\014.EPI" +
+      "AFADAJAN\022\024\n\013HALAOGOBMKJ\030\230\016 \001(\r\022\"\n\tslot_l" +
+      "ist\030\r \003(\0132\017.WidgetSlotData\022%\n\035background" +
+      "_active_widget_list\030\006 \003(\r\022/\n\023weather_wiz" +
+      "ard_data\030\002 \001(\0132\022.WeatherWizardDataB\033\n\031em" +
+      "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -4278,7 +4278,7 @@ public final class AllWidgetDataNotifyOuterClass {
     internal_static_AllWidgetDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AllWidgetDataNotify_descriptor,
-        new java.lang.String[] { "OneoffGatherPointDetectorDataList", "ClientCollectorDataList", "CMFPEOMAJLM", "PEOHMDJKMKO", "AnchorPointList", "LunchBoxData", "MCMDFPAFOIG", "ELIOJBDGIMJ", "SkyCrystalDetectorData", "EMPBLGKLCOA", "NNPMMJCEJAO", "HALAOGOBMKJ", "SlotList", "BackgroundActiveWidgetList", "WeatherWizardData", });
+        new java.lang.String[] { "OneoffGatherPointDetectorDataList", "ClientCollectorDataList", "CMFPEOMAJLM", "CoolDownGroupDataList", "AnchorPointList", "LunchBoxData", "NormalCoolDownDataList", "ELIOJBDGIMJ", "SkyCrystalDetectorData", "EMPBLGKLCOA", "NNPMMJCEJAO", "HALAOGOBMKJ", "SlotList", "BackgroundActiveWidgetList", "WeatherWizardData", });
     emu.grasscutter.net.proto.OneoffGatherPointDetectorDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ClientCollectorDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java
index 00509d769..3b27fcc14 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java
@@ -43,10 +43,10 @@ public final class BlossomBriefInfoOuterClass {
     int getCircleCampId();
 
     /**
-     * uint32 BGNHKCLIPCF = 12;
-     * @return The bGNHKCLIPCF.
+     * uint32 monster_level = 12;
+     * @return The monsterLevel.
      */
-    int getBGNHKCLIPCF();
+    int getMonsterLevel();
 
     /**
      * uint32 HJMMAOMEHOL = 8;
@@ -179,7 +179,7 @@ public final class BlossomBriefInfoOuterClass {
             }
             case 96: {
 
-              bGNHKCLIPCF_ = input.readUInt32();
+              monsterLevel_ = input.readUInt32();
               break;
             }
             case 104: {
@@ -281,15 +281,15 @@ public final class BlossomBriefInfoOuterClass {
       return circleCampId_;
     }
 
-    public static final int BGNHKCLIPCF_FIELD_NUMBER = 12;
-    private int bGNHKCLIPCF_;
+    public static final int MONSTER_LEVEL_FIELD_NUMBER = 12;
+    private int monsterLevel_;
     /**
-     * uint32 BGNHKCLIPCF = 12;
-     * @return The bGNHKCLIPCF.
+     * uint32 monster_level = 12;
+     * @return The monsterLevel.
      */
     @java.lang.Override
-    public int getBGNHKCLIPCF() {
-      return bGNHKCLIPCF_;
+    public int getMonsterLevel() {
+      return monsterLevel_;
     }
 
     public static final int HJMMAOMEHOL_FIELD_NUMBER = 8;
@@ -408,8 +408,8 @@ public final class BlossomBriefInfoOuterClass {
       if (refreshId_ != 0) {
         output.writeUInt32(11, refreshId_);
       }
-      if (bGNHKCLIPCF_ != 0) {
-        output.writeUInt32(12, bGNHKCLIPCF_);
+      if (monsterLevel_ != 0) {
+        output.writeUInt32(12, monsterLevel_);
       }
       if (sceneId_ != 0) {
         output.writeUInt32(13, sceneId_);
@@ -457,9 +457,9 @@ public final class BlossomBriefInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(11, refreshId_);
       }
-      if (bGNHKCLIPCF_ != 0) {
+      if (monsterLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, bGNHKCLIPCF_);
+          .computeUInt32Size(12, monsterLevel_);
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -496,8 +496,8 @@ public final class BlossomBriefInfoOuterClass {
           != other.getResin()) return false;
       if (getCircleCampId()
           != other.getCircleCampId()) return false;
-      if (getBGNHKCLIPCF()
-          != other.getBGNHKCLIPCF()) return false;
+      if (getMonsterLevel()
+          != other.getMonsterLevel()) return false;
       if (getHJMMAOMEHOL()
           != other.getHJMMAOMEHOL()) return false;
       if (getSceneId()
@@ -533,8 +533,8 @@ public final class BlossomBriefInfoOuterClass {
       hash = (53 * hash) + getResin();
       hash = (37 * hash) + CIRCLE_CAMP_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCircleCampId();
-      hash = (37 * hash) + BGNHKCLIPCF_FIELD_NUMBER;
-      hash = (53 * hash) + getBGNHKCLIPCF();
+      hash = (37 * hash) + MONSTER_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getMonsterLevel();
       hash = (37 * hash) + HJMMAOMEHOL_FIELD_NUMBER;
       hash = (53 * hash) + getHJMMAOMEHOL();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
@@ -694,7 +694,7 @@ public final class BlossomBriefInfoOuterClass {
 
         circleCampId_ = 0;
 
-        bGNHKCLIPCF_ = 0;
+        monsterLevel_ = 0;
 
         hJMMAOMEHOL_ = 0;
 
@@ -742,7 +742,7 @@ public final class BlossomBriefInfoOuterClass {
         result.isGuideOpened_ = isGuideOpened_;
         result.resin_ = resin_;
         result.circleCampId_ = circleCampId_;
-        result.bGNHKCLIPCF_ = bGNHKCLIPCF_;
+        result.monsterLevel_ = monsterLevel_;
         result.hJMMAOMEHOL_ = hJMMAOMEHOL_;
         result.sceneId_ = sceneId_;
         result.refreshId_ = refreshId_;
@@ -813,8 +813,8 @@ public final class BlossomBriefInfoOuterClass {
         if (other.getCircleCampId() != 0) {
           setCircleCampId(other.getCircleCampId());
         }
-        if (other.getBGNHKCLIPCF() != 0) {
-          setBGNHKCLIPCF(other.getBGNHKCLIPCF());
+        if (other.getMonsterLevel() != 0) {
+          setMonsterLevel(other.getMonsterLevel());
         }
         if (other.getHJMMAOMEHOL() != 0) {
           setHJMMAOMEHOL(other.getHJMMAOMEHOL());
@@ -987,33 +987,33 @@ public final class BlossomBriefInfoOuterClass {
         return this;
       }
 
-      private int bGNHKCLIPCF_ ;
+      private int monsterLevel_ ;
       /**
-       * uint32 BGNHKCLIPCF = 12;
-       * @return The bGNHKCLIPCF.
+       * uint32 monster_level = 12;
+       * @return The monsterLevel.
        */
       @java.lang.Override
-      public int getBGNHKCLIPCF() {
-        return bGNHKCLIPCF_;
+      public int getMonsterLevel() {
+        return monsterLevel_;
       }
       /**
-       * uint32 BGNHKCLIPCF = 12;
-       * @param value The bGNHKCLIPCF to set.
+       * uint32 monster_level = 12;
+       * @param value The monsterLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setBGNHKCLIPCF(int value) {
+      public Builder setMonsterLevel(int value) {
         
-        bGNHKCLIPCF_ = value;
+        monsterLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 BGNHKCLIPCF = 12;
+       * uint32 monster_level = 12;
        * @return This builder for chaining.
        */
-      public Builder clearBGNHKCLIPCF() {
+      public Builder clearMonsterLevel() {
         
-        bGNHKCLIPCF_ = 0;
+        monsterLevel_ = 0;
         onChanged();
         return this;
       }
@@ -1358,14 +1358,14 @@ public final class BlossomBriefInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026BlossomBriefInfo.proto\032\014Vector.proto\"\353" +
+      "\n\026BlossomBriefInfo.proto\032\014Vector.proto\"\355" +
       "\001\n\020BlossomBriefInfo\022\r\n\005state\030\n \001(\r\022\027\n\017is" +
       "_guide_opened\030\005 \001(\010\022\r\n\005resin\030\002 \001(\r\022\026\n\016ci" +
-      "rcle_camp_id\030\016 \001(\r\022\023\n\013BGNHKCLIPCF\030\014 \001(\r\022" +
-      "\023\n\013HJMMAOMEHOL\030\010 \001(\r\022\020\n\010scene_id\030\r \001(\r\022\022" +
-      "\n\nrefresh_id\030\013 \001(\r\022\021\n\treward_id\030\007 \001(\r\022\024\n" +
-      "\003pos\030\017 \001(\0132\007.Vector\022\017\n\007city_id\030\004 \001(\rB\033\n\031" +
-      "emu.grasscutter.net.protob\006proto3"
+      "rcle_camp_id\030\016 \001(\r\022\025\n\rmonster_level\030\014 \001(" +
+      "\r\022\023\n\013HJMMAOMEHOL\030\010 \001(\r\022\020\n\010scene_id\030\r \001(\r" +
+      "\022\022\n\nrefresh_id\030\013 \001(\r\022\021\n\treward_id\030\007 \001(\r\022" +
+      "\024\n\003pos\030\017 \001(\0132\007.Vector\022\017\n\007city_id\030\004 \001(\rB\033" +
+      "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1377,7 +1377,7 @@ public final class BlossomBriefInfoOuterClass {
     internal_static_BlossomBriefInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BlossomBriefInfo_descriptor,
-        new java.lang.String[] { "State", "IsGuideOpened", "Resin", "CircleCampId", "BGNHKCLIPCF", "HJMMAOMEHOL", "SceneId", "RefreshId", "RewardId", "Pos", "CityId", });
+        new java.lang.String[] { "State", "IsGuideOpened", "Resin", "CircleCampId", "MonsterLevel", "HJMMAOMEHOL", "SceneId", "RefreshId", "RewardId", "Pos", "CityId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java
index 20a672431..cc3df4f0b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java
@@ -224,6 +224,123 @@ public final class ChatInfoOuterClass {
               emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.class, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder.class);
     }
 
+    /**
+     * Protobuf enum {@code ChatInfo.SystemHintType}
+     */
+    public enum SystemHintType
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * SYSTEM_HINT_TYPE_CHAT_NONE = 0;
+       */
+      SYSTEM_HINT_TYPE_CHAT_NONE(0),
+      /**
+       * SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1;
+       */
+      SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD(1),
+      /**
+       * SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2;
+       */
+      SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD(2),
+      UNRECOGNIZED(-1),
+      ;
+
+      /**
+       * SYSTEM_HINT_TYPE_CHAT_NONE = 0;
+       */
+      public static final int SYSTEM_HINT_TYPE_CHAT_NONE_VALUE = 0;
+      /**
+       * SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1;
+       */
+      public static final int SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD_VALUE = 1;
+      /**
+       * SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2;
+       */
+      public static final int SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD_VALUE = 2;
+
+
+      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 SystemHintType 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 SystemHintType forNumber(int value) {
+        switch (value) {
+          case 0: return SYSTEM_HINT_TYPE_CHAT_NONE;
+          case 1: return SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD;
+          case 2: return SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          SystemHintType> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public SystemHintType findValueByNumber(int number) {
+                return SystemHintType.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.ChatInfoOuterClass.ChatInfo.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final SystemHintType[] VALUES = values();
+
+      public static SystemHintType 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 SystemHintType(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:ChatInfo.SystemHintType)
+    }
+
     public interface SystemHintOrBuilder extends
         // @@protoc_insertion_point(interface_extends:ChatInfo.SystemHint)
         com.google.protobuf.MessageOrBuilder {
@@ -1907,13 +2024,16 @@ public final class ChatInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\016ChatInfo.proto\"\317\001\n\010ChatInfo\022\016\n\006to_uid\030" +
+      "\n\016ChatInfo.proto\"\317\002\n\010ChatInfo\022\016\n\006to_uid\030" +
       "\n \001(\r\022\014\n\004time\030\r \001(\r\022\013\n\003uid\030\004 \001(\r\022\017\n\004text" +
       "\030\302\007 \001(\tH\000\022\017\n\004icon\030\232\014 \001(\rH\000\022,\n\013system_hin" +
       "t\030\311\006 \001(\0132\024.ChatInfo.SystemHintH\000\022\017\n\007is_r" +
       "ead\030\007 \001(\010\022\020\n\010sequence\030\005 \001(\r\032\032\n\nSystemHin" +
-      "t\022\014\n\004type\030\017 \001(\rB\t\n\007contentB\033\n\031emu.grassc" +
-      "utter.net.protob\006proto3"
+      "t\022\014\n\004type\030\017 \001(\r\"~\n\016SystemHintType\022\036\n\032SYS" +
+      "TEM_HINT_TYPE_CHAT_NONE\020\000\022%\n!SYSTEM_HINT" +
+      "_TYPE_CHAT_ENTER_WORLD\020\001\022%\n!SYSTEM_HINT_" +
+      "TYPE_CHAT_LEAVE_WORLD\020\002B\t\n\007contentB\033\n\031em" +
+      "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java
index a87f4b0da..54aebca52 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java
@@ -31,99 +31,99 @@ public final class CombineRspOuterClass {
     int getCombineCount();
 
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
     java.util.List 
-        getFDFCGJGJDPPList();
+        getResultItemListList();
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getFDFCGJGJDPP(int index);
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index);
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
-    int getFDFCGJGJDPPCount();
+    int getResultItemListCount();
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
     java.util.List 
-        getFDFCGJGJDPPOrBuilderList();
+        getResultItemListOrBuilderList();
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getFDFCGJGJDPPOrBuilder(
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder(
         int index);
 
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
     java.util.List 
-        getAJDGGDPILBDList();
+        getTotalRandomItemListList();
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAJDGGDPILBD(int index);
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index);
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
-    int getAJDGGDPILBDCount();
+    int getTotalRandomItemListCount();
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
     java.util.List 
-        getAJDGGDPILBDOrBuilderList();
+        getTotalRandomItemListOrBuilderList();
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAJDGGDPILBDOrBuilder(
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder(
         int index);
 
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
     java.util.List 
-        getAABDGFADCIJList();
+        getTotalReturnItemListList();
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAABDGFADCIJ(int index);
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index);
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
-    int getAABDGFADCIJCount();
+    int getTotalReturnItemListCount();
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
     java.util.List 
-        getAABDGFADCIJOrBuilderList();
+        getTotalReturnItemListOrBuilderList();
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAABDGFADCIJOrBuilder(
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder(
         int index);
 
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
     java.util.List 
-        getGFKKOPJFFLMList();
+        getTotalExtraItemListList();
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGFKKOPJFFLM(int index);
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index);
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
-    int getGFKKOPJFFLMCount();
+    int getTotalExtraItemListCount();
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
     java.util.List 
-        getGFKKOPJFFLMOrBuilderList();
+        getTotalExtraItemListOrBuilderList();
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGFKKOPJFFLMOrBuilder(
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder(
         int index);
 
     /**
@@ -204,10 +204,10 @@ public final class CombineRspOuterClass {
       super(builder);
     }
     private CombineRsp() {
-      fDFCGJGJDPP_ = java.util.Collections.emptyList();
-      aJDGGDPILBD_ = java.util.Collections.emptyList();
-      aABDGFADCIJ_ = java.util.Collections.emptyList();
-      gFKKOPJFFLM_ = java.util.Collections.emptyList();
+      resultItemList_ = java.util.Collections.emptyList();
+      totalRandomItemList_ = java.util.Collections.emptyList();
+      totalReturnItemList_ = java.util.Collections.emptyList();
+      totalExtraItemList_ = java.util.Collections.emptyList();
       gAEEJPPNJDD_ = java.util.Collections.emptyList();
       costItemList_ = java.util.Collections.emptyList();
     }
@@ -283,37 +283,37 @@ public final class CombineRspOuterClass {
             }
             case 82: {
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                gFKKOPJFFLM_ = new java.util.ArrayList();
+                totalExtraItemList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
-              gFKKOPJFFLM_.add(
+              totalExtraItemList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
             case 90: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                aABDGFADCIJ_ = new java.util.ArrayList();
+                totalReturnItemList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              aABDGFADCIJ_.add(
+              totalReturnItemList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
             case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                fDFCGJGJDPP_ = new java.util.ArrayList();
+                resultItemList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              fDFCGJGJDPP_.add(
+              resultItemList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
             case 122: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                aJDGGDPILBD_ = new java.util.ArrayList();
+                totalRandomItemList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              aJDGGDPILBD_.add(
+              totalRandomItemList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
@@ -339,16 +339,16 @@ public final class CombineRspOuterClass {
           gAEEJPPNJDD_ = java.util.Collections.unmodifiableList(gAEEJPPNJDD_);
         }
         if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          gFKKOPJFFLM_ = java.util.Collections.unmodifiableList(gFKKOPJFFLM_);
+          totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_);
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          aABDGFADCIJ_ = java.util.Collections.unmodifiableList(aABDGFADCIJ_);
+          totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_);
         }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          fDFCGJGJDPP_ = java.util.Collections.unmodifiableList(fDFCGJGJDPP_);
+          resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          aJDGGDPILBD_ = java.util.Collections.unmodifiableList(aJDGGDPILBD_);
+          totalRandomItemList_ = java.util.Collections.unmodifiableList(totalRandomItemList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -389,164 +389,164 @@ public final class CombineRspOuterClass {
       return combineCount_;
     }
 
-    public static final int FDFCGJGJDPP_FIELD_NUMBER = 13;
-    private java.util.List fDFCGJGJDPP_;
+    public static final int RESULT_ITEM_LIST_FIELD_NUMBER = 13;
+    private java.util.List resultItemList_;
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
     @java.lang.Override
-    public java.util.List getFDFCGJGJDPPList() {
-      return fDFCGJGJDPP_;
+    public java.util.List getResultItemListList() {
+      return resultItemList_;
     }
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
     @java.lang.Override
     public java.util.List 
-        getFDFCGJGJDPPOrBuilderList() {
-      return fDFCGJGJDPP_;
+        getResultItemListOrBuilderList() {
+      return resultItemList_;
     }
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
     @java.lang.Override
-    public int getFDFCGJGJDPPCount() {
-      return fDFCGJGJDPP_.size();
+    public int getResultItemListCount() {
+      return resultItemList_.size();
     }
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getFDFCGJGJDPP(int index) {
-      return fDFCGJGJDPP_.get(index);
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) {
+      return resultItemList_.get(index);
     }
     /**
-     * repeated .ItemParam FDFCGJGJDPP = 13;
+     * repeated .ItemParam result_item_list = 13;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getFDFCGJGJDPPOrBuilder(
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder(
         int index) {
-      return fDFCGJGJDPP_.get(index);
+      return resultItemList_.get(index);
     }
 
-    public static final int AJDGGDPILBD_FIELD_NUMBER = 15;
-    private java.util.List aJDGGDPILBD_;
+    public static final int TOTAL_RANDOM_ITEM_LIST_FIELD_NUMBER = 15;
+    private java.util.List totalRandomItemList_;
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
     @java.lang.Override
-    public java.util.List getAJDGGDPILBDList() {
-      return aJDGGDPILBD_;
+    public java.util.List getTotalRandomItemListList() {
+      return totalRandomItemList_;
     }
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
     @java.lang.Override
     public java.util.List 
-        getAJDGGDPILBDOrBuilderList() {
-      return aJDGGDPILBD_;
+        getTotalRandomItemListOrBuilderList() {
+      return totalRandomItemList_;
     }
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
     @java.lang.Override
-    public int getAJDGGDPILBDCount() {
-      return aJDGGDPILBD_.size();
+    public int getTotalRandomItemListCount() {
+      return totalRandomItemList_.size();
     }
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAJDGGDPILBD(int index) {
-      return aJDGGDPILBD_.get(index);
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) {
+      return totalRandomItemList_.get(index);
     }
     /**
-     * repeated .ItemParam AJDGGDPILBD = 15;
+     * repeated .ItemParam total_random_item_list = 15;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAJDGGDPILBDOrBuilder(
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder(
         int index) {
-      return aJDGGDPILBD_.get(index);
+      return totalRandomItemList_.get(index);
     }
 
-    public static final int AABDGFADCIJ_FIELD_NUMBER = 11;
-    private java.util.List aABDGFADCIJ_;
+    public static final int TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER = 11;
+    private java.util.List totalReturnItemList_;
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
     @java.lang.Override
-    public java.util.List getAABDGFADCIJList() {
-      return aABDGFADCIJ_;
+    public java.util.List getTotalReturnItemListList() {
+      return totalReturnItemList_;
     }
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
     @java.lang.Override
     public java.util.List 
-        getAABDGFADCIJOrBuilderList() {
-      return aABDGFADCIJ_;
+        getTotalReturnItemListOrBuilderList() {
+      return totalReturnItemList_;
     }
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
     @java.lang.Override
-    public int getAABDGFADCIJCount() {
-      return aABDGFADCIJ_.size();
+    public int getTotalReturnItemListCount() {
+      return totalReturnItemList_.size();
     }
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAABDGFADCIJ(int index) {
-      return aABDGFADCIJ_.get(index);
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) {
+      return totalReturnItemList_.get(index);
     }
     /**
-     * repeated .ItemParam AABDGFADCIJ = 11;
+     * repeated .ItemParam total_return_item_list = 11;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAABDGFADCIJOrBuilder(
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder(
         int index) {
-      return aABDGFADCIJ_.get(index);
+      return totalReturnItemList_.get(index);
     }
 
-    public static final int GFKKOPJFFLM_FIELD_NUMBER = 10;
-    private java.util.List gFKKOPJFFLM_;
+    public static final int TOTAL_EXTRA_ITEM_LIST_FIELD_NUMBER = 10;
+    private java.util.List totalExtraItemList_;
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
     @java.lang.Override
-    public java.util.List getGFKKOPJFFLMList() {
-      return gFKKOPJFFLM_;
+    public java.util.List getTotalExtraItemListList() {
+      return totalExtraItemList_;
     }
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
     @java.lang.Override
     public java.util.List 
-        getGFKKOPJFFLMOrBuilderList() {
-      return gFKKOPJFFLM_;
+        getTotalExtraItemListOrBuilderList() {
+      return totalExtraItemList_;
     }
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
     @java.lang.Override
-    public int getGFKKOPJFFLMCount() {
-      return gFKKOPJFFLM_.size();
+    public int getTotalExtraItemListCount() {
+      return totalExtraItemList_.size();
     }
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGFKKOPJFFLM(int index) {
-      return gFKKOPJFFLM_.get(index);
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index) {
+      return totalExtraItemList_.get(index);
     }
     /**
-     * repeated .ItemParam GFKKOPJFFLM = 10;
+     * repeated .ItemParam total_extra_item_list = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGFKKOPJFFLMOrBuilder(
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder(
         int index) {
-      return gFKKOPJFFLM_.get(index);
+      return totalExtraItemList_.get(index);
     }
 
     public static final int AVATAR_GUID_FIELD_NUMBER = 5;
@@ -683,17 +683,17 @@ public final class CombineRspOuterClass {
       for (int i = 0; i < gAEEJPPNJDD_.size(); i++) {
         output.writeMessage(8, gAEEJPPNJDD_.get(i));
       }
-      for (int i = 0; i < gFKKOPJFFLM_.size(); i++) {
-        output.writeMessage(10, gFKKOPJFFLM_.get(i));
+      for (int i = 0; i < totalExtraItemList_.size(); i++) {
+        output.writeMessage(10, totalExtraItemList_.get(i));
       }
-      for (int i = 0; i < aABDGFADCIJ_.size(); i++) {
-        output.writeMessage(11, aABDGFADCIJ_.get(i));
+      for (int i = 0; i < totalReturnItemList_.size(); i++) {
+        output.writeMessage(11, totalReturnItemList_.get(i));
       }
-      for (int i = 0; i < fDFCGJGJDPP_.size(); i++) {
-        output.writeMessage(13, fDFCGJGJDPP_.get(i));
+      for (int i = 0; i < resultItemList_.size(); i++) {
+        output.writeMessage(13, resultItemList_.get(i));
       }
-      for (int i = 0; i < aJDGGDPILBD_.size(); i++) {
-        output.writeMessage(15, aJDGGDPILBD_.get(i));
+      for (int i = 0; i < totalRandomItemList_.size(); i++) {
+        output.writeMessage(15, totalRandomItemList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -728,21 +728,21 @@ public final class CombineRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, gAEEJPPNJDD_.get(i));
       }
-      for (int i = 0; i < gFKKOPJFFLM_.size(); i++) {
+      for (int i = 0; i < totalExtraItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, gFKKOPJFFLM_.get(i));
+          .computeMessageSize(10, totalExtraItemList_.get(i));
       }
-      for (int i = 0; i < aABDGFADCIJ_.size(); i++) {
+      for (int i = 0; i < totalReturnItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, aABDGFADCIJ_.get(i));
+          .computeMessageSize(11, totalReturnItemList_.get(i));
       }
-      for (int i = 0; i < fDFCGJGJDPP_.size(); i++) {
+      for (int i = 0; i < resultItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, fDFCGJGJDPP_.get(i));
+          .computeMessageSize(13, resultItemList_.get(i));
       }
-      for (int i = 0; i < aJDGGDPILBD_.size(); i++) {
+      for (int i = 0; i < totalRandomItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, aJDGGDPILBD_.get(i));
+          .computeMessageSize(15, totalRandomItemList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -763,14 +763,14 @@ public final class CombineRspOuterClass {
           != other.getCombineId()) return false;
       if (getCombineCount()
           != other.getCombineCount()) return false;
-      if (!getFDFCGJGJDPPList()
-          .equals(other.getFDFCGJGJDPPList())) return false;
-      if (!getAJDGGDPILBDList()
-          .equals(other.getAJDGGDPILBDList())) return false;
-      if (!getAABDGFADCIJList()
-          .equals(other.getAABDGFADCIJList())) return false;
-      if (!getGFKKOPJFFLMList()
-          .equals(other.getGFKKOPJFFLMList())) return false;
+      if (!getResultItemListList()
+          .equals(other.getResultItemListList())) return false;
+      if (!getTotalRandomItemListList()
+          .equals(other.getTotalRandomItemListList())) return false;
+      if (!getTotalReturnItemListList()
+          .equals(other.getTotalReturnItemListList())) return false;
+      if (!getTotalExtraItemListList()
+          .equals(other.getTotalExtraItemListList())) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
       if (getRetcode()
@@ -794,21 +794,21 @@ public final class CombineRspOuterClass {
       hash = (53 * hash) + getCombineId();
       hash = (37 * hash) + COMBINE_COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getCombineCount();
-      if (getFDFCGJGJDPPCount() > 0) {
-        hash = (37 * hash) + FDFCGJGJDPP_FIELD_NUMBER;
-        hash = (53 * hash) + getFDFCGJGJDPPList().hashCode();
+      if (getResultItemListCount() > 0) {
+        hash = (37 * hash) + RESULT_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getResultItemListList().hashCode();
       }
-      if (getAJDGGDPILBDCount() > 0) {
-        hash = (37 * hash) + AJDGGDPILBD_FIELD_NUMBER;
-        hash = (53 * hash) + getAJDGGDPILBDList().hashCode();
+      if (getTotalRandomItemListCount() > 0) {
+        hash = (37 * hash) + TOTAL_RANDOM_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTotalRandomItemListList().hashCode();
       }
-      if (getAABDGFADCIJCount() > 0) {
-        hash = (37 * hash) + AABDGFADCIJ_FIELD_NUMBER;
-        hash = (53 * hash) + getAABDGFADCIJList().hashCode();
+      if (getTotalReturnItemListCount() > 0) {
+        hash = (37 * hash) + TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTotalReturnItemListList().hashCode();
       }
-      if (getGFKKOPJFFLMCount() > 0) {
-        hash = (37 * hash) + GFKKOPJFFLM_FIELD_NUMBER;
-        hash = (53 * hash) + getGFKKOPJFFLMList().hashCode();
+      if (getTotalExtraItemListCount() > 0) {
+        hash = (37 * hash) + TOTAL_EXTRA_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTotalExtraItemListList().hashCode();
       }
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
@@ -956,10 +956,10 @@ public final class CombineRspOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getFDFCGJGJDPPFieldBuilder();
-          getAJDGGDPILBDFieldBuilder();
-          getAABDGFADCIJFieldBuilder();
-          getGFKKOPJFFLMFieldBuilder();
+          getResultItemListFieldBuilder();
+          getTotalRandomItemListFieldBuilder();
+          getTotalReturnItemListFieldBuilder();
+          getTotalExtraItemListFieldBuilder();
           getGAEEJPPNJDDFieldBuilder();
           getCostItemListFieldBuilder();
         }
@@ -971,29 +971,29 @@ public final class CombineRspOuterClass {
 
         combineCount_ = 0;
 
-        if (fDFCGJGJDPPBuilder_ == null) {
-          fDFCGJGJDPP_ = java.util.Collections.emptyList();
+        if (resultItemListBuilder_ == null) {
+          resultItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          fDFCGJGJDPPBuilder_.clear();
+          resultItemListBuilder_.clear();
         }
-        if (aJDGGDPILBDBuilder_ == null) {
-          aJDGGDPILBD_ = java.util.Collections.emptyList();
+        if (totalRandomItemListBuilder_ == null) {
+          totalRandomItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
-          aJDGGDPILBDBuilder_.clear();
+          totalRandomItemListBuilder_.clear();
         }
-        if (aABDGFADCIJBuilder_ == null) {
-          aABDGFADCIJ_ = java.util.Collections.emptyList();
+        if (totalReturnItemListBuilder_ == null) {
+          totalReturnItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
         } else {
-          aABDGFADCIJBuilder_.clear();
+          totalReturnItemListBuilder_.clear();
         }
-        if (gFKKOPJFFLMBuilder_ == null) {
-          gFKKOPJFFLM_ = java.util.Collections.emptyList();
+        if (totalExtraItemListBuilder_ == null) {
+          totalExtraItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000008);
         } else {
-          gFKKOPJFFLMBuilder_.clear();
+          totalExtraItemListBuilder_.clear();
         }
         avatarGuid_ = 0L;
 
@@ -1040,41 +1040,41 @@ public final class CombineRspOuterClass {
         int from_bitField0_ = bitField0_;
         result.combineId_ = combineId_;
         result.combineCount_ = combineCount_;
-        if (fDFCGJGJDPPBuilder_ == null) {
+        if (resultItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
-            fDFCGJGJDPP_ = java.util.Collections.unmodifiableList(fDFCGJGJDPP_);
+            resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_);
             bitField0_ = (bitField0_ & ~0x00000001);
           }
-          result.fDFCGJGJDPP_ = fDFCGJGJDPP_;
+          result.resultItemList_ = resultItemList_;
         } else {
-          result.fDFCGJGJDPP_ = fDFCGJGJDPPBuilder_.build();
+          result.resultItemList_ = resultItemListBuilder_.build();
         }
-        if (aJDGGDPILBDBuilder_ == null) {
+        if (totalRandomItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
-            aJDGGDPILBD_ = java.util.Collections.unmodifiableList(aJDGGDPILBD_);
+            totalRandomItemList_ = java.util.Collections.unmodifiableList(totalRandomItemList_);
             bitField0_ = (bitField0_ & ~0x00000002);
           }
-          result.aJDGGDPILBD_ = aJDGGDPILBD_;
+          result.totalRandomItemList_ = totalRandomItemList_;
         } else {
-          result.aJDGGDPILBD_ = aJDGGDPILBDBuilder_.build();
+          result.totalRandomItemList_ = totalRandomItemListBuilder_.build();
         }
-        if (aABDGFADCIJBuilder_ == null) {
+        if (totalReturnItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
-            aABDGFADCIJ_ = java.util.Collections.unmodifiableList(aABDGFADCIJ_);
+            totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_);
             bitField0_ = (bitField0_ & ~0x00000004);
           }
-          result.aABDGFADCIJ_ = aABDGFADCIJ_;
+          result.totalReturnItemList_ = totalReturnItemList_;
         } else {
-          result.aABDGFADCIJ_ = aABDGFADCIJBuilder_.build();
+          result.totalReturnItemList_ = totalReturnItemListBuilder_.build();
         }
-        if (gFKKOPJFFLMBuilder_ == null) {
+        if (totalExtraItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0)) {
-            gFKKOPJFFLM_ = java.util.Collections.unmodifiableList(gFKKOPJFFLM_);
+            totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_);
             bitField0_ = (bitField0_ & ~0x00000008);
           }
-          result.gFKKOPJFFLM_ = gFKKOPJFFLM_;
+          result.totalExtraItemList_ = totalExtraItemList_;
         } else {
-          result.gFKKOPJFFLM_ = gFKKOPJFFLMBuilder_.build();
+          result.totalExtraItemList_ = totalExtraItemListBuilder_.build();
         }
         result.avatarGuid_ = avatarGuid_;
         result.retcode_ = retcode_;
@@ -1150,107 +1150,107 @@ public final class CombineRspOuterClass {
         if (other.getCombineCount() != 0) {
           setCombineCount(other.getCombineCount());
         }
-        if (fDFCGJGJDPPBuilder_ == null) {
-          if (!other.fDFCGJGJDPP_.isEmpty()) {
-            if (fDFCGJGJDPP_.isEmpty()) {
-              fDFCGJGJDPP_ = other.fDFCGJGJDPP_;
+        if (resultItemListBuilder_ == null) {
+          if (!other.resultItemList_.isEmpty()) {
+            if (resultItemList_.isEmpty()) {
+              resultItemList_ = other.resultItemList_;
               bitField0_ = (bitField0_ & ~0x00000001);
             } else {
-              ensureFDFCGJGJDPPIsMutable();
-              fDFCGJGJDPP_.addAll(other.fDFCGJGJDPP_);
+              ensureResultItemListIsMutable();
+              resultItemList_.addAll(other.resultItemList_);
             }
             onChanged();
           }
         } else {
-          if (!other.fDFCGJGJDPP_.isEmpty()) {
-            if (fDFCGJGJDPPBuilder_.isEmpty()) {
-              fDFCGJGJDPPBuilder_.dispose();
-              fDFCGJGJDPPBuilder_ = null;
-              fDFCGJGJDPP_ = other.fDFCGJGJDPP_;
+          if (!other.resultItemList_.isEmpty()) {
+            if (resultItemListBuilder_.isEmpty()) {
+              resultItemListBuilder_.dispose();
+              resultItemListBuilder_ = null;
+              resultItemList_ = other.resultItemList_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              fDFCGJGJDPPBuilder_ = 
+              resultItemListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getFDFCGJGJDPPFieldBuilder() : null;
+                   getResultItemListFieldBuilder() : null;
             } else {
-              fDFCGJGJDPPBuilder_.addAllMessages(other.fDFCGJGJDPP_);
+              resultItemListBuilder_.addAllMessages(other.resultItemList_);
             }
           }
         }
-        if (aJDGGDPILBDBuilder_ == null) {
-          if (!other.aJDGGDPILBD_.isEmpty()) {
-            if (aJDGGDPILBD_.isEmpty()) {
-              aJDGGDPILBD_ = other.aJDGGDPILBD_;
+        if (totalRandomItemListBuilder_ == null) {
+          if (!other.totalRandomItemList_.isEmpty()) {
+            if (totalRandomItemList_.isEmpty()) {
+              totalRandomItemList_ = other.totalRandomItemList_;
               bitField0_ = (bitField0_ & ~0x00000002);
             } else {
-              ensureAJDGGDPILBDIsMutable();
-              aJDGGDPILBD_.addAll(other.aJDGGDPILBD_);
+              ensureTotalRandomItemListIsMutable();
+              totalRandomItemList_.addAll(other.totalRandomItemList_);
             }
             onChanged();
           }
         } else {
-          if (!other.aJDGGDPILBD_.isEmpty()) {
-            if (aJDGGDPILBDBuilder_.isEmpty()) {
-              aJDGGDPILBDBuilder_.dispose();
-              aJDGGDPILBDBuilder_ = null;
-              aJDGGDPILBD_ = other.aJDGGDPILBD_;
+          if (!other.totalRandomItemList_.isEmpty()) {
+            if (totalRandomItemListBuilder_.isEmpty()) {
+              totalRandomItemListBuilder_.dispose();
+              totalRandomItemListBuilder_ = null;
+              totalRandomItemList_ = other.totalRandomItemList_;
               bitField0_ = (bitField0_ & ~0x00000002);
-              aJDGGDPILBDBuilder_ = 
+              totalRandomItemListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getAJDGGDPILBDFieldBuilder() : null;
+                   getTotalRandomItemListFieldBuilder() : null;
             } else {
-              aJDGGDPILBDBuilder_.addAllMessages(other.aJDGGDPILBD_);
+              totalRandomItemListBuilder_.addAllMessages(other.totalRandomItemList_);
             }
           }
         }
-        if (aABDGFADCIJBuilder_ == null) {
-          if (!other.aABDGFADCIJ_.isEmpty()) {
-            if (aABDGFADCIJ_.isEmpty()) {
-              aABDGFADCIJ_ = other.aABDGFADCIJ_;
+        if (totalReturnItemListBuilder_ == null) {
+          if (!other.totalReturnItemList_.isEmpty()) {
+            if (totalReturnItemList_.isEmpty()) {
+              totalReturnItemList_ = other.totalReturnItemList_;
               bitField0_ = (bitField0_ & ~0x00000004);
             } else {
-              ensureAABDGFADCIJIsMutable();
-              aABDGFADCIJ_.addAll(other.aABDGFADCIJ_);
+              ensureTotalReturnItemListIsMutable();
+              totalReturnItemList_.addAll(other.totalReturnItemList_);
             }
             onChanged();
           }
         } else {
-          if (!other.aABDGFADCIJ_.isEmpty()) {
-            if (aABDGFADCIJBuilder_.isEmpty()) {
-              aABDGFADCIJBuilder_.dispose();
-              aABDGFADCIJBuilder_ = null;
-              aABDGFADCIJ_ = other.aABDGFADCIJ_;
+          if (!other.totalReturnItemList_.isEmpty()) {
+            if (totalReturnItemListBuilder_.isEmpty()) {
+              totalReturnItemListBuilder_.dispose();
+              totalReturnItemListBuilder_ = null;
+              totalReturnItemList_ = other.totalReturnItemList_;
               bitField0_ = (bitField0_ & ~0x00000004);
-              aABDGFADCIJBuilder_ = 
+              totalReturnItemListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getAABDGFADCIJFieldBuilder() : null;
+                   getTotalReturnItemListFieldBuilder() : null;
             } else {
-              aABDGFADCIJBuilder_.addAllMessages(other.aABDGFADCIJ_);
+              totalReturnItemListBuilder_.addAllMessages(other.totalReturnItemList_);
             }
           }
         }
-        if (gFKKOPJFFLMBuilder_ == null) {
-          if (!other.gFKKOPJFFLM_.isEmpty()) {
-            if (gFKKOPJFFLM_.isEmpty()) {
-              gFKKOPJFFLM_ = other.gFKKOPJFFLM_;
+        if (totalExtraItemListBuilder_ == null) {
+          if (!other.totalExtraItemList_.isEmpty()) {
+            if (totalExtraItemList_.isEmpty()) {
+              totalExtraItemList_ = other.totalExtraItemList_;
               bitField0_ = (bitField0_ & ~0x00000008);
             } else {
-              ensureGFKKOPJFFLMIsMutable();
-              gFKKOPJFFLM_.addAll(other.gFKKOPJFFLM_);
+              ensureTotalExtraItemListIsMutable();
+              totalExtraItemList_.addAll(other.totalExtraItemList_);
             }
             onChanged();
           }
         } else {
-          if (!other.gFKKOPJFFLM_.isEmpty()) {
-            if (gFKKOPJFFLMBuilder_.isEmpty()) {
-              gFKKOPJFFLMBuilder_.dispose();
-              gFKKOPJFFLMBuilder_ = null;
-              gFKKOPJFFLM_ = other.gFKKOPJFFLM_;
+          if (!other.totalExtraItemList_.isEmpty()) {
+            if (totalExtraItemListBuilder_.isEmpty()) {
+              totalExtraItemListBuilder_.dispose();
+              totalExtraItemListBuilder_ = null;
+              totalExtraItemList_ = other.totalExtraItemList_;
               bitField0_ = (bitField0_ & ~0x00000008);
-              gFKKOPJFFLMBuilder_ = 
+              totalExtraItemListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getGFKKOPJFFLMFieldBuilder() : null;
+                   getTotalExtraItemListFieldBuilder() : null;
             } else {
-              gFKKOPJFFLMBuilder_.addAllMessages(other.gFKKOPJFFLM_);
+              totalExtraItemListBuilder_.addAllMessages(other.totalExtraItemList_);
             }
           }
         }
@@ -1404,964 +1404,964 @@ public final class CombineRspOuterClass {
         return this;
       }
 
-      private java.util.List fDFCGJGJDPP_ =
+      private java.util.List resultItemList_ =
         java.util.Collections.emptyList();
-      private void ensureFDFCGJGJDPPIsMutable() {
+      private void ensureResultItemListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          fDFCGJGJDPP_ = new java.util.ArrayList(fDFCGJGJDPP_);
+          resultItemList_ = new java.util.ArrayList(resultItemList_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> fDFCGJGJDPPBuilder_;
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> resultItemListBuilder_;
 
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public java.util.List getFDFCGJGJDPPList() {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(fDFCGJGJDPP_);
+      public java.util.List getResultItemListList() {
+        if (resultItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(resultItemList_);
         } else {
-          return fDFCGJGJDPPBuilder_.getMessageList();
+          return resultItemListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public int getFDFCGJGJDPPCount() {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          return fDFCGJGJDPP_.size();
+      public int getResultItemListCount() {
+        if (resultItemListBuilder_ == null) {
+          return resultItemList_.size();
         } else {
-          return fDFCGJGJDPPBuilder_.getCount();
+          return resultItemListBuilder_.getCount();
         }
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getFDFCGJGJDPP(int index) {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          return fDFCGJGJDPP_.get(index);
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) {
+        if (resultItemListBuilder_ == null) {
+          return resultItemList_.get(index);
         } else {
-          return fDFCGJGJDPPBuilder_.getMessage(index);
+          return resultItemListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder setFDFCGJGJDPP(
+      public Builder setResultItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (fDFCGJGJDPPBuilder_ == null) {
+        if (resultItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFDFCGJGJDPPIsMutable();
-          fDFCGJGJDPP_.set(index, value);
+          ensureResultItemListIsMutable();
+          resultItemList_.set(index, value);
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.setMessage(index, value);
+          resultItemListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder setFDFCGJGJDPP(
+      public Builder setResultItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          ensureFDFCGJGJDPPIsMutable();
-          fDFCGJGJDPP_.set(index, builderForValue.build());
+        if (resultItemListBuilder_ == null) {
+          ensureResultItemListIsMutable();
+          resultItemList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.setMessage(index, builderForValue.build());
+          resultItemListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder addFDFCGJGJDPP(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (fDFCGJGJDPPBuilder_ == null) {
+      public Builder addResultItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (resultItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFDFCGJGJDPPIsMutable();
-          fDFCGJGJDPP_.add(value);
+          ensureResultItemListIsMutable();
+          resultItemList_.add(value);
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.addMessage(value);
+          resultItemListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder addFDFCGJGJDPP(
+      public Builder addResultItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (fDFCGJGJDPPBuilder_ == null) {
+        if (resultItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFDFCGJGJDPPIsMutable();
-          fDFCGJGJDPP_.add(index, value);
+          ensureResultItemListIsMutable();
+          resultItemList_.add(index, value);
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.addMessage(index, value);
+          resultItemListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder addFDFCGJGJDPP(
+      public Builder addResultItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          ensureFDFCGJGJDPPIsMutable();
-          fDFCGJGJDPP_.add(builderForValue.build());
+        if (resultItemListBuilder_ == null) {
+          ensureResultItemListIsMutable();
+          resultItemList_.add(builderForValue.build());
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.addMessage(builderForValue.build());
+          resultItemListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder addFDFCGJGJDPP(
+      public Builder addResultItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          ensureFDFCGJGJDPPIsMutable();
-          fDFCGJGJDPP_.add(index, builderForValue.build());
+        if (resultItemListBuilder_ == null) {
+          ensureResultItemListIsMutable();
+          resultItemList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.addMessage(index, builderForValue.build());
+          resultItemListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder addAllFDFCGJGJDPP(
+      public Builder addAllResultItemList(
           java.lang.Iterable values) {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          ensureFDFCGJGJDPPIsMutable();
+        if (resultItemListBuilder_ == null) {
+          ensureResultItemListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, fDFCGJGJDPP_);
+              values, resultItemList_);
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.addAllMessages(values);
+          resultItemListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder clearFDFCGJGJDPP() {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          fDFCGJGJDPP_ = java.util.Collections.emptyList();
+      public Builder clearResultItemList() {
+        if (resultItemListBuilder_ == null) {
+          resultItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.clear();
+          resultItemListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public Builder removeFDFCGJGJDPP(int index) {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          ensureFDFCGJGJDPPIsMutable();
-          fDFCGJGJDPP_.remove(index);
+      public Builder removeResultItemList(int index) {
+        if (resultItemListBuilder_ == null) {
+          ensureResultItemListIsMutable();
+          resultItemList_.remove(index);
           onChanged();
         } else {
-          fDFCGJGJDPPBuilder_.remove(index);
+          resultItemListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getFDFCGJGJDPPBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getResultItemListBuilder(
           int index) {
-        return getFDFCGJGJDPPFieldBuilder().getBuilder(index);
+        return getResultItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getFDFCGJGJDPPOrBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder(
           int index) {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          return fDFCGJGJDPP_.get(index);  } else {
-          return fDFCGJGJDPPBuilder_.getMessageOrBuilder(index);
+        if (resultItemListBuilder_ == null) {
+          return resultItemList_.get(index);  } else {
+          return resultItemListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
       public java.util.List 
-           getFDFCGJGJDPPOrBuilderList() {
-        if (fDFCGJGJDPPBuilder_ != null) {
-          return fDFCGJGJDPPBuilder_.getMessageOrBuilderList();
+           getResultItemListOrBuilderList() {
+        if (resultItemListBuilder_ != null) {
+          return resultItemListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(fDFCGJGJDPP_);
+          return java.util.Collections.unmodifiableList(resultItemList_);
         }
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addFDFCGJGJDPPBuilder() {
-        return getFDFCGJGJDPPFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder() {
+        return getResultItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addFDFCGJGJDPPBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder(
           int index) {
-        return getFDFCGJGJDPPFieldBuilder().addBuilder(
+        return getResultItemListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam FDFCGJGJDPP = 13;
+       * repeated .ItemParam result_item_list = 13;
        */
       public java.util.List 
-           getFDFCGJGJDPPBuilderList() {
-        return getFDFCGJGJDPPFieldBuilder().getBuilderList();
+           getResultItemListBuilderList() {
+        return getResultItemListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getFDFCGJGJDPPFieldBuilder() {
-        if (fDFCGJGJDPPBuilder_ == null) {
-          fDFCGJGJDPPBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getResultItemListFieldBuilder() {
+        if (resultItemListBuilder_ == null) {
+          resultItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  fDFCGJGJDPP_,
+                  resultItemList_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
-          fDFCGJGJDPP_ = null;
+          resultItemList_ = null;
         }
-        return fDFCGJGJDPPBuilder_;
+        return resultItemListBuilder_;
       }
 
-      private java.util.List aJDGGDPILBD_ =
+      private java.util.List totalRandomItemList_ =
         java.util.Collections.emptyList();
-      private void ensureAJDGGDPILBDIsMutable() {
+      private void ensureTotalRandomItemListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          aJDGGDPILBD_ = new java.util.ArrayList(aJDGGDPILBD_);
+          totalRandomItemList_ = new java.util.ArrayList(totalRandomItemList_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> aJDGGDPILBDBuilder_;
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> totalRandomItemListBuilder_;
 
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public java.util.List getAJDGGDPILBDList() {
-        if (aJDGGDPILBDBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(aJDGGDPILBD_);
+      public java.util.List getTotalRandomItemListList() {
+        if (totalRandomItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(totalRandomItemList_);
         } else {
-          return aJDGGDPILBDBuilder_.getMessageList();
+          return totalRandomItemListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public int getAJDGGDPILBDCount() {
-        if (aJDGGDPILBDBuilder_ == null) {
-          return aJDGGDPILBD_.size();
+      public int getTotalRandomItemListCount() {
+        if (totalRandomItemListBuilder_ == null) {
+          return totalRandomItemList_.size();
         } else {
-          return aJDGGDPILBDBuilder_.getCount();
+          return totalRandomItemListBuilder_.getCount();
         }
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAJDGGDPILBD(int index) {
-        if (aJDGGDPILBDBuilder_ == null) {
-          return aJDGGDPILBD_.get(index);
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) {
+        if (totalRandomItemListBuilder_ == null) {
+          return totalRandomItemList_.get(index);
         } else {
-          return aJDGGDPILBDBuilder_.getMessage(index);
+          return totalRandomItemListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder setAJDGGDPILBD(
+      public Builder setTotalRandomItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aJDGGDPILBDBuilder_ == null) {
+        if (totalRandomItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAJDGGDPILBDIsMutable();
-          aJDGGDPILBD_.set(index, value);
+          ensureTotalRandomItemListIsMutable();
+          totalRandomItemList_.set(index, value);
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.setMessage(index, value);
+          totalRandomItemListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder setAJDGGDPILBD(
+      public Builder setTotalRandomItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aJDGGDPILBDBuilder_ == null) {
-          ensureAJDGGDPILBDIsMutable();
-          aJDGGDPILBD_.set(index, builderForValue.build());
+        if (totalRandomItemListBuilder_ == null) {
+          ensureTotalRandomItemListIsMutable();
+          totalRandomItemList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.setMessage(index, builderForValue.build());
+          totalRandomItemListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder addAJDGGDPILBD(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aJDGGDPILBDBuilder_ == null) {
+      public Builder addTotalRandomItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (totalRandomItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAJDGGDPILBDIsMutable();
-          aJDGGDPILBD_.add(value);
+          ensureTotalRandomItemListIsMutable();
+          totalRandomItemList_.add(value);
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.addMessage(value);
+          totalRandomItemListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder addAJDGGDPILBD(
+      public Builder addTotalRandomItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aJDGGDPILBDBuilder_ == null) {
+        if (totalRandomItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAJDGGDPILBDIsMutable();
-          aJDGGDPILBD_.add(index, value);
+          ensureTotalRandomItemListIsMutable();
+          totalRandomItemList_.add(index, value);
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.addMessage(index, value);
+          totalRandomItemListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder addAJDGGDPILBD(
+      public Builder addTotalRandomItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aJDGGDPILBDBuilder_ == null) {
-          ensureAJDGGDPILBDIsMutable();
-          aJDGGDPILBD_.add(builderForValue.build());
+        if (totalRandomItemListBuilder_ == null) {
+          ensureTotalRandomItemListIsMutable();
+          totalRandomItemList_.add(builderForValue.build());
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.addMessage(builderForValue.build());
+          totalRandomItemListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder addAJDGGDPILBD(
+      public Builder addTotalRandomItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aJDGGDPILBDBuilder_ == null) {
-          ensureAJDGGDPILBDIsMutable();
-          aJDGGDPILBD_.add(index, builderForValue.build());
+        if (totalRandomItemListBuilder_ == null) {
+          ensureTotalRandomItemListIsMutable();
+          totalRandomItemList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.addMessage(index, builderForValue.build());
+          totalRandomItemListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder addAllAJDGGDPILBD(
+      public Builder addAllTotalRandomItemList(
           java.lang.Iterable values) {
-        if (aJDGGDPILBDBuilder_ == null) {
-          ensureAJDGGDPILBDIsMutable();
+        if (totalRandomItemListBuilder_ == null) {
+          ensureTotalRandomItemListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, aJDGGDPILBD_);
+              values, totalRandomItemList_);
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.addAllMessages(values);
+          totalRandomItemListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder clearAJDGGDPILBD() {
-        if (aJDGGDPILBDBuilder_ == null) {
-          aJDGGDPILBD_ = java.util.Collections.emptyList();
+      public Builder clearTotalRandomItemList() {
+        if (totalRandomItemListBuilder_ == null) {
+          totalRandomItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.clear();
+          totalRandomItemListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public Builder removeAJDGGDPILBD(int index) {
-        if (aJDGGDPILBDBuilder_ == null) {
-          ensureAJDGGDPILBDIsMutable();
-          aJDGGDPILBD_.remove(index);
+      public Builder removeTotalRandomItemList(int index) {
+        if (totalRandomItemListBuilder_ == null) {
+          ensureTotalRandomItemListIsMutable();
+          totalRandomItemList_.remove(index);
           onChanged();
         } else {
-          aJDGGDPILBDBuilder_.remove(index);
+          totalRandomItemListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getAJDGGDPILBDBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalRandomItemListBuilder(
           int index) {
-        return getAJDGGDPILBDFieldBuilder().getBuilder(index);
+        return getTotalRandomItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAJDGGDPILBDOrBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder(
           int index) {
-        if (aJDGGDPILBDBuilder_ == null) {
-          return aJDGGDPILBD_.get(index);  } else {
-          return aJDGGDPILBDBuilder_.getMessageOrBuilder(index);
+        if (totalRandomItemListBuilder_ == null) {
+          return totalRandomItemList_.get(index);  } else {
+          return totalRandomItemListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
       public java.util.List 
-           getAJDGGDPILBDOrBuilderList() {
-        if (aJDGGDPILBDBuilder_ != null) {
-          return aJDGGDPILBDBuilder_.getMessageOrBuilderList();
+           getTotalRandomItemListOrBuilderList() {
+        if (totalRandomItemListBuilder_ != null) {
+          return totalRandomItemListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(aJDGGDPILBD_);
+          return java.util.Collections.unmodifiableList(totalRandomItemList_);
         }
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addAJDGGDPILBDBuilder() {
-        return getAJDGGDPILBDFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder() {
+        return getTotalRandomItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addAJDGGDPILBDBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder(
           int index) {
-        return getAJDGGDPILBDFieldBuilder().addBuilder(
+        return getTotalRandomItemListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam AJDGGDPILBD = 15;
+       * repeated .ItemParam total_random_item_list = 15;
        */
       public java.util.List 
-           getAJDGGDPILBDBuilderList() {
-        return getAJDGGDPILBDFieldBuilder().getBuilderList();
+           getTotalRandomItemListBuilderList() {
+        return getTotalRandomItemListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getAJDGGDPILBDFieldBuilder() {
-        if (aJDGGDPILBDBuilder_ == null) {
-          aJDGGDPILBDBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getTotalRandomItemListFieldBuilder() {
+        if (totalRandomItemListBuilder_ == null) {
+          totalRandomItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  aJDGGDPILBD_,
+                  totalRandomItemList_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
-          aJDGGDPILBD_ = null;
+          totalRandomItemList_ = null;
         }
-        return aJDGGDPILBDBuilder_;
+        return totalRandomItemListBuilder_;
       }
 
-      private java.util.List aABDGFADCIJ_ =
+      private java.util.List totalReturnItemList_ =
         java.util.Collections.emptyList();
-      private void ensureAABDGFADCIJIsMutable() {
+      private void ensureTotalReturnItemListIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          aABDGFADCIJ_ = new java.util.ArrayList(aABDGFADCIJ_);
+          totalReturnItemList_ = new java.util.ArrayList(totalReturnItemList_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> aABDGFADCIJBuilder_;
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> totalReturnItemListBuilder_;
 
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public java.util.List getAABDGFADCIJList() {
-        if (aABDGFADCIJBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(aABDGFADCIJ_);
+      public java.util.List getTotalReturnItemListList() {
+        if (totalReturnItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(totalReturnItemList_);
         } else {
-          return aABDGFADCIJBuilder_.getMessageList();
+          return totalReturnItemListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public int getAABDGFADCIJCount() {
-        if (aABDGFADCIJBuilder_ == null) {
-          return aABDGFADCIJ_.size();
+      public int getTotalReturnItemListCount() {
+        if (totalReturnItemListBuilder_ == null) {
+          return totalReturnItemList_.size();
         } else {
-          return aABDGFADCIJBuilder_.getCount();
+          return totalReturnItemListBuilder_.getCount();
         }
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAABDGFADCIJ(int index) {
-        if (aABDGFADCIJBuilder_ == null) {
-          return aABDGFADCIJ_.get(index);
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) {
+        if (totalReturnItemListBuilder_ == null) {
+          return totalReturnItemList_.get(index);
         } else {
-          return aABDGFADCIJBuilder_.getMessage(index);
+          return totalReturnItemListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder setAABDGFADCIJ(
+      public Builder setTotalReturnItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aABDGFADCIJBuilder_ == null) {
+        if (totalReturnItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAABDGFADCIJIsMutable();
-          aABDGFADCIJ_.set(index, value);
+          ensureTotalReturnItemListIsMutable();
+          totalReturnItemList_.set(index, value);
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.setMessage(index, value);
+          totalReturnItemListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder setAABDGFADCIJ(
+      public Builder setTotalReturnItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aABDGFADCIJBuilder_ == null) {
-          ensureAABDGFADCIJIsMutable();
-          aABDGFADCIJ_.set(index, builderForValue.build());
+        if (totalReturnItemListBuilder_ == null) {
+          ensureTotalReturnItemListIsMutable();
+          totalReturnItemList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.setMessage(index, builderForValue.build());
+          totalReturnItemListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder addAABDGFADCIJ(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aABDGFADCIJBuilder_ == null) {
+      public Builder addTotalReturnItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (totalReturnItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAABDGFADCIJIsMutable();
-          aABDGFADCIJ_.add(value);
+          ensureTotalReturnItemListIsMutable();
+          totalReturnItemList_.add(value);
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.addMessage(value);
+          totalReturnItemListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder addAABDGFADCIJ(
+      public Builder addTotalReturnItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aABDGFADCIJBuilder_ == null) {
+        if (totalReturnItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAABDGFADCIJIsMutable();
-          aABDGFADCIJ_.add(index, value);
+          ensureTotalReturnItemListIsMutable();
+          totalReturnItemList_.add(index, value);
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.addMessage(index, value);
+          totalReturnItemListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder addAABDGFADCIJ(
+      public Builder addTotalReturnItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aABDGFADCIJBuilder_ == null) {
-          ensureAABDGFADCIJIsMutable();
-          aABDGFADCIJ_.add(builderForValue.build());
+        if (totalReturnItemListBuilder_ == null) {
+          ensureTotalReturnItemListIsMutable();
+          totalReturnItemList_.add(builderForValue.build());
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.addMessage(builderForValue.build());
+          totalReturnItemListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder addAABDGFADCIJ(
+      public Builder addTotalReturnItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aABDGFADCIJBuilder_ == null) {
-          ensureAABDGFADCIJIsMutable();
-          aABDGFADCIJ_.add(index, builderForValue.build());
+        if (totalReturnItemListBuilder_ == null) {
+          ensureTotalReturnItemListIsMutable();
+          totalReturnItemList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.addMessage(index, builderForValue.build());
+          totalReturnItemListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder addAllAABDGFADCIJ(
+      public Builder addAllTotalReturnItemList(
           java.lang.Iterable values) {
-        if (aABDGFADCIJBuilder_ == null) {
-          ensureAABDGFADCIJIsMutable();
+        if (totalReturnItemListBuilder_ == null) {
+          ensureTotalReturnItemListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, aABDGFADCIJ_);
+              values, totalReturnItemList_);
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.addAllMessages(values);
+          totalReturnItemListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder clearAABDGFADCIJ() {
-        if (aABDGFADCIJBuilder_ == null) {
-          aABDGFADCIJ_ = java.util.Collections.emptyList();
+      public Builder clearTotalReturnItemList() {
+        if (totalReturnItemListBuilder_ == null) {
+          totalReturnItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.clear();
+          totalReturnItemListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public Builder removeAABDGFADCIJ(int index) {
-        if (aABDGFADCIJBuilder_ == null) {
-          ensureAABDGFADCIJIsMutable();
-          aABDGFADCIJ_.remove(index);
+      public Builder removeTotalReturnItemList(int index) {
+        if (totalReturnItemListBuilder_ == null) {
+          ensureTotalReturnItemListIsMutable();
+          totalReturnItemList_.remove(index);
           onChanged();
         } else {
-          aABDGFADCIJBuilder_.remove(index);
+          totalReturnItemListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getAABDGFADCIJBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalReturnItemListBuilder(
           int index) {
-        return getAABDGFADCIJFieldBuilder().getBuilder(index);
+        return getTotalReturnItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAABDGFADCIJOrBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder(
           int index) {
-        if (aABDGFADCIJBuilder_ == null) {
-          return aABDGFADCIJ_.get(index);  } else {
-          return aABDGFADCIJBuilder_.getMessageOrBuilder(index);
+        if (totalReturnItemListBuilder_ == null) {
+          return totalReturnItemList_.get(index);  } else {
+          return totalReturnItemListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
       public java.util.List 
-           getAABDGFADCIJOrBuilderList() {
-        if (aABDGFADCIJBuilder_ != null) {
-          return aABDGFADCIJBuilder_.getMessageOrBuilderList();
+           getTotalReturnItemListOrBuilderList() {
+        if (totalReturnItemListBuilder_ != null) {
+          return totalReturnItemListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(aABDGFADCIJ_);
+          return java.util.Collections.unmodifiableList(totalReturnItemList_);
         }
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addAABDGFADCIJBuilder() {
-        return getAABDGFADCIJFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder() {
+        return getTotalReturnItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addAABDGFADCIJBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder(
           int index) {
-        return getAABDGFADCIJFieldBuilder().addBuilder(
+        return getTotalReturnItemListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam AABDGFADCIJ = 11;
+       * repeated .ItemParam total_return_item_list = 11;
        */
       public java.util.List 
-           getAABDGFADCIJBuilderList() {
-        return getAABDGFADCIJFieldBuilder().getBuilderList();
+           getTotalReturnItemListBuilderList() {
+        return getTotalReturnItemListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getAABDGFADCIJFieldBuilder() {
-        if (aABDGFADCIJBuilder_ == null) {
-          aABDGFADCIJBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getTotalReturnItemListFieldBuilder() {
+        if (totalReturnItemListBuilder_ == null) {
+          totalReturnItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  aABDGFADCIJ_,
+                  totalReturnItemList_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
                   isClean());
-          aABDGFADCIJ_ = null;
+          totalReturnItemList_ = null;
         }
-        return aABDGFADCIJBuilder_;
+        return totalReturnItemListBuilder_;
       }
 
-      private java.util.List gFKKOPJFFLM_ =
+      private java.util.List totalExtraItemList_ =
         java.util.Collections.emptyList();
-      private void ensureGFKKOPJFFLMIsMutable() {
+      private void ensureTotalExtraItemListIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          gFKKOPJFFLM_ = new java.util.ArrayList(gFKKOPJFFLM_);
+          totalExtraItemList_ = new java.util.ArrayList(totalExtraItemList_);
           bitField0_ |= 0x00000008;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> gFKKOPJFFLMBuilder_;
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> totalExtraItemListBuilder_;
 
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public java.util.List getGFKKOPJFFLMList() {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(gFKKOPJFFLM_);
+      public java.util.List getTotalExtraItemListList() {
+        if (totalExtraItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(totalExtraItemList_);
         } else {
-          return gFKKOPJFFLMBuilder_.getMessageList();
+          return totalExtraItemListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public int getGFKKOPJFFLMCount() {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          return gFKKOPJFFLM_.size();
+      public int getTotalExtraItemListCount() {
+        if (totalExtraItemListBuilder_ == null) {
+          return totalExtraItemList_.size();
         } else {
-          return gFKKOPJFFLMBuilder_.getCount();
+          return totalExtraItemListBuilder_.getCount();
         }
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGFKKOPJFFLM(int index) {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          return gFKKOPJFFLM_.get(index);
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index) {
+        if (totalExtraItemListBuilder_ == null) {
+          return totalExtraItemList_.get(index);
         } else {
-          return gFKKOPJFFLMBuilder_.getMessage(index);
+          return totalExtraItemListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder setGFKKOPJFFLM(
+      public Builder setTotalExtraItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (gFKKOPJFFLMBuilder_ == null) {
+        if (totalExtraItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureGFKKOPJFFLMIsMutable();
-          gFKKOPJFFLM_.set(index, value);
+          ensureTotalExtraItemListIsMutable();
+          totalExtraItemList_.set(index, value);
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.setMessage(index, value);
+          totalExtraItemListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder setGFKKOPJFFLM(
+      public Builder setTotalExtraItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          ensureGFKKOPJFFLMIsMutable();
-          gFKKOPJFFLM_.set(index, builderForValue.build());
+        if (totalExtraItemListBuilder_ == null) {
+          ensureTotalExtraItemListIsMutable();
+          totalExtraItemList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.setMessage(index, builderForValue.build());
+          totalExtraItemListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder addGFKKOPJFFLM(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (gFKKOPJFFLMBuilder_ == null) {
+      public Builder addTotalExtraItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (totalExtraItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureGFKKOPJFFLMIsMutable();
-          gFKKOPJFFLM_.add(value);
+          ensureTotalExtraItemListIsMutable();
+          totalExtraItemList_.add(value);
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.addMessage(value);
+          totalExtraItemListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder addGFKKOPJFFLM(
+      public Builder addTotalExtraItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (gFKKOPJFFLMBuilder_ == null) {
+        if (totalExtraItemListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureGFKKOPJFFLMIsMutable();
-          gFKKOPJFFLM_.add(index, value);
+          ensureTotalExtraItemListIsMutable();
+          totalExtraItemList_.add(index, value);
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.addMessage(index, value);
+          totalExtraItemListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder addGFKKOPJFFLM(
+      public Builder addTotalExtraItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          ensureGFKKOPJFFLMIsMutable();
-          gFKKOPJFFLM_.add(builderForValue.build());
+        if (totalExtraItemListBuilder_ == null) {
+          ensureTotalExtraItemListIsMutable();
+          totalExtraItemList_.add(builderForValue.build());
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.addMessage(builderForValue.build());
+          totalExtraItemListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder addGFKKOPJFFLM(
+      public Builder addTotalExtraItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          ensureGFKKOPJFFLMIsMutable();
-          gFKKOPJFFLM_.add(index, builderForValue.build());
+        if (totalExtraItemListBuilder_ == null) {
+          ensureTotalExtraItemListIsMutable();
+          totalExtraItemList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.addMessage(index, builderForValue.build());
+          totalExtraItemListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder addAllGFKKOPJFFLM(
+      public Builder addAllTotalExtraItemList(
           java.lang.Iterable values) {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          ensureGFKKOPJFFLMIsMutable();
+        if (totalExtraItemListBuilder_ == null) {
+          ensureTotalExtraItemListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, gFKKOPJFFLM_);
+              values, totalExtraItemList_);
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.addAllMessages(values);
+          totalExtraItemListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder clearGFKKOPJFFLM() {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          gFKKOPJFFLM_ = java.util.Collections.emptyList();
+      public Builder clearTotalExtraItemList() {
+        if (totalExtraItemListBuilder_ == null) {
+          totalExtraItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000008);
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.clear();
+          totalExtraItemListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public Builder removeGFKKOPJFFLM(int index) {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          ensureGFKKOPJFFLMIsMutable();
-          gFKKOPJFFLM_.remove(index);
+      public Builder removeTotalExtraItemList(int index) {
+        if (totalExtraItemListBuilder_ == null) {
+          ensureTotalExtraItemListIsMutable();
+          totalExtraItemList_.remove(index);
           onChanged();
         } else {
-          gFKKOPJFFLMBuilder_.remove(index);
+          totalExtraItemListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGFKKOPJFFLMBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalExtraItemListBuilder(
           int index) {
-        return getGFKKOPJFFLMFieldBuilder().getBuilder(index);
+        return getTotalExtraItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGFKKOPJFFLMOrBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder(
           int index) {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          return gFKKOPJFFLM_.get(index);  } else {
-          return gFKKOPJFFLMBuilder_.getMessageOrBuilder(index);
+        if (totalExtraItemListBuilder_ == null) {
+          return totalExtraItemList_.get(index);  } else {
+          return totalExtraItemListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
       public java.util.List 
-           getGFKKOPJFFLMOrBuilderList() {
-        if (gFKKOPJFFLMBuilder_ != null) {
-          return gFKKOPJFFLMBuilder_.getMessageOrBuilderList();
+           getTotalExtraItemListOrBuilderList() {
+        if (totalExtraItemListBuilder_ != null) {
+          return totalExtraItemListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(gFKKOPJFFLM_);
+          return java.util.Collections.unmodifiableList(totalExtraItemList_);
         }
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addGFKKOPJFFLMBuilder() {
-        return getGFKKOPJFFLMFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalExtraItemListBuilder() {
+        return getTotalExtraItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addGFKKOPJFFLMBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalExtraItemListBuilder(
           int index) {
-        return getGFKKOPJFFLMFieldBuilder().addBuilder(
+        return getTotalExtraItemListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * repeated .ItemParam GFKKOPJFFLM = 10;
+       * repeated .ItemParam total_extra_item_list = 10;
        */
       public java.util.List 
-           getGFKKOPJFFLMBuilderList() {
-        return getGFKKOPJFFLMFieldBuilder().getBuilderList();
+           getTotalExtraItemListBuilderList() {
+        return getTotalExtraItemListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getGFKKOPJFFLMFieldBuilder() {
-        if (gFKKOPJFFLMBuilder_ == null) {
-          gFKKOPJFFLMBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getTotalExtraItemListFieldBuilder() {
+        if (totalExtraItemListBuilder_ == null) {
+          totalExtraItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  gFKKOPJFFLM_,
+                  totalExtraItemList_,
                   ((bitField0_ & 0x00000008) != 0),
                   getParentForChildren(),
                   isClean());
-          gFKKOPJFFLM_ = null;
+          totalExtraItemList_ = null;
         }
-        return gFKKOPJFFLMBuilder_;
+        return totalExtraItemListBuilder_;
       }
 
       private long avatarGuid_ ;
@@ -2972,16 +2972,17 @@ public final class CombineRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020CombineRsp.proto\032\017ItemParam.proto\"\246\002\n\n" +
+      "\n\020CombineRsp.proto\032\017ItemParam.proto\"\313\002\n\n" +
       "CombineRsp\022\022\n\ncombine_id\030\007 \001(\r\022\025\n\rcombin" +
-      "e_count\030\003 \001(\r\022\037\n\013FDFCGJGJDPP\030\r \003(\0132\n.Ite" +
-      "mParam\022\037\n\013AJDGGDPILBD\030\017 \003(\0132\n.ItemParam\022" +
-      "\037\n\013AABDGFADCIJ\030\013 \003(\0132\n.ItemParam\022\037\n\013GFKK" +
-      "OPJFFLM\030\n \003(\0132\n.ItemParam\022\023\n\013avatar_guid" +
-      "\030\005 \001(\004\022\017\n\007retcode\030\006 \001(\005\022\037\n\013GAEEJPPNJDD\030\010" +
-      " \003(\0132\n.ItemParam\022\"\n\016cost_item_list\030\004 \003(\013" +
-      "2\n.ItemParamB\033\n\031emu.grasscutter.net.prot" +
-      "ob\006proto3"
+      "e_count\030\003 \001(\r\022$\n\020result_item_list\030\r \003(\0132" +
+      "\n.ItemParam\022*\n\026total_random_item_list\030\017 " +
+      "\003(\0132\n.ItemParam\022*\n\026total_return_item_lis" +
+      "t\030\013 \003(\0132\n.ItemParam\022)\n\025total_extra_item_" +
+      "list\030\n \003(\0132\n.ItemParam\022\023\n\013avatar_guid\030\005 " +
+      "\001(\004\022\017\n\007retcode\030\006 \001(\005\022\037\n\013GAEEJPPNJDD\030\010 \003(" +
+      "\0132\n.ItemParam\022\"\n\016cost_item_list\030\004 \003(\0132\n." +
+      "ItemParamB\033\n\031emu.grasscutter.net.protob\006" +
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2993,7 +2994,7 @@ public final class CombineRspOuterClass {
     internal_static_CombineRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CombineRsp_descriptor,
-        new java.lang.String[] { "CombineId", "CombineCount", "FDFCGJGJDPP", "AJDGGDPILBD", "AABDGFADCIJ", "GFKKOPJFFLM", "AvatarGuid", "Retcode", "GAEEJPPNJDD", "CostItemList", });
+        new java.lang.String[] { "CombineId", "CombineCount", "ResultItemList", "TotalRandomItemList", "TotalReturnItemList", "TotalExtraItemList", "AvatarGuid", "Retcode", "GAEEJPPNJDD", "CostItemList", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtCreateGadgetNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtCreateGadgetNotifyOuterClass.java
index be8b1c255..304bedeae 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtCreateGadgetNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtCreateGadgetNotifyOuterClass.java
@@ -66,10 +66,10 @@ public final class EvtCreateGadgetNotifyOuterClass {
     int getOwnerEntityId();
 
     /**
-     * bool OFGGANCKDLM = 438;
-     * @return The oFGGANCKDLM.
+     * bool is_async_load = 438;
+     * @return The isAsyncLoad.
      */
-    boolean getOFGGANCKDLM();
+    boolean getIsAsyncLoad();
 
     /**
      * uint32 target_lock_point_index = 8;
@@ -346,7 +346,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
             }
             case 3504: {
 
-              oFGGANCKDLM_ = input.readBool();
+              isAsyncLoad_ = input.readBool();
               break;
             }
             case 4128: {
@@ -496,15 +496,15 @@ public final class EvtCreateGadgetNotifyOuterClass {
       return ownerEntityId_;
     }
 
-    public static final int OFGGANCKDLM_FIELD_NUMBER = 438;
-    private boolean oFGGANCKDLM_;
+    public static final int IS_ASYNC_LOAD_FIELD_NUMBER = 438;
+    private boolean isAsyncLoad_;
     /**
-     * bool OFGGANCKDLM = 438;
-     * @return The oFGGANCKDLM.
+     * bool is_async_load = 438;
+     * @return The isAsyncLoad.
      */
     @java.lang.Override
-    public boolean getOFGGANCKDLM() {
-      return oFGGANCKDLM_;
+    public boolean getIsAsyncLoad() {
+      return isAsyncLoad_;
     }
 
     public static final int TARGET_LOCK_POINT_INDEX_FIELD_NUMBER = 8;
@@ -761,8 +761,8 @@ public final class EvtCreateGadgetNotifyOuterClass {
       for (int i = 0; i < targetEntityIdList_.size(); i++) {
         output.writeUInt32NoTag(targetEntityIdList_.getInt(i));
       }
-      if (oFGGANCKDLM_ != false) {
-        output.writeBool(438, oFGGANCKDLM_);
+      if (isAsyncLoad_ != false) {
+        output.writeBool(438, isAsyncLoad_);
       }
       if (getTargetLockPointIndexListList().size() > 0) {
         output.writeUInt32NoTag(4130);
@@ -857,9 +857,9 @@ public final class EvtCreateGadgetNotifyOuterClass {
         }
         targetEntityIdListMemoizedSerializedSize = dataSize;
       }
-      if (oFGGANCKDLM_ != false) {
+      if (isAsyncLoad_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(438, oFGGANCKDLM_);
+          .computeBoolSize(438, isAsyncLoad_);
       }
       {
         int dataSize = 0;
@@ -906,8 +906,8 @@ public final class EvtCreateGadgetNotifyOuterClass {
           != other.getHEPFGKFLCCD()) return false;
       if (getOwnerEntityId()
           != other.getOwnerEntityId()) return false;
-      if (getOFGGANCKDLM()
-          != other.getOFGGANCKDLM()) return false;
+      if (getIsAsyncLoad()
+          != other.getIsAsyncLoad()) return false;
       if (getTargetLockPointIndex()
           != other.getTargetLockPointIndex()) return false;
       if (hasInitEulerAngles() != other.hasInitEulerAngles()) return false;
@@ -965,9 +965,9 @@ public final class EvtCreateGadgetNotifyOuterClass {
           getHEPFGKFLCCD());
       hash = (37 * hash) + OWNER_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getOwnerEntityId();
-      hash = (37 * hash) + OFGGANCKDLM_FIELD_NUMBER;
+      hash = (37 * hash) + IS_ASYNC_LOAD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getOFGGANCKDLM());
+          getIsAsyncLoad());
       hash = (37 * hash) + TARGET_LOCK_POINT_INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getTargetLockPointIndex();
       if (hasInitEulerAngles()) {
@@ -1149,7 +1149,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
 
         ownerEntityId_ = 0;
 
-        oFGGANCKDLM_ = false;
+        isAsyncLoad_ = false;
 
         targetLockPointIndex_ = 0;
 
@@ -1220,7 +1220,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         result.isPeerIdFromPlayer_ = isPeerIdFromPlayer_;
         result.hEPFGKFLCCD_ = hEPFGKFLCCD_;
         result.ownerEntityId_ = ownerEntityId_;
-        result.oFGGANCKDLM_ = oFGGANCKDLM_;
+        result.isAsyncLoad_ = isAsyncLoad_;
         result.targetLockPointIndex_ = targetLockPointIndex_;
         if (initEulerAnglesBuilder_ == null) {
           result.initEulerAngles_ = initEulerAngles_;
@@ -1318,8 +1318,8 @@ public final class EvtCreateGadgetNotifyOuterClass {
         if (other.getOwnerEntityId() != 0) {
           setOwnerEntityId(other.getOwnerEntityId());
         }
-        if (other.getOFGGANCKDLM() != false) {
-          setOFGGANCKDLM(other.getOFGGANCKDLM());
+        if (other.getIsAsyncLoad() != false) {
+          setIsAsyncLoad(other.getIsAsyncLoad());
         }
         if (other.getTargetLockPointIndex() != 0) {
           setTargetLockPointIndex(other.getTargetLockPointIndex());
@@ -1628,33 +1628,33 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
 
-      private boolean oFGGANCKDLM_ ;
+      private boolean isAsyncLoad_ ;
       /**
-       * bool OFGGANCKDLM = 438;
-       * @return The oFGGANCKDLM.
+       * bool is_async_load = 438;
+       * @return The isAsyncLoad.
        */
       @java.lang.Override
-      public boolean getOFGGANCKDLM() {
-        return oFGGANCKDLM_;
+      public boolean getIsAsyncLoad() {
+        return isAsyncLoad_;
       }
       /**
-       * bool OFGGANCKDLM = 438;
-       * @param value The oFGGANCKDLM to set.
+       * bool is_async_load = 438;
+       * @param value The isAsyncLoad to set.
        * @return This builder for chaining.
        */
-      public Builder setOFGGANCKDLM(boolean value) {
+      public Builder setIsAsyncLoad(boolean value) {
         
-        oFGGANCKDLM_ = value;
+        isAsyncLoad_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool OFGGANCKDLM = 438;
+       * bool is_async_load = 438;
        * @return This builder for chaining.
        */
-      public Builder clearOFGGANCKDLM() {
+      public Builder clearIsAsyncLoad() {
         
-        oFGGANCKDLM_ = false;
+        isAsyncLoad_ = false;
         onChanged();
         return this;
       }
@@ -2345,21 +2345,21 @@ public final class EvtCreateGadgetNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033EvtCreateGadgetNotify.proto\032\014Vector.pr" +
-      "oto\032\021ForwardType.proto\"\372\003\n\025EvtCreateGadg" +
+      "oto\032\021ForwardType.proto\"\374\003\n\025EvtCreateGadg" +
       "etNotify\022\014\n\004guid\030\013 \001(\004\022%\n\034target_lock_po" +
       "int_index_list\030\204\004 \003(\r\022\017\n\007room_id\030\003 \001(\r\022\037" +
       "\n\026is_peer_id_from_player\030\336\016 \001(\010\022\023\n\013HEPFG" +
-      "KFLCCD\030\r \001(\010\022\027\n\017owner_entity_id\030\016 \001(\r\022\024\n" +
-      "\013OFGGANCKDLM\030\266\003 \001(\010\022\037\n\027target_lock_point" +
-      "_index\030\010 \001(\r\022 \n\017InitEulerAngles\030\004 \001(\0132\007." +
-      "Vector\022\034\n\024prop_owner_entity_id\030\001 \001(\r\022\021\n\t" +
-      "camp_type\030\005 \001(\r\022\"\n\014forward_type\030\007 \001(\0162\014." +
-      "ForwardType\022\030\n\007InitPos\030\t \001(\0132\007.Vector\022\030\n" +
-      "\020target_entity_id\030\002 \001(\r\022\021\n\tconfig_id\030\017 \001" +
-      "(\r\022\017\n\007camp_id\030\014 \001(\r\022\036\n\025target_entity_id_" +
-      "list\030\330\001 \003(\r\022\021\n\tentity_id\030\n \001(\r\022\023\n\013CNIILE" +
-      "KPCMD\030\006 \001(\010B\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "KFLCCD\030\r \001(\010\022\027\n\017owner_entity_id\030\016 \001(\r\022\026\n" +
+      "\ris_async_load\030\266\003 \001(\010\022\037\n\027target_lock_poi" +
+      "nt_index\030\010 \001(\r\022 \n\017InitEulerAngles\030\004 \001(\0132" +
+      "\007.Vector\022\034\n\024prop_owner_entity_id\030\001 \001(\r\022\021" +
+      "\n\tcamp_type\030\005 \001(\r\022\"\n\014forward_type\030\007 \001(\0162" +
+      "\014.ForwardType\022\030\n\007InitPos\030\t \001(\0132\007.Vector\022" +
+      "\030\n\020target_entity_id\030\002 \001(\r\022\021\n\tconfig_id\030\017" +
+      " \001(\r\022\017\n\007camp_id\030\014 \001(\r\022\036\n\025target_entity_i" +
+      "d_list\030\330\001 \003(\r\022\021\n\tentity_id\030\n \001(\r\022\023\n\013CNII" +
+      "LEKPCMD\030\006 \001(\010B\033\n\031emu.grasscutter.net.pro" +
+      "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2372,7 +2372,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
     internal_static_EvtCreateGadgetNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtCreateGadgetNotify_descriptor,
-        new java.lang.String[] { "Guid", "TargetLockPointIndexList", "RoomId", "IsPeerIdFromPlayer", "HEPFGKFLCCD", "OwnerEntityId", "OFGGANCKDLM", "TargetLockPointIndex", "InitEulerAngles", "PropOwnerEntityId", "CampType", "ForwardType", "InitPos", "TargetEntityId", "ConfigId", "CampId", "TargetEntityIdList", "EntityId", "CNIILEKPCMD", });
+        new java.lang.String[] { "Guid", "TargetLockPointIndexList", "RoomId", "IsPeerIdFromPlayer", "HEPFGKFLCCD", "OwnerEntityId", "IsAsyncLoad", "TargetLockPointIndex", "InitEulerAngles", "PropOwnerEntityId", "CampType", "ForwardType", "InitPos", "TargetEntityId", "ConfigId", "CampId", "TargetEntityIdList", "EntityId", "CNIILEKPCMD", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java
index db6e2d740..494a707a2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java
@@ -19,10 +19,10 @@ public final class ForgeQueueDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * uint32 POMGMIIKMGK = 13;
-     * @return The pOMGMIIKMGK.
+     * uint32 queue_id = 13;
+     * @return The queueId.
      */
-    int getPOMGMIIKMGK();
+    int getQueueId();
 
     /**
      * uint32 avatar_id = 8;
@@ -31,28 +31,28 @@ public final class ForgeQueueDataOuterClass {
     int getAvatarId();
 
     /**
-     * uint32 FEAIEFCFKJK = 3;
-     * @return The fEAIEFCFKJK.
+     * uint32 finish_count = 3;
+     * @return The finishCount.
      */
-    int getFEAIEFCFKJK();
+    int getFinishCount();
 
     /**
-     * uint32 MNHMIPIKBIH = 14;
-     * @return The mNHMIPIKBIH.
+     * uint32 unfinish_count = 14;
+     * @return The unfinishCount.
      */
-    int getMNHMIPIKBIH();
+    int getUnfinishCount();
 
     /**
-     * uint32 JAJEGBOFAEE = 11;
-     * @return The jAJEGBOFAEE.
+     * uint32 total_finish_timestamp = 11;
+     * @return The totalFinishTimestamp.
      */
-    int getJAJEGBOFAEE();
+    int getTotalFinishTimestamp();
 
     /**
-     * uint32 DLAMPPPDANO = 4;
-     * @return The dLAMPPPDANO.
+     * uint32 next_finish_timestamp = 4;
+     * @return The nextFinishTimestamp.
      */
-    int getDLAMPPPDANO();
+    int getNextFinishTimestamp();
 
     /**
      * uint32 forge_id = 15;
@@ -111,12 +111,12 @@ public final class ForgeQueueDataOuterClass {
               break;
             case 24: {
 
-              fEAIEFCFKJK_ = input.readUInt32();
+              finishCount_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              dLAMPPPDANO_ = input.readUInt32();
+              nextFinishTimestamp_ = input.readUInt32();
               break;
             }
             case 64: {
@@ -126,17 +126,17 @@ public final class ForgeQueueDataOuterClass {
             }
             case 88: {
 
-              jAJEGBOFAEE_ = input.readUInt32();
+              totalFinishTimestamp_ = input.readUInt32();
               break;
             }
             case 104: {
 
-              pOMGMIIKMGK_ = input.readUInt32();
+              queueId_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              mNHMIPIKBIH_ = input.readUInt32();
+              unfinishCount_ = 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 POMGMIIKMGK_FIELD_NUMBER = 13;
-    private int pOMGMIIKMGK_;
+    public static final int QUEUE_ID_FIELD_NUMBER = 13;
+    private int queueId_;
     /**
-     * uint32 POMGMIIKMGK = 13;
-     * @return The pOMGMIIKMGK.
+     * uint32 queue_id = 13;
+     * @return The queueId.
      */
     @java.lang.Override
-    public int getPOMGMIIKMGK() {
-      return pOMGMIIKMGK_;
+    public int getQueueId() {
+      return queueId_;
     }
 
     public static final int AVATAR_ID_FIELD_NUMBER = 8;
@@ -198,48 +198,48 @@ public final class ForgeQueueDataOuterClass {
       return avatarId_;
     }
 
-    public static final int FEAIEFCFKJK_FIELD_NUMBER = 3;
-    private int fEAIEFCFKJK_;
+    public static final int FINISH_COUNT_FIELD_NUMBER = 3;
+    private int finishCount_;
     /**
-     * uint32 FEAIEFCFKJK = 3;
-     * @return The fEAIEFCFKJK.
+     * uint32 finish_count = 3;
+     * @return The finishCount.
      */
     @java.lang.Override
-    public int getFEAIEFCFKJK() {
-      return fEAIEFCFKJK_;
+    public int getFinishCount() {
+      return finishCount_;
     }
 
-    public static final int MNHMIPIKBIH_FIELD_NUMBER = 14;
-    private int mNHMIPIKBIH_;
+    public static final int UNFINISH_COUNT_FIELD_NUMBER = 14;
+    private int unfinishCount_;
     /**
-     * uint32 MNHMIPIKBIH = 14;
-     * @return The mNHMIPIKBIH.
+     * uint32 unfinish_count = 14;
+     * @return The unfinishCount.
      */
     @java.lang.Override
-    public int getMNHMIPIKBIH() {
-      return mNHMIPIKBIH_;
+    public int getUnfinishCount() {
+      return unfinishCount_;
     }
 
-    public static final int JAJEGBOFAEE_FIELD_NUMBER = 11;
-    private int jAJEGBOFAEE_;
+    public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 11;
+    private int totalFinishTimestamp_;
     /**
-     * uint32 JAJEGBOFAEE = 11;
-     * @return The jAJEGBOFAEE.
+     * uint32 total_finish_timestamp = 11;
+     * @return The totalFinishTimestamp.
      */
     @java.lang.Override
-    public int getJAJEGBOFAEE() {
-      return jAJEGBOFAEE_;
+    public int getTotalFinishTimestamp() {
+      return totalFinishTimestamp_;
     }
 
-    public static final int DLAMPPPDANO_FIELD_NUMBER = 4;
-    private int dLAMPPPDANO_;
+    public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 4;
+    private int nextFinishTimestamp_;
     /**
-     * uint32 DLAMPPPDANO = 4;
-     * @return The dLAMPPPDANO.
+     * uint32 next_finish_timestamp = 4;
+     * @return The nextFinishTimestamp.
      */
     @java.lang.Override
-    public int getDLAMPPPDANO() {
-      return dLAMPPPDANO_;
+    public int getNextFinishTimestamp() {
+      return nextFinishTimestamp_;
     }
 
     public static final int FORGE_ID_FIELD_NUMBER = 15;
@@ -267,23 +267,23 @@ public final class ForgeQueueDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (fEAIEFCFKJK_ != 0) {
-        output.writeUInt32(3, fEAIEFCFKJK_);
+      if (finishCount_ != 0) {
+        output.writeUInt32(3, finishCount_);
       }
-      if (dLAMPPPDANO_ != 0) {
-        output.writeUInt32(4, dLAMPPPDANO_);
+      if (nextFinishTimestamp_ != 0) {
+        output.writeUInt32(4, nextFinishTimestamp_);
       }
       if (avatarId_ != 0) {
         output.writeUInt32(8, avatarId_);
       }
-      if (jAJEGBOFAEE_ != 0) {
-        output.writeUInt32(11, jAJEGBOFAEE_);
+      if (totalFinishTimestamp_ != 0) {
+        output.writeUInt32(11, totalFinishTimestamp_);
       }
-      if (pOMGMIIKMGK_ != 0) {
-        output.writeUInt32(13, pOMGMIIKMGK_);
+      if (queueId_ != 0) {
+        output.writeUInt32(13, queueId_);
       }
-      if (mNHMIPIKBIH_ != 0) {
-        output.writeUInt32(14, mNHMIPIKBIH_);
+      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 (fEAIEFCFKJK_ != 0) {
+      if (finishCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, fEAIEFCFKJK_);
+          .computeUInt32Size(3, finishCount_);
       }
-      if (dLAMPPPDANO_ != 0) {
+      if (nextFinishTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, dLAMPPPDANO_);
+          .computeUInt32Size(4, nextFinishTimestamp_);
       }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(8, avatarId_);
       }
-      if (jAJEGBOFAEE_ != 0) {
+      if (totalFinishTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, jAJEGBOFAEE_);
+          .computeUInt32Size(11, totalFinishTimestamp_);
       }
-      if (pOMGMIIKMGK_ != 0) {
+      if (queueId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, pOMGMIIKMGK_);
+          .computeUInt32Size(13, queueId_);
       }
-      if (mNHMIPIKBIH_ != 0) {
+      if (unfinishCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, mNHMIPIKBIH_);
+          .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 (getPOMGMIIKMGK()
-          != other.getPOMGMIIKMGK()) return false;
+      if (getQueueId()
+          != other.getQueueId()) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
-      if (getFEAIEFCFKJK()
-          != other.getFEAIEFCFKJK()) return false;
-      if (getMNHMIPIKBIH()
-          != other.getMNHMIPIKBIH()) return false;
-      if (getJAJEGBOFAEE()
-          != other.getJAJEGBOFAEE()) return false;
-      if (getDLAMPPPDANO()
-          != other.getDLAMPPPDANO()) return false;
+      if (getFinishCount()
+          != other.getFinishCount()) return false;
+      if (getUnfinishCount()
+          != other.getUnfinishCount()) return false;
+      if (getTotalFinishTimestamp()
+          != other.getTotalFinishTimestamp()) return false;
+      if (getNextFinishTimestamp()
+          != other.getNextFinishTimestamp()) 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) + POMGMIIKMGK_FIELD_NUMBER;
-      hash = (53 * hash) + getPOMGMIIKMGK();
+      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) + FEAIEFCFKJK_FIELD_NUMBER;
-      hash = (53 * hash) + getFEAIEFCFKJK();
-      hash = (37 * hash) + MNHMIPIKBIH_FIELD_NUMBER;
-      hash = (53 * hash) + getMNHMIPIKBIH();
-      hash = (37 * hash) + JAJEGBOFAEE_FIELD_NUMBER;
-      hash = (53 * hash) + getJAJEGBOFAEE();
-      hash = (37 * hash) + DLAMPPPDANO_FIELD_NUMBER;
-      hash = (53 * hash) + getDLAMPPPDANO();
+      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) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER;
+      hash = (53 * hash) + getNextFinishTimestamp();
       hash = (37 * hash) + FORGE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getForgeId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -516,17 +516,17 @@ public final class ForgeQueueDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pOMGMIIKMGK_ = 0;
+        queueId_ = 0;
 
         avatarId_ = 0;
 
-        fEAIEFCFKJK_ = 0;
+        finishCount_ = 0;
 
-        mNHMIPIKBIH_ = 0;
+        unfinishCount_ = 0;
 
-        jAJEGBOFAEE_ = 0;
+        totalFinishTimestamp_ = 0;
 
-        dLAMPPPDANO_ = 0;
+        nextFinishTimestamp_ = 0;
 
         forgeId_ = 0;
 
@@ -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.pOMGMIIKMGK_ = pOMGMIIKMGK_;
+        result.queueId_ = queueId_;
         result.avatarId_ = avatarId_;
-        result.fEAIEFCFKJK_ = fEAIEFCFKJK_;
-        result.mNHMIPIKBIH_ = mNHMIPIKBIH_;
-        result.jAJEGBOFAEE_ = jAJEGBOFAEE_;
-        result.dLAMPPPDANO_ = dLAMPPPDANO_;
+        result.finishCount_ = finishCount_;
+        result.unfinishCount_ = unfinishCount_;
+        result.totalFinishTimestamp_ = totalFinishTimestamp_;
+        result.nextFinishTimestamp_ = nextFinishTimestamp_;
         result.forgeId_ = forgeId_;
         onBuilt();
         return result;
@@ -611,23 +611,23 @@ 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.getPOMGMIIKMGK() != 0) {
-          setPOMGMIIKMGK(other.getPOMGMIIKMGK());
+        if (other.getQueueId() != 0) {
+          setQueueId(other.getQueueId());
         }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
         }
-        if (other.getFEAIEFCFKJK() != 0) {
-          setFEAIEFCFKJK(other.getFEAIEFCFKJK());
+        if (other.getFinishCount() != 0) {
+          setFinishCount(other.getFinishCount());
         }
-        if (other.getMNHMIPIKBIH() != 0) {
-          setMNHMIPIKBIH(other.getMNHMIPIKBIH());
+        if (other.getUnfinishCount() != 0) {
+          setUnfinishCount(other.getUnfinishCount());
         }
-        if (other.getJAJEGBOFAEE() != 0) {
-          setJAJEGBOFAEE(other.getJAJEGBOFAEE());
+        if (other.getTotalFinishTimestamp() != 0) {
+          setTotalFinishTimestamp(other.getTotalFinishTimestamp());
         }
-        if (other.getDLAMPPPDANO() != 0) {
-          setDLAMPPPDANO(other.getDLAMPPPDANO());
+        if (other.getNextFinishTimestamp() != 0) {
+          setNextFinishTimestamp(other.getNextFinishTimestamp());
         }
         if (other.getForgeId() != 0) {
           setForgeId(other.getForgeId());
@@ -661,33 +661,33 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
 
-      private int pOMGMIIKMGK_ ;
+      private int queueId_ ;
       /**
-       * uint32 POMGMIIKMGK = 13;
-       * @return The pOMGMIIKMGK.
+       * uint32 queue_id = 13;
+       * @return The queueId.
        */
       @java.lang.Override
-      public int getPOMGMIIKMGK() {
-        return pOMGMIIKMGK_;
+      public int getQueueId() {
+        return queueId_;
       }
       /**
-       * uint32 POMGMIIKMGK = 13;
-       * @param value The pOMGMIIKMGK to set.
+       * uint32 queue_id = 13;
+       * @param value The queueId to set.
        * @return This builder for chaining.
        */
-      public Builder setPOMGMIIKMGK(int value) {
+      public Builder setQueueId(int value) {
         
-        pOMGMIIKMGK_ = value;
+        queueId_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 POMGMIIKMGK = 13;
+       * uint32 queue_id = 13;
        * @return This builder for chaining.
        */
-      public Builder clearPOMGMIIKMGK() {
+      public Builder clearQueueId() {
         
-        pOMGMIIKMGK_ = 0;
+        queueId_ = 0;
         onChanged();
         return this;
       }
@@ -723,126 +723,126 @@ public final class ForgeQueueDataOuterClass {
         return this;
       }
 
-      private int fEAIEFCFKJK_ ;
+      private int finishCount_ ;
       /**
-       * uint32 FEAIEFCFKJK = 3;
-       * @return The fEAIEFCFKJK.
+       * uint32 finish_count = 3;
+       * @return The finishCount.
        */
       @java.lang.Override
-      public int getFEAIEFCFKJK() {
-        return fEAIEFCFKJK_;
+      public int getFinishCount() {
+        return finishCount_;
       }
       /**
-       * uint32 FEAIEFCFKJK = 3;
-       * @param value The fEAIEFCFKJK to set.
+       * uint32 finish_count = 3;
+       * @param value The finishCount to set.
        * @return This builder for chaining.
        */
-      public Builder setFEAIEFCFKJK(int value) {
+      public Builder setFinishCount(int value) {
         
-        fEAIEFCFKJK_ = value;
+        finishCount_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 FEAIEFCFKJK = 3;
+       * uint32 finish_count = 3;
        * @return This builder for chaining.
        */
-      public Builder clearFEAIEFCFKJK() {
+      public Builder clearFinishCount() {
         
-        fEAIEFCFKJK_ = 0;
+        finishCount_ = 0;
         onChanged();
         return this;
       }
 
-      private int mNHMIPIKBIH_ ;
+      private int unfinishCount_ ;
       /**
-       * uint32 MNHMIPIKBIH = 14;
-       * @return The mNHMIPIKBIH.
+       * uint32 unfinish_count = 14;
+       * @return The unfinishCount.
        */
       @java.lang.Override
-      public int getMNHMIPIKBIH() {
-        return mNHMIPIKBIH_;
+      public int getUnfinishCount() {
+        return unfinishCount_;
       }
       /**
-       * uint32 MNHMIPIKBIH = 14;
-       * @param value The mNHMIPIKBIH to set.
+       * uint32 unfinish_count = 14;
+       * @param value The unfinishCount to set.
        * @return This builder for chaining.
        */
-      public Builder setMNHMIPIKBIH(int value) {
+      public Builder setUnfinishCount(int value) {
         
-        mNHMIPIKBIH_ = value;
+        unfinishCount_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 MNHMIPIKBIH = 14;
+       * uint32 unfinish_count = 14;
        * @return This builder for chaining.
        */
-      public Builder clearMNHMIPIKBIH() {
+      public Builder clearUnfinishCount() {
         
-        mNHMIPIKBIH_ = 0;
+        unfinishCount_ = 0;
         onChanged();
         return this;
       }
 
-      private int jAJEGBOFAEE_ ;
+      private int totalFinishTimestamp_ ;
       /**
-       * uint32 JAJEGBOFAEE = 11;
-       * @return The jAJEGBOFAEE.
+       * uint32 total_finish_timestamp = 11;
+       * @return The totalFinishTimestamp.
        */
       @java.lang.Override
-      public int getJAJEGBOFAEE() {
-        return jAJEGBOFAEE_;
+      public int getTotalFinishTimestamp() {
+        return totalFinishTimestamp_;
       }
       /**
-       * uint32 JAJEGBOFAEE = 11;
-       * @param value The jAJEGBOFAEE to set.
+       * uint32 total_finish_timestamp = 11;
+       * @param value The totalFinishTimestamp to set.
        * @return This builder for chaining.
        */
-      public Builder setJAJEGBOFAEE(int value) {
+      public Builder setTotalFinishTimestamp(int value) {
         
-        jAJEGBOFAEE_ = value;
+        totalFinishTimestamp_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 JAJEGBOFAEE = 11;
+       * uint32 total_finish_timestamp = 11;
        * @return This builder for chaining.
        */
-      public Builder clearJAJEGBOFAEE() {
+      public Builder clearTotalFinishTimestamp() {
         
-        jAJEGBOFAEE_ = 0;
+        totalFinishTimestamp_ = 0;
         onChanged();
         return this;
       }
 
-      private int dLAMPPPDANO_ ;
+      private int nextFinishTimestamp_ ;
       /**
-       * uint32 DLAMPPPDANO = 4;
-       * @return The dLAMPPPDANO.
+       * uint32 next_finish_timestamp = 4;
+       * @return The nextFinishTimestamp.
        */
       @java.lang.Override
-      public int getDLAMPPPDANO() {
-        return dLAMPPPDANO_;
+      public int getNextFinishTimestamp() {
+        return nextFinishTimestamp_;
       }
       /**
-       * uint32 DLAMPPPDANO = 4;
-       * @param value The dLAMPPPDANO to set.
+       * uint32 next_finish_timestamp = 4;
+       * @param value The nextFinishTimestamp to set.
        * @return This builder for chaining.
        */
-      public Builder setDLAMPPPDANO(int value) {
+      public Builder setNextFinishTimestamp(int value) {
         
-        dLAMPPPDANO_ = value;
+        nextFinishTimestamp_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 DLAMPPPDANO = 4;
+       * uint32 next_finish_timestamp = 4;
        * @return This builder for chaining.
        */
-      public Builder clearDLAMPPPDANO() {
+      public Builder clearNextFinishTimestamp() {
         
-        dLAMPPPDANO_ = 0;
+        nextFinishTimestamp_ = 0;
         onChanged();
         return this;
       }
@@ -944,12 +944,13 @@ public final class ForgeQueueDataOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024ForgeQueueData.proto\"\236\001\n\016ForgeQueueDat" +
-      "a\022\023\n\013POMGMIIKMGK\030\r \001(\r\022\021\n\tavatar_id\030\010 \001(" +
-      "\r\022\023\n\013FEAIEFCFKJK\030\003 \001(\r\022\023\n\013MNHMIPIKBIH\030\016 " +
-      "\001(\r\022\023\n\013JAJEGBOFAEE\030\013 \001(\r\022\023\n\013DLAMPPPDANO\030" +
-      "\004 \001(\r\022\020\n\010forge_id\030\017 \001(\rB\033\n\031emu.grasscutt" +
-      "er.net.protob\006proto3"
+      "\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" +
+      "\n\014finish_count\030\003 \001(\r\022\026\n\016unfinish_count\030\016" +
+      " \001(\r\022\036\n\026total_finish_timestamp\030\013 \001(\r\022\035\n\025" +
+      "next_finish_timestamp\030\004 \001(\r\022\020\n\010forge_id\030" +
+      "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -960,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[] { "POMGMIIKMGK", "AvatarId", "FEAIEFCFKJK", "MNHMIPIKBIH", "JAJEGBOFAEE", "DLAMPPPDANO", "ForgeId", });
+        new java.lang.String[] { "QueueId", "AvatarId", "FinishCount", "UnfinishCount", "TotalFinishTimestamp", "NextFinishTimestamp", "ForgeId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java
index ba841370f..3ad24c212 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java
@@ -114,10 +114,10 @@ public final class FriendBriefOuterClass {
     int getNameCardId();
 
     /**
-     * uint32 PKANPMBCGGH = 14;
-     * @return The pKANPMBCGGH.
+     * uint32 last_active_time = 14;
+     * @return The lastActiveTime.
      */
-    int getPKANPMBCGGH();
+    int getLastActiveTime();
 
     /**
      * bool is_chat_no_disturb = 15;
@@ -217,10 +217,10 @@ public final class FriendBriefOuterClass {
     emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType getPlatformType();
 
     /**
-     * bool IEAHDCLDOEJ = 28;
-     * @return The iEAHDCLDOEJ.
+     * bool is_game_source = 28;
+     * @return The isGameSource.
      */
-    boolean getIEAHDCLDOEJ();
+    boolean getIsGameSource();
 
     /**
      * bool BJFJJMGENCH = 29;
@@ -352,7 +352,7 @@ public final class FriendBriefOuterClass {
             }
             case 112: {
 
-              pKANPMBCGGH_ = input.readUInt32();
+              lastActiveTime_ = input.readUInt32();
               break;
             }
             case 120: {
@@ -417,7 +417,7 @@ public final class FriendBriefOuterClass {
             }
             case 224: {
 
-              iEAHDCLDOEJ_ = input.readBool();
+              isGameSource_ = input.readBool();
               break;
             }
             case 232: {
@@ -681,15 +681,15 @@ public final class FriendBriefOuterClass {
       return nameCardId_;
     }
 
-    public static final int PKANPMBCGGH_FIELD_NUMBER = 14;
-    private int pKANPMBCGGH_;
+    public static final int LAST_ACTIVE_TIME_FIELD_NUMBER = 14;
+    private int lastActiveTime_;
     /**
-     * uint32 PKANPMBCGGH = 14;
-     * @return The pKANPMBCGGH.
+     * uint32 last_active_time = 14;
+     * @return The lastActiveTime.
      */
     @java.lang.Override
-    public int getPKANPMBCGGH() {
-      return pKANPMBCGGH_;
+    public int getLastActiveTime() {
+      return lastActiveTime_;
     }
 
     public static final int IS_CHAT_NO_DISTURB_FIELD_NUMBER = 15;
@@ -878,15 +878,15 @@ public final class FriendBriefOuterClass {
       return result == null ? emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType.UNRECOGNIZED : result;
     }
 
-    public static final int IEAHDCLDOEJ_FIELD_NUMBER = 28;
-    private boolean iEAHDCLDOEJ_;
+    public static final int IS_GAME_SOURCE_FIELD_NUMBER = 28;
+    private boolean isGameSource_;
     /**
-     * bool IEAHDCLDOEJ = 28;
-     * @return The iEAHDCLDOEJ.
+     * bool is_game_source = 28;
+     * @return The isGameSource.
      */
     @java.lang.Override
-    public boolean getIEAHDCLDOEJ() {
-      return iEAHDCLDOEJ_;
+    public boolean getIsGameSource() {
+      return isGameSource_;
     }
 
     public static final int BJFJJMGENCH_FIELD_NUMBER = 29;
@@ -950,8 +950,8 @@ public final class FriendBriefOuterClass {
       if (nameCardId_ != 0) {
         output.writeUInt32(13, nameCardId_);
       }
-      if (pKANPMBCGGH_ != 0) {
-        output.writeUInt32(14, pKANPMBCGGH_);
+      if (lastActiveTime_ != 0) {
+        output.writeUInt32(14, lastActiveTime_);
       }
       if (isChatNoDisturb_ != false) {
         output.writeBool(15, isChatNoDisturb_);
@@ -980,8 +980,8 @@ public final class FriendBriefOuterClass {
       if (platformType_ != emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType.PLATFORM_TYPE_EDITOR.getNumber()) {
         output.writeEnum(27, platformType_);
       }
-      if (iEAHDCLDOEJ_ != false) {
-        output.writeBool(28, iEAHDCLDOEJ_);
+      if (isGameSource_ != false) {
+        output.writeBool(28, isGameSource_);
       }
       if (bJFJJMGENCH_ != false) {
         output.writeBool(29, bJFJJMGENCH_);
@@ -1040,9 +1040,9 @@ public final class FriendBriefOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(13, nameCardId_);
       }
-      if (pKANPMBCGGH_ != 0) {
+      if (lastActiveTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, pKANPMBCGGH_);
+          .computeUInt32Size(14, lastActiveTime_);
       }
       if (isChatNoDisturb_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -1079,9 +1079,9 @@ public final class FriendBriefOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(27, platformType_);
       }
-      if (iEAHDCLDOEJ_ != false) {
+      if (isGameSource_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(28, iEAHDCLDOEJ_);
+          .computeBoolSize(28, isGameSource_);
       }
       if (bJFJJMGENCH_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -1125,8 +1125,8 @@ public final class FriendBriefOuterClass {
           != other.getNHCJGKFNCFD()) return false;
       if (getNameCardId()
           != other.getNameCardId()) return false;
-      if (getPKANPMBCGGH()
-          != other.getPKANPMBCGGH()) return false;
+      if (getLastActiveTime()
+          != other.getLastActiveTime()) return false;
       if (getIsChatNoDisturb()
           != other.getIsChatNoDisturb()) return false;
       if (getEFMMMOPAPAK()
@@ -1146,8 +1146,8 @@ public final class FriendBriefOuterClass {
       if (getFNCJLBGOBAE()
           != other.getFNCJLBGOBAE()) return false;
       if (platformType_ != other.platformType_) return false;
-      if (getIEAHDCLDOEJ()
-          != other.getIEAHDCLDOEJ()) return false;
+      if (getIsGameSource()
+          != other.getIsGameSource()) return false;
       if (getBJFJJMGENCH()
           != other.getBJFJJMGENCH()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -1186,8 +1186,8 @@ public final class FriendBriefOuterClass {
       hash = (53 * hash) + getNHCJGKFNCFD();
       hash = (37 * hash) + NAME_CARD_ID_FIELD_NUMBER;
       hash = (53 * hash) + getNameCardId();
-      hash = (37 * hash) + PKANPMBCGGH_FIELD_NUMBER;
-      hash = (53 * hash) + getPKANPMBCGGH();
+      hash = (37 * hash) + LAST_ACTIVE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getLastActiveTime();
       hash = (37 * hash) + IS_CHAT_NO_DISTURB_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsChatNoDisturb());
@@ -1213,9 +1213,9 @@ public final class FriendBriefOuterClass {
           getFNCJLBGOBAE());
       hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + platformType_;
-      hash = (37 * hash) + IEAHDCLDOEJ_FIELD_NUMBER;
+      hash = (37 * hash) + IS_GAME_SOURCE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIEAHDCLDOEJ());
+          getIsGameSource());
       hash = (37 * hash) + BJFJJMGENCH_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getBJFJJMGENCH());
@@ -1381,7 +1381,7 @@ public final class FriendBriefOuterClass {
 
         nameCardId_ = 0;
 
-        pKANPMBCGGH_ = 0;
+        lastActiveTime_ = 0;
 
         isChatNoDisturb_ = false;
 
@@ -1409,7 +1409,7 @@ public final class FriendBriefOuterClass {
 
         platformType_ = 0;
 
-        iEAHDCLDOEJ_ = false;
+        isGameSource_ = false;
 
         bJFJJMGENCH_ = false;
 
@@ -1452,7 +1452,7 @@ public final class FriendBriefOuterClass {
         result.onlineId_ = onlineId_;
         result.nHCJGKFNCFD_ = nHCJGKFNCFD_;
         result.nameCardId_ = nameCardId_;
-        result.pKANPMBCGGH_ = pKANPMBCGGH_;
+        result.lastActiveTime_ = lastActiveTime_;
         result.isChatNoDisturb_ = isChatNoDisturb_;
         result.eFMMMOPAPAK_ = eFMMMOPAPAK_;
         result.remarkName_ = remarkName_;
@@ -1474,7 +1474,7 @@ public final class FriendBriefOuterClass {
         result.pBFEPMNHMPL_ = pBFEPMNHMPL_;
         result.fNCJLBGOBAE_ = fNCJLBGOBAE_;
         result.platformType_ = platformType_;
-        result.iEAHDCLDOEJ_ = iEAHDCLDOEJ_;
+        result.isGameSource_ = isGameSource_;
         result.bJFJJMGENCH_ = bJFJJMGENCH_;
         onBuilt();
         return result;
@@ -1563,8 +1563,8 @@ public final class FriendBriefOuterClass {
         if (other.getNameCardId() != 0) {
           setNameCardId(other.getNameCardId());
         }
-        if (other.getPKANPMBCGGH() != 0) {
-          setPKANPMBCGGH(other.getPKANPMBCGGH());
+        if (other.getLastActiveTime() != 0) {
+          setLastActiveTime(other.getLastActiveTime());
         }
         if (other.getIsChatNoDisturb() != false) {
           setIsChatNoDisturb(other.getIsChatNoDisturb());
@@ -1617,8 +1617,8 @@ public final class FriendBriefOuterClass {
         if (other.platformType_ != 0) {
           setPlatformTypeValue(other.getPlatformTypeValue());
         }
-        if (other.getIEAHDCLDOEJ() != false) {
-          setIEAHDCLDOEJ(other.getIEAHDCLDOEJ());
+        if (other.getIsGameSource() != false) {
+          setIsGameSource(other.getIsGameSource());
         }
         if (other.getBJFJJMGENCH() != false) {
           setBJFJJMGENCH(other.getBJFJJMGENCH());
@@ -2183,33 +2183,33 @@ public final class FriendBriefOuterClass {
         return this;
       }
 
-      private int pKANPMBCGGH_ ;
+      private int lastActiveTime_ ;
       /**
-       * uint32 PKANPMBCGGH = 14;
-       * @return The pKANPMBCGGH.
+       * uint32 last_active_time = 14;
+       * @return The lastActiveTime.
        */
       @java.lang.Override
-      public int getPKANPMBCGGH() {
-        return pKANPMBCGGH_;
+      public int getLastActiveTime() {
+        return lastActiveTime_;
       }
       /**
-       * uint32 PKANPMBCGGH = 14;
-       * @param value The pKANPMBCGGH to set.
+       * uint32 last_active_time = 14;
+       * @param value The lastActiveTime to set.
        * @return This builder for chaining.
        */
-      public Builder setPKANPMBCGGH(int value) {
+      public Builder setLastActiveTime(int value) {
         
-        pKANPMBCGGH_ = value;
+        lastActiveTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 PKANPMBCGGH = 14;
+       * uint32 last_active_time = 14;
        * @return This builder for chaining.
        */
-      public Builder clearPKANPMBCGGH() {
+      public Builder clearLastActiveTime() {
         
-        pKANPMBCGGH_ = 0;
+        lastActiveTime_ = 0;
         onChanged();
         return this;
       }
@@ -2881,33 +2881,33 @@ public final class FriendBriefOuterClass {
         return this;
       }
 
-      private boolean iEAHDCLDOEJ_ ;
+      private boolean isGameSource_ ;
       /**
-       * bool IEAHDCLDOEJ = 28;
-       * @return The iEAHDCLDOEJ.
+       * bool is_game_source = 28;
+       * @return The isGameSource.
        */
       @java.lang.Override
-      public boolean getIEAHDCLDOEJ() {
-        return iEAHDCLDOEJ_;
+      public boolean getIsGameSource() {
+        return isGameSource_;
       }
       /**
-       * bool IEAHDCLDOEJ = 28;
-       * @param value The iEAHDCLDOEJ to set.
+       * bool is_game_source = 28;
+       * @param value The isGameSource to set.
        * @return This builder for chaining.
        */
-      public Builder setIEAHDCLDOEJ(boolean value) {
+      public Builder setIsGameSource(boolean value) {
         
-        iEAHDCLDOEJ_ = value;
+        isGameSource_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool IEAHDCLDOEJ = 28;
+       * bool is_game_source = 28;
        * @return This builder for chaining.
        */
-      public Builder clearIEAHDCLDOEJ() {
+      public Builder clearIsGameSource() {
         
-        iEAHDCLDOEJ_ = false;
+        isGameSource_ = false;
         onChanged();
         return this;
       }
@@ -3012,24 +3012,24 @@ public final class FriendBriefOuterClass {
       "\n\021FriendBrief.proto\032\027FriendOnlineState.p" +
       "roto\032\032SocialShowAvatarInfo.proto\032\033Friend" +
       "EnterHomeOption.proto\032\024ProfilePicture.pr" +
-      "oto\032\022PlatformType.proto\"\372\004\n\013FriendBrief\022" +
+      "oto\032\022PlatformType.proto\"\202\005\n\013FriendBrief\022" +
       "\013\n\003uid\030\001 \001(\r\022\020\n\010nickname\030\002 \001(\t\022\r\n\005level\030" +
       "\003 \001(\r\022\021\n\tavatar_id\030\004 \001(\r\022\023\n\013world_level\030" +
       "\005 \001(\r\022\021\n\tsignature\030\006 \001(\t\022(\n\014online_state" +
       "\030\007 \001(\0162\022.FriendOnlineState\022\r\n\005param\030\010 \001(" +
       "\r\022\034\n\024is_mp_mode_available\030\n \001(\010\022\021\n\tonlin" +
       "e_id\030\013 \001(\t\022\023\n\013NHCJGKFNCFD\030\014 \001(\r\022\024\n\014name_" +
-      "card_id\030\r \001(\r\022\023\n\013PKANPMBCGGH\030\016 \001(\r\022\032\n\022is" +
-      "_chat_no_disturb\030\017 \001(\010\022\023\n\013EFMMMOPAPAK\030\020 " +
-      "\001(\r\022\023\n\013remark_name\030\021 \001(\t\0224\n\025show_avatar_" +
-      "info_list\030\026 \003(\0132\025.SocialShowAvatarInfo\0228" +
-      "\n\030friend_enter_home_option\030\027 \001(\0162\026.Frien" +
-      "dEnterHomeOption\022(\n\017profile_picture\030\030 \001(" +
-      "\0132\017.ProfilePicture\022\023\n\013PBFEPMNHMPL\030\031 \001(\010\022" +
-      "\023\n\013FNCJLBGOBAE\030\032 \001(\010\022$\n\rplatform_type\030\033 " +
-      "\001(\0162\r.PlatformType\022\023\n\013IEAHDCLDOEJ\030\034 \001(\010\022" +
-      "\023\n\013BJFJJMGENCH\030\035 \001(\010B\033\n\031emu.grasscutter." +
-      "net.protob\006proto3"
+      "card_id\030\r \001(\r\022\030\n\020last_active_time\030\016 \001(\r\022" +
+      "\032\n\022is_chat_no_disturb\030\017 \001(\010\022\023\n\013EFMMMOPAP" +
+      "AK\030\020 \001(\r\022\023\n\013remark_name\030\021 \001(\t\0224\n\025show_av" +
+      "atar_info_list\030\026 \003(\0132\025.SocialShowAvatarI" +
+      "nfo\0228\n\030friend_enter_home_option\030\027 \001(\0162\026." +
+      "FriendEnterHomeOption\022(\n\017profile_picture" +
+      "\030\030 \001(\0132\017.ProfilePicture\022\023\n\013PBFEPMNHMPL\030\031" +
+      " \001(\010\022\023\n\013FNCJLBGOBAE\030\032 \001(\010\022$\n\rplatform_ty" +
+      "pe\030\033 \001(\0162\r.PlatformType\022\026\n\016is_game_sourc" +
+      "e\030\034 \001(\010\022\023\n\013BJFJJMGENCH\030\035 \001(\010B\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3045,7 +3045,7 @@ public final class FriendBriefOuterClass {
     internal_static_FriendBrief_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_FriendBrief_descriptor,
-        new java.lang.String[] { "Uid", "Nickname", "Level", "AvatarId", "WorldLevel", "Signature", "OnlineState", "Param", "IsMpModeAvailable", "OnlineId", "NHCJGKFNCFD", "NameCardId", "PKANPMBCGGH", "IsChatNoDisturb", "EFMMMOPAPAK", "RemarkName", "ShowAvatarInfoList", "FriendEnterHomeOption", "ProfilePicture", "PBFEPMNHMPL", "FNCJLBGOBAE", "PlatformType", "IEAHDCLDOEJ", "BJFJJMGENCH", });
+        new java.lang.String[] { "Uid", "Nickname", "Level", "AvatarId", "WorldLevel", "Signature", "OnlineState", "Param", "IsMpModeAvailable", "OnlineId", "NHCJGKFNCFD", "NameCardId", "LastActiveTime", "IsChatNoDisturb", "EFMMMOPAPAK", "RemarkName", "ShowAvatarInfoList", "FriendEnterHomeOption", "ProfilePicture", "PBFEPMNHMPL", "FNCJLBGOBAE", "PlatformType", "IsGameSource", "BJFJJMGENCH", });
     emu.grasscutter.net.proto.FriendOnlineStateOuterClass.getDescriptor();
     emu.grasscutter.net.proto.SocialShowAvatarInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java
index bce3c1084..b846eb390 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java
@@ -97,21 +97,21 @@ public final class GachaInfoOuterClass {
     int getGachaSortId();
 
     /**
-     * repeated uint32 FFMOBAAKKBH = 1285;
-     * @return A list containing the fFMOBAAKKBH.
+     * repeated uint32 displayUp4ItemList = 1285;
+     * @return A list containing the displayUp4ItemList.
      */
-    java.util.List getFFMOBAAKKBHList();
+    java.util.List getDisplayUp4ItemListList();
     /**
-     * repeated uint32 FFMOBAAKKBH = 1285;
-     * @return The count of fFMOBAAKKBH.
+     * repeated uint32 displayUp4ItemList = 1285;
+     * @return The count of displayUp4ItemList.
      */
-    int getFFMOBAAKKBHCount();
+    int getDisplayUp4ItemListCount();
     /**
-     * repeated uint32 FFMOBAAKKBH = 1285;
+     * repeated uint32 displayUp4ItemList = 1285;
      * @param index The index of the element to return.
-     * @return The fFMOBAAKKBH at the given index.
+     * @return The displayUp4ItemList at the given index.
      */
-    int getFFMOBAAKKBH(int index);
+    int getDisplayUp4ItemList(int index);
 
     /**
      * string gachaRecordUrlOversea = 1181;
@@ -180,21 +180,21 @@ public final class GachaInfoOuterClass {
         getTitleTextmapBytes();
 
     /**
-     * repeated uint32 OCIHCEACNNF = 1831;
-     * @return A list containing the oCIHCEACNNF.
+     * repeated uint32 displayUp5ItemList = 1831;
+     * @return A list containing the displayUp5ItemList.
      */
-    java.util.List getOCIHCEACNNFList();
+    java.util.List getDisplayUp5ItemListList();
     /**
-     * repeated uint32 OCIHCEACNNF = 1831;
-     * @return The count of oCIHCEACNNF.
+     * repeated uint32 displayUp5ItemList = 1831;
+     * @return The count of displayUp5ItemList.
      */
-    int getOCIHCEACNNFCount();
+    int getDisplayUp5ItemListCount();
     /**
-     * repeated uint32 OCIHCEACNNF = 1831;
+     * repeated uint32 displayUp5ItemList = 1831;
      * @param index The index of the element to return.
-     * @return The oCIHCEACNNF at the given index.
+     * @return The displayUp5ItemList at the given index.
      */
-    int getOCIHCEACNNF(int index);
+    int getDisplayUp5ItemList(int index);
 
     /**
      * uint32 gachaTimesLimit = 14;
@@ -274,12 +274,12 @@ public final class GachaInfoOuterClass {
     }
     private GachaInfo() {
       gachaPrefabPath_ = "";
-      fFMOBAAKKBH_ = emptyIntList();
+      displayUp4ItemList_ = emptyIntList();
       gachaRecordUrlOversea_ = "";
       gachaProbUrlOversea_ = "";
       gachaPreviewPrefabPath_ = "";
       titleTextmap_ = "";
-      oCIHCEACNNF_ = emptyIntList();
+      displayUp5ItemList_ = emptyIntList();
       gachaRecordUrl_ = "";
       gachaUpInfoList_ = java.util.Collections.emptyList();
       gachaProbUrl_ = "";
@@ -425,21 +425,21 @@ public final class GachaInfoOuterClass {
             }
             case 10280: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                fFMOBAAKKBH_ = newIntList();
+                displayUp4ItemList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              fFMOBAAKKBH_.addInt(input.readUInt32());
+              displayUp4ItemList_.addInt(input.readUInt32());
               break;
             }
             case 10282: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                fFMOBAAKKBH_ = newIntList();
+                displayUp4ItemList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                fFMOBAAKKBH_.addInt(input.readUInt32());
+                displayUp4ItemList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -470,21 +470,21 @@ public final class GachaInfoOuterClass {
             }
             case 14648: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                oCIHCEACNNF_ = newIntList();
+                displayUp5ItemList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              oCIHCEACNNF_.addInt(input.readUInt32());
+              displayUp5ItemList_.addInt(input.readUInt32());
               break;
             }
             case 14650: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                oCIHCEACNNF_ = newIntList();
+                displayUp5ItemList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                oCIHCEACNNF_.addInt(input.readUInt32());
+                displayUp5ItemList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -505,13 +505,13 @@ public final class GachaInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          fFMOBAAKKBH_.makeImmutable(); // C
+          displayUp4ItemList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
           gachaUpInfoList_ = java.util.Collections.unmodifiableList(gachaUpInfoList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          oCIHCEACNNF_.makeImmutable(); // C
+          displayUp5ItemList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -689,33 +689,33 @@ public final class GachaInfoOuterClass {
       return gachaSortId_;
     }
 
-    public static final int FFMOBAAKKBH_FIELD_NUMBER = 1285;
-    private com.google.protobuf.Internal.IntList fFMOBAAKKBH_;
+    public static final int DISPLAYUP4ITEMLIST_FIELD_NUMBER = 1285;
+    private com.google.protobuf.Internal.IntList displayUp4ItemList_;
     /**
-     * repeated uint32 FFMOBAAKKBH = 1285;
-     * @return A list containing the fFMOBAAKKBH.
+     * repeated uint32 displayUp4ItemList = 1285;
+     * @return A list containing the displayUp4ItemList.
      */
     @java.lang.Override
     public java.util.List
-        getFFMOBAAKKBHList() {
-      return fFMOBAAKKBH_;
+        getDisplayUp4ItemListList() {
+      return displayUp4ItemList_;
     }
     /**
-     * repeated uint32 FFMOBAAKKBH = 1285;
-     * @return The count of fFMOBAAKKBH.
+     * repeated uint32 displayUp4ItemList = 1285;
+     * @return The count of displayUp4ItemList.
      */
-    public int getFFMOBAAKKBHCount() {
-      return fFMOBAAKKBH_.size();
+    public int getDisplayUp4ItemListCount() {
+      return displayUp4ItemList_.size();
     }
     /**
-     * repeated uint32 FFMOBAAKKBH = 1285;
+     * repeated uint32 displayUp4ItemList = 1285;
      * @param index The index of the element to return.
-     * @return The fFMOBAAKKBH at the given index.
+     * @return The displayUp4ItemList at the given index.
      */
-    public int getFFMOBAAKKBH(int index) {
-      return fFMOBAAKKBH_.getInt(index);
+    public int getDisplayUp4ItemList(int index) {
+      return displayUp4ItemList_.getInt(index);
     }
-    private int fFMOBAAKKBHMemoizedSerializedSize = -1;
+    private int displayUp4ItemListMemoizedSerializedSize = -1;
 
     public static final int GACHARECORDURLOVERSEA_FIELD_NUMBER = 1181;
     private volatile java.lang.Object gachaRecordUrlOversea_;
@@ -902,33 +902,33 @@ public final class GachaInfoOuterClass {
       }
     }
 
-    public static final int OCIHCEACNNF_FIELD_NUMBER = 1831;
-    private com.google.protobuf.Internal.IntList oCIHCEACNNF_;
+    public static final int DISPLAYUP5ITEMLIST_FIELD_NUMBER = 1831;
+    private com.google.protobuf.Internal.IntList displayUp5ItemList_;
     /**
-     * repeated uint32 OCIHCEACNNF = 1831;
-     * @return A list containing the oCIHCEACNNF.
+     * repeated uint32 displayUp5ItemList = 1831;
+     * @return A list containing the displayUp5ItemList.
      */
     @java.lang.Override
     public java.util.List
-        getOCIHCEACNNFList() {
-      return oCIHCEACNNF_;
+        getDisplayUp5ItemListList() {
+      return displayUp5ItemList_;
     }
     /**
-     * repeated uint32 OCIHCEACNNF = 1831;
-     * @return The count of oCIHCEACNNF.
+     * repeated uint32 displayUp5ItemList = 1831;
+     * @return The count of displayUp5ItemList.
      */
-    public int getOCIHCEACNNFCount() {
-      return oCIHCEACNNF_.size();
+    public int getDisplayUp5ItemListCount() {
+      return displayUp5ItemList_.size();
     }
     /**
-     * repeated uint32 OCIHCEACNNF = 1831;
+     * repeated uint32 displayUp5ItemList = 1831;
      * @param index The index of the element to return.
-     * @return The oCIHCEACNNF at the given index.
+     * @return The displayUp5ItemList at the given index.
      */
-    public int getOCIHCEACNNF(int index) {
-      return oCIHCEACNNF_.getInt(index);
+    public int getDisplayUp5ItemList(int index) {
+      return displayUp5ItemList_.getInt(index);
     }
-    private int oCIHCEACNNFMemoizedSerializedSize = -1;
+    private int displayUp5ItemListMemoizedSerializedSize = -1;
 
     public static final int GACHATIMESLIMIT_FIELD_NUMBER = 14;
     private int gachaTimesLimit_;
@@ -1143,12 +1143,12 @@ public final class GachaInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrlOversea_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1221, gachaProbUrlOversea_);
       }
-      if (getFFMOBAAKKBHList().size() > 0) {
+      if (getDisplayUp4ItemListList().size() > 0) {
         output.writeUInt32NoTag(10282);
-        output.writeUInt32NoTag(fFMOBAAKKBHMemoizedSerializedSize);
+        output.writeUInt32NoTag(displayUp4ItemListMemoizedSerializedSize);
       }
-      for (int i = 0; i < fFMOBAAKKBH_.size(); i++) {
-        output.writeUInt32NoTag(fFMOBAAKKBH_.getInt(i));
+      for (int i = 0; i < displayUp4ItemList_.size(); i++) {
+        output.writeUInt32NoTag(displayUp4ItemList_.getInt(i));
       }
       if (curScheduleDailyGachaTimes_ != 0) {
         output.writeUInt32(1456, curScheduleDailyGachaTimes_);
@@ -1162,12 +1162,12 @@ public final class GachaInfoOuterClass {
       if (isNewWish_ != false) {
         output.writeBool(1537, isNewWish_);
       }
-      if (getOCIHCEACNNFList().size() > 0) {
+      if (getDisplayUp5ItemListList().size() > 0) {
         output.writeUInt32NoTag(14650);
-        output.writeUInt32NoTag(oCIHCEACNNFMemoizedSerializedSize);
+        output.writeUInt32NoTag(displayUp5ItemListMemoizedSerializedSize);
       }
-      for (int i = 0; i < oCIHCEACNNF_.size(); i++) {
-        output.writeUInt32NoTag(oCIHCEACNNF_.getInt(i));
+      for (int i = 0; i < displayUp5ItemList_.size(); i++) {
+        output.writeUInt32NoTag(displayUp5ItemList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -1253,17 +1253,17 @@ public final class GachaInfoOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < fFMOBAAKKBH_.size(); i++) {
+        for (int i = 0; i < displayUp4ItemList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(fFMOBAAKKBH_.getInt(i));
+            .computeUInt32SizeNoTag(displayUp4ItemList_.getInt(i));
         }
         size += dataSize;
-        if (!getFFMOBAAKKBHList().isEmpty()) {
+        if (!getDisplayUp4ItemListList().isEmpty()) {
           size += 2;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        fFMOBAAKKBHMemoizedSerializedSize = dataSize;
+        displayUp4ItemListMemoizedSerializedSize = dataSize;
       }
       if (curScheduleDailyGachaTimes_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1283,17 +1283,17 @@ public final class GachaInfoOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < oCIHCEACNNF_.size(); i++) {
+        for (int i = 0; i < displayUp5ItemList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(oCIHCEACNNF_.getInt(i));
+            .computeUInt32SizeNoTag(displayUp5ItemList_.getInt(i));
         }
         size += dataSize;
-        if (!getOCIHCEACNNFList().isEmpty()) {
+        if (!getDisplayUp5ItemListList().isEmpty()) {
           size += 2;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        oCIHCEACNNFMemoizedSerializedSize = dataSize;
+        displayUp5ItemListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1334,8 +1334,8 @@ public final class GachaInfoOuterClass {
           != other.getTenCostItemId()) return false;
       if (getGachaSortId()
           != other.getGachaSortId()) return false;
-      if (!getFFMOBAAKKBHList()
-          .equals(other.getFFMOBAAKKBHList())) return false;
+      if (!getDisplayUp4ItemListList()
+          .equals(other.getDisplayUp4ItemListList())) return false;
       if (!getGachaRecordUrlOversea()
           .equals(other.getGachaRecordUrlOversea())) return false;
       if (!getGachaProbUrlOversea()
@@ -1350,8 +1350,8 @@ public final class GachaInfoOuterClass {
           .equals(other.getGachaPreviewPrefabPath())) return false;
       if (!getTitleTextmap()
           .equals(other.getTitleTextmap())) return false;
-      if (!getOCIHCEACNNFList()
-          .equals(other.getOCIHCEACNNFList())) return false;
+      if (!getDisplayUp5ItemListList()
+          .equals(other.getDisplayUp5ItemListList())) return false;
       if (getGachaTimesLimit()
           != other.getGachaTimesLimit()) return false;
       if (!getGachaRecordUrl()
@@ -1398,9 +1398,9 @@ public final class GachaInfoOuterClass {
       hash = (53 * hash) + getTenCostItemId();
       hash = (37 * hash) + GACHASORTID_FIELD_NUMBER;
       hash = (53 * hash) + getGachaSortId();
-      if (getFFMOBAAKKBHCount() > 0) {
-        hash = (37 * hash) + FFMOBAAKKBH_FIELD_NUMBER;
-        hash = (53 * hash) + getFFMOBAAKKBHList().hashCode();
+      if (getDisplayUp4ItemListCount() > 0) {
+        hash = (37 * hash) + DISPLAYUP4ITEMLIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDisplayUp4ItemListList().hashCode();
       }
       hash = (37 * hash) + GACHARECORDURLOVERSEA_FIELD_NUMBER;
       hash = (53 * hash) + getGachaRecordUrlOversea().hashCode();
@@ -1416,9 +1416,9 @@ public final class GachaInfoOuterClass {
       hash = (53 * hash) + getGachaPreviewPrefabPath().hashCode();
       hash = (37 * hash) + TITLETEXTMAP_FIELD_NUMBER;
       hash = (53 * hash) + getTitleTextmap().hashCode();
-      if (getOCIHCEACNNFCount() > 0) {
-        hash = (37 * hash) + OCIHCEACNNF_FIELD_NUMBER;
-        hash = (53 * hash) + getOCIHCEACNNFList().hashCode();
+      if (getDisplayUp5ItemListCount() > 0) {
+        hash = (37 * hash) + DISPLAYUP5ITEMLIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDisplayUp5ItemListList().hashCode();
       }
       hash = (37 * hash) + GACHATIMESLIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getGachaTimesLimit();
@@ -1594,7 +1594,7 @@ public final class GachaInfoOuterClass {
 
         gachaSortId_ = 0;
 
-        fFMOBAAKKBH_ = emptyIntList();
+        displayUp4ItemList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         gachaRecordUrlOversea_ = "";
 
@@ -1610,7 +1610,7 @@ public final class GachaInfoOuterClass {
 
         titleTextmap_ = "";
 
-        oCIHCEACNNF_ = emptyIntList();
+        displayUp5ItemList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         gachaTimesLimit_ = 0;
 
@@ -1666,10 +1666,10 @@ public final class GachaInfoOuterClass {
         result.tenCostItemId_ = tenCostItemId_;
         result.gachaSortId_ = gachaSortId_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          fFMOBAAKKBH_.makeImmutable();
+          displayUp4ItemList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.fFMOBAAKKBH_ = fFMOBAAKKBH_;
+        result.displayUp4ItemList_ = displayUp4ItemList_;
         result.gachaRecordUrlOversea_ = gachaRecordUrlOversea_;
         result.gachaProbUrlOversea_ = gachaProbUrlOversea_;
         result.beginTime_ = beginTime_;
@@ -1678,10 +1678,10 @@ public final class GachaInfoOuterClass {
         result.gachaPreviewPrefabPath_ = gachaPreviewPrefabPath_;
         result.titleTextmap_ = titleTextmap_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          oCIHCEACNNF_.makeImmutable();
+          displayUp5ItemList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.oCIHCEACNNF_ = oCIHCEACNNF_;
+        result.displayUp5ItemList_ = displayUp5ItemList_;
         result.gachaTimesLimit_ = gachaTimesLimit_;
         result.gachaRecordUrl_ = gachaRecordUrl_;
         if (gachaUpInfoListBuilder_ == null) {
@@ -1780,13 +1780,13 @@ public final class GachaInfoOuterClass {
         if (other.getGachaSortId() != 0) {
           setGachaSortId(other.getGachaSortId());
         }
-        if (!other.fFMOBAAKKBH_.isEmpty()) {
-          if (fFMOBAAKKBH_.isEmpty()) {
-            fFMOBAAKKBH_ = other.fFMOBAAKKBH_;
+        if (!other.displayUp4ItemList_.isEmpty()) {
+          if (displayUp4ItemList_.isEmpty()) {
+            displayUp4ItemList_ = other.displayUp4ItemList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureFFMOBAAKKBHIsMutable();
-            fFMOBAAKKBH_.addAll(other.fFMOBAAKKBH_);
+            ensureDisplayUp4ItemListIsMutable();
+            displayUp4ItemList_.addAll(other.displayUp4ItemList_);
           }
           onChanged();
         }
@@ -1815,13 +1815,13 @@ public final class GachaInfoOuterClass {
           titleTextmap_ = other.titleTextmap_;
           onChanged();
         }
-        if (!other.oCIHCEACNNF_.isEmpty()) {
-          if (oCIHCEACNNF_.isEmpty()) {
-            oCIHCEACNNF_ = other.oCIHCEACNNF_;
+        if (!other.displayUp5ItemList_.isEmpty()) {
+          if (displayUp5ItemList_.isEmpty()) {
+            displayUp5ItemList_ = other.displayUp5ItemList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureOCIHCEACNNFIsMutable();
-            oCIHCEACNNF_.addAll(other.oCIHCEACNNF_);
+            ensureDisplayUp5ItemListIsMutable();
+            displayUp5ItemList_.addAll(other.displayUp5ItemList_);
           }
           onChanged();
         }
@@ -2312,80 +2312,80 @@ public final class GachaInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList fFMOBAAKKBH_ = emptyIntList();
-      private void ensureFFMOBAAKKBHIsMutable() {
+      private com.google.protobuf.Internal.IntList displayUp4ItemList_ = emptyIntList();
+      private void ensureDisplayUp4ItemListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          fFMOBAAKKBH_ = mutableCopy(fFMOBAAKKBH_);
+          displayUp4ItemList_ = mutableCopy(displayUp4ItemList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * repeated uint32 FFMOBAAKKBH = 1285;
-       * @return A list containing the fFMOBAAKKBH.
+       * repeated uint32 displayUp4ItemList = 1285;
+       * @return A list containing the displayUp4ItemList.
        */
       public java.util.List
-          getFFMOBAAKKBHList() {
+          getDisplayUp4ItemListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(fFMOBAAKKBH_) : fFMOBAAKKBH_;
+                 java.util.Collections.unmodifiableList(displayUp4ItemList_) : displayUp4ItemList_;
       }
       /**
-       * repeated uint32 FFMOBAAKKBH = 1285;
-       * @return The count of fFMOBAAKKBH.
+       * repeated uint32 displayUp4ItemList = 1285;
+       * @return The count of displayUp4ItemList.
        */
-      public int getFFMOBAAKKBHCount() {
-        return fFMOBAAKKBH_.size();
+      public int getDisplayUp4ItemListCount() {
+        return displayUp4ItemList_.size();
       }
       /**
-       * repeated uint32 FFMOBAAKKBH = 1285;
+       * repeated uint32 displayUp4ItemList = 1285;
        * @param index The index of the element to return.
-       * @return The fFMOBAAKKBH at the given index.
+       * @return The displayUp4ItemList at the given index.
        */
-      public int getFFMOBAAKKBH(int index) {
-        return fFMOBAAKKBH_.getInt(index);
+      public int getDisplayUp4ItemList(int index) {
+        return displayUp4ItemList_.getInt(index);
       }
       /**
-       * repeated uint32 FFMOBAAKKBH = 1285;
+       * repeated uint32 displayUp4ItemList = 1285;
        * @param index The index to set the value at.
-       * @param value The fFMOBAAKKBH to set.
+       * @param value The displayUp4ItemList to set.
        * @return This builder for chaining.
        */
-      public Builder setFFMOBAAKKBH(
+      public Builder setDisplayUp4ItemList(
           int index, int value) {
-        ensureFFMOBAAKKBHIsMutable();
-        fFMOBAAKKBH_.setInt(index, value);
+        ensureDisplayUp4ItemListIsMutable();
+        displayUp4ItemList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 FFMOBAAKKBH = 1285;
-       * @param value The fFMOBAAKKBH to add.
+       * repeated uint32 displayUp4ItemList = 1285;
+       * @param value The displayUp4ItemList to add.
        * @return This builder for chaining.
        */
-      public Builder addFFMOBAAKKBH(int value) {
-        ensureFFMOBAAKKBHIsMutable();
-        fFMOBAAKKBH_.addInt(value);
+      public Builder addDisplayUp4ItemList(int value) {
+        ensureDisplayUp4ItemListIsMutable();
+        displayUp4ItemList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 FFMOBAAKKBH = 1285;
-       * @param values The fFMOBAAKKBH to add.
+       * repeated uint32 displayUp4ItemList = 1285;
+       * @param values The displayUp4ItemList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllFFMOBAAKKBH(
+      public Builder addAllDisplayUp4ItemList(
           java.lang.Iterable values) {
-        ensureFFMOBAAKKBHIsMutable();
+        ensureDisplayUp4ItemListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, fFMOBAAKKBH_);
+            values, displayUp4ItemList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 FFMOBAAKKBH = 1285;
+       * repeated uint32 displayUp4ItemList = 1285;
        * @return This builder for chaining.
        */
-      public Builder clearFFMOBAAKKBH() {
-        fFMOBAAKKBH_ = emptyIntList();
+      public Builder clearDisplayUp4ItemList() {
+        displayUp4ItemList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -2788,80 +2788,80 @@ public final class GachaInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList oCIHCEACNNF_ = emptyIntList();
-      private void ensureOCIHCEACNNFIsMutable() {
+      private com.google.protobuf.Internal.IntList displayUp5ItemList_ = emptyIntList();
+      private void ensureDisplayUp5ItemListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          oCIHCEACNNF_ = mutableCopy(oCIHCEACNNF_);
+          displayUp5ItemList_ = mutableCopy(displayUp5ItemList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 OCIHCEACNNF = 1831;
-       * @return A list containing the oCIHCEACNNF.
+       * repeated uint32 displayUp5ItemList = 1831;
+       * @return A list containing the displayUp5ItemList.
        */
       public java.util.List
-          getOCIHCEACNNFList() {
+          getDisplayUp5ItemListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(oCIHCEACNNF_) : oCIHCEACNNF_;
+                 java.util.Collections.unmodifiableList(displayUp5ItemList_) : displayUp5ItemList_;
       }
       /**
-       * repeated uint32 OCIHCEACNNF = 1831;
-       * @return The count of oCIHCEACNNF.
+       * repeated uint32 displayUp5ItemList = 1831;
+       * @return The count of displayUp5ItemList.
        */
-      public int getOCIHCEACNNFCount() {
-        return oCIHCEACNNF_.size();
+      public int getDisplayUp5ItemListCount() {
+        return displayUp5ItemList_.size();
       }
       /**
-       * repeated uint32 OCIHCEACNNF = 1831;
+       * repeated uint32 displayUp5ItemList = 1831;
        * @param index The index of the element to return.
-       * @return The oCIHCEACNNF at the given index.
+       * @return The displayUp5ItemList at the given index.
        */
-      public int getOCIHCEACNNF(int index) {
-        return oCIHCEACNNF_.getInt(index);
+      public int getDisplayUp5ItemList(int index) {
+        return displayUp5ItemList_.getInt(index);
       }
       /**
-       * repeated uint32 OCIHCEACNNF = 1831;
+       * repeated uint32 displayUp5ItemList = 1831;
        * @param index The index to set the value at.
-       * @param value The oCIHCEACNNF to set.
+       * @param value The displayUp5ItemList to set.
        * @return This builder for chaining.
        */
-      public Builder setOCIHCEACNNF(
+      public Builder setDisplayUp5ItemList(
           int index, int value) {
-        ensureOCIHCEACNNFIsMutable();
-        oCIHCEACNNF_.setInt(index, value);
+        ensureDisplayUp5ItemListIsMutable();
+        displayUp5ItemList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 OCIHCEACNNF = 1831;
-       * @param value The oCIHCEACNNF to add.
+       * repeated uint32 displayUp5ItemList = 1831;
+       * @param value The displayUp5ItemList to add.
        * @return This builder for chaining.
        */
-      public Builder addOCIHCEACNNF(int value) {
-        ensureOCIHCEACNNFIsMutable();
-        oCIHCEACNNF_.addInt(value);
+      public Builder addDisplayUp5ItemList(int value) {
+        ensureDisplayUp5ItemListIsMutable();
+        displayUp5ItemList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 OCIHCEACNNF = 1831;
-       * @param values The oCIHCEACNNF to add.
+       * repeated uint32 displayUp5ItemList = 1831;
+       * @param values The displayUp5ItemList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllOCIHCEACNNF(
+      public Builder addAllDisplayUp5ItemList(
           java.lang.Iterable values) {
-        ensureOCIHCEACNNFIsMutable();
+        ensureDisplayUp5ItemListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, oCIHCEACNNF_);
+            values, displayUp5ItemList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 OCIHCEACNNF = 1831;
+       * repeated uint32 displayUp5ItemList = 1831;
        * @return This builder for chaining.
        */
-      public Builder clearOCIHCEACNNF() {
-        oCIHCEACNNF_ = emptyIntList();
+      public Builder clearDisplayUp5ItemList() {
+        displayUp5ItemList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -3387,7 +3387,7 @@ public final class GachaInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017GachaInfo.proto\032\021GachaUpInfo.proto\"\213\005\n" +
+      "\n\017GachaInfo.proto\032\021GachaUpInfo.proto\"\231\005\n" +
       "\tGachaInfo\022\022\n\ncostItemId\030\r \001(\r\022\027\n\017gachaP" +
       "refabPath\030\n \001(\t\022\021\n\tgachaType\030\001 \001(\r\022\030\n\017wi" +
       "shMaxProgress\030\300\007 \001(\r\022#\n\032curScheduleDaily" +
@@ -3395,17 +3395,17 @@ public final class GachaInfoOuterClass {
       "\r\022\024\n\013is_new_wish\030\201\014 \001(\010\022\026\n\016tenCostItemNu" +
       "m\030\010 \001(\r\022\025\n\014wishProgress\030\347\013 \001(\r\022\023\n\013schedu" +
       "le_id\030\005 \001(\r\022\025\n\rtenCostItemId\030\006 \001(\r\022\023\n\013ga" +
-      "chaSortId\030\013 \001(\r\022\024\n\013FFMOBAAKKBH\030\205\n \003(\r\022\036\n" +
-      "\025gachaRecordUrlOversea\030\235\t \001(\t\022\034\n\023gachaPr" +
-      "obUrlOversea\030\305\t \001(\t\022\022\n\nbegin_time\030\003 \001(\r\022" +
-      "\023\n\nwishItemId\030\346\006 \001(\r\022\020\n\010end_time\030\007 \001(\r\022\036" +
-      "\n\026gachaPreviewPrefabPath\030\014 \001(\t\022\025\n\014titleT" +
-      "extmap\030\317\006 \001(\t\022\024\n\013OCIHCEACNNF\030\247\016 \003(\r\022\027\n\017g" +
-      "achaTimesLimit\030\016 \001(\r\022\026\n\016gachaRecordUrl\030\t" +
-      " \001(\t\022)\n\022gacha_up_info_list\030\352\013 \003(\0132\014.Gach" +
-      "aUpInfo\022\023\n\013costItemNum\030\002 \001(\r\022\024\n\014gachaPro" +
-      "bUrl\030\004 \001(\tB\033\n\031emu.grasscutter.net.protob" +
-      "\006proto3"
+      "chaSortId\030\013 \001(\r\022\033\n\022displayUp4ItemList\030\205\n" +
+      " \003(\r\022\036\n\025gachaRecordUrlOversea\030\235\t \001(\t\022\034\n\023" +
+      "gachaProbUrlOversea\030\305\t \001(\t\022\022\n\nbegin_time" +
+      "\030\003 \001(\r\022\023\n\nwishItemId\030\346\006 \001(\r\022\020\n\010end_time\030" +
+      "\007 \001(\r\022\036\n\026gachaPreviewPrefabPath\030\014 \001(\t\022\025\n" +
+      "\014titleTextmap\030\317\006 \001(\t\022\033\n\022displayUp5ItemLi" +
+      "st\030\247\016 \003(\r\022\027\n\017gachaTimesLimit\030\016 \001(\r\022\026\n\016ga" +
+      "chaRecordUrl\030\t \001(\t\022)\n\022gacha_up_info_list" +
+      "\030\352\013 \003(\0132\014.GachaUpInfo\022\023\n\013costItemNum\030\002 \001" +
+      "(\r\022\024\n\014gachaProbUrl\030\004 \001(\tB\033\n\031emu.grasscut" +
+      "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3417,7 +3417,7 @@ public final class GachaInfoOuterClass {
     internal_static_GachaInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GachaInfo_descriptor,
-        new java.lang.String[] { "CostItemId", "GachaPrefabPath", "GachaType", "WishMaxProgress", "CurScheduleDailyGachaTimes", "LeftGachaTimes", "IsNewWish", "TenCostItemNum", "WishProgress", "ScheduleId", "TenCostItemId", "GachaSortId", "FFMOBAAKKBH", "GachaRecordUrlOversea", "GachaProbUrlOversea", "BeginTime", "WishItemId", "EndTime", "GachaPreviewPrefabPath", "TitleTextmap", "OCIHCEACNNF", "GachaTimesLimit", "GachaRecordUrl", "GachaUpInfoList", "CostItemNum", "GachaProbUrl", });
+        new java.lang.String[] { "CostItemId", "GachaPrefabPath", "GachaType", "WishMaxProgress", "CurScheduleDailyGachaTimes", "LeftGachaTimes", "IsNewWish", "TenCostItemNum", "WishProgress", "ScheduleId", "TenCostItemId", "GachaSortId", "DisplayUp4ItemList", "GachaRecordUrlOversea", "GachaProbUrlOversea", "BeginTime", "WishItemId", "EndTime", "GachaPreviewPrefabPath", "TitleTextmap", "DisplayUp5ItemList", "GachaTimesLimit", "GachaRecordUrl", "GachaUpInfoList", "CostItemNum", "GachaProbUrl", });
     emu.grasscutter.net.proto.GachaUpInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
index cdf020b4c..3eac65540 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
@@ -36,21 +36,21 @@ public final class GetScenePointRspOuterClass {
     int getUnlockedPointList(int index);
 
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
-     * @return A list containing the eLDLGKEKABI.
+     * repeated uint32 unhide_point_list = 6;
+     * @return A list containing the unhidePointList.
      */
-    java.util.List getELDLGKEKABIList();
+    java.util.List getUnhidePointListList();
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
-     * @return The count of eLDLGKEKABI.
+     * repeated uint32 unhide_point_list = 6;
+     * @return The count of unhidePointList.
      */
-    int getELDLGKEKABICount();
+    int getUnhidePointListCount();
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
+     * repeated uint32 unhide_point_list = 6;
      * @param index The index of the element to return.
-     * @return The eLDLGKEKABI at the given index.
+     * @return The unhidePointList at the given index.
      */
-    int getELDLGKEKABI(int index);
+    int getUnhidePointList(int index);
 
     /**
      * bool FBFJPEPMAOF = 9;
@@ -65,21 +65,21 @@ public final class GetScenePointRspOuterClass {
     int getRetcode();
 
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
-     * @return A list containing the gILIFDOOHFF.
+     * repeated uint32 unlock_area_list = 12;
+     * @return A list containing the unlockAreaList.
      */
-    java.util.List getGILIFDOOHFFList();
+    java.util.List getUnlockAreaListList();
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
-     * @return The count of gILIFDOOHFF.
+     * repeated uint32 unlock_area_list = 12;
+     * @return The count of unlockAreaList.
      */
-    int getGILIFDOOHFFCount();
+    int getUnlockAreaListCount();
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
+     * repeated uint32 unlock_area_list = 12;
      * @param index The index of the element to return.
-     * @return The gILIFDOOHFF at the given index.
+     * @return The unlockAreaList at the given index.
      */
-    int getGILIFDOOHFF(int index);
+    int getUnlockAreaList(int index);
 
     /**
      * repeated uint32 PPDDIADEDIC = 8;
@@ -214,8 +214,8 @@ public final class GetScenePointRspOuterClass {
     }
     private GetScenePointRsp() {
       unlockedPointList_ = emptyIntList();
-      eLDLGKEKABI_ = emptyIntList();
-      gILIFDOOHFF_ = emptyIntList();
+      unhidePointList_ = emptyIntList();
+      unlockAreaList_ = emptyIntList();
       pPDDIADEDIC_ = emptyIntList();
       oGKCOCBLNLF_ = emptyIntList();
       eBIFELCKPEA_ = emptyIntList();
@@ -325,21 +325,21 @@ public final class GetScenePointRspOuterClass {
             }
             case 48: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                eLDLGKEKABI_ = newIntList();
+                unhidePointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              eLDLGKEKABI_.addInt(input.readUInt32());
+              unhidePointList_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                eLDLGKEKABI_ = newIntList();
+                unhidePointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                eLDLGKEKABI_.addInt(input.readUInt32());
+                unhidePointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -419,21 +419,21 @@ public final class GetScenePointRspOuterClass {
             }
             case 96: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                gILIFDOOHFF_ = newIntList();
+                unlockAreaList_ = newIntList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              gILIFDOOHFF_.addInt(input.readUInt32());
+              unlockAreaList_.addInt(input.readUInt32());
               break;
             }
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                gILIFDOOHFF_ = newIntList();
+                unlockAreaList_ = newIntList();
                 mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
-                gILIFDOOHFF_.addInt(input.readUInt32());
+                unlockAreaList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -489,7 +489,7 @@ public final class GetScenePointRspOuterClass {
           jJOHJDFINFN_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          eLDLGKEKABI_.makeImmutable(); // C
+          unhidePointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000020) != 0)) {
           eBIFELCKPEA_.makeImmutable(); // C
@@ -501,7 +501,7 @@ public final class GetScenePointRspOuterClass {
           oGKCOCBLNLF_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          gILIFDOOHFF_.makeImmutable(); // C
+          unlockAreaList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000080) != 0)) {
           jCLHNODLPOH_.makeImmutable(); // C
@@ -551,33 +551,33 @@ public final class GetScenePointRspOuterClass {
     }
     private int unlockedPointListMemoizedSerializedSize = -1;
 
-    public static final int ELDLGKEKABI_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList eLDLGKEKABI_;
+    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList unhidePointList_;
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
-     * @return A list containing the eLDLGKEKABI.
+     * repeated uint32 unhide_point_list = 6;
+     * @return A list containing the unhidePointList.
      */
     @java.lang.Override
     public java.util.List
-        getELDLGKEKABIList() {
-      return eLDLGKEKABI_;
+        getUnhidePointListList() {
+      return unhidePointList_;
     }
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
-     * @return The count of eLDLGKEKABI.
+     * repeated uint32 unhide_point_list = 6;
+     * @return The count of unhidePointList.
      */
-    public int getELDLGKEKABICount() {
-      return eLDLGKEKABI_.size();
+    public int getUnhidePointListCount() {
+      return unhidePointList_.size();
     }
     /**
-     * repeated uint32 ELDLGKEKABI = 6;
+     * repeated uint32 unhide_point_list = 6;
      * @param index The index of the element to return.
-     * @return The eLDLGKEKABI at the given index.
+     * @return The unhidePointList at the given index.
      */
-    public int getELDLGKEKABI(int index) {
-      return eLDLGKEKABI_.getInt(index);
+    public int getUnhidePointList(int index) {
+      return unhidePointList_.getInt(index);
     }
-    private int eLDLGKEKABIMemoizedSerializedSize = -1;
+    private int unhidePointListMemoizedSerializedSize = -1;
 
     public static final int FBFJPEPMAOF_FIELD_NUMBER = 9;
     private boolean fBFJPEPMAOF_;
@@ -601,33 +601,33 @@ public final class GetScenePointRspOuterClass {
       return retcode_;
     }
 
-    public static final int GILIFDOOHFF_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList gILIFDOOHFF_;
+    public static final int UNLOCK_AREA_LIST_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList unlockAreaList_;
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
-     * @return A list containing the gILIFDOOHFF.
+     * repeated uint32 unlock_area_list = 12;
+     * @return A list containing the unlockAreaList.
      */
     @java.lang.Override
     public java.util.List
-        getGILIFDOOHFFList() {
-      return gILIFDOOHFF_;
+        getUnlockAreaListList() {
+      return unlockAreaList_;
     }
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
-     * @return The count of gILIFDOOHFF.
+     * repeated uint32 unlock_area_list = 12;
+     * @return The count of unlockAreaList.
      */
-    public int getGILIFDOOHFFCount() {
-      return gILIFDOOHFF_.size();
+    public int getUnlockAreaListCount() {
+      return unlockAreaList_.size();
     }
     /**
-     * repeated uint32 GILIFDOOHFF = 12;
+     * repeated uint32 unlock_area_list = 12;
      * @param index The index of the element to return.
-     * @return The gILIFDOOHFF at the given index.
+     * @return The unlockAreaList at the given index.
      */
-    public int getGILIFDOOHFF(int index) {
-      return gILIFDOOHFF_.getInt(index);
+    public int getUnlockAreaList(int index) {
+      return unlockAreaList_.getInt(index);
     }
-    private int gILIFDOOHFFMemoizedSerializedSize = -1;
+    private int unlockAreaListMemoizedSerializedSize = -1;
 
     public static final int PPDDIADEDIC_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList pPDDIADEDIC_;
@@ -858,12 +858,12 @@ public final class GetScenePointRspOuterClass {
       for (int i = 0; i < jJOHJDFINFN_.size(); i++) {
         output.writeUInt32NoTag(jJOHJDFINFN_.getInt(i));
       }
-      if (getELDLGKEKABIList().size() > 0) {
+      if (getUnhidePointListList().size() > 0) {
         output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(eLDLGKEKABIMemoizedSerializedSize);
+        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
-        output.writeUInt32NoTag(eLDLGKEKABI_.getInt(i));
+      for (int i = 0; i < unhidePointList_.size(); i++) {
+        output.writeUInt32NoTag(unhidePointList_.getInt(i));
       }
       if (getEBIFELCKPEAList().size() > 0) {
         output.writeUInt32NoTag(58);
@@ -892,12 +892,12 @@ public final class GetScenePointRspOuterClass {
       if (retcode_ != 0) {
         output.writeInt32(11, retcode_);
       }
-      if (getGILIFDOOHFFList().size() > 0) {
+      if (getUnlockAreaListList().size() > 0) {
         output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(gILIFDOOHFFMemoizedSerializedSize);
+        output.writeUInt32NoTag(unlockAreaListMemoizedSerializedSize);
       }
-      for (int i = 0; i < gILIFDOOHFF_.size(); i++) {
-        output.writeUInt32NoTag(gILIFDOOHFF_.getInt(i));
+      for (int i = 0; i < unlockAreaList_.size(); i++) {
+        output.writeUInt32NoTag(unlockAreaList_.getInt(i));
       }
       if (getJCLHNODLPOHList().size() > 0) {
         output.writeUInt32NoTag(106);
@@ -966,17 +966,17 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
+        for (int i = 0; i < unhidePointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(eLDLGKEKABI_.getInt(i));
+            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
         }
         size += dataSize;
-        if (!getELDLGKEKABIList().isEmpty()) {
+        if (!getUnhidePointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        eLDLGKEKABIMemoizedSerializedSize = dataSize;
+        unhidePointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -1030,17 +1030,17 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < gILIFDOOHFF_.size(); i++) {
+        for (int i = 0; i < unlockAreaList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(gILIFDOOHFF_.getInt(i));
+            .computeUInt32SizeNoTag(unlockAreaList_.getInt(i));
         }
         size += dataSize;
-        if (!getGILIFDOOHFFList().isEmpty()) {
+        if (!getUnlockAreaListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        gILIFDOOHFFMemoizedSerializedSize = dataSize;
+        unlockAreaListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -1077,14 +1077,14 @@ public final class GetScenePointRspOuterClass {
 
       if (!getUnlockedPointListList()
           .equals(other.getUnlockedPointListList())) return false;
-      if (!getELDLGKEKABIList()
-          .equals(other.getELDLGKEKABIList())) return false;
+      if (!getUnhidePointListList()
+          .equals(other.getUnhidePointListList())) return false;
       if (getFBFJPEPMAOF()
           != other.getFBFJPEPMAOF()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (!getGILIFDOOHFFList()
-          .equals(other.getGILIFDOOHFFList())) return false;
+      if (!getUnlockAreaListList()
+          .equals(other.getUnlockAreaListList())) return false;
       if (!getPPDDIADEDICList()
           .equals(other.getPPDDIADEDICList())) return false;
       if (!getOGKCOCBLNLFList()
@@ -1116,18 +1116,18 @@ public final class GetScenePointRspOuterClass {
         hash = (37 * hash) + UNLOCKED_POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedPointListList().hashCode();
       }
-      if (getELDLGKEKABICount() > 0) {
-        hash = (37 * hash) + ELDLGKEKABI_FIELD_NUMBER;
-        hash = (53 * hash) + getELDLGKEKABIList().hashCode();
+      if (getUnhidePointListCount() > 0) {
+        hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnhidePointListList().hashCode();
       }
       hash = (37 * hash) + FBFJPEPMAOF_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getFBFJPEPMAOF());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      if (getGILIFDOOHFFCount() > 0) {
-        hash = (37 * hash) + GILIFDOOHFF_FIELD_NUMBER;
-        hash = (53 * hash) + getGILIFDOOHFFList().hashCode();
+      if (getUnlockAreaListCount() > 0) {
+        hash = (37 * hash) + UNLOCK_AREA_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnlockAreaListList().hashCode();
       }
       if (getPPDDIADEDICCount() > 0) {
         hash = (37 * hash) + PPDDIADEDIC_FIELD_NUMBER;
@@ -1297,13 +1297,13 @@ public final class GetScenePointRspOuterClass {
         super.clear();
         unlockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        eLDLGKEKABI_ = emptyIntList();
+        unhidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         fBFJPEPMAOF_ = false;
 
         retcode_ = 0;
 
-        gILIFDOOHFF_ = emptyIntList();
+        unlockAreaList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         pPDDIADEDIC_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -1354,17 +1354,17 @@ public final class GetScenePointRspOuterClass {
         }
         result.unlockedPointList_ = unlockedPointList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          eLDLGKEKABI_.makeImmutable();
+          unhidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.eLDLGKEKABI_ = eLDLGKEKABI_;
+        result.unhidePointList_ = unhidePointList_;
         result.fBFJPEPMAOF_ = fBFJPEPMAOF_;
         result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          gILIFDOOHFF_.makeImmutable();
+          unlockAreaList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.gILIFDOOHFF_ = gILIFDOOHFF_;
+        result.unlockAreaList_ = unlockAreaList_;
         if (((bitField0_ & 0x00000008) != 0)) {
           pPDDIADEDIC_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
@@ -1455,13 +1455,13 @@ public final class GetScenePointRspOuterClass {
           }
           onChanged();
         }
-        if (!other.eLDLGKEKABI_.isEmpty()) {
-          if (eLDLGKEKABI_.isEmpty()) {
-            eLDLGKEKABI_ = other.eLDLGKEKABI_;
+        if (!other.unhidePointList_.isEmpty()) {
+          if (unhidePointList_.isEmpty()) {
+            unhidePointList_ = other.unhidePointList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureELDLGKEKABIIsMutable();
-            eLDLGKEKABI_.addAll(other.eLDLGKEKABI_);
+            ensureUnhidePointListIsMutable();
+            unhidePointList_.addAll(other.unhidePointList_);
           }
           onChanged();
         }
@@ -1471,13 +1471,13 @@ public final class GetScenePointRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (!other.gILIFDOOHFF_.isEmpty()) {
-          if (gILIFDOOHFF_.isEmpty()) {
-            gILIFDOOHFF_ = other.gILIFDOOHFF_;
+        if (!other.unlockAreaList_.isEmpty()) {
+          if (unlockAreaList_.isEmpty()) {
+            unlockAreaList_ = other.unlockAreaList_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureGILIFDOOHFFIsMutable();
-            gILIFDOOHFF_.addAll(other.gILIFDOOHFF_);
+            ensureUnlockAreaListIsMutable();
+            unlockAreaList_.addAll(other.unlockAreaList_);
           }
           onChanged();
         }
@@ -1656,80 +1656,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList eLDLGKEKABI_ = emptyIntList();
-      private void ensureELDLGKEKABIIsMutable() {
+      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
+      private void ensureUnhidePointListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          eLDLGKEKABI_ = mutableCopy(eLDLGKEKABI_);
+          unhidePointList_ = mutableCopy(unhidePointList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @return A list containing the eLDLGKEKABI.
+       * repeated uint32 unhide_point_list = 6;
+       * @return A list containing the unhidePointList.
        */
       public java.util.List
-          getELDLGKEKABIList() {
+          getUnhidePointListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(eLDLGKEKABI_) : eLDLGKEKABI_;
+                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @return The count of eLDLGKEKABI.
+       * repeated uint32 unhide_point_list = 6;
+       * @return The count of unhidePointList.
        */
-      public int getELDLGKEKABICount() {
-        return eLDLGKEKABI_.size();
+      public int getUnhidePointListCount() {
+        return unhidePointList_.size();
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
+       * repeated uint32 unhide_point_list = 6;
        * @param index The index of the element to return.
-       * @return The eLDLGKEKABI at the given index.
+       * @return The unhidePointList at the given index.
        */
-      public int getELDLGKEKABI(int index) {
-        return eLDLGKEKABI_.getInt(index);
+      public int getUnhidePointList(int index) {
+        return unhidePointList_.getInt(index);
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
+       * repeated uint32 unhide_point_list = 6;
        * @param index The index to set the value at.
-       * @param value The eLDLGKEKABI to set.
+       * @param value The unhidePointList to set.
        * @return This builder for chaining.
        */
-      public Builder setELDLGKEKABI(
+      public Builder setUnhidePointList(
           int index, int value) {
-        ensureELDLGKEKABIIsMutable();
-        eLDLGKEKABI_.setInt(index, value);
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @param value The eLDLGKEKABI to add.
+       * repeated uint32 unhide_point_list = 6;
+       * @param value The unhidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addELDLGKEKABI(int value) {
-        ensureELDLGKEKABIIsMutable();
-        eLDLGKEKABI_.addInt(value);
+      public Builder addUnhidePointList(int value) {
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
-       * @param values The eLDLGKEKABI to add.
+       * repeated uint32 unhide_point_list = 6;
+       * @param values The unhidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllELDLGKEKABI(
+      public Builder addAllUnhidePointList(
           java.lang.Iterable values) {
-        ensureELDLGKEKABIIsMutable();
+        ensureUnhidePointListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, eLDLGKEKABI_);
+            values, unhidePointList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 ELDLGKEKABI = 6;
+       * repeated uint32 unhide_point_list = 6;
        * @return This builder for chaining.
        */
-      public Builder clearELDLGKEKABI() {
-        eLDLGKEKABI_ = emptyIntList();
+      public Builder clearUnhidePointList() {
+        unhidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1797,80 +1797,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList gILIFDOOHFF_ = emptyIntList();
-      private void ensureGILIFDOOHFFIsMutable() {
+      private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
+      private void ensureUnlockAreaListIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          gILIFDOOHFF_ = mutableCopy(gILIFDOOHFF_);
+          unlockAreaList_ = mutableCopy(unlockAreaList_);
           bitField0_ |= 0x00000004;
          }
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @return A list containing the gILIFDOOHFF.
+       * repeated uint32 unlock_area_list = 12;
+       * @return A list containing the unlockAreaList.
        */
       public java.util.List
-          getGILIFDOOHFFList() {
+          getUnlockAreaListList() {
         return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(gILIFDOOHFF_) : gILIFDOOHFF_;
+                 java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @return The count of gILIFDOOHFF.
+       * repeated uint32 unlock_area_list = 12;
+       * @return The count of unlockAreaList.
        */
-      public int getGILIFDOOHFFCount() {
-        return gILIFDOOHFF_.size();
+      public int getUnlockAreaListCount() {
+        return unlockAreaList_.size();
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
+       * repeated uint32 unlock_area_list = 12;
        * @param index The index of the element to return.
-       * @return The gILIFDOOHFF at the given index.
+       * @return The unlockAreaList at the given index.
        */
-      public int getGILIFDOOHFF(int index) {
-        return gILIFDOOHFF_.getInt(index);
+      public int getUnlockAreaList(int index) {
+        return unlockAreaList_.getInt(index);
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
+       * repeated uint32 unlock_area_list = 12;
        * @param index The index to set the value at.
-       * @param value The gILIFDOOHFF to set.
+       * @param value The unlockAreaList to set.
        * @return This builder for chaining.
        */
-      public Builder setGILIFDOOHFF(
+      public Builder setUnlockAreaList(
           int index, int value) {
-        ensureGILIFDOOHFFIsMutable();
-        gILIFDOOHFF_.setInt(index, value);
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @param value The gILIFDOOHFF to add.
+       * repeated uint32 unlock_area_list = 12;
+       * @param value The unlockAreaList to add.
        * @return This builder for chaining.
        */
-      public Builder addGILIFDOOHFF(int value) {
-        ensureGILIFDOOHFFIsMutable();
-        gILIFDOOHFF_.addInt(value);
+      public Builder addUnlockAreaList(int value) {
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
-       * @param values The gILIFDOOHFF to add.
+       * repeated uint32 unlock_area_list = 12;
+       * @param values The unlockAreaList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllGILIFDOOHFF(
+      public Builder addAllUnlockAreaList(
           java.lang.Iterable values) {
-        ensureGILIFDOOHFFIsMutable();
+        ensureUnlockAreaListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, gILIFDOOHFF_);
+            values, unlockAreaList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GILIFDOOHFF = 12;
+       * repeated uint32 unlock_area_list = 12;
        * @return This builder for chaining.
        */
-      public Builder clearGILIFDOOHFF() {
-        gILIFDOOHFF_ = emptyIntList();
+      public Builder clearUnlockAreaList() {
+        unlockAreaList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -2478,15 +2478,16 @@ public final class GetScenePointRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026GetScenePointRsp.proto\"\243\002\n\020GetScenePoi" +
-      "ntRsp\022\033\n\023unlocked_point_list\030\001 \003(\r\022\023\n\013EL" +
-      "DLGKEKABI\030\006 \003(\r\022\023\n\013FBFJPEPMAOF\030\t \001(\010\022\017\n\007" +
-      "retcode\030\013 \001(\005\022\023\n\013GILIFDOOHFF\030\014 \003(\r\022\023\n\013PP" +
-      "DDIADEDIC\030\010 \003(\r\022\023\n\013OGKCOCBLNLF\030\n \003(\r\022\023\n\013" +
-      "EBIFELCKPEA\030\007 \003(\r\022\023\n\013JJOHJDFINFN\030\004 \003(\r\022\022" +
-      "\n\nbelong_uid\030\016 \001(\r\022\023\n\013JCLHNODLPOH\030\r \003(\r\022" +
-      "\020\n\010scene_id\030\002 \001(\r\022\023\n\013KOPAHGHMECF\030\003 \003(\rB\033" +
-      "\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\026GetScenePointRsp.proto\"\256\002\n\020GetScenePoi" +
+      "ntRsp\022\033\n\023unlocked_point_list\030\001 \003(\r\022\031\n\021un" +
+      "hide_point_list\030\006 \003(\r\022\023\n\013FBFJPEPMAOF\030\t \001" +
+      "(\010\022\017\n\007retcode\030\013 \001(\005\022\030\n\020unlock_area_list\030" +
+      "\014 \003(\r\022\023\n\013PPDDIADEDIC\030\010 \003(\r\022\023\n\013OGKCOCBLNL" +
+      "F\030\n \003(\r\022\023\n\013EBIFELCKPEA\030\007 \003(\r\022\023\n\013JJOHJDFI" +
+      "NFN\030\004 \003(\r\022\022\n\nbelong_uid\030\016 \001(\r\022\023\n\013JCLHNOD" +
+      "LPOH\030\r \003(\r\022\020\n\010scene_id\030\002 \001(\r\022\023\n\013KOPAHGHM" +
+      "ECF\030\003 \003(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2497,7 +2498,7 @@ public final class GetScenePointRspOuterClass {
     internal_static_GetScenePointRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetScenePointRsp_descriptor,
-        new java.lang.String[] { "UnlockedPointList", "ELDLGKEKABI", "FBFJPEPMAOF", "Retcode", "GILIFDOOHFF", "PPDDIADEDIC", "OGKCOCBLNLF", "EBIFELCKPEA", "JJOHJDFINFN", "BelongUid", "JCLHNODLPOH", "SceneId", "KOPAHGHMECF", });
+        new java.lang.String[] { "UnlockedPointList", "UnhidePointList", "FBFJPEPMAOF", "Retcode", "UnlockAreaList", "PPDDIADEDIC", "OGKCOCBLNLF", "EBIFELCKPEA", "JJOHJDFINFN", "BelongUid", "JCLHNODLPOH", "SceneId", "KOPAHGHMECF", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java
index 0678438ea..040cf4ee3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java
@@ -43,16 +43,16 @@ public final class HomeBasicInfoOuterClass {
     boolean getIsInEditMode();
 
     /**
-     * uint32 BEIJAFMDNFK = 13;
-     * @return The bEIJAFMDNFK.
+     * uint32 cur_module_id = 13;
+     * @return The curModuleId.
      */
-    int getBEIJAFMDNFK();
+    int getCurModuleId();
 
     /**
-     * uint32 GLJCPMPPCKO = 8;
-     * @return The gLJCPMPPCKO.
+     * uint32 cur_room_scene_id = 8;
+     * @return The curRoomSceneId.
      */
-    int getGLJCPMPPCKO();
+    int getCurRoomSceneId();
 
     /**
      * uint64 exp = 10;
@@ -61,10 +61,10 @@ public final class HomeBasicInfoOuterClass {
     long getExp();
 
     /**
-     * uint32 PAOBDHAMCKB = 14;
-     * @return The pAOBDHAMCKB.
+     * uint32 home_owner_uid = 14;
+     * @return The homeOwnerUid.
      */
-    int getPAOBDHAMCKB();
+    int getHomeOwnerUid();
 
     /**
      * .HomeLimitedShopInfo limited_shop_info = 15;
@@ -139,7 +139,7 @@ public final class HomeBasicInfoOuterClass {
             }
             case 64: {
 
-              gLJCPMPPCKO_ = input.readUInt32();
+              curRoomSceneId_ = input.readUInt32();
               break;
             }
             case 72: {
@@ -159,12 +159,12 @@ public final class HomeBasicInfoOuterClass {
             }
             case 104: {
 
-              bEIJAFMDNFK_ = input.readUInt32();
+              curModuleId_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              pAOBDHAMCKB_ = input.readUInt32();
+              homeOwnerUid_ = input.readUInt32();
               break;
             }
             case 122: {
@@ -272,26 +272,26 @@ public final class HomeBasicInfoOuterClass {
       return isInEditMode_;
     }
 
-    public static final int BEIJAFMDNFK_FIELD_NUMBER = 13;
-    private int bEIJAFMDNFK_;
+    public static final int CUR_MODULE_ID_FIELD_NUMBER = 13;
+    private int curModuleId_;
     /**
-     * uint32 BEIJAFMDNFK = 13;
-     * @return The bEIJAFMDNFK.
+     * uint32 cur_module_id = 13;
+     * @return The curModuleId.
      */
     @java.lang.Override
-    public int getBEIJAFMDNFK() {
-      return bEIJAFMDNFK_;
+    public int getCurModuleId() {
+      return curModuleId_;
     }
 
-    public static final int GLJCPMPPCKO_FIELD_NUMBER = 8;
-    private int gLJCPMPPCKO_;
+    public static final int CUR_ROOM_SCENE_ID_FIELD_NUMBER = 8;
+    private int curRoomSceneId_;
     /**
-     * uint32 GLJCPMPPCKO = 8;
-     * @return The gLJCPMPPCKO.
+     * uint32 cur_room_scene_id = 8;
+     * @return The curRoomSceneId.
      */
     @java.lang.Override
-    public int getGLJCPMPPCKO() {
-      return gLJCPMPPCKO_;
+    public int getCurRoomSceneId() {
+      return curRoomSceneId_;
     }
 
     public static final int EXP_FIELD_NUMBER = 10;
@@ -305,15 +305,15 @@ public final class HomeBasicInfoOuterClass {
       return exp_;
     }
 
-    public static final int PAOBDHAMCKB_FIELD_NUMBER = 14;
-    private int pAOBDHAMCKB_;
+    public static final int HOME_OWNER_UID_FIELD_NUMBER = 14;
+    private int homeOwnerUid_;
     /**
-     * uint32 PAOBDHAMCKB = 14;
-     * @return The pAOBDHAMCKB.
+     * uint32 home_owner_uid = 14;
+     * @return The homeOwnerUid.
      */
     @java.lang.Override
-    public int getPAOBDHAMCKB() {
-      return pAOBDHAMCKB_;
+    public int getHomeOwnerUid() {
+      return homeOwnerUid_;
     }
 
     public static final int LIMITED_SHOP_INFO_FIELD_NUMBER = 15;
@@ -359,8 +359,8 @@ public final class HomeBasicInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ownerNickName_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, ownerNickName_);
       }
-      if (gLJCPMPPCKO_ != 0) {
-        output.writeUInt32(8, gLJCPMPPCKO_);
+      if (curRoomSceneId_ != 0) {
+        output.writeUInt32(8, curRoomSceneId_);
       }
       if (isInEditMode_ != false) {
         output.writeBool(9, isInEditMode_);
@@ -371,11 +371,11 @@ public final class HomeBasicInfoOuterClass {
       if (level_ != 0) {
         output.writeUInt32(11, level_);
       }
-      if (bEIJAFMDNFK_ != 0) {
-        output.writeUInt32(13, bEIJAFMDNFK_);
+      if (curModuleId_ != 0) {
+        output.writeUInt32(13, curModuleId_);
       }
-      if (pAOBDHAMCKB_ != 0) {
-        output.writeUInt32(14, pAOBDHAMCKB_);
+      if (homeOwnerUid_ != 0) {
+        output.writeUInt32(14, homeOwnerUid_);
       }
       if (limitedShopInfo_ != null) {
         output.writeMessage(15, getLimitedShopInfo());
@@ -392,9 +392,9 @@ public final class HomeBasicInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ownerNickName_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, ownerNickName_);
       }
-      if (gLJCPMPPCKO_ != 0) {
+      if (curRoomSceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, gLJCPMPPCKO_);
+          .computeUInt32Size(8, curRoomSceneId_);
       }
       if (isInEditMode_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -408,13 +408,13 @@ public final class HomeBasicInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(11, level_);
       }
-      if (bEIJAFMDNFK_ != 0) {
+      if (curModuleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, bEIJAFMDNFK_);
+          .computeUInt32Size(13, curModuleId_);
       }
-      if (pAOBDHAMCKB_ != 0) {
+      if (homeOwnerUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, pAOBDHAMCKB_);
+          .computeUInt32Size(14, homeOwnerUid_);
       }
       if (limitedShopInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -441,14 +441,14 @@ public final class HomeBasicInfoOuterClass {
           .equals(other.getOwnerNickName())) return false;
       if (getIsInEditMode()
           != other.getIsInEditMode()) return false;
-      if (getBEIJAFMDNFK()
-          != other.getBEIJAFMDNFK()) return false;
-      if (getGLJCPMPPCKO()
-          != other.getGLJCPMPPCKO()) return false;
+      if (getCurModuleId()
+          != other.getCurModuleId()) return false;
+      if (getCurRoomSceneId()
+          != other.getCurRoomSceneId()) return false;
       if (getExp()
           != other.getExp()) return false;
-      if (getPAOBDHAMCKB()
-          != other.getPAOBDHAMCKB()) return false;
+      if (getHomeOwnerUid()
+          != other.getHomeOwnerUid()) return false;
       if (hasLimitedShopInfo() != other.hasLimitedShopInfo()) return false;
       if (hasLimitedShopInfo()) {
         if (!getLimitedShopInfo()
@@ -472,15 +472,15 @@ public final class HomeBasicInfoOuterClass {
       hash = (37 * hash) + IS_IN_EDIT_MODE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsInEditMode());
-      hash = (37 * hash) + BEIJAFMDNFK_FIELD_NUMBER;
-      hash = (53 * hash) + getBEIJAFMDNFK();
-      hash = (37 * hash) + GLJCPMPPCKO_FIELD_NUMBER;
-      hash = (53 * hash) + getGLJCPMPPCKO();
+      hash = (37 * hash) + CUR_MODULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurModuleId();
+      hash = (37 * hash) + CUR_ROOM_SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurRoomSceneId();
       hash = (37 * hash) + EXP_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getExp());
-      hash = (37 * hash) + PAOBDHAMCKB_FIELD_NUMBER;
-      hash = (53 * hash) + getPAOBDHAMCKB();
+      hash = (37 * hash) + HOME_OWNER_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getHomeOwnerUid();
       if (hasLimitedShopInfo()) {
         hash = (37 * hash) + LIMITED_SHOP_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getLimitedShopInfo().hashCode();
@@ -628,13 +628,13 @@ public final class HomeBasicInfoOuterClass {
 
         isInEditMode_ = false;
 
-        bEIJAFMDNFK_ = 0;
+        curModuleId_ = 0;
 
-        gLJCPMPPCKO_ = 0;
+        curRoomSceneId_ = 0;
 
         exp_ = 0L;
 
-        pAOBDHAMCKB_ = 0;
+        homeOwnerUid_ = 0;
 
         if (limitedShopInfoBuilder_ == null) {
           limitedShopInfo_ = null;
@@ -671,10 +671,10 @@ public final class HomeBasicInfoOuterClass {
         result.level_ = level_;
         result.ownerNickName_ = ownerNickName_;
         result.isInEditMode_ = isInEditMode_;
-        result.bEIJAFMDNFK_ = bEIJAFMDNFK_;
-        result.gLJCPMPPCKO_ = gLJCPMPPCKO_;
+        result.curModuleId_ = curModuleId_;
+        result.curRoomSceneId_ = curRoomSceneId_;
         result.exp_ = exp_;
-        result.pAOBDHAMCKB_ = pAOBDHAMCKB_;
+        result.homeOwnerUid_ = homeOwnerUid_;
         if (limitedShopInfoBuilder_ == null) {
           result.limitedShopInfo_ = limitedShopInfo_;
         } else {
@@ -738,17 +738,17 @@ public final class HomeBasicInfoOuterClass {
         if (other.getIsInEditMode() != false) {
           setIsInEditMode(other.getIsInEditMode());
         }
-        if (other.getBEIJAFMDNFK() != 0) {
-          setBEIJAFMDNFK(other.getBEIJAFMDNFK());
+        if (other.getCurModuleId() != 0) {
+          setCurModuleId(other.getCurModuleId());
         }
-        if (other.getGLJCPMPPCKO() != 0) {
-          setGLJCPMPPCKO(other.getGLJCPMPPCKO());
+        if (other.getCurRoomSceneId() != 0) {
+          setCurRoomSceneId(other.getCurRoomSceneId());
         }
         if (other.getExp() != 0L) {
           setExp(other.getExp());
         }
-        if (other.getPAOBDHAMCKB() != 0) {
-          setPAOBDHAMCKB(other.getPAOBDHAMCKB());
+        if (other.getHomeOwnerUid() != 0) {
+          setHomeOwnerUid(other.getHomeOwnerUid());
         }
         if (other.hasLimitedShopInfo()) {
           mergeLimitedShopInfo(other.getLimitedShopInfo());
@@ -920,64 +920,64 @@ public final class HomeBasicInfoOuterClass {
         return this;
       }
 
-      private int bEIJAFMDNFK_ ;
+      private int curModuleId_ ;
       /**
-       * uint32 BEIJAFMDNFK = 13;
-       * @return The bEIJAFMDNFK.
+       * uint32 cur_module_id = 13;
+       * @return The curModuleId.
        */
       @java.lang.Override
-      public int getBEIJAFMDNFK() {
-        return bEIJAFMDNFK_;
+      public int getCurModuleId() {
+        return curModuleId_;
       }
       /**
-       * uint32 BEIJAFMDNFK = 13;
-       * @param value The bEIJAFMDNFK to set.
+       * uint32 cur_module_id = 13;
+       * @param value The curModuleId to set.
        * @return This builder for chaining.
        */
-      public Builder setBEIJAFMDNFK(int value) {
+      public Builder setCurModuleId(int value) {
         
-        bEIJAFMDNFK_ = value;
+        curModuleId_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 BEIJAFMDNFK = 13;
+       * uint32 cur_module_id = 13;
        * @return This builder for chaining.
        */
-      public Builder clearBEIJAFMDNFK() {
+      public Builder clearCurModuleId() {
         
-        bEIJAFMDNFK_ = 0;
+        curModuleId_ = 0;
         onChanged();
         return this;
       }
 
-      private int gLJCPMPPCKO_ ;
+      private int curRoomSceneId_ ;
       /**
-       * uint32 GLJCPMPPCKO = 8;
-       * @return The gLJCPMPPCKO.
+       * uint32 cur_room_scene_id = 8;
+       * @return The curRoomSceneId.
        */
       @java.lang.Override
-      public int getGLJCPMPPCKO() {
-        return gLJCPMPPCKO_;
+      public int getCurRoomSceneId() {
+        return curRoomSceneId_;
       }
       /**
-       * uint32 GLJCPMPPCKO = 8;
-       * @param value The gLJCPMPPCKO to set.
+       * uint32 cur_room_scene_id = 8;
+       * @param value The curRoomSceneId to set.
        * @return This builder for chaining.
        */
-      public Builder setGLJCPMPPCKO(int value) {
+      public Builder setCurRoomSceneId(int value) {
         
-        gLJCPMPPCKO_ = value;
+        curRoomSceneId_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 GLJCPMPPCKO = 8;
+       * uint32 cur_room_scene_id = 8;
        * @return This builder for chaining.
        */
-      public Builder clearGLJCPMPPCKO() {
+      public Builder clearCurRoomSceneId() {
         
-        gLJCPMPPCKO_ = 0;
+        curRoomSceneId_ = 0;
         onChanged();
         return this;
       }
@@ -1013,33 +1013,33 @@ public final class HomeBasicInfoOuterClass {
         return this;
       }
 
-      private int pAOBDHAMCKB_ ;
+      private int homeOwnerUid_ ;
       /**
-       * uint32 PAOBDHAMCKB = 14;
-       * @return The pAOBDHAMCKB.
+       * uint32 home_owner_uid = 14;
+       * @return The homeOwnerUid.
        */
       @java.lang.Override
-      public int getPAOBDHAMCKB() {
-        return pAOBDHAMCKB_;
+      public int getHomeOwnerUid() {
+        return homeOwnerUid_;
       }
       /**
-       * uint32 PAOBDHAMCKB = 14;
-       * @param value The pAOBDHAMCKB to set.
+       * uint32 home_owner_uid = 14;
+       * @param value The homeOwnerUid to set.
        * @return This builder for chaining.
        */
-      public Builder setPAOBDHAMCKB(int value) {
+      public Builder setHomeOwnerUid(int value) {
         
-        pAOBDHAMCKB_ = value;
+        homeOwnerUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 PAOBDHAMCKB = 14;
+       * uint32 home_owner_uid = 14;
        * @return This builder for chaining.
        */
-      public Builder clearPAOBDHAMCKB() {
+      public Builder clearHomeOwnerUid() {
         
-        pAOBDHAMCKB_ = 0;
+        homeOwnerUid_ = 0;
         onChanged();
         return this;
       }
@@ -1230,13 +1230,13 @@ public final class HomeBasicInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023HomeBasicInfo.proto\032\031HomeLimitedShopIn" +
-      "fo.proto\"\315\001\n\rHomeBasicInfo\022\r\n\005level\030\013 \001(" +
+      "fo.proto\"\330\001\n\rHomeBasicInfo\022\r\n\005level\030\013 \001(" +
       "\r\022\027\n\017owner_nick_name\030\005 \001(\t\022\027\n\017is_in_edit" +
-      "_mode\030\t \001(\010\022\023\n\013BEIJAFMDNFK\030\r \001(\r\022\023\n\013GLJC" +
-      "PMPPCKO\030\010 \001(\r\022\013\n\003exp\030\n \001(\004\022\023\n\013PAOBDHAMCK" +
-      "B\030\016 \001(\r\022/\n\021limited_shop_info\030\017 \001(\0132\024.Hom" +
-      "eLimitedShopInfoB\033\n\031emu.grasscutter.net." +
-      "protob\006proto3"
+      "_mode\030\t \001(\010\022\025\n\rcur_module_id\030\r \001(\r\022\031\n\021cu" +
+      "r_room_scene_id\030\010 \001(\r\022\013\n\003exp\030\n \001(\004\022\026\n\016ho" +
+      "me_owner_uid\030\016 \001(\r\022/\n\021limited_shop_info\030" +
+      "\017 \001(\0132\024.HomeLimitedShopInfoB\033\n\031emu.grass" +
+      "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1248,7 +1248,7 @@ public final class HomeBasicInfoOuterClass {
     internal_static_HomeBasicInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeBasicInfo_descriptor,
-        new java.lang.String[] { "Level", "OwnerNickName", "IsInEditMode", "BEIJAFMDNFK", "GLJCPMPPCKO", "Exp", "PAOBDHAMCKB", "LimitedShopInfo", });
+        new java.lang.String[] { "Level", "OwnerNickName", "IsInEditMode", "CurModuleId", "CurRoomSceneId", "Exp", "HomeOwnerUid", "LimitedShopInfo", });
     emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java
index 9be348803..4178ae31c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java
@@ -43,27 +43,27 @@ public final class HomeBlockArrangementInfoOuterClass {
         int index);
 
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
     java.util.List 
-        getBEBDBMPNNLEList();
+        getPersistentFurnitureListList();
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getBEBDBMPNNLE(int index);
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index);
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
-    int getBEBDBMPNNLECount();
+    int getPersistentFurnitureListCount();
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
     java.util.List 
-        getBEBDBMPNNLEOrBuilderList();
+        getPersistentFurnitureListOrBuilderList();
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getBEBDBMPNNLEOrBuilder(
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
         int index);
 
     /**
@@ -199,27 +199,27 @@ public final class HomeBlockArrangementInfoOuterClass {
     int getComfortValue();
 
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
     java.util.List 
-        getCGNFDNDHLGLList();
+        getDeployFurniureListList();
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getCGNFDNDHLGL(int index);
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index);
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
-    int getCGNFDNDHLGLCount();
+    int getDeployFurniureListCount();
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
     java.util.List 
-        getCGNFDNDHLGLOrBuilderList();
+        getDeployFurniureListOrBuilderList();
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getCGNFDNDHLGLOrBuilder(
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
         int index);
 
     /**
@@ -294,13 +294,13 @@ public final class HomeBlockArrangementInfoOuterClass {
     }
     private HomeBlockArrangementInfo() {
       dotPatternList_ = java.util.Collections.emptyList();
-      bEBDBMPNNLE_ = java.util.Collections.emptyList();
+      persistentFurnitureList_ = java.util.Collections.emptyList();
       furnitureSuiteList_ = java.util.Collections.emptyList();
       furnitureCustomSuiteList_ = java.util.Collections.emptyList();
       furnitureGroupList_ = java.util.Collections.emptyList();
       deployAnimalList_ = java.util.Collections.emptyList();
       fieldList_ = java.util.Collections.emptyList();
-      cGNFDNDHLGL_ = java.util.Collections.emptyList();
+      deployFurniureList_ = java.util.Collections.emptyList();
       deployNpcList_ = java.util.Collections.emptyList();
       weekendDjinnInfoList_ = java.util.Collections.emptyList();
     }
@@ -393,10 +393,10 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
             case 82: {
               if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                cGNFDNDHLGL_ = new java.util.ArrayList();
+                deployFurniureList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              cGNFDNDHLGL_.add(
+              deployFurniureList_.add(
                   input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
               break;
             }
@@ -411,10 +411,10 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
             case 98: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                bEBDBMPNNLE_ = new java.util.ArrayList();
+                persistentFurnitureList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              bEBDBMPNNLE_.add(
+              persistentFurnitureList_.add(
                   input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
               break;
             }
@@ -472,13 +472,13 @@ public final class HomeBlockArrangementInfoOuterClass {
           deployNpcList_ = java.util.Collections.unmodifiableList(deployNpcList_);
         }
         if (((mutable_bitField0_ & 0x00000080) != 0)) {
-          cGNFDNDHLGL_ = java.util.Collections.unmodifiableList(cGNFDNDHLGL_);
+          deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
         }
         if (((mutable_bitField0_ & 0x00000040) != 0)) {
           fieldList_ = java.util.Collections.unmodifiableList(fieldList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          bEBDBMPNNLE_ = java.util.Collections.unmodifiableList(bEBDBMPNNLE_);
+          persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
           furnitureSuiteList_ = java.util.Collections.unmodifiableList(furnitureSuiteList_);
@@ -543,44 +543,44 @@ public final class HomeBlockArrangementInfoOuterClass {
       return dotPatternList_.get(index);
     }
 
-    public static final int BEBDBMPNNLE_FIELD_NUMBER = 12;
-    private java.util.List bEBDBMPNNLE_;
+    public static final int PERSISTENT_FURNITURE_LIST_FIELD_NUMBER = 12;
+    private java.util.List persistentFurnitureList_;
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
     @java.lang.Override
-    public java.util.List getBEBDBMPNNLEList() {
-      return bEBDBMPNNLE_;
+    public java.util.List getPersistentFurnitureListList() {
+      return persistentFurnitureList_;
     }
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
     @java.lang.Override
     public java.util.List 
-        getBEBDBMPNNLEOrBuilderList() {
-      return bEBDBMPNNLE_;
+        getPersistentFurnitureListOrBuilderList() {
+      return persistentFurnitureList_;
     }
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
     @java.lang.Override
-    public int getBEBDBMPNNLECount() {
-      return bEBDBMPNNLE_.size();
+    public int getPersistentFurnitureListCount() {
+      return persistentFurnitureList_.size();
     }
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getBEBDBMPNNLE(int index) {
-      return bEBDBMPNNLE_.get(index);
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
+      return persistentFurnitureList_.get(index);
     }
     /**
-     * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+     * repeated .HomeFurnitureData persistent_furniture_list = 12;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getBEBDBMPNNLEOrBuilder(
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
         int index) {
-      return bEBDBMPNNLE_.get(index);
+      return persistentFurnitureList_.get(index);
     }
 
     public static final int FURNITURE_SUITE_LIST_FIELD_NUMBER = 14;
@@ -805,44 +805,44 @@ public final class HomeBlockArrangementInfoOuterClass {
       return comfortValue_;
     }
 
-    public static final int CGNFDNDHLGL_FIELD_NUMBER = 10;
-    private java.util.List cGNFDNDHLGL_;
+    public static final int DEPLOY_FURNIURE_LIST_FIELD_NUMBER = 10;
+    private java.util.List deployFurniureList_;
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
     @java.lang.Override
-    public java.util.List getCGNFDNDHLGLList() {
-      return cGNFDNDHLGL_;
+    public java.util.List getDeployFurniureListList() {
+      return deployFurniureList_;
     }
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
     @java.lang.Override
     public java.util.List 
-        getCGNFDNDHLGLOrBuilderList() {
-      return cGNFDNDHLGL_;
+        getDeployFurniureListOrBuilderList() {
+      return deployFurniureList_;
     }
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
     @java.lang.Override
-    public int getCGNFDNDHLGLCount() {
-      return cGNFDNDHLGL_.size();
+    public int getDeployFurniureListCount() {
+      return deployFurniureList_.size();
     }
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getCGNFDNDHLGL(int index) {
-      return cGNFDNDHLGL_.get(index);
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
+      return deployFurniureList_.get(index);
     }
     /**
-     * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+     * repeated .HomeFurnitureData deploy_furniure_list = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getCGNFDNDHLGLOrBuilder(
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
         int index) {
-      return cGNFDNDHLGL_.get(index);
+      return deployFurniureList_.get(index);
     }
 
     public static final int DEPLOY_NPC_LIST_FIELD_NUMBER = 9;
@@ -971,14 +971,14 @@ public final class HomeBlockArrangementInfoOuterClass {
       for (int i = 0; i < deployNpcList_.size(); i++) {
         output.writeMessage(9, deployNpcList_.get(i));
       }
-      for (int i = 0; i < cGNFDNDHLGL_.size(); i++) {
-        output.writeMessage(10, cGNFDNDHLGL_.get(i));
+      for (int i = 0; i < deployFurniureList_.size(); i++) {
+        output.writeMessage(10, deployFurniureList_.get(i));
       }
       for (int i = 0; i < fieldList_.size(); i++) {
         output.writeMessage(11, fieldList_.get(i));
       }
-      for (int i = 0; i < bEBDBMPNNLE_.size(); i++) {
-        output.writeMessage(12, bEBDBMPNNLE_.get(i));
+      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
+        output.writeMessage(12, persistentFurnitureList_.get(i));
       }
       if (comfortValue_ != 0) {
         output.writeUInt32(13, comfortValue_);
@@ -1026,17 +1026,17 @@ public final class HomeBlockArrangementInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(9, deployNpcList_.get(i));
       }
-      for (int i = 0; i < cGNFDNDHLGL_.size(); i++) {
+      for (int i = 0; i < deployFurniureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, cGNFDNDHLGL_.get(i));
+          .computeMessageSize(10, deployFurniureList_.get(i));
       }
       for (int i = 0; i < fieldList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(11, fieldList_.get(i));
       }
-      for (int i = 0; i < bEBDBMPNNLE_.size(); i++) {
+      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, bEBDBMPNNLE_.get(i));
+          .computeMessageSize(12, persistentFurnitureList_.get(i));
       }
       if (comfortValue_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1067,8 +1067,8 @@ public final class HomeBlockArrangementInfoOuterClass {
 
       if (!getDotPatternListList()
           .equals(other.getDotPatternListList())) return false;
-      if (!getBEBDBMPNNLEList()
-          .equals(other.getBEBDBMPNNLEList())) return false;
+      if (!getPersistentFurnitureListList()
+          .equals(other.getPersistentFurnitureListList())) return false;
       if (!getFurnitureSuiteListList()
           .equals(other.getFurnitureSuiteListList())) return false;
       if (!getFurnitureCustomSuiteListList()
@@ -1083,8 +1083,8 @@ public final class HomeBlockArrangementInfoOuterClass {
           .equals(other.getFieldListList())) return false;
       if (getComfortValue()
           != other.getComfortValue()) return false;
-      if (!getCGNFDNDHLGLList()
-          .equals(other.getCGNFDNDHLGLList())) return false;
+      if (!getDeployFurniureListList()
+          .equals(other.getDeployFurniureListList())) return false;
       if (!getDeployNpcListList()
           .equals(other.getDeployNpcListList())) return false;
       if (getIsUnlocked()
@@ -1106,9 +1106,9 @@ public final class HomeBlockArrangementInfoOuterClass {
         hash = (37 * hash) + DOT_PATTERN_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getDotPatternListList().hashCode();
       }
-      if (getBEBDBMPNNLECount() > 0) {
-        hash = (37 * hash) + BEBDBMPNNLE_FIELD_NUMBER;
-        hash = (53 * hash) + getBEBDBMPNNLEList().hashCode();
+      if (getPersistentFurnitureListCount() > 0) {
+        hash = (37 * hash) + PERSISTENT_FURNITURE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPersistentFurnitureListList().hashCode();
       }
       if (getFurnitureSuiteListCount() > 0) {
         hash = (37 * hash) + FURNITURE_SUITE_LIST_FIELD_NUMBER;
@@ -1134,9 +1134,9 @@ public final class HomeBlockArrangementInfoOuterClass {
       }
       hash = (37 * hash) + COMFORT_VALUE_FIELD_NUMBER;
       hash = (53 * hash) + getComfortValue();
-      if (getCGNFDNDHLGLCount() > 0) {
-        hash = (37 * hash) + CGNFDNDHLGL_FIELD_NUMBER;
-        hash = (53 * hash) + getCGNFDNDHLGLList().hashCode();
+      if (getDeployFurniureListCount() > 0) {
+        hash = (37 * hash) + DEPLOY_FURNIURE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDeployFurniureListList().hashCode();
       }
       if (getDeployNpcListCount() > 0) {
         hash = (37 * hash) + DEPLOY_NPC_LIST_FIELD_NUMBER;
@@ -1282,13 +1282,13 @@ public final class HomeBlockArrangementInfoOuterClass {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getDotPatternListFieldBuilder();
-          getBEBDBMPNNLEFieldBuilder();
+          getPersistentFurnitureListFieldBuilder();
           getFurnitureSuiteListFieldBuilder();
           getFurnitureCustomSuiteListFieldBuilder();
           getFurnitureGroupListFieldBuilder();
           getDeployAnimalListFieldBuilder();
           getFieldListFieldBuilder();
-          getCGNFDNDHLGLFieldBuilder();
+          getDeployFurniureListFieldBuilder();
           getDeployNpcListFieldBuilder();
           getWeekendDjinnInfoListFieldBuilder();
         }
@@ -1302,11 +1302,11 @@ public final class HomeBlockArrangementInfoOuterClass {
         } else {
           dotPatternListBuilder_.clear();
         }
-        if (bEBDBMPNNLEBuilder_ == null) {
-          bEBDBMPNNLE_ = java.util.Collections.emptyList();
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
-          bEBDBMPNNLEBuilder_.clear();
+          persistentFurnitureListBuilder_.clear();
         }
         if (furnitureSuiteListBuilder_ == null) {
           furnitureSuiteList_ = java.util.Collections.emptyList();
@@ -1342,11 +1342,11 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
         comfortValue_ = 0;
 
-        if (cGNFDNDHLGLBuilder_ == null) {
-          cGNFDNDHLGL_ = java.util.Collections.emptyList();
+        if (deployFurniureListBuilder_ == null) {
+          deployFurniureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000080);
         } else {
-          cGNFDNDHLGLBuilder_.clear();
+          deployFurniureListBuilder_.clear();
         }
         if (deployNpcListBuilder_ == null) {
           deployNpcList_ = java.util.Collections.emptyList();
@@ -1398,14 +1398,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         } else {
           result.dotPatternList_ = dotPatternListBuilder_.build();
         }
-        if (bEBDBMPNNLEBuilder_ == null) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
-            bEBDBMPNNLE_ = java.util.Collections.unmodifiableList(bEBDBMPNNLE_);
+            persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
             bitField0_ = (bitField0_ & ~0x00000002);
           }
-          result.bEBDBMPNNLE_ = bEBDBMPNNLE_;
+          result.persistentFurnitureList_ = persistentFurnitureList_;
         } else {
-          result.bEBDBMPNNLE_ = bEBDBMPNNLEBuilder_.build();
+          result.persistentFurnitureList_ = persistentFurnitureListBuilder_.build();
         }
         if (furnitureSuiteListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
@@ -1454,14 +1454,14 @@ public final class HomeBlockArrangementInfoOuterClass {
           result.fieldList_ = fieldListBuilder_.build();
         }
         result.comfortValue_ = comfortValue_;
-        if (cGNFDNDHLGLBuilder_ == null) {
+        if (deployFurniureListBuilder_ == null) {
           if (((bitField0_ & 0x00000080) != 0)) {
-            cGNFDNDHLGL_ = java.util.Collections.unmodifiableList(cGNFDNDHLGL_);
+            deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
             bitField0_ = (bitField0_ & ~0x00000080);
           }
-          result.cGNFDNDHLGL_ = cGNFDNDHLGL_;
+          result.deployFurniureList_ = deployFurniureList_;
         } else {
-          result.cGNFDNDHLGL_ = cGNFDNDHLGLBuilder_.build();
+          result.deployFurniureList_ = deployFurniureListBuilder_.build();
         }
         if (deployNpcListBuilder_ == null) {
           if (((bitField0_ & 0x00000100) != 0)) {
@@ -1556,29 +1556,29 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
           }
         }
-        if (bEBDBMPNNLEBuilder_ == null) {
-          if (!other.bEBDBMPNNLE_.isEmpty()) {
-            if (bEBDBMPNNLE_.isEmpty()) {
-              bEBDBMPNNLE_ = other.bEBDBMPNNLE_;
+        if (persistentFurnitureListBuilder_ == null) {
+          if (!other.persistentFurnitureList_.isEmpty()) {
+            if (persistentFurnitureList_.isEmpty()) {
+              persistentFurnitureList_ = other.persistentFurnitureList_;
               bitField0_ = (bitField0_ & ~0x00000002);
             } else {
-              ensureBEBDBMPNNLEIsMutable();
-              bEBDBMPNNLE_.addAll(other.bEBDBMPNNLE_);
+              ensurePersistentFurnitureListIsMutable();
+              persistentFurnitureList_.addAll(other.persistentFurnitureList_);
             }
             onChanged();
           }
         } else {
-          if (!other.bEBDBMPNNLE_.isEmpty()) {
-            if (bEBDBMPNNLEBuilder_.isEmpty()) {
-              bEBDBMPNNLEBuilder_.dispose();
-              bEBDBMPNNLEBuilder_ = null;
-              bEBDBMPNNLE_ = other.bEBDBMPNNLE_;
+          if (!other.persistentFurnitureList_.isEmpty()) {
+            if (persistentFurnitureListBuilder_.isEmpty()) {
+              persistentFurnitureListBuilder_.dispose();
+              persistentFurnitureListBuilder_ = null;
+              persistentFurnitureList_ = other.persistentFurnitureList_;
               bitField0_ = (bitField0_ & ~0x00000002);
-              bEBDBMPNNLEBuilder_ = 
+              persistentFurnitureListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getBEBDBMPNNLEFieldBuilder() : null;
+                   getPersistentFurnitureListFieldBuilder() : null;
             } else {
-              bEBDBMPNNLEBuilder_.addAllMessages(other.bEBDBMPNNLE_);
+              persistentFurnitureListBuilder_.addAllMessages(other.persistentFurnitureList_);
             }
           }
         }
@@ -1718,29 +1718,29 @@ public final class HomeBlockArrangementInfoOuterClass {
         if (other.getComfortValue() != 0) {
           setComfortValue(other.getComfortValue());
         }
-        if (cGNFDNDHLGLBuilder_ == null) {
-          if (!other.cGNFDNDHLGL_.isEmpty()) {
-            if (cGNFDNDHLGL_.isEmpty()) {
-              cGNFDNDHLGL_ = other.cGNFDNDHLGL_;
+        if (deployFurniureListBuilder_ == null) {
+          if (!other.deployFurniureList_.isEmpty()) {
+            if (deployFurniureList_.isEmpty()) {
+              deployFurniureList_ = other.deployFurniureList_;
               bitField0_ = (bitField0_ & ~0x00000080);
             } else {
-              ensureCGNFDNDHLGLIsMutable();
-              cGNFDNDHLGL_.addAll(other.cGNFDNDHLGL_);
+              ensureDeployFurniureListIsMutable();
+              deployFurniureList_.addAll(other.deployFurniureList_);
             }
             onChanged();
           }
         } else {
-          if (!other.cGNFDNDHLGL_.isEmpty()) {
-            if (cGNFDNDHLGLBuilder_.isEmpty()) {
-              cGNFDNDHLGLBuilder_.dispose();
-              cGNFDNDHLGLBuilder_ = null;
-              cGNFDNDHLGL_ = other.cGNFDNDHLGL_;
+          if (!other.deployFurniureList_.isEmpty()) {
+            if (deployFurniureListBuilder_.isEmpty()) {
+              deployFurniureListBuilder_.dispose();
+              deployFurniureListBuilder_ = null;
+              deployFurniureList_ = other.deployFurniureList_;
               bitField0_ = (bitField0_ & ~0x00000080);
-              cGNFDNDHLGLBuilder_ = 
+              deployFurniureListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getCGNFDNDHLGLFieldBuilder() : null;
+                   getDeployFurniureListFieldBuilder() : null;
             } else {
-              cGNFDNDHLGLBuilder_.addAllMessages(other.cGNFDNDHLGL_);
+              deployFurniureListBuilder_.addAllMessages(other.deployFurniureList_);
             }
           }
         }
@@ -2069,244 +2069,244 @@ public final class HomeBlockArrangementInfoOuterClass {
         return dotPatternListBuilder_;
       }
 
-      private java.util.List bEBDBMPNNLE_ =
+      private java.util.List persistentFurnitureList_ =
         java.util.Collections.emptyList();
-      private void ensureBEBDBMPNNLEIsMutable() {
+      private void ensurePersistentFurnitureListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          bEBDBMPNNLE_ = new java.util.ArrayList(bEBDBMPNNLE_);
+          persistentFurnitureList_ = new java.util.ArrayList(persistentFurnitureList_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> bEBDBMPNNLEBuilder_;
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> persistentFurnitureListBuilder_;
 
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public java.util.List getBEBDBMPNNLEList() {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(bEBDBMPNNLE_);
+      public java.util.List getPersistentFurnitureListList() {
+        if (persistentFurnitureListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
         } else {
-          return bEBDBMPNNLEBuilder_.getMessageList();
+          return persistentFurnitureListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public int getBEBDBMPNNLECount() {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          return bEBDBMPNNLE_.size();
+      public int getPersistentFurnitureListCount() {
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.size();
         } else {
-          return bEBDBMPNNLEBuilder_.getCount();
+          return persistentFurnitureListBuilder_.getCount();
         }
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getBEBDBMPNNLE(int index) {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          return bEBDBMPNNLE_.get(index);
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.get(index);
         } else {
-          return bEBDBMPNNLEBuilder_.getMessage(index);
+          return persistentFurnitureListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder setBEBDBMPNNLE(
+      public Builder setPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (bEBDBMPNNLEBuilder_ == null) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureBEBDBMPNNLEIsMutable();
-          bEBDBMPNNLE_.set(index, value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.set(index, value);
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.setMessage(index, value);
+          persistentFurnitureListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder setBEBDBMPNNLE(
+      public Builder setPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          ensureBEBDBMPNNLEIsMutable();
-          bEBDBMPNNLE_.set(index, builderForValue.build());
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.setMessage(index, builderForValue.build());
+          persistentFurnitureListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder addBEBDBMPNNLE(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (bEBDBMPNNLEBuilder_ == null) {
+      public Builder addPersistentFurnitureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureBEBDBMPNNLEIsMutable();
-          bEBDBMPNNLE_.add(value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(value);
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.addMessage(value);
+          persistentFurnitureListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder addBEBDBMPNNLE(
+      public Builder addPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (bEBDBMPNNLEBuilder_ == null) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureBEBDBMPNNLEIsMutable();
-          bEBDBMPNNLE_.add(index, value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(index, value);
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.addMessage(index, value);
+          persistentFurnitureListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder addBEBDBMPNNLE(
+      public Builder addPersistentFurnitureList(
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          ensureBEBDBMPNNLEIsMutable();
-          bEBDBMPNNLE_.add(builderForValue.build());
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(builderForValue.build());
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.addMessage(builderForValue.build());
+          persistentFurnitureListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder addBEBDBMPNNLE(
+      public Builder addPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          ensureBEBDBMPNNLEIsMutable();
-          bEBDBMPNNLE_.add(index, builderForValue.build());
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.addMessage(index, builderForValue.build());
+          persistentFurnitureListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder addAllBEBDBMPNNLE(
+      public Builder addAllPersistentFurnitureList(
           java.lang.Iterable values) {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          ensureBEBDBMPNNLEIsMutable();
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, bEBDBMPNNLE_);
+              values, persistentFurnitureList_);
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.addAllMessages(values);
+          persistentFurnitureListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder clearBEBDBMPNNLE() {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          bEBDBMPNNLE_ = java.util.Collections.emptyList();
+      public Builder clearPersistentFurnitureList() {
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.clear();
+          persistentFurnitureListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public Builder removeBEBDBMPNNLE(int index) {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          ensureBEBDBMPNNLEIsMutable();
-          bEBDBMPNNLE_.remove(index);
+      public Builder removePersistentFurnitureList(int index) {
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.remove(index);
           onChanged();
         } else {
-          bEBDBMPNNLEBuilder_.remove(index);
+          persistentFurnitureListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getBEBDBMPNNLEBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getPersistentFurnitureListBuilder(
           int index) {
-        return getBEBDBMPNNLEFieldBuilder().getBuilder(index);
+        return getPersistentFurnitureListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getBEBDBMPNNLEOrBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
           int index) {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          return bEBDBMPNNLE_.get(index);  } else {
-          return bEBDBMPNNLEBuilder_.getMessageOrBuilder(index);
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.get(index);  } else {
+          return persistentFurnitureListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
       public java.util.List 
-           getBEBDBMPNNLEOrBuilderList() {
-        if (bEBDBMPNNLEBuilder_ != null) {
-          return bEBDBMPNNLEBuilder_.getMessageOrBuilderList();
+           getPersistentFurnitureListOrBuilderList() {
+        if (persistentFurnitureListBuilder_ != null) {
+          return persistentFurnitureListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(bEBDBMPNNLE_);
+          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
         }
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addBEBDBMPNNLEBuilder() {
-        return getBEBDBMPNNLEFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder() {
+        return getPersistentFurnitureListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addBEBDBMPNNLEBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder(
           int index) {
-        return getBEBDBMPNNLEFieldBuilder().addBuilder(
+        return getPersistentFurnitureListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData BEBDBMPNNLE = 12;
+       * repeated .HomeFurnitureData persistent_furniture_list = 12;
        */
       public java.util.List 
-           getBEBDBMPNNLEBuilderList() {
-        return getBEBDBMPNNLEFieldBuilder().getBuilderList();
+           getPersistentFurnitureListBuilderList() {
+        return getPersistentFurnitureListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-          getBEBDBMPNNLEFieldBuilder() {
-        if (bEBDBMPNNLEBuilder_ == null) {
-          bEBDBMPNNLEBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getPersistentFurnitureListFieldBuilder() {
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
-                  bEBDBMPNNLE_,
+                  persistentFurnitureList_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
-          bEBDBMPNNLE_ = null;
+          persistentFurnitureList_ = null;
         }
-        return bEBDBMPNNLEBuilder_;
+        return persistentFurnitureListBuilder_;
       }
 
       private java.util.List furnitureSuiteList_ =
@@ -3571,244 +3571,244 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
 
-      private java.util.List cGNFDNDHLGL_ =
+      private java.util.List deployFurniureList_ =
         java.util.Collections.emptyList();
-      private void ensureCGNFDNDHLGLIsMutable() {
+      private void ensureDeployFurniureListIsMutable() {
         if (!((bitField0_ & 0x00000080) != 0)) {
-          cGNFDNDHLGL_ = new java.util.ArrayList(cGNFDNDHLGL_);
+          deployFurniureList_ = new java.util.ArrayList(deployFurniureList_);
           bitField0_ |= 0x00000080;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> cGNFDNDHLGLBuilder_;
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> deployFurniureListBuilder_;
 
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public java.util.List getCGNFDNDHLGLList() {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(cGNFDNDHLGL_);
+      public java.util.List getDeployFurniureListList() {
+        if (deployFurniureListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(deployFurniureList_);
         } else {
-          return cGNFDNDHLGLBuilder_.getMessageList();
+          return deployFurniureListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public int getCGNFDNDHLGLCount() {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          return cGNFDNDHLGL_.size();
+      public int getDeployFurniureListCount() {
+        if (deployFurniureListBuilder_ == null) {
+          return deployFurniureList_.size();
         } else {
-          return cGNFDNDHLGLBuilder_.getCount();
+          return deployFurniureListBuilder_.getCount();
         }
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getCGNFDNDHLGL(int index) {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          return cGNFDNDHLGL_.get(index);
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
+        if (deployFurniureListBuilder_ == null) {
+          return deployFurniureList_.get(index);
         } else {
-          return cGNFDNDHLGLBuilder_.getMessage(index);
+          return deployFurniureListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder setCGNFDNDHLGL(
+      public Builder setDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (cGNFDNDHLGLBuilder_ == null) {
+        if (deployFurniureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureCGNFDNDHLGLIsMutable();
-          cGNFDNDHLGL_.set(index, value);
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.set(index, value);
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.setMessage(index, value);
+          deployFurniureListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder setCGNFDNDHLGL(
+      public Builder setDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          ensureCGNFDNDHLGLIsMutable();
-          cGNFDNDHLGL_.set(index, builderForValue.build());
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.setMessage(index, builderForValue.build());
+          deployFurniureListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder addCGNFDNDHLGL(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (cGNFDNDHLGLBuilder_ == null) {
+      public Builder addDeployFurniureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (deployFurniureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureCGNFDNDHLGLIsMutable();
-          cGNFDNDHLGL_.add(value);
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(value);
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.addMessage(value);
+          deployFurniureListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder addCGNFDNDHLGL(
+      public Builder addDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (cGNFDNDHLGLBuilder_ == null) {
+        if (deployFurniureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureCGNFDNDHLGLIsMutable();
-          cGNFDNDHLGL_.add(index, value);
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(index, value);
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.addMessage(index, value);
+          deployFurniureListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder addCGNFDNDHLGL(
+      public Builder addDeployFurniureList(
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          ensureCGNFDNDHLGLIsMutable();
-          cGNFDNDHLGL_.add(builderForValue.build());
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(builderForValue.build());
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.addMessage(builderForValue.build());
+          deployFurniureListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder addCGNFDNDHLGL(
+      public Builder addDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          ensureCGNFDNDHLGLIsMutable();
-          cGNFDNDHLGL_.add(index, builderForValue.build());
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.addMessage(index, builderForValue.build());
+          deployFurniureListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder addAllCGNFDNDHLGL(
+      public Builder addAllDeployFurniureList(
           java.lang.Iterable values) {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          ensureCGNFDNDHLGLIsMutable();
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, cGNFDNDHLGL_);
+              values, deployFurniureList_);
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.addAllMessages(values);
+          deployFurniureListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder clearCGNFDNDHLGL() {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          cGNFDNDHLGL_ = java.util.Collections.emptyList();
+      public Builder clearDeployFurniureList() {
+        if (deployFurniureListBuilder_ == null) {
+          deployFurniureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000080);
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.clear();
+          deployFurniureListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public Builder removeCGNFDNDHLGL(int index) {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          ensureCGNFDNDHLGLIsMutable();
-          cGNFDNDHLGL_.remove(index);
+      public Builder removeDeployFurniureList(int index) {
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.remove(index);
           onChanged();
         } else {
-          cGNFDNDHLGLBuilder_.remove(index);
+          deployFurniureListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getCGNFDNDHLGLBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getDeployFurniureListBuilder(
           int index) {
-        return getCGNFDNDHLGLFieldBuilder().getBuilder(index);
+        return getDeployFurniureListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getCGNFDNDHLGLOrBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
           int index) {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          return cGNFDNDHLGL_.get(index);  } else {
-          return cGNFDNDHLGLBuilder_.getMessageOrBuilder(index);
+        if (deployFurniureListBuilder_ == null) {
+          return deployFurniureList_.get(index);  } else {
+          return deployFurniureListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
       public java.util.List 
-           getCGNFDNDHLGLOrBuilderList() {
-        if (cGNFDNDHLGLBuilder_ != null) {
-          return cGNFDNDHLGLBuilder_.getMessageOrBuilderList();
+           getDeployFurniureListOrBuilderList() {
+        if (deployFurniureListBuilder_ != null) {
+          return deployFurniureListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(cGNFDNDHLGL_);
+          return java.util.Collections.unmodifiableList(deployFurniureList_);
         }
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addCGNFDNDHLGLBuilder() {
-        return getCGNFDNDHLGLFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder() {
+        return getDeployFurniureListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addCGNFDNDHLGLBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder(
           int index) {
-        return getCGNFDNDHLGLFieldBuilder().addBuilder(
+        return getDeployFurniureListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData CGNFDNDHLGL = 10;
+       * repeated .HomeFurnitureData deploy_furniure_list = 10;
        */
       public java.util.List 
-           getCGNFDNDHLGLBuilderList() {
-        return getCGNFDNDHLGLFieldBuilder().getBuilderList();
+           getDeployFurniureListBuilderList() {
+        return getDeployFurniureListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-          getCGNFDNDHLGLFieldBuilder() {
-        if (cGNFDNDHLGLBuilder_ == null) {
-          cGNFDNDHLGLBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getDeployFurniureListFieldBuilder() {
+        if (deployFurniureListBuilder_ == null) {
+          deployFurniureListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
-                  cGNFDNDHLGL_,
+                  deployFurniureList_,
                   ((bitField0_ & 0x00000080) != 0),
                   getParentForChildren(),
                   isClean());
-          cGNFDNDHLGL_ = null;
+          deployFurniureList_ = null;
         }
-        return cGNFDNDHLGLBuilder_;
+        return deployFurniureListBuilder_;
       }
 
       private java.util.List deployNpcList_ =
@@ -4394,23 +4394,23 @@ public final class HomeBlockArrangementInfoOuterClass {
       "FurnitureCustomSuiteData.proto\032\034HomeFurn" +
       "itureGroupData.proto\032\024HomeAnimalData.pro" +
       "to\032\030HomeBlockFieldData.proto\032\021HomeNpcDat" +
-      "a.proto\032\026WeekendDjinnInfo.proto\"\275\004\n\030Home" +
+      "a.proto\032\026WeekendDjinnInfo.proto\"\324\004\n\030Home" +
       "BlockArrangementInfo\022.\n\020dot_pattern_list" +
-      "\030\001 \003(\0132\024.HomeBlockDotPattern\022\'\n\013BEBDBMPN" +
-      "NLE\030\014 \003(\0132\022.HomeFurnitureData\0225\n\024furnitu" +
-      "re_suite_list\030\016 \003(\0132\027.HomeFurnitureSuite" +
-      "Data\022B\n\033furniture_custom_suite_list\030\002 \003(" +
-      "\0132\035.HomeFurnitureCustomSuiteData\022\020\n\010bloc" +
-      "k_id\030\010 \001(\r\0225\n\024furniture_group_list\030\004 \003(\013" +
-      "2\027.HomeFurnitureGroupData\022+\n\022deploy_anim" +
-      "al_list\030\017 \003(\0132\017.HomeAnimalData\022\'\n\nfield_" +
-      "list\030\013 \003(\0132\023.HomeBlockFieldData\022\025\n\rcomfo" +
-      "rt_value\030\r \001(\r\022\'\n\013CGNFDNDHLGL\030\n \003(\0132\022.Ho" +
-      "meFurnitureData\022%\n\017deploy_npc_list\030\t \003(\013" +
-      "2\014.HomeNpcData\022\023\n\013is_unlocked\030\006 \001(\010\0222\n\027w" +
-      "eekend_djinn_info_list\030\003 \003(\0132\021.WeekendDj" +
-      "innInfoB\033\n\031emu.grasscutter.net.protob\006pr" +
-      "oto3"
+      "\030\001 \003(\0132\024.HomeBlockDotPattern\0225\n\031persiste" +
+      "nt_furniture_list\030\014 \003(\0132\022.HomeFurnitureD" +
+      "ata\0225\n\024furniture_suite_list\030\016 \003(\0132\027.Home" +
+      "FurnitureSuiteData\022B\n\033furniture_custom_s" +
+      "uite_list\030\002 \003(\0132\035.HomeFurnitureCustomSui" +
+      "teData\022\020\n\010block_id\030\010 \001(\r\0225\n\024furniture_gr" +
+      "oup_list\030\004 \003(\0132\027.HomeFurnitureGroupData\022" +
+      "+\n\022deploy_animal_list\030\017 \003(\0132\017.HomeAnimal" +
+      "Data\022\'\n\nfield_list\030\013 \003(\0132\023.HomeBlockFiel" +
+      "dData\022\025\n\rcomfort_value\030\r \001(\r\0220\n\024deploy_f" +
+      "urniure_list\030\n \003(\0132\022.HomeFurnitureData\022%" +
+      "\n\017deploy_npc_list\030\t \003(\0132\014.HomeNpcData\022\023\n" +
+      "\013is_unlocked\030\006 \001(\010\0222\n\027weekend_djinn_info" +
+      "_list\030\003 \003(\0132\021.WeekendDjinnInfoB\033\n\031emu.gr" +
+      "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -4430,7 +4430,7 @@ public final class HomeBlockArrangementInfoOuterClass {
     internal_static_HomeBlockArrangementInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeBlockArrangementInfo_descriptor,
-        new java.lang.String[] { "DotPatternList", "BEBDBMPNNLE", "FurnitureSuiteList", "FurnitureCustomSuiteList", "BlockId", "FurnitureGroupList", "DeployAnimalList", "FieldList", "ComfortValue", "CGNFDNDHLGL", "DeployNpcList", "IsUnlocked", "WeekendDjinnInfoList", });
+        new java.lang.String[] { "DotPatternList", "PersistentFurnitureList", "FurnitureSuiteList", "FurnitureCustomSuiteList", "BlockId", "FurnitureGroupList", "DeployAnimalList", "FieldList", "ComfortValue", "DeployFurniureList", "DeployNpcList", "IsUnlocked", "WeekendDjinnInfoList", });
     emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.getDescriptor();
     emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java
index eae147933..0635f01f0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java
@@ -43,19 +43,19 @@ public final class HomeMarkPointSceneDataOuterClass {
         int index);
 
     /**
-     * .Vector HPIMNKGLMNC = 8;
-     * @return Whether the hPIMNKGLMNC field is set.
+     * .Vector safe_point_pos = 8;
+     * @return Whether the safePointPos field is set.
      */
-    boolean hasHPIMNKGLMNC();
+    boolean hasSafePointPos();
     /**
-     * .Vector HPIMNKGLMNC = 8;
-     * @return The hPIMNKGLMNC.
+     * .Vector safe_point_pos = 8;
+     * @return The safePointPos.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getHPIMNKGLMNC();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos();
     /**
-     * .Vector HPIMNKGLMNC = 8;
+     * .Vector safe_point_pos = 8;
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHPIMNKGLMNCOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder();
 
     /**
      * uint32 module_id = 9;
@@ -70,19 +70,19 @@ public final class HomeMarkPointSceneDataOuterClass {
     int getSceneId();
 
     /**
-     * .Vector KGAJHCFOHCB = 3;
-     * @return Whether the kGAJHCFOHCB field is set.
+     * .Vector teapot_spirit_pos = 3;
+     * @return Whether the teapotSpiritPos field is set.
      */
-    boolean hasKGAJHCFOHCB();
+    boolean hasTeapotSpiritPos();
     /**
-     * .Vector KGAJHCFOHCB = 3;
-     * @return The kGAJHCFOHCB.
+     * .Vector teapot_spirit_pos = 3;
+     * @return The teapotSpiritPos.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getKGAJHCFOHCB();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos();
     /**
-     * .Vector KGAJHCFOHCB = 3;
+     * .Vector teapot_spirit_pos = 3;
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKGAJHCFOHCBOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder();
   }
   /**
    * 
@@ -137,13 +137,13 @@ public final class HomeMarkPointSceneDataOuterClass {
               break;
             case 26: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (kGAJHCFOHCB_ != null) {
-                subBuilder = kGAJHCFOHCB_.toBuilder();
+              if (teapotSpiritPos_ != null) {
+                subBuilder = teapotSpiritPos_.toBuilder();
               }
-              kGAJHCFOHCB_ = 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(kGAJHCFOHCB_);
-                kGAJHCFOHCB_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(teapotSpiritPos_);
+                teapotSpiritPos_ = subBuilder.buildPartial();
               }
 
               break;
@@ -164,13 +164,13 @@ public final class HomeMarkPointSceneDataOuterClass {
             }
             case 66: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (hPIMNKGLMNC_ != null) {
-                subBuilder = hPIMNKGLMNC_.toBuilder();
+              if (safePointPos_ != null) {
+                subBuilder = safePointPos_.toBuilder();
               }
-              hPIMNKGLMNC_ = 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(hPIMNKGLMNC_);
-                hPIMNKGLMNC_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(safePointPos_);
+                safePointPos_ = subBuilder.buildPartial();
               }
 
               break;
@@ -255,30 +255,30 @@ public final class HomeMarkPointSceneDataOuterClass {
       return furnitureList_.get(index);
     }
 
-    public static final int HPIMNKGLMNC_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector hPIMNKGLMNC_;
+    public static final int SAFE_POINT_POS_FIELD_NUMBER = 8;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
     /**
-     * .Vector HPIMNKGLMNC = 8;
-     * @return Whether the hPIMNKGLMNC field is set.
+     * .Vector safe_point_pos = 8;
+     * @return Whether the safePointPos field is set.
      */
     @java.lang.Override
-    public boolean hasHPIMNKGLMNC() {
-      return hPIMNKGLMNC_ != null;
+    public boolean hasSafePointPos() {
+      return safePointPos_ != null;
     }
     /**
-     * .Vector HPIMNKGLMNC = 8;
-     * @return The hPIMNKGLMNC.
+     * .Vector safe_point_pos = 8;
+     * @return The safePointPos.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getHPIMNKGLMNC() {
-      return hPIMNKGLMNC_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hPIMNKGLMNC_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+      return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
     }
     /**
-     * .Vector HPIMNKGLMNC = 8;
+     * .Vector safe_point_pos = 8;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHPIMNKGLMNCOrBuilder() {
-      return getHPIMNKGLMNC();
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+      return getSafePointPos();
     }
 
     public static final int MODULE_ID_FIELD_NUMBER = 9;
@@ -303,30 +303,30 @@ public final class HomeMarkPointSceneDataOuterClass {
       return sceneId_;
     }
 
-    public static final int KGAJHCFOHCB_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector kGAJHCFOHCB_;
+    public static final int TEAPOT_SPIRIT_POS_FIELD_NUMBER = 3;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
     /**
-     * .Vector KGAJHCFOHCB = 3;
-     * @return Whether the kGAJHCFOHCB field is set.
+     * .Vector teapot_spirit_pos = 3;
+     * @return Whether the teapotSpiritPos field is set.
      */
     @java.lang.Override
-    public boolean hasKGAJHCFOHCB() {
-      return kGAJHCFOHCB_ != null;
+    public boolean hasTeapotSpiritPos() {
+      return teapotSpiritPos_ != null;
     }
     /**
-     * .Vector KGAJHCFOHCB = 3;
-     * @return The kGAJHCFOHCB.
+     * .Vector teapot_spirit_pos = 3;
+     * @return The teapotSpiritPos.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getKGAJHCFOHCB() {
-      return kGAJHCFOHCB_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kGAJHCFOHCB_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
+      return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
     }
     /**
-     * .Vector KGAJHCFOHCB = 3;
+     * .Vector teapot_spirit_pos = 3;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKGAJHCFOHCBOrBuilder() {
-      return getKGAJHCFOHCB();
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
+      return getTeapotSpiritPos();
     }
 
     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 (kGAJHCFOHCB_ != null) {
-        output.writeMessage(3, getKGAJHCFOHCB());
+      if (teapotSpiritPos_ != null) {
+        output.writeMessage(3, getTeapotSpiritPos());
       }
       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 (hPIMNKGLMNC_ != null) {
-        output.writeMessage(8, getHPIMNKGLMNC());
+      if (safePointPos_ != null) {
+        output.writeMessage(8, getSafePointPos());
       }
       if (moduleId_ != 0) {
         output.writeUInt32(9, moduleId_);
@@ -367,9 +367,9 @@ public final class HomeMarkPointSceneDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (kGAJHCFOHCB_ != null) {
+      if (teapotSpiritPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getKGAJHCFOHCB());
+          .computeMessageSize(3, getTeapotSpiritPos());
       }
       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 (hPIMNKGLMNC_ != null) {
+      if (safePointPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getHPIMNKGLMNC());
+          .computeMessageSize(8, getSafePointPos());
       }
       if (moduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -404,19 +404,19 @@ public final class HomeMarkPointSceneDataOuterClass {
 
       if (!getFurnitureListList()
           .equals(other.getFurnitureListList())) return false;
-      if (hasHPIMNKGLMNC() != other.hasHPIMNKGLMNC()) return false;
-      if (hasHPIMNKGLMNC()) {
-        if (!getHPIMNKGLMNC()
-            .equals(other.getHPIMNKGLMNC())) return false;
+      if (hasSafePointPos() != other.hasSafePointPos()) return false;
+      if (hasSafePointPos()) {
+        if (!getSafePointPos()
+            .equals(other.getSafePointPos())) return false;
       }
       if (getModuleId()
           != other.getModuleId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (hasKGAJHCFOHCB() != other.hasKGAJHCFOHCB()) return false;
-      if (hasKGAJHCFOHCB()) {
-        if (!getKGAJHCFOHCB()
-            .equals(other.getKGAJHCFOHCB())) return false;
+      if (hasTeapotSpiritPos() != other.hasTeapotSpiritPos()) return false;
+      if (hasTeapotSpiritPos()) {
+        if (!getTeapotSpiritPos()
+            .equals(other.getTeapotSpiritPos())) 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 (hasHPIMNKGLMNC()) {
-        hash = (37 * hash) + HPIMNKGLMNC_FIELD_NUMBER;
-        hash = (53 * hash) + getHPIMNKGLMNC().hashCode();
+      if (hasSafePointPos()) {
+        hash = (37 * hash) + SAFE_POINT_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getSafePointPos().hashCode();
       }
       hash = (37 * hash) + MODULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getModuleId();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
-      if (hasKGAJHCFOHCB()) {
-        hash = (37 * hash) + KGAJHCFOHCB_FIELD_NUMBER;
-        hash = (53 * hash) + getKGAJHCFOHCB().hashCode();
+      if (hasTeapotSpiritPos()) {
+        hash = (37 * hash) + TEAPOT_SPIRIT_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getTeapotSpiritPos().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -589,21 +589,21 @@ public final class HomeMarkPointSceneDataOuterClass {
         } else {
           furnitureListBuilder_.clear();
         }
-        if (hPIMNKGLMNCBuilder_ == null) {
-          hPIMNKGLMNC_ = null;
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = null;
         } else {
-          hPIMNKGLMNC_ = null;
-          hPIMNKGLMNCBuilder_ = null;
+          safePointPos_ = null;
+          safePointPosBuilder_ = null;
         }
         moduleId_ = 0;
 
         sceneId_ = 0;
 
-        if (kGAJHCFOHCBBuilder_ == null) {
-          kGAJHCFOHCB_ = null;
+        if (teapotSpiritPosBuilder_ == null) {
+          teapotSpiritPos_ = null;
         } else {
-          kGAJHCFOHCB_ = null;
-          kGAJHCFOHCBBuilder_ = null;
+          teapotSpiritPos_ = null;
+          teapotSpiritPosBuilder_ = null;
         }
         return this;
       }
@@ -641,17 +641,17 @@ public final class HomeMarkPointSceneDataOuterClass {
         } else {
           result.furnitureList_ = furnitureListBuilder_.build();
         }
-        if (hPIMNKGLMNCBuilder_ == null) {
-          result.hPIMNKGLMNC_ = hPIMNKGLMNC_;
+        if (safePointPosBuilder_ == null) {
+          result.safePointPos_ = safePointPos_;
         } else {
-          result.hPIMNKGLMNC_ = hPIMNKGLMNCBuilder_.build();
+          result.safePointPos_ = safePointPosBuilder_.build();
         }
         result.moduleId_ = moduleId_;
         result.sceneId_ = sceneId_;
-        if (kGAJHCFOHCBBuilder_ == null) {
-          result.kGAJHCFOHCB_ = kGAJHCFOHCB_;
+        if (teapotSpiritPosBuilder_ == null) {
+          result.teapotSpiritPos_ = teapotSpiritPos_;
         } else {
-          result.kGAJHCFOHCB_ = kGAJHCFOHCBBuilder_.build();
+          result.teapotSpiritPos_ = teapotSpiritPosBuilder_.build();
         }
         onBuilt();
         return result;
@@ -727,8 +727,8 @@ public final class HomeMarkPointSceneDataOuterClass {
             }
           }
         }
-        if (other.hasHPIMNKGLMNC()) {
-          mergeHPIMNKGLMNC(other.getHPIMNKGLMNC());
+        if (other.hasSafePointPos()) {
+          mergeSafePointPos(other.getSafePointPos());
         }
         if (other.getModuleId() != 0) {
           setModuleId(other.getModuleId());
@@ -736,8 +736,8 @@ public final class HomeMarkPointSceneDataOuterClass {
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (other.hasKGAJHCFOHCB()) {
-          mergeKGAJHCFOHCB(other.getKGAJHCFOHCB());
+        if (other.hasTeapotSpiritPos()) {
+          mergeTeapotSpiritPos(other.getTeapotSpiritPos());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1009,123 +1009,123 @@ public final class HomeMarkPointSceneDataOuterClass {
         return furnitureListBuilder_;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector hPIMNKGLMNC_;
+      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> hPIMNKGLMNCBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> safePointPosBuilder_;
       /**
-       * .Vector HPIMNKGLMNC = 8;
-       * @return Whether the hPIMNKGLMNC field is set.
+       * .Vector safe_point_pos = 8;
+       * @return Whether the safePointPos field is set.
        */
-      public boolean hasHPIMNKGLMNC() {
-        return hPIMNKGLMNCBuilder_ != null || hPIMNKGLMNC_ != null;
+      public boolean hasSafePointPos() {
+        return safePointPosBuilder_ != null || safePointPos_ != null;
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
-       * @return The hPIMNKGLMNC.
+       * .Vector safe_point_pos = 8;
+       * @return The safePointPos.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getHPIMNKGLMNC() {
-        if (hPIMNKGLMNCBuilder_ == null) {
-          return hPIMNKGLMNC_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hPIMNKGLMNC_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+        if (safePointPosBuilder_ == null) {
+          return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
         } else {
-          return hPIMNKGLMNCBuilder_.getMessage();
+          return safePointPosBuilder_.getMessage();
         }
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
+       * .Vector safe_point_pos = 8;
        */
-      public Builder setHPIMNKGLMNC(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (hPIMNKGLMNCBuilder_ == null) {
+      public Builder setSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (safePointPosBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          hPIMNKGLMNC_ = value;
+          safePointPos_ = value;
           onChanged();
         } else {
-          hPIMNKGLMNCBuilder_.setMessage(value);
+          safePointPosBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
+       * .Vector safe_point_pos = 8;
        */
-      public Builder setHPIMNKGLMNC(
+      public Builder setSafePointPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (hPIMNKGLMNCBuilder_ == null) {
-          hPIMNKGLMNC_ = builderForValue.build();
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = builderForValue.build();
           onChanged();
         } else {
-          hPIMNKGLMNCBuilder_.setMessage(builderForValue.build());
+          safePointPosBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
+       * .Vector safe_point_pos = 8;
        */
-      public Builder mergeHPIMNKGLMNC(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (hPIMNKGLMNCBuilder_ == null) {
-          if (hPIMNKGLMNC_ != null) {
-            hPIMNKGLMNC_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(hPIMNKGLMNC_).mergeFrom(value).buildPartial();
+      public Builder mergeSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (safePointPosBuilder_ == null) {
+          if (safePointPos_ != null) {
+            safePointPos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(safePointPos_).mergeFrom(value).buildPartial();
           } else {
-            hPIMNKGLMNC_ = value;
+            safePointPos_ = value;
           }
           onChanged();
         } else {
-          hPIMNKGLMNCBuilder_.mergeFrom(value);
+          safePointPosBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
+       * .Vector safe_point_pos = 8;
        */
-      public Builder clearHPIMNKGLMNC() {
-        if (hPIMNKGLMNCBuilder_ == null) {
-          hPIMNKGLMNC_ = null;
+      public Builder clearSafePointPos() {
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = null;
           onChanged();
         } else {
-          hPIMNKGLMNC_ = null;
-          hPIMNKGLMNCBuilder_ = null;
+          safePointPos_ = null;
+          safePointPosBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
+       * .Vector safe_point_pos = 8;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getHPIMNKGLMNCBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSafePointPosBuilder() {
         
         onChanged();
-        return getHPIMNKGLMNCFieldBuilder().getBuilder();
+        return getSafePointPosFieldBuilder().getBuilder();
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
+       * .Vector safe_point_pos = 8;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHPIMNKGLMNCOrBuilder() {
-        if (hPIMNKGLMNCBuilder_ != null) {
-          return hPIMNKGLMNCBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+        if (safePointPosBuilder_ != null) {
+          return safePointPosBuilder_.getMessageOrBuilder();
         } else {
-          return hPIMNKGLMNC_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hPIMNKGLMNC_;
+          return safePointPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
         }
       }
       /**
-       * .Vector HPIMNKGLMNC = 8;
+       * .Vector safe_point_pos = 8;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-          getHPIMNKGLMNCFieldBuilder() {
-        if (hPIMNKGLMNCBuilder_ == null) {
-          hPIMNKGLMNCBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          getSafePointPosFieldBuilder() {
+        if (safePointPosBuilder_ == null) {
+          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>(
-                  getHPIMNKGLMNC(),
+                  getSafePointPos(),
                   getParentForChildren(),
                   isClean());
-          hPIMNKGLMNC_ = null;
+          safePointPos_ = null;
         }
-        return hPIMNKGLMNCBuilder_;
+        return safePointPosBuilder_;
       }
 
       private int moduleId_ ;
@@ -1190,123 +1190,123 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector kGAJHCFOHCB_;
+      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> kGAJHCFOHCBBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> teapotSpiritPosBuilder_;
       /**
-       * .Vector KGAJHCFOHCB = 3;
-       * @return Whether the kGAJHCFOHCB field is set.
+       * .Vector teapot_spirit_pos = 3;
+       * @return Whether the teapotSpiritPos field is set.
        */
-      public boolean hasKGAJHCFOHCB() {
-        return kGAJHCFOHCBBuilder_ != null || kGAJHCFOHCB_ != null;
+      public boolean hasTeapotSpiritPos() {
+        return teapotSpiritPosBuilder_ != null || teapotSpiritPos_ != null;
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
-       * @return The kGAJHCFOHCB.
+       * .Vector teapot_spirit_pos = 3;
+       * @return The teapotSpiritPos.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getKGAJHCFOHCB() {
-        if (kGAJHCFOHCBBuilder_ == null) {
-          return kGAJHCFOHCB_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kGAJHCFOHCB_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
+        if (teapotSpiritPosBuilder_ == null) {
+          return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
         } else {
-          return kGAJHCFOHCBBuilder_.getMessage();
+          return teapotSpiritPosBuilder_.getMessage();
         }
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
+       * .Vector teapot_spirit_pos = 3;
        */
-      public Builder setKGAJHCFOHCB(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (kGAJHCFOHCBBuilder_ == null) {
+      public Builder setTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (teapotSpiritPosBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          kGAJHCFOHCB_ = value;
+          teapotSpiritPos_ = value;
           onChanged();
         } else {
-          kGAJHCFOHCBBuilder_.setMessage(value);
+          teapotSpiritPosBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
+       * .Vector teapot_spirit_pos = 3;
        */
-      public Builder setKGAJHCFOHCB(
+      public Builder setTeapotSpiritPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (kGAJHCFOHCBBuilder_ == null) {
-          kGAJHCFOHCB_ = builderForValue.build();
+        if (teapotSpiritPosBuilder_ == null) {
+          teapotSpiritPos_ = builderForValue.build();
           onChanged();
         } else {
-          kGAJHCFOHCBBuilder_.setMessage(builderForValue.build());
+          teapotSpiritPosBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
+       * .Vector teapot_spirit_pos = 3;
        */
-      public Builder mergeKGAJHCFOHCB(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (kGAJHCFOHCBBuilder_ == null) {
-          if (kGAJHCFOHCB_ != null) {
-            kGAJHCFOHCB_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(kGAJHCFOHCB_).mergeFrom(value).buildPartial();
+      public Builder mergeTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (teapotSpiritPosBuilder_ == null) {
+          if (teapotSpiritPos_ != null) {
+            teapotSpiritPos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(teapotSpiritPos_).mergeFrom(value).buildPartial();
           } else {
-            kGAJHCFOHCB_ = value;
+            teapotSpiritPos_ = value;
           }
           onChanged();
         } else {
-          kGAJHCFOHCBBuilder_.mergeFrom(value);
+          teapotSpiritPosBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
+       * .Vector teapot_spirit_pos = 3;
        */
-      public Builder clearKGAJHCFOHCB() {
-        if (kGAJHCFOHCBBuilder_ == null) {
-          kGAJHCFOHCB_ = null;
+      public Builder clearTeapotSpiritPos() {
+        if (teapotSpiritPosBuilder_ == null) {
+          teapotSpiritPos_ = null;
           onChanged();
         } else {
-          kGAJHCFOHCB_ = null;
-          kGAJHCFOHCBBuilder_ = null;
+          teapotSpiritPos_ = null;
+          teapotSpiritPosBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
+       * .Vector teapot_spirit_pos = 3;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getKGAJHCFOHCBBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTeapotSpiritPosBuilder() {
         
         onChanged();
-        return getKGAJHCFOHCBFieldBuilder().getBuilder();
+        return getTeapotSpiritPosFieldBuilder().getBuilder();
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
+       * .Vector teapot_spirit_pos = 3;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKGAJHCFOHCBOrBuilder() {
-        if (kGAJHCFOHCBBuilder_ != null) {
-          return kGAJHCFOHCBBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
+        if (teapotSpiritPosBuilder_ != null) {
+          return teapotSpiritPosBuilder_.getMessageOrBuilder();
         } else {
-          return kGAJHCFOHCB_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kGAJHCFOHCB_;
+          return teapotSpiritPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
         }
       }
       /**
-       * .Vector KGAJHCFOHCB = 3;
+       * .Vector teapot_spirit_pos = 3;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-          getKGAJHCFOHCBFieldBuilder() {
-        if (kGAJHCFOHCBBuilder_ == null) {
-          kGAJHCFOHCBBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          getTeapotSpiritPosFieldBuilder() {
+        if (teapotSpiritPosBuilder_ == null) {
+          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>(
-                  getKGAJHCFOHCB(),
+                  getTeapotSpiritPos(),
                   getParentForChildren(),
                   isClean());
-          kGAJHCFOHCB_ = null;
+          teapotSpiritPos_ = null;
         }
-        return kGAJHCFOHCBBuilder_;
+        return teapotSpiritPosBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1376,13 +1376,13 @@ public final class HomeMarkPointSceneDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034HomeMarkPointSceneData.proto\032 HomeMark" +
-      "PointFurnitureData.proto\032\014Vector.proto\"\256" +
+      "PointFurnitureData.proto\032\014Vector.proto\"\267" +
       "\001\n\026HomeMarkPointSceneData\0223\n\016furniture_l" +
-      "ist\030\007 \003(\0132\033.HomeMarkPointFurnitureData\022\034" +
-      "\n\013HPIMNKGLMNC\030\010 \001(\0132\007.Vector\022\021\n\tmodule_i" +
-      "d\030\t \001(\r\022\020\n\010scene_id\030\005 \001(\r\022\034\n\013KGAJHCFOHCB" +
-      "\030\003 \001(\0132\007.VectorB\033\n\031emu.grasscutter.net.p" +
-      "rotob\006proto3"
+      "ist\030\007 \003(\0132\033.HomeMarkPointFurnitureData\022\037" +
+      "\n\016safe_point_pos\030\010 \001(\0132\007.Vector\022\021\n\tmodul" +
+      "e_id\030\t \001(\r\022\020\n\010scene_id\030\005 \001(\r\022\"\n\021teapot_s" +
+      "pirit_pos\030\003 \001(\0132\007.VectorB\033\n\031emu.grasscut" +
+      "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -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", "HPIMNKGLMNC", "ModuleId", "SceneId", "KGAJHCFOHCB", });
+        new java.lang.String[] { "FurnitureList", "SafePointPos", "ModuleId", "SceneId", "TeapotSpiritPos", });
     emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeResourceOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeResourceOuterClass.java
index e4cdf72d9..64ab2a3b8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeResourceOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeResourceOuterClass.java
@@ -19,10 +19,10 @@ public final class HomeResourceOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * uint32 AIHDOEBOLLC = 1;
-     * @return The aIHDOEBOLLC.
+     * uint32 store_value = 1;
+     * @return The storeValue.
      */
-    int getAIHDOEBOLLC();
+    int getStoreValue();
 
     /**
      * fixed32 next_refresh_time = 5;
@@ -31,10 +31,10 @@ public final class HomeResourceOuterClass {
     int getNextRefreshTime();
 
     /**
-     * uint32 CELOOEHBGBJ = 3;
-     * @return The cELOOEHBGBJ.
+     * uint32 store_limit = 3;
+     * @return The storeLimit.
      */
-    int getCELOOEHBGBJ();
+    int getStoreLimit();
   }
   /**
    * 
@@ -87,12 +87,12 @@ public final class HomeResourceOuterClass {
               break;
             case 8: {
 
-              aIHDOEBOLLC_ = input.readUInt32();
+              storeValue_ = input.readUInt32();
               break;
             }
             case 24: {
 
-              cELOOEHBGBJ_ = input.readUInt32();
+              storeLimit_ = 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 AIHDOEBOLLC_FIELD_NUMBER = 1;
-    private int aIHDOEBOLLC_;
+    public static final int STORE_VALUE_FIELD_NUMBER = 1;
+    private int storeValue_;
     /**
-     * uint32 AIHDOEBOLLC = 1;
-     * @return The aIHDOEBOLLC.
+     * uint32 store_value = 1;
+     * @return The storeValue.
      */
     @java.lang.Override
-    public int getAIHDOEBOLLC() {
-      return aIHDOEBOLLC_;
+    public int getStoreValue() {
+      return storeValue_;
     }
 
     public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 5;
@@ -154,15 +154,15 @@ public final class HomeResourceOuterClass {
       return nextRefreshTime_;
     }
 
-    public static final int CELOOEHBGBJ_FIELD_NUMBER = 3;
-    private int cELOOEHBGBJ_;
+    public static final int STORE_LIMIT_FIELD_NUMBER = 3;
+    private int storeLimit_;
     /**
-     * uint32 CELOOEHBGBJ = 3;
-     * @return The cELOOEHBGBJ.
+     * uint32 store_limit = 3;
+     * @return The storeLimit.
      */
     @java.lang.Override
-    public int getCELOOEHBGBJ() {
-      return cELOOEHBGBJ_;
+    public int getStoreLimit() {
+      return storeLimit_;
     }
 
     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 (aIHDOEBOLLC_ != 0) {
-        output.writeUInt32(1, aIHDOEBOLLC_);
+      if (storeValue_ != 0) {
+        output.writeUInt32(1, storeValue_);
       }
-      if (cELOOEHBGBJ_ != 0) {
-        output.writeUInt32(3, cELOOEHBGBJ_);
+      if (storeLimit_ != 0) {
+        output.writeUInt32(3, storeLimit_);
       }
       if (nextRefreshTime_ != 0) {
         output.writeFixed32(5, nextRefreshTime_);
@@ -197,13 +197,13 @@ public final class HomeResourceOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (aIHDOEBOLLC_ != 0) {
+      if (storeValue_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, aIHDOEBOLLC_);
+          .computeUInt32Size(1, storeValue_);
       }
-      if (cELOOEHBGBJ_ != 0) {
+      if (storeLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, cELOOEHBGBJ_);
+          .computeUInt32Size(3, storeLimit_);
       }
       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 (getAIHDOEBOLLC()
-          != other.getAIHDOEBOLLC()) return false;
+      if (getStoreValue()
+          != other.getStoreValue()) return false;
       if (getNextRefreshTime()
           != other.getNextRefreshTime()) return false;
-      if (getCELOOEHBGBJ()
-          != other.getCELOOEHBGBJ()) return false;
+      if (getStoreLimit()
+          != other.getStoreLimit()) 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) + AIHDOEBOLLC_FIELD_NUMBER;
-      hash = (53 * hash) + getAIHDOEBOLLC();
+      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) + CELOOEHBGBJ_FIELD_NUMBER;
-      hash = (53 * hash) + getCELOOEHBGBJ();
+      hash = (37 * hash) + STORE_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getStoreLimit();
       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();
-        aIHDOEBOLLC_ = 0;
+        storeValue_ = 0;
 
         nextRefreshTime_ = 0;
 
-        cELOOEHBGBJ_ = 0;
+        storeLimit_ = 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.aIHDOEBOLLC_ = aIHDOEBOLLC_;
+        result.storeValue_ = storeValue_;
         result.nextRefreshTime_ = nextRefreshTime_;
-        result.cELOOEHBGBJ_ = cELOOEHBGBJ_;
+        result.storeLimit_ = storeLimit_;
         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.getAIHDOEBOLLC() != 0) {
-          setAIHDOEBOLLC(other.getAIHDOEBOLLC());
+        if (other.getStoreValue() != 0) {
+          setStoreValue(other.getStoreValue());
         }
         if (other.getNextRefreshTime() != 0) {
           setNextRefreshTime(other.getNextRefreshTime());
         }
-        if (other.getCELOOEHBGBJ() != 0) {
-          setCELOOEHBGBJ(other.getCELOOEHBGBJ());
+        if (other.getStoreLimit() != 0) {
+          setStoreLimit(other.getStoreLimit());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -505,33 +505,33 @@ public final class HomeResourceOuterClass {
         return this;
       }
 
-      private int aIHDOEBOLLC_ ;
+      private int storeValue_ ;
       /**
-       * uint32 AIHDOEBOLLC = 1;
-       * @return The aIHDOEBOLLC.
+       * uint32 store_value = 1;
+       * @return The storeValue.
        */
       @java.lang.Override
-      public int getAIHDOEBOLLC() {
-        return aIHDOEBOLLC_;
+      public int getStoreValue() {
+        return storeValue_;
       }
       /**
-       * uint32 AIHDOEBOLLC = 1;
-       * @param value The aIHDOEBOLLC to set.
+       * uint32 store_value = 1;
+       * @param value The storeValue to set.
        * @return This builder for chaining.
        */
-      public Builder setAIHDOEBOLLC(int value) {
+      public Builder setStoreValue(int value) {
         
-        aIHDOEBOLLC_ = value;
+        storeValue_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 AIHDOEBOLLC = 1;
+       * uint32 store_value = 1;
        * @return This builder for chaining.
        */
-      public Builder clearAIHDOEBOLLC() {
+      public Builder clearStoreValue() {
         
-        aIHDOEBOLLC_ = 0;
+        storeValue_ = 0;
         onChanged();
         return this;
       }
@@ -567,33 +567,33 @@ public final class HomeResourceOuterClass {
         return this;
       }
 
-      private int cELOOEHBGBJ_ ;
+      private int storeLimit_ ;
       /**
-       * uint32 CELOOEHBGBJ = 3;
-       * @return The cELOOEHBGBJ.
+       * uint32 store_limit = 3;
+       * @return The storeLimit.
        */
       @java.lang.Override
-      public int getCELOOEHBGBJ() {
-        return cELOOEHBGBJ_;
+      public int getStoreLimit() {
+        return storeLimit_;
       }
       /**
-       * uint32 CELOOEHBGBJ = 3;
-       * @param value The cELOOEHBGBJ to set.
+       * uint32 store_limit = 3;
+       * @param value The storeLimit to set.
        * @return This builder for chaining.
        */
-      public Builder setCELOOEHBGBJ(int value) {
+      public Builder setStoreLimit(int value) {
         
-        cELOOEHBGBJ_ = value;
+        storeLimit_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 CELOOEHBGBJ = 3;
+       * uint32 store_limit = 3;
        * @return This builder for chaining.
        */
-      public Builder clearCELOOEHBGBJ() {
+      public Builder clearStoreLimit() {
         
-        cELOOEHBGBJ_ = 0;
+        storeLimit_ = 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" +
-      "AIHDOEBOLLC\030\001 \001(\r\022\031\n\021next_refresh_time\030\005" +
-      " \001(\007\022\023\n\013CELOOEHBGBJ\030\003 \001(\rB\033\n\031emu.grasscu" +
+      "store_value\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" +
       "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[] { "AIHDOEBOLLC", "NextRefreshTime", "CELOOEHBGBJ", });
+        new java.lang.String[] { "StoreValue", "NextRefreshTime", "StoreLimit", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PathStatusTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PathStatusTypeOuterClass.java
new file mode 100644
index 000000000..6a5a541ce
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PathStatusTypeOuterClass.java
@@ -0,0 +1,156 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: PathStatusType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class PathStatusTypeOuterClass {
+  private PathStatusTypeOuterClass() {}
+  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 PathStatusType}
+   */
+  public enum PathStatusType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * PATH_STATUS_TYPE_FAIL = 0;
+     */
+    PATH_STATUS_TYPE_FAIL(0),
+    /**
+     * PATH_STATUS_TYPE_SUCC = 1;
+     */
+    PATH_STATUS_TYPE_SUCC(1),
+    /**
+     * PATH_STATUS_TYPE_PARTIAL = 2;
+     */
+    PATH_STATUS_TYPE_PARTIAL(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * PATH_STATUS_TYPE_FAIL = 0;
+     */
+    public static final int PATH_STATUS_TYPE_FAIL_VALUE = 0;
+    /**
+     * PATH_STATUS_TYPE_SUCC = 1;
+     */
+    public static final int PATH_STATUS_TYPE_SUCC_VALUE = 1;
+    /**
+     * PATH_STATUS_TYPE_PARTIAL = 2;
+     */
+    public static final int PATH_STATUS_TYPE_PARTIAL_VALUE = 2;
+
+
+    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 PathStatusType 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 PathStatusType forNumber(int value) {
+      switch (value) {
+        case 0: return PATH_STATUS_TYPE_FAIL;
+        case 1: return PATH_STATUS_TYPE_SUCC;
+        case 2: return PATH_STATUS_TYPE_PARTIAL;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        PathStatusType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public PathStatusType findValueByNumber(int number) {
+              return PathStatusType.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.PathStatusTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final PathStatusType[] VALUES = values();
+
+    public static PathStatusType 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 PathStatusType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:PathStatusType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\024PathStatusType.proto*d\n\016PathStatusType" +
+      "\022\031\n\025PATH_STATUS_TYPE_FAIL\020\000\022\031\n\025PATH_STAT" +
+      "US_TYPE_SUCC\020\001\022\034\n\030PATH_STATUS_TYPE_PARTI" +
+      "AL\020\002B\033\n\031emu.grasscutter.net.protob\006proto" +
+      "3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java
index 62e4a30ce..d0488714b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java
@@ -19,21 +19,21 @@ public final class PersonalLineAllDataRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * repeated uint32 APAJHHBKJPK = 2;
-     * @return A list containing the aPAJHHBKJPK.
+     * repeated uint32 ongoing_personal_line_list = 2;
+     * @return A list containing the ongoingPersonalLineList.
      */
-    java.util.List getAPAJHHBKJPKList();
+    java.util.List getOngoingPersonalLineListList();
     /**
-     * repeated uint32 APAJHHBKJPK = 2;
-     * @return The count of aPAJHHBKJPK.
+     * repeated uint32 ongoing_personal_line_list = 2;
+     * @return The count of ongoingPersonalLineList.
      */
-    int getAPAJHHBKJPKCount();
+    int getOngoingPersonalLineListCount();
     /**
-     * repeated uint32 APAJHHBKJPK = 2;
+     * repeated uint32 ongoing_personal_line_list = 2;
      * @param index The index of the element to return.
-     * @return The aPAJHHBKJPK at the given index.
+     * @return The ongoingPersonalLineList at the given index.
      */
-    int getAPAJHHBKJPK(int index);
+    int getOngoingPersonalLineList(int index);
 
     /**
      * int32 retcode = 3;
@@ -54,21 +54,21 @@ public final class PersonalLineAllDataRspOuterClass {
     int getLegendaryKeyCount();
 
     /**
-     * repeated uint32 HPNCPHKCDHN = 6;
-     * @return A list containing the hPNCPHKCDHN.
+     * repeated uint32 can_be_unlocked_personal_line_list = 6;
+     * @return A list containing the canBeUnlockedPersonalLineList.
      */
-    java.util.List getHPNCPHKCDHNList();
+    java.util.List getCanBeUnlockedPersonalLineListList();
     /**
-     * repeated uint32 HPNCPHKCDHN = 6;
-     * @return The count of hPNCPHKCDHN.
+     * repeated uint32 can_be_unlocked_personal_line_list = 6;
+     * @return The count of canBeUnlockedPersonalLineList.
      */
-    int getHPNCPHKCDHNCount();
+    int getCanBeUnlockedPersonalLineListCount();
     /**
-     * repeated uint32 HPNCPHKCDHN = 6;
+     * repeated uint32 can_be_unlocked_personal_line_list = 6;
      * @param index The index of the element to return.
-     * @return The hPNCPHKCDHN at the given index.
+     * @return The canBeUnlockedPersonalLineList at the given index.
      */
-    int getHPNCPHKCDHN(int index);
+    int getCanBeUnlockedPersonalLineList(int index);
 
     /**
      * repeated .LockedPersonallineData locked_personal_line_list = 8;
@@ -112,8 +112,8 @@ public final class PersonalLineAllDataRspOuterClass {
       super(builder);
     }
     private PersonalLineAllDataRsp() {
-      aPAJHHBKJPK_ = emptyIntList();
-      hPNCPHKCDHN_ = emptyIntList();
+      ongoingPersonalLineList_ = emptyIntList();
+      canBeUnlockedPersonalLineList_ = emptyIntList();
       lockedPersonalLineList_ = java.util.Collections.emptyList();
     }
 
@@ -155,21 +155,21 @@ public final class PersonalLineAllDataRspOuterClass {
             }
             case 16: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                aPAJHHBKJPK_ = newIntList();
+                ongoingPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              aPAJHHBKJPK_.addInt(input.readUInt32());
+              ongoingPersonalLineList_.addInt(input.readUInt32());
               break;
             }
             case 18: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                aPAJHHBKJPK_ = newIntList();
+                ongoingPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                aPAJHHBKJPK_.addInt(input.readUInt32());
+                ongoingPersonalLineList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -181,21 +181,21 @@ public final class PersonalLineAllDataRspOuterClass {
             }
             case 48: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                hPNCPHKCDHN_ = newIntList();
+                canBeUnlockedPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              hPNCPHKCDHN_.addInt(input.readUInt32());
+              canBeUnlockedPersonalLineList_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                hPNCPHKCDHN_ = newIntList();
+                canBeUnlockedPersonalLineList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                hPNCPHKCDHN_.addInt(input.readUInt32());
+                canBeUnlockedPersonalLineList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -230,10 +230,10 @@ public final class PersonalLineAllDataRspOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          aPAJHHBKJPK_.makeImmutable(); // C
+          ongoingPersonalLineList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          hPNCPHKCDHN_.makeImmutable(); // C
+          canBeUnlockedPersonalLineList_.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 APAJHHBKJPK_FIELD_NUMBER = 2;
-    private com.google.protobuf.Internal.IntList aPAJHHBKJPK_;
+    public static final int ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER = 2;
+    private com.google.protobuf.Internal.IntList ongoingPersonalLineList_;
     /**
-     * repeated uint32 APAJHHBKJPK = 2;
-     * @return A list containing the aPAJHHBKJPK.
+     * repeated uint32 ongoing_personal_line_list = 2;
+     * @return A list containing the ongoingPersonalLineList.
      */
     @java.lang.Override
     public java.util.List
-        getAPAJHHBKJPKList() {
-      return aPAJHHBKJPK_;
+        getOngoingPersonalLineListList() {
+      return ongoingPersonalLineList_;
     }
     /**
-     * repeated uint32 APAJHHBKJPK = 2;
-     * @return The count of aPAJHHBKJPK.
+     * repeated uint32 ongoing_personal_line_list = 2;
+     * @return The count of ongoingPersonalLineList.
      */
-    public int getAPAJHHBKJPKCount() {
-      return aPAJHHBKJPK_.size();
+    public int getOngoingPersonalLineListCount() {
+      return ongoingPersonalLineList_.size();
     }
     /**
-     * repeated uint32 APAJHHBKJPK = 2;
+     * repeated uint32 ongoing_personal_line_list = 2;
      * @param index The index of the element to return.
-     * @return The aPAJHHBKJPK at the given index.
+     * @return The ongoingPersonalLineList at the given index.
      */
-    public int getAPAJHHBKJPK(int index) {
-      return aPAJHHBKJPK_.getInt(index);
+    public int getOngoingPersonalLineList(int index) {
+      return ongoingPersonalLineList_.getInt(index);
     }
-    private int aPAJHHBKJPKMemoizedSerializedSize = -1;
+    private int ongoingPersonalLineListMemoizedSerializedSize = -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 HPNCPHKCDHN_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList hPNCPHKCDHN_;
+    public static final int CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_;
     /**
-     * repeated uint32 HPNCPHKCDHN = 6;
-     * @return A list containing the hPNCPHKCDHN.
+     * repeated uint32 can_be_unlocked_personal_line_list = 6;
+     * @return A list containing the canBeUnlockedPersonalLineList.
      */
     @java.lang.Override
     public java.util.List
-        getHPNCPHKCDHNList() {
-      return hPNCPHKCDHN_;
+        getCanBeUnlockedPersonalLineListList() {
+      return canBeUnlockedPersonalLineList_;
     }
     /**
-     * repeated uint32 HPNCPHKCDHN = 6;
-     * @return The count of hPNCPHKCDHN.
+     * repeated uint32 can_be_unlocked_personal_line_list = 6;
+     * @return The count of canBeUnlockedPersonalLineList.
      */
-    public int getHPNCPHKCDHNCount() {
-      return hPNCPHKCDHN_.size();
+    public int getCanBeUnlockedPersonalLineListCount() {
+      return canBeUnlockedPersonalLineList_.size();
     }
     /**
-     * repeated uint32 HPNCPHKCDHN = 6;
+     * repeated uint32 can_be_unlocked_personal_line_list = 6;
      * @param index The index of the element to return.
-     * @return The hPNCPHKCDHN at the given index.
+     * @return The canBeUnlockedPersonalLineList at the given index.
      */
-    public int getHPNCPHKCDHN(int index) {
-      return hPNCPHKCDHN_.getInt(index);
+    public int getCanBeUnlockedPersonalLineList(int index) {
+      return canBeUnlockedPersonalLineList_.getInt(index);
     }
-    private int hPNCPHKCDHNMemoizedSerializedSize = -1;
+    private int canBeUnlockedPersonalLineListMemoizedSerializedSize = -1;
 
     public static final int LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 8;
     private java.util.List lockedPersonalLineList_;
@@ -402,22 +402,22 @@ public final class PersonalLineAllDataRspOuterClass {
       if (legendaryKeyCount_ != 0) {
         output.writeUInt32(1, legendaryKeyCount_);
       }
-      if (getAPAJHHBKJPKList().size() > 0) {
+      if (getOngoingPersonalLineListList().size() > 0) {
         output.writeUInt32NoTag(18);
-        output.writeUInt32NoTag(aPAJHHBKJPKMemoizedSerializedSize);
+        output.writeUInt32NoTag(ongoingPersonalLineListMemoizedSerializedSize);
       }
-      for (int i = 0; i < aPAJHHBKJPK_.size(); i++) {
-        output.writeUInt32NoTag(aPAJHHBKJPK_.getInt(i));
+      for (int i = 0; i < ongoingPersonalLineList_.size(); i++) {
+        output.writeUInt32NoTag(ongoingPersonalLineList_.getInt(i));
       }
       if (retcode_ != 0) {
         output.writeInt32(3, retcode_);
       }
-      if (getHPNCPHKCDHNList().size() > 0) {
+      if (getCanBeUnlockedPersonalLineListList().size() > 0) {
         output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(hPNCPHKCDHNMemoizedSerializedSize);
+        output.writeUInt32NoTag(canBeUnlockedPersonalLineListMemoizedSerializedSize);
       }
-      for (int i = 0; i < hPNCPHKCDHN_.size(); i++) {
-        output.writeUInt32NoTag(hPNCPHKCDHN_.getInt(i));
+      for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) {
+        output.writeUInt32NoTag(canBeUnlockedPersonalLineList_.getInt(i));
       }
       for (int i = 0; i < lockedPersonalLineList_.size(); i++) {
         output.writeMessage(8, lockedPersonalLineList_.get(i));
@@ -440,17 +440,17 @@ public final class PersonalLineAllDataRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < aPAJHHBKJPK_.size(); i++) {
+        for (int i = 0; i < ongoingPersonalLineList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(aPAJHHBKJPK_.getInt(i));
+            .computeUInt32SizeNoTag(ongoingPersonalLineList_.getInt(i));
         }
         size += dataSize;
-        if (!getAPAJHHBKJPKList().isEmpty()) {
+        if (!getOngoingPersonalLineListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        aPAJHHBKJPKMemoizedSerializedSize = dataSize;
+        ongoingPersonalLineListMemoizedSerializedSize = dataSize;
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -458,17 +458,17 @@ public final class PersonalLineAllDataRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < hPNCPHKCDHN_.size(); i++) {
+        for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(hPNCPHKCDHN_.getInt(i));
+            .computeUInt32SizeNoTag(canBeUnlockedPersonalLineList_.getInt(i));
         }
         size += dataSize;
-        if (!getHPNCPHKCDHNList().isEmpty()) {
+        if (!getCanBeUnlockedPersonalLineListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        hPNCPHKCDHNMemoizedSerializedSize = dataSize;
+        canBeUnlockedPersonalLineListMemoizedSerializedSize = dataSize;
       }
       for (int i = 0; i < lockedPersonalLineList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -493,16 +493,16 @@ public final class PersonalLineAllDataRspOuterClass {
       }
       emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp other = (emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp) obj;
 
-      if (!getAPAJHHBKJPKList()
-          .equals(other.getAPAJHHBKJPKList())) return false;
+      if (!getOngoingPersonalLineListList()
+          .equals(other.getOngoingPersonalLineListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getCurFinishedDailyTaskCount()
           != other.getCurFinishedDailyTaskCount()) return false;
       if (getLegendaryKeyCount()
           != other.getLegendaryKeyCount()) return false;
-      if (!getHPNCPHKCDHNList()
-          .equals(other.getHPNCPHKCDHNList())) return false;
+      if (!getCanBeUnlockedPersonalLineListList()
+          .equals(other.getCanBeUnlockedPersonalLineListList())) 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 (getAPAJHHBKJPKCount() > 0) {
-        hash = (37 * hash) + APAJHHBKJPK_FIELD_NUMBER;
-        hash = (53 * hash) + getAPAJHHBKJPKList().hashCode();
+      if (getOngoingPersonalLineListCount() > 0) {
+        hash = (37 * hash) + ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getOngoingPersonalLineListList().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 (getHPNCPHKCDHNCount() > 0) {
-        hash = (37 * hash) + HPNCPHKCDHN_FIELD_NUMBER;
-        hash = (53 * hash) + getHPNCPHKCDHNList().hashCode();
+      if (getCanBeUnlockedPersonalLineListCount() > 0) {
+        hash = (37 * hash) + CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getCanBeUnlockedPersonalLineListList().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();
-        aPAJHHBKJPK_ = emptyIntList();
+        ongoingPersonalLineList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
 
@@ -681,7 +681,7 @@ public final class PersonalLineAllDataRspOuterClass {
 
         legendaryKeyCount_ = 0;
 
-        hPNCPHKCDHN_ = emptyIntList();
+        canBeUnlockedPersonalLineList_ = 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)) {
-          aPAJHHBKJPK_.makeImmutable();
+          ongoingPersonalLineList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.aPAJHHBKJPK_ = aPAJHHBKJPK_;
+        result.ongoingPersonalLineList_ = ongoingPersonalLineList_;
         result.retcode_ = retcode_;
         result.curFinishedDailyTaskCount_ = curFinishedDailyTaskCount_;
         result.legendaryKeyCount_ = legendaryKeyCount_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          hPNCPHKCDHN_.makeImmutable();
+          canBeUnlockedPersonalLineList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.hPNCPHKCDHN_ = hPNCPHKCDHN_;
+        result.canBeUnlockedPersonalLineList_ = canBeUnlockedPersonalLineList_;
         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.aPAJHHBKJPK_.isEmpty()) {
-          if (aPAJHHBKJPK_.isEmpty()) {
-            aPAJHHBKJPK_ = other.aPAJHHBKJPK_;
+        if (!other.ongoingPersonalLineList_.isEmpty()) {
+          if (ongoingPersonalLineList_.isEmpty()) {
+            ongoingPersonalLineList_ = other.ongoingPersonalLineList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureAPAJHHBKJPKIsMutable();
-            aPAJHHBKJPK_.addAll(other.aPAJHHBKJPK_);
+            ensureOngoingPersonalLineListIsMutable();
+            ongoingPersonalLineList_.addAll(other.ongoingPersonalLineList_);
           }
           onChanged();
         }
@@ -805,13 +805,13 @@ public final class PersonalLineAllDataRspOuterClass {
         if (other.getLegendaryKeyCount() != 0) {
           setLegendaryKeyCount(other.getLegendaryKeyCount());
         }
-        if (!other.hPNCPHKCDHN_.isEmpty()) {
-          if (hPNCPHKCDHN_.isEmpty()) {
-            hPNCPHKCDHN_ = other.hPNCPHKCDHN_;
+        if (!other.canBeUnlockedPersonalLineList_.isEmpty()) {
+          if (canBeUnlockedPersonalLineList_.isEmpty()) {
+            canBeUnlockedPersonalLineList_ = other.canBeUnlockedPersonalLineList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureHPNCPHKCDHNIsMutable();
-            hPNCPHKCDHN_.addAll(other.hPNCPHKCDHN_);
+            ensureCanBeUnlockedPersonalLineListIsMutable();
+            canBeUnlockedPersonalLineList_.addAll(other.canBeUnlockedPersonalLineList_);
           }
           onChanged();
         }
@@ -871,80 +871,80 @@ public final class PersonalLineAllDataRspOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList aPAJHHBKJPK_ = emptyIntList();
-      private void ensureAPAJHHBKJPKIsMutable() {
+      private com.google.protobuf.Internal.IntList ongoingPersonalLineList_ = emptyIntList();
+      private void ensureOngoingPersonalLineListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          aPAJHHBKJPK_ = mutableCopy(aPAJHHBKJPK_);
+          ongoingPersonalLineList_ = mutableCopy(ongoingPersonalLineList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * repeated uint32 APAJHHBKJPK = 2;
-       * @return A list containing the aPAJHHBKJPK.
+       * repeated uint32 ongoing_personal_line_list = 2;
+       * @return A list containing the ongoingPersonalLineList.
        */
       public java.util.List
-          getAPAJHHBKJPKList() {
+          getOngoingPersonalLineListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(aPAJHHBKJPK_) : aPAJHHBKJPK_;
+                 java.util.Collections.unmodifiableList(ongoingPersonalLineList_) : ongoingPersonalLineList_;
       }
       /**
-       * repeated uint32 APAJHHBKJPK = 2;
-       * @return The count of aPAJHHBKJPK.
+       * repeated uint32 ongoing_personal_line_list = 2;
+       * @return The count of ongoingPersonalLineList.
        */
-      public int getAPAJHHBKJPKCount() {
-        return aPAJHHBKJPK_.size();
+      public int getOngoingPersonalLineListCount() {
+        return ongoingPersonalLineList_.size();
       }
       /**
-       * repeated uint32 APAJHHBKJPK = 2;
+       * repeated uint32 ongoing_personal_line_list = 2;
        * @param index The index of the element to return.
-       * @return The aPAJHHBKJPK at the given index.
+       * @return The ongoingPersonalLineList at the given index.
        */
-      public int getAPAJHHBKJPK(int index) {
-        return aPAJHHBKJPK_.getInt(index);
+      public int getOngoingPersonalLineList(int index) {
+        return ongoingPersonalLineList_.getInt(index);
       }
       /**
-       * repeated uint32 APAJHHBKJPK = 2;
+       * repeated uint32 ongoing_personal_line_list = 2;
        * @param index The index to set the value at.
-       * @param value The aPAJHHBKJPK to set.
+       * @param value The ongoingPersonalLineList to set.
        * @return This builder for chaining.
        */
-      public Builder setAPAJHHBKJPK(
+      public Builder setOngoingPersonalLineList(
           int index, int value) {
-        ensureAPAJHHBKJPKIsMutable();
-        aPAJHHBKJPK_.setInt(index, value);
+        ensureOngoingPersonalLineListIsMutable();
+        ongoingPersonalLineList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 APAJHHBKJPK = 2;
-       * @param value The aPAJHHBKJPK to add.
+       * repeated uint32 ongoing_personal_line_list = 2;
+       * @param value The ongoingPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addAPAJHHBKJPK(int value) {
-        ensureAPAJHHBKJPKIsMutable();
-        aPAJHHBKJPK_.addInt(value);
+      public Builder addOngoingPersonalLineList(int value) {
+        ensureOngoingPersonalLineListIsMutable();
+        ongoingPersonalLineList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 APAJHHBKJPK = 2;
-       * @param values The aPAJHHBKJPK to add.
+       * repeated uint32 ongoing_personal_line_list = 2;
+       * @param values The ongoingPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllAPAJHHBKJPK(
+      public Builder addAllOngoingPersonalLineList(
           java.lang.Iterable values) {
-        ensureAPAJHHBKJPKIsMutable();
+        ensureOngoingPersonalLineListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, aPAJHHBKJPK_);
+            values, ongoingPersonalLineList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 APAJHHBKJPK = 2;
+       * repeated uint32 ongoing_personal_line_list = 2;
        * @return This builder for chaining.
        */
-      public Builder clearAPAJHHBKJPK() {
-        aPAJHHBKJPK_ = emptyIntList();
+      public Builder clearOngoingPersonalLineList() {
+        ongoingPersonalLineList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -1043,80 +1043,80 @@ public final class PersonalLineAllDataRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList hPNCPHKCDHN_ = emptyIntList();
-      private void ensureHPNCPHKCDHNIsMutable() {
+      private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_ = emptyIntList();
+      private void ensureCanBeUnlockedPersonalLineListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          hPNCPHKCDHN_ = mutableCopy(hPNCPHKCDHN_);
+          canBeUnlockedPersonalLineList_ = mutableCopy(canBeUnlockedPersonalLineList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 HPNCPHKCDHN = 6;
-       * @return A list containing the hPNCPHKCDHN.
+       * repeated uint32 can_be_unlocked_personal_line_list = 6;
+       * @return A list containing the canBeUnlockedPersonalLineList.
        */
       public java.util.List
-          getHPNCPHKCDHNList() {
+          getCanBeUnlockedPersonalLineListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(hPNCPHKCDHN_) : hPNCPHKCDHN_;
+                 java.util.Collections.unmodifiableList(canBeUnlockedPersonalLineList_) : canBeUnlockedPersonalLineList_;
       }
       /**
-       * repeated uint32 HPNCPHKCDHN = 6;
-       * @return The count of hPNCPHKCDHN.
+       * repeated uint32 can_be_unlocked_personal_line_list = 6;
+       * @return The count of canBeUnlockedPersonalLineList.
        */
-      public int getHPNCPHKCDHNCount() {
-        return hPNCPHKCDHN_.size();
+      public int getCanBeUnlockedPersonalLineListCount() {
+        return canBeUnlockedPersonalLineList_.size();
       }
       /**
-       * repeated uint32 HPNCPHKCDHN = 6;
+       * repeated uint32 can_be_unlocked_personal_line_list = 6;
        * @param index The index of the element to return.
-       * @return The hPNCPHKCDHN at the given index.
+       * @return The canBeUnlockedPersonalLineList at the given index.
        */
-      public int getHPNCPHKCDHN(int index) {
-        return hPNCPHKCDHN_.getInt(index);
+      public int getCanBeUnlockedPersonalLineList(int index) {
+        return canBeUnlockedPersonalLineList_.getInt(index);
       }
       /**
-       * repeated uint32 HPNCPHKCDHN = 6;
+       * repeated uint32 can_be_unlocked_personal_line_list = 6;
        * @param index The index to set the value at.
-       * @param value The hPNCPHKCDHN to set.
+       * @param value The canBeUnlockedPersonalLineList to set.
        * @return This builder for chaining.
        */
-      public Builder setHPNCPHKCDHN(
+      public Builder setCanBeUnlockedPersonalLineList(
           int index, int value) {
-        ensureHPNCPHKCDHNIsMutable();
-        hPNCPHKCDHN_.setInt(index, value);
+        ensureCanBeUnlockedPersonalLineListIsMutable();
+        canBeUnlockedPersonalLineList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 HPNCPHKCDHN = 6;
-       * @param value The hPNCPHKCDHN to add.
+       * repeated uint32 can_be_unlocked_personal_line_list = 6;
+       * @param value The canBeUnlockedPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addHPNCPHKCDHN(int value) {
-        ensureHPNCPHKCDHNIsMutable();
-        hPNCPHKCDHN_.addInt(value);
+      public Builder addCanBeUnlockedPersonalLineList(int value) {
+        ensureCanBeUnlockedPersonalLineListIsMutable();
+        canBeUnlockedPersonalLineList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 HPNCPHKCDHN = 6;
-       * @param values The hPNCPHKCDHN to add.
+       * repeated uint32 can_be_unlocked_personal_line_list = 6;
+       * @param values The canBeUnlockedPersonalLineList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllHPNCPHKCDHN(
+      public Builder addAllCanBeUnlockedPersonalLineList(
           java.lang.Iterable values) {
-        ensureHPNCPHKCDHNIsMutable();
+        ensureCanBeUnlockedPersonalLineListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, hPNCPHKCDHN_);
+            values, canBeUnlockedPersonalLineList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 HPNCPHKCDHN = 6;
+       * repeated uint32 can_be_unlocked_personal_line_list = 6;
        * @return This builder for chaining.
        */
-      public Builder clearHPNCPHKCDHN() {
-        hPNCPHKCDHN_ = emptyIntList();
+      public Builder clearCanBeUnlockedPersonalLineList() {
+        canBeUnlockedPersonalLineList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1429,13 +1429,14 @@ public final class PersonalLineAllDataRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034PersonalLineAllDataRsp.proto\032\034LockedPe" +
-      "rsonallineData.proto\"\323\001\n\026PersonalLineAll" +
-      "DataRsp\022\023\n\013APAJHHBKJPK\030\002 \003(\r\022\017\n\007retcode\030" +
-      "\003 \001(\005\022%\n\035cur_finished_daily_task_count\030\013" +
-      " \001(\r\022\033\n\023legendary_key_count\030\001 \001(\r\022\023\n\013HPN" +
-      "CPHKCDHN\030\006 \003(\r\022:\n\031locked_personal_line_l" +
-      "ist\030\010 \003(\0132\027.LockedPersonallineDataB\033\n\031em" +
-      "u.grasscutter.net.protob\006proto3"
+      "rsonallineData.proto\"\371\001\n\026PersonalLineAll" +
+      "DataRsp\022\"\n\032ongoing_personal_line_list\030\002 " +
+      "\003(\r\022\017\n\007retcode\030\003 \001(\005\022%\n\035cur_finished_dai" +
+      "ly_task_count\030\013 \001(\r\022\033\n\023legendary_key_cou" +
+      "nt\030\001 \001(\r\022*\n\"can_be_unlocked_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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1447,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[] { "APAJHHBKJPK", "Retcode", "CurFinishedDailyTaskCount", "LegendaryKeyCount", "HPNCPHKCDHN", "LockedPersonalLineList", });
+        new java.lang.String[] { "OngoingPersonalLineList", "Retcode", "CurFinishedDailyTaskCount", "LegendaryKeyCount", "CanBeUnlockedPersonalLineList", "LockedPersonalLineList", });
     emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java
index 9903bfbf4..0cb83da39 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java
@@ -19,38 +19,38 @@ public final class PlayerHomeCompInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * repeated uint32 PDAIEFBCLNI = 3;
-     * @return A list containing the pDAIEFBCLNI.
+     * repeated uint32 levelup_reward_got_level_list = 3;
+     * @return A list containing the levelupRewardGotLevelList.
      */
-    java.util.List getPDAIEFBCLNIList();
+    java.util.List getLevelupRewardGotLevelListList();
     /**
-     * repeated uint32 PDAIEFBCLNI = 3;
-     * @return The count of pDAIEFBCLNI.
+     * repeated uint32 levelup_reward_got_level_list = 3;
+     * @return The count of levelupRewardGotLevelList.
      */
-    int getPDAIEFBCLNICount();
+    int getLevelupRewardGotLevelListCount();
     /**
-     * repeated uint32 PDAIEFBCLNI = 3;
+     * repeated uint32 levelup_reward_got_level_list = 3;
      * @param index The index of the element to return.
-     * @return The pDAIEFBCLNI at the given index.
+     * @return The levelupRewardGotLevelList at the given index.
      */
-    int getPDAIEFBCLNI(int index);
+    int getLevelupRewardGotLevelList(int index);
 
     /**
-     * repeated uint32 GPEAAFAIGAF = 10;
-     * @return A list containing the gPEAAFAIGAF.
+     * repeated uint32 unlocked_module_id_list = 10;
+     * @return A list containing the unlockedModuleIdList.
      */
-    java.util.List getGPEAAFAIGAFList();
+    java.util.List getUnlockedModuleIdListList();
     /**
-     * repeated uint32 GPEAAFAIGAF = 10;
-     * @return The count of gPEAAFAIGAF.
+     * repeated uint32 unlocked_module_id_list = 10;
+     * @return The count of unlockedModuleIdList.
      */
-    int getGPEAAFAIGAFCount();
+    int getUnlockedModuleIdListCount();
     /**
-     * repeated uint32 GPEAAFAIGAF = 10;
+     * repeated uint32 unlocked_module_id_list = 10;
      * @param index The index of the element to return.
-     * @return The gPEAAFAIGAF at the given index.
+     * @return The unlockedModuleIdList at the given index.
      */
-    int getGPEAAFAIGAF(int index);
+    int getUnlockedModuleIdList(int index);
 
     /**
      * repeated uint32 seen_module_id_list = 8;
@@ -97,8 +97,8 @@ public final class PlayerHomeCompInfoOuterClass {
       super(builder);
     }
     private PlayerHomeCompInfo() {
-      pDAIEFBCLNI_ = emptyIntList();
-      gPEAAFAIGAF_ = emptyIntList();
+      levelupRewardGotLevelList_ = emptyIntList();
+      unlockedModuleIdList_ = emptyIntList();
       seenModuleIdList_ = emptyIntList();
       friendEnterHomeOption_ = 0;
     }
@@ -136,21 +136,21 @@ public final class PlayerHomeCompInfoOuterClass {
               break;
             case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                pDAIEFBCLNI_ = newIntList();
+                levelupRewardGotLevelList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              pDAIEFBCLNI_.addInt(input.readUInt32());
+              levelupRewardGotLevelList_.addInt(input.readUInt32());
               break;
             }
             case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                pDAIEFBCLNI_ = newIntList();
+                levelupRewardGotLevelList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                pDAIEFBCLNI_.addInt(input.readUInt32());
+                levelupRewardGotLevelList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -178,21 +178,21 @@ public final class PlayerHomeCompInfoOuterClass {
             }
             case 80: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                gPEAAFAIGAF_ = newIntList();
+                unlockedModuleIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              gPEAAFAIGAF_.addInt(input.readUInt32());
+              unlockedModuleIdList_.addInt(input.readUInt32());
               break;
             }
             case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                gPEAAFAIGAF_ = newIntList();
+                unlockedModuleIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                gPEAAFAIGAF_.addInt(input.readUInt32());
+                unlockedModuleIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -219,13 +219,13 @@ public final class PlayerHomeCompInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          pDAIEFBCLNI_.makeImmutable(); // C
+          levelupRewardGotLevelList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
           seenModuleIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          gPEAAFAIGAF_.makeImmutable(); // C
+          unlockedModuleIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -244,61 +244,61 @@ public final class PlayerHomeCompInfoOuterClass {
               emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.class, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder.class);
     }
 
-    public static final int PDAIEFBCLNI_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList pDAIEFBCLNI_;
+    public static final int LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_;
     /**
-     * repeated uint32 PDAIEFBCLNI = 3;
-     * @return A list containing the pDAIEFBCLNI.
+     * repeated uint32 levelup_reward_got_level_list = 3;
+     * @return A list containing the levelupRewardGotLevelList.
      */
     @java.lang.Override
     public java.util.List
-        getPDAIEFBCLNIList() {
-      return pDAIEFBCLNI_;
+        getLevelupRewardGotLevelListList() {
+      return levelupRewardGotLevelList_;
     }
     /**
-     * repeated uint32 PDAIEFBCLNI = 3;
-     * @return The count of pDAIEFBCLNI.
+     * repeated uint32 levelup_reward_got_level_list = 3;
+     * @return The count of levelupRewardGotLevelList.
      */
-    public int getPDAIEFBCLNICount() {
-      return pDAIEFBCLNI_.size();
+    public int getLevelupRewardGotLevelListCount() {
+      return levelupRewardGotLevelList_.size();
     }
     /**
-     * repeated uint32 PDAIEFBCLNI = 3;
+     * repeated uint32 levelup_reward_got_level_list = 3;
      * @param index The index of the element to return.
-     * @return The pDAIEFBCLNI at the given index.
+     * @return The levelupRewardGotLevelList at the given index.
      */
-    public int getPDAIEFBCLNI(int index) {
-      return pDAIEFBCLNI_.getInt(index);
+    public int getLevelupRewardGotLevelList(int index) {
+      return levelupRewardGotLevelList_.getInt(index);
     }
-    private int pDAIEFBCLNIMemoizedSerializedSize = -1;
+    private int levelupRewardGotLevelListMemoizedSerializedSize = -1;
 
-    public static final int GPEAAFAIGAF_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList gPEAAFAIGAF_;
+    public static final int UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER = 10;
+    private com.google.protobuf.Internal.IntList unlockedModuleIdList_;
     /**
-     * repeated uint32 GPEAAFAIGAF = 10;
-     * @return A list containing the gPEAAFAIGAF.
+     * repeated uint32 unlocked_module_id_list = 10;
+     * @return A list containing the unlockedModuleIdList.
      */
     @java.lang.Override
     public java.util.List
-        getGPEAAFAIGAFList() {
-      return gPEAAFAIGAF_;
+        getUnlockedModuleIdListList() {
+      return unlockedModuleIdList_;
     }
     /**
-     * repeated uint32 GPEAAFAIGAF = 10;
-     * @return The count of gPEAAFAIGAF.
+     * repeated uint32 unlocked_module_id_list = 10;
+     * @return The count of unlockedModuleIdList.
      */
-    public int getGPEAAFAIGAFCount() {
-      return gPEAAFAIGAF_.size();
+    public int getUnlockedModuleIdListCount() {
+      return unlockedModuleIdList_.size();
     }
     /**
-     * repeated uint32 GPEAAFAIGAF = 10;
+     * repeated uint32 unlocked_module_id_list = 10;
      * @param index The index of the element to return.
-     * @return The gPEAAFAIGAF at the given index.
+     * @return The unlockedModuleIdList at the given index.
      */
-    public int getGPEAAFAIGAF(int index) {
-      return gPEAAFAIGAF_.getInt(index);
+    public int getUnlockedModuleIdList(int index) {
+      return unlockedModuleIdList_.getInt(index);
     }
-    private int gPEAAFAIGAFMemoizedSerializedSize = -1;
+    private int unlockedModuleIdListMemoizedSerializedSize = -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 (getPDAIEFBCLNIList().size() > 0) {
+      if (getLevelupRewardGotLevelListList().size() > 0) {
         output.writeUInt32NoTag(26);
-        output.writeUInt32NoTag(pDAIEFBCLNIMemoizedSerializedSize);
+        output.writeUInt32NoTag(levelupRewardGotLevelListMemoizedSerializedSize);
       }
-      for (int i = 0; i < pDAIEFBCLNI_.size(); i++) {
-        output.writeUInt32NoTag(pDAIEFBCLNI_.getInt(i));
+      for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
+        output.writeUInt32NoTag(levelupRewardGotLevelList_.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 (getGPEAAFAIGAFList().size() > 0) {
+      if (getUnlockedModuleIdListList().size() > 0) {
         output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(gPEAAFAIGAFMemoizedSerializedSize);
+        output.writeUInt32NoTag(unlockedModuleIdListMemoizedSerializedSize);
       }
-      for (int i = 0; i < gPEAAFAIGAF_.size(); i++) {
-        output.writeUInt32NoTag(gPEAAFAIGAF_.getInt(i));
+      for (int i = 0; i < unlockedModuleIdList_.size(); i++) {
+        output.writeUInt32NoTag(unlockedModuleIdList_.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 < pDAIEFBCLNI_.size(); i++) {
+        for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(pDAIEFBCLNI_.getInt(i));
+            .computeUInt32SizeNoTag(levelupRewardGotLevelList_.getInt(i));
         }
         size += dataSize;
-        if (!getPDAIEFBCLNIList().isEmpty()) {
+        if (!getLevelupRewardGotLevelListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        pDAIEFBCLNIMemoizedSerializedSize = dataSize;
+        levelupRewardGotLevelListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -425,17 +425,17 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < gPEAAFAIGAF_.size(); i++) {
+        for (int i = 0; i < unlockedModuleIdList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(gPEAAFAIGAF_.getInt(i));
+            .computeUInt32SizeNoTag(unlockedModuleIdList_.getInt(i));
         }
         size += dataSize;
-        if (!getGPEAAFAIGAFList().isEmpty()) {
+        if (!getUnlockedModuleIdListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        gPEAAFAIGAFMemoizedSerializedSize = dataSize;
+        unlockedModuleIdListMemoizedSerializedSize = 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 (!getPDAIEFBCLNIList()
-          .equals(other.getPDAIEFBCLNIList())) return false;
-      if (!getGPEAAFAIGAFList()
-          .equals(other.getGPEAAFAIGAFList())) return false;
+      if (!getLevelupRewardGotLevelListList()
+          .equals(other.getLevelupRewardGotLevelListList())) return false;
+      if (!getUnlockedModuleIdListList()
+          .equals(other.getUnlockedModuleIdListList())) return false;
       if (!getSeenModuleIdListList()
           .equals(other.getSeenModuleIdListList())) return false;
       if (friendEnterHomeOption_ != other.friendEnterHomeOption_) return false;
@@ -474,13 +474,13 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getPDAIEFBCLNICount() > 0) {
-        hash = (37 * hash) + PDAIEFBCLNI_FIELD_NUMBER;
-        hash = (53 * hash) + getPDAIEFBCLNIList().hashCode();
+      if (getLevelupRewardGotLevelListCount() > 0) {
+        hash = (37 * hash) + LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getLevelupRewardGotLevelListList().hashCode();
       }
-      if (getGPEAAFAIGAFCount() > 0) {
-        hash = (37 * hash) + GPEAAFAIGAF_FIELD_NUMBER;
-        hash = (53 * hash) + getGPEAAFAIGAFList().hashCode();
+      if (getUnlockedModuleIdListCount() > 0) {
+        hash = (37 * hash) + UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnlockedModuleIdListList().hashCode();
       }
       if (getSeenModuleIdListCount() > 0) {
         hash = (37 * hash) + SEEN_MODULE_ID_LIST_FIELD_NUMBER;
@@ -625,9 +625,9 @@ public final class PlayerHomeCompInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pDAIEFBCLNI_ = emptyIntList();
+        levelupRewardGotLevelList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        gPEAAFAIGAF_ = emptyIntList();
+        unlockedModuleIdList_ = 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)) {
-          pDAIEFBCLNI_.makeImmutable();
+          levelupRewardGotLevelList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.pDAIEFBCLNI_ = pDAIEFBCLNI_;
+        result.levelupRewardGotLevelList_ = levelupRewardGotLevelList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          gPEAAFAIGAF_.makeImmutable();
+          unlockedModuleIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.gPEAAFAIGAF_ = gPEAAFAIGAF_;
+        result.unlockedModuleIdList_ = unlockedModuleIdList_;
         if (((bitField0_ & 0x00000004) != 0)) {
           seenModuleIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
@@ -724,23 +724,23 @@ 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.pDAIEFBCLNI_.isEmpty()) {
-          if (pDAIEFBCLNI_.isEmpty()) {
-            pDAIEFBCLNI_ = other.pDAIEFBCLNI_;
+        if (!other.levelupRewardGotLevelList_.isEmpty()) {
+          if (levelupRewardGotLevelList_.isEmpty()) {
+            levelupRewardGotLevelList_ = other.levelupRewardGotLevelList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensurePDAIEFBCLNIIsMutable();
-            pDAIEFBCLNI_.addAll(other.pDAIEFBCLNI_);
+            ensureLevelupRewardGotLevelListIsMutable();
+            levelupRewardGotLevelList_.addAll(other.levelupRewardGotLevelList_);
           }
           onChanged();
         }
-        if (!other.gPEAAFAIGAF_.isEmpty()) {
-          if (gPEAAFAIGAF_.isEmpty()) {
-            gPEAAFAIGAF_ = other.gPEAAFAIGAF_;
+        if (!other.unlockedModuleIdList_.isEmpty()) {
+          if (unlockedModuleIdList_.isEmpty()) {
+            unlockedModuleIdList_ = other.unlockedModuleIdList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureGPEAAFAIGAFIsMutable();
-            gPEAAFAIGAF_.addAll(other.gPEAAFAIGAF_);
+            ensureUnlockedModuleIdListIsMutable();
+            unlockedModuleIdList_.addAll(other.unlockedModuleIdList_);
           }
           onChanged();
         }
@@ -787,159 +787,159 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList pDAIEFBCLNI_ = emptyIntList();
-      private void ensurePDAIEFBCLNIIsMutable() {
+      private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_ = emptyIntList();
+      private void ensureLevelupRewardGotLevelListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          pDAIEFBCLNI_ = mutableCopy(pDAIEFBCLNI_);
+          levelupRewardGotLevelList_ = mutableCopy(levelupRewardGotLevelList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * repeated uint32 PDAIEFBCLNI = 3;
-       * @return A list containing the pDAIEFBCLNI.
+       * repeated uint32 levelup_reward_got_level_list = 3;
+       * @return A list containing the levelupRewardGotLevelList.
        */
       public java.util.List
-          getPDAIEFBCLNIList() {
+          getLevelupRewardGotLevelListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(pDAIEFBCLNI_) : pDAIEFBCLNI_;
+                 java.util.Collections.unmodifiableList(levelupRewardGotLevelList_) : levelupRewardGotLevelList_;
       }
       /**
-       * repeated uint32 PDAIEFBCLNI = 3;
-       * @return The count of pDAIEFBCLNI.
+       * repeated uint32 levelup_reward_got_level_list = 3;
+       * @return The count of levelupRewardGotLevelList.
        */
-      public int getPDAIEFBCLNICount() {
-        return pDAIEFBCLNI_.size();
+      public int getLevelupRewardGotLevelListCount() {
+        return levelupRewardGotLevelList_.size();
       }
       /**
-       * repeated uint32 PDAIEFBCLNI = 3;
+       * repeated uint32 levelup_reward_got_level_list = 3;
        * @param index The index of the element to return.
-       * @return The pDAIEFBCLNI at the given index.
+       * @return The levelupRewardGotLevelList at the given index.
        */
-      public int getPDAIEFBCLNI(int index) {
-        return pDAIEFBCLNI_.getInt(index);
+      public int getLevelupRewardGotLevelList(int index) {
+        return levelupRewardGotLevelList_.getInt(index);
       }
       /**
-       * repeated uint32 PDAIEFBCLNI = 3;
+       * repeated uint32 levelup_reward_got_level_list = 3;
        * @param index The index to set the value at.
-       * @param value The pDAIEFBCLNI to set.
+       * @param value The levelupRewardGotLevelList to set.
        * @return This builder for chaining.
        */
-      public Builder setPDAIEFBCLNI(
+      public Builder setLevelupRewardGotLevelList(
           int index, int value) {
-        ensurePDAIEFBCLNIIsMutable();
-        pDAIEFBCLNI_.setInt(index, value);
+        ensureLevelupRewardGotLevelListIsMutable();
+        levelupRewardGotLevelList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 PDAIEFBCLNI = 3;
-       * @param value The pDAIEFBCLNI to add.
+       * repeated uint32 levelup_reward_got_level_list = 3;
+       * @param value The levelupRewardGotLevelList to add.
        * @return This builder for chaining.
        */
-      public Builder addPDAIEFBCLNI(int value) {
-        ensurePDAIEFBCLNIIsMutable();
-        pDAIEFBCLNI_.addInt(value);
+      public Builder addLevelupRewardGotLevelList(int value) {
+        ensureLevelupRewardGotLevelListIsMutable();
+        levelupRewardGotLevelList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 PDAIEFBCLNI = 3;
-       * @param values The pDAIEFBCLNI to add.
+       * repeated uint32 levelup_reward_got_level_list = 3;
+       * @param values The levelupRewardGotLevelList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPDAIEFBCLNI(
+      public Builder addAllLevelupRewardGotLevelList(
           java.lang.Iterable values) {
-        ensurePDAIEFBCLNIIsMutable();
+        ensureLevelupRewardGotLevelListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, pDAIEFBCLNI_);
+            values, levelupRewardGotLevelList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 PDAIEFBCLNI = 3;
+       * repeated uint32 levelup_reward_got_level_list = 3;
        * @return This builder for chaining.
        */
-      public Builder clearPDAIEFBCLNI() {
-        pDAIEFBCLNI_ = emptyIntList();
+      public Builder clearLevelupRewardGotLevelList() {
+        levelupRewardGotLevelList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList gPEAAFAIGAF_ = emptyIntList();
-      private void ensureGPEAAFAIGAFIsMutable() {
+      private com.google.protobuf.Internal.IntList unlockedModuleIdList_ = emptyIntList();
+      private void ensureUnlockedModuleIdListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          gPEAAFAIGAF_ = mutableCopy(gPEAAFAIGAF_);
+          unlockedModuleIdList_ = mutableCopy(unlockedModuleIdList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 GPEAAFAIGAF = 10;
-       * @return A list containing the gPEAAFAIGAF.
+       * repeated uint32 unlocked_module_id_list = 10;
+       * @return A list containing the unlockedModuleIdList.
        */
       public java.util.List
-          getGPEAAFAIGAFList() {
+          getUnlockedModuleIdListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(gPEAAFAIGAF_) : gPEAAFAIGAF_;
+                 java.util.Collections.unmodifiableList(unlockedModuleIdList_) : unlockedModuleIdList_;
       }
       /**
-       * repeated uint32 GPEAAFAIGAF = 10;
-       * @return The count of gPEAAFAIGAF.
+       * repeated uint32 unlocked_module_id_list = 10;
+       * @return The count of unlockedModuleIdList.
        */
-      public int getGPEAAFAIGAFCount() {
-        return gPEAAFAIGAF_.size();
+      public int getUnlockedModuleIdListCount() {
+        return unlockedModuleIdList_.size();
       }
       /**
-       * repeated uint32 GPEAAFAIGAF = 10;
+       * repeated uint32 unlocked_module_id_list = 10;
        * @param index The index of the element to return.
-       * @return The gPEAAFAIGAF at the given index.
+       * @return The unlockedModuleIdList at the given index.
        */
-      public int getGPEAAFAIGAF(int index) {
-        return gPEAAFAIGAF_.getInt(index);
+      public int getUnlockedModuleIdList(int index) {
+        return unlockedModuleIdList_.getInt(index);
       }
       /**
-       * repeated uint32 GPEAAFAIGAF = 10;
+       * repeated uint32 unlocked_module_id_list = 10;
        * @param index The index to set the value at.
-       * @param value The gPEAAFAIGAF to set.
+       * @param value The unlockedModuleIdList to set.
        * @return This builder for chaining.
        */
-      public Builder setGPEAAFAIGAF(
+      public Builder setUnlockedModuleIdList(
           int index, int value) {
-        ensureGPEAAFAIGAFIsMutable();
-        gPEAAFAIGAF_.setInt(index, value);
+        ensureUnlockedModuleIdListIsMutable();
+        unlockedModuleIdList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GPEAAFAIGAF = 10;
-       * @param value The gPEAAFAIGAF to add.
+       * repeated uint32 unlocked_module_id_list = 10;
+       * @param value The unlockedModuleIdList to add.
        * @return This builder for chaining.
        */
-      public Builder addGPEAAFAIGAF(int value) {
-        ensureGPEAAFAIGAFIsMutable();
-        gPEAAFAIGAF_.addInt(value);
+      public Builder addUnlockedModuleIdList(int value) {
+        ensureUnlockedModuleIdListIsMutable();
+        unlockedModuleIdList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GPEAAFAIGAF = 10;
-       * @param values The gPEAAFAIGAF to add.
+       * repeated uint32 unlocked_module_id_list = 10;
+       * @param values The unlockedModuleIdList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllGPEAAFAIGAF(
+      public Builder addAllUnlockedModuleIdList(
           java.lang.Iterable values) {
-        ensureGPEAAFAIGAFIsMutable();
+        ensureUnlockedModuleIdListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, gPEAAFAIGAF_);
+            values, unlockedModuleIdList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 GPEAAFAIGAF = 10;
+       * repeated uint32 unlocked_module_id_list = 10;
        * @return This builder for chaining.
        */
-      public Builder clearGPEAAFAIGAF() {
-        gPEAAFAIGAF_ = emptyIntList();
+      public Builder clearUnlockedModuleIdList() {
+        unlockedModuleIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1145,12 +1145,12 @@ public final class PlayerHomeCompInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030PlayerHomeCompInfo.proto\032\033FriendEnterH" +
-      "omeOption.proto\"\225\001\n\022PlayerHomeCompInfo\022\023" +
-      "\n\013PDAIEFBCLNI\030\003 \003(\r\022\023\n\013GPEAAFAIGAF\030\n \003(\r" +
-      "\022\033\n\023seen_module_id_list\030\010 \003(\r\0228\n\030friend_" +
-      "enter_home_option\030\017 \001(\0162\026.FriendEnterHom" +
-      "eOptionB\033\n\031emu.grasscutter.net.protob\006pr" +
-      "oto3"
+      "omeOption.proto\"\263\001\n\022PlayerHomeCompInfo\022%" +
+      "\n\035levelup_reward_got_level_list\030\003 \003(\r\022\037\n" +
+      "\027unlocked_module_id_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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -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[] { "PDAIEFBCLNI", "GPEAAFAIGAF", "SeenModuleIdList", "FriendEnterHomeOption", });
+        new java.lang.String[] { "LevelupRewardGotLevelList", "UnlockedModuleIdList", "SeenModuleIdList", "FriendEnterHomeOption", });
     emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
index 2efa90d92..02bba4a2a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
@@ -203,10 +203,10 @@ public final class PlayerLoginRspOuterClass {
     int getClientSilenceDataVersion();
 
     /**
-     * bool PKKKINOCFMJ = 2;
-     * @return The pKKKINOCFMJ.
+     * bool is_use_ability_hash = 2;
+     * @return The isUseAbilityHash.
      */
-    boolean getPKKKINOCFMJ();
+    boolean getIsUseAbilityHash();
 
     /**
      * int32 retcode = 8;
@@ -486,7 +486,7 @@ public final class PlayerLoginRspOuterClass {
               break;
             case 16: {
 
-              pKKKINOCFMJ_ = input.readBool();
+              isUseAbilityHash_ = input.readBool();
               break;
             }
             case 24: {
@@ -1191,15 +1191,15 @@ public final class PlayerLoginRspOuterClass {
       return clientSilenceDataVersion_;
     }
 
-    public static final int PKKKINOCFMJ_FIELD_NUMBER = 2;
-    private boolean pKKKINOCFMJ_;
+    public static final int IS_USE_ABILITY_HASH_FIELD_NUMBER = 2;
+    private boolean isUseAbilityHash_;
     /**
-     * bool PKKKINOCFMJ = 2;
-     * @return The pKKKINOCFMJ.
+     * bool is_use_ability_hash = 2;
+     * @return The isUseAbilityHash.
      */
     @java.lang.Override
-    public boolean getPKKKINOCFMJ() {
-      return pKKKINOCFMJ_;
+    public boolean getIsUseAbilityHash() {
+      return isUseAbilityHash_;
     }
 
     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 (pKKKINOCFMJ_ != false) {
-        output.writeBool(2, pKKKINOCFMJ_);
+      if (isUseAbilityHash_ != false) {
+        output.writeBool(2, isUseAbilityHash_);
       }
       if (loginRand_ != 0L) {
         output.writeUInt64(3, loginRand_);
@@ -1839,9 +1839,9 @@ public final class PlayerLoginRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pKKKINOCFMJ_ != false) {
+      if (isUseAbilityHash_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, pKKKINOCFMJ_);
+          .computeBoolSize(2, isUseAbilityHash_);
       }
       if (loginRand_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
@@ -2036,8 +2036,8 @@ public final class PlayerLoginRspOuterClass {
           != other.getDNHHIMENOLD()) return false;
       if (getClientSilenceDataVersion()
           != other.getClientSilenceDataVersion()) return false;
-      if (getPKKKINOCFMJ()
-          != other.getPKKKINOCFMJ()) return false;
+      if (getIsUseAbilityHash()
+          != other.getIsUseAbilityHash()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getClientDataVersion()
@@ -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) + PKKKINOCFMJ_FIELD_NUMBER;
+      hash = (37 * hash) + IS_USE_ABILITY_HASH_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getPKKKINOCFMJ());
+          getIsUseAbilityHash());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
@@ -2403,7 +2403,7 @@ public final class PlayerLoginRspOuterClass {
 
         clientSilenceDataVersion_ = 0;
 
-        pKKKINOCFMJ_ = false;
+        isUseAbilityHash_ = false;
 
         retcode_ = 0;
 
@@ -2516,7 +2516,7 @@ public final class PlayerLoginRspOuterClass {
         }
         result.dNHHIMENOLD_ = dNHHIMENOLD_;
         result.clientSilenceDataVersion_ = clientSilenceDataVersion_;
-        result.pKKKINOCFMJ_ = pKKKINOCFMJ_;
+        result.isUseAbilityHash_ = isUseAbilityHash_;
         result.retcode_ = retcode_;
         result.clientDataVersion_ = clientDataVersion_;
         result.birthday_ = birthday_;
@@ -2695,8 +2695,8 @@ public final class PlayerLoginRspOuterClass {
         if (other.getClientSilenceDataVersion() != 0) {
           setClientSilenceDataVersion(other.getClientSilenceDataVersion());
         }
-        if (other.getPKKKINOCFMJ() != false) {
-          setPKKKINOCFMJ(other.getPKKKINOCFMJ());
+        if (other.getIsUseAbilityHash() != false) {
+          setIsUseAbilityHash(other.getIsUseAbilityHash());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
@@ -3984,33 +3984,33 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
 
-      private boolean pKKKINOCFMJ_ ;
+      private boolean isUseAbilityHash_ ;
       /**
-       * bool PKKKINOCFMJ = 2;
-       * @return The pKKKINOCFMJ.
+       * bool is_use_ability_hash = 2;
+       * @return The isUseAbilityHash.
        */
       @java.lang.Override
-      public boolean getPKKKINOCFMJ() {
-        return pKKKINOCFMJ_;
+      public boolean getIsUseAbilityHash() {
+        return isUseAbilityHash_;
       }
       /**
-       * bool PKKKINOCFMJ = 2;
-       * @param value The pKKKINOCFMJ to set.
+       * bool is_use_ability_hash = 2;
+       * @param value The isUseAbilityHash to set.
        * @return This builder for chaining.
        */
-      public Builder setPKKKINOCFMJ(boolean value) {
+      public Builder setIsUseAbilityHash(boolean value) {
         
-        pKKKINOCFMJ_ = value;
+        isUseAbilityHash_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool PKKKINOCFMJ = 2;
+       * bool is_use_ability_hash = 2;
        * @return This builder for chaining.
        */
-      public Builder clearPKKKINOCFMJ() {
+      public Builder clearIsUseAbilityHash() {
         
-        pKKKINOCFMJ_ = false;
+        isUseAbilityHash_ = false;
         onChanged();
         return this;
       }
@@ -5351,7 +5351,7 @@ public final class PlayerLoginRspOuterClass {
       "\n\024PlayerLoginRsp.proto\032\032ShortAbilityHash" +
       "Pair.proto\032\026FeatureBlockInfo.proto\032\017Bloc" +
       "kInfo.proto\032\026ResVersionConfig.proto\032\024Sto" +
-      "pServerInfo.proto\"\316\t\n\016PlayerLoginRsp\022\036\n\025" +
+      "pServerInfo.proto\"\326\t\n\016PlayerLoginRsp\022\036\n\025" +
       "client_version_suffix\030\307\017 \001(\t\022=\n\020ability_" +
       "hash_map\030\n \003(\0132#.PlayerLoginRsp.AbilityH" +
       "ashMapEntry\022\024\n\013is_transfer\030\304\017 \001(\010\022\036\n\025tar" +
@@ -5364,26 +5364,26 @@ public final class PlayerLoginRspOuterClass {
       "\030\220\006 \001(\t\022\013\n\003msg\030+ \001(\t\0223\n\027feature_block_in" +
       "fo_list\030\333\014 \003(\0132\021.FeatureBlockInfo\022\024\n\013DNH" +
       "HIMENOLD\030\333\n \001(\010\022#\n\033client_silence_data_v" +
-      "ersion\030\006 \001(\r\022\023\n\013PKKKINOCFMJ\030\002 \001(\010\022\017\n\007ret" +
-      "code\030\010 \001(\005\022\033\n\023client_data_version\030\014 \001(\r\022" +
-      "\021\n\010birthday\030\230\r \001(\t\022\024\n\013BOKKNHEOKPD\030\354\004 \001(\010" +
-      "\022\022\n\ntarget_uid\030\t \001(\r\022:\n\016block_info_map\030\327" +
-      "\017 \003(\0132!.PlayerLoginRsp.BlockInfoMapEntry" +
-      "\022\024\n\013GOFGOCDJDND\030\231\002 \001(\010\022\032\n\021next_resource_" +
-      "url\030\332\007 \001(\t\022.\n\022res_version_config\030\235\003 \001(\0132" +
-      "\021.ResVersionConfig\022\030\n\017total_tick_time\030\206\002" +
-      " \001(\001\022\023\n\013player_data\030\r \001(\014\022\020\n\007sc_info\030\240\003 " +
-      "\001(\014\022\022\n\nlogin_rand\030\003 \001(\004\022\024\n\013ENNOCBNIHIK\030\352" +
-      "\t \001(\t\022\025\n\014country_code\030\304\003 \001(\t\022\033\n\023player_d" +
-      "ata_version\030\013 \001(\r\022&\n\035client_silence_vers" +
-      "ion_suffix\030\323\001 \001(\t\022%\n\013ECKNMCACJKG\030\345\017 \001(\0132" +
-      "\017.StopServerInfo\022\023\n\nclient_md5\030\227\004 \001(\t\0223\n" +
-      "\027next_res_version_config\030\354\010 \001(\0132\021.ResVer" +
-      "sionConfig\0325\n\023AbilityHashMapEntry\022\013\n\003key" +
-      "\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032?\n\021BlockInfoMa" +
-      "pEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 \001(\0132\n.Blo" +
-      "ckInfo:\0028\001B\033\n\031emu.grasscutter.net.protob" +
-      "\006proto3"
+      "ersion\030\006 \001(\r\022\033\n\023is_use_ability_hash\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" +
+      "fo_map\030\327\017 \003(\0132!.PlayerLoginRsp.BlockInfo" +
+      "MapEntry\022\024\n\013GOFGOCDJDND\030\231\002 \001(\010\022\032\n\021next_r" +
+      "esource_url\030\332\007 \001(\t\022.\n\022res_version_config" +
+      "\030\235\003 \001(\0132\021.ResVersionConfig\022\030\n\017total_tick" +
+      "_time\030\206\002 \001(\001\022\023\n\013player_data\030\r \001(\014\022\020\n\007sc_" +
+      "info\030\240\003 \001(\014\022\022\n\nlogin_rand\030\003 \001(\004\022\024\n\013ENNOC" +
+      "BNIHIK\030\352\t \001(\t\022\025\n\014country_code\030\304\003 \001(\t\022\033\n\023" +
+      "player_data_version\030\013 \001(\r\022&\n\035client_sile" +
+      "nce_version_suffix\030\323\001 \001(\t\022%\n\013ECKNMCACJKG" +
+      "\030\345\017 \001(\0132\017.StopServerInfo\022\023\n\nclient_md5\030\227" +
+      "\004 \001(\t\0223\n\027next_res_version_config\030\354\010 \001(\0132" +
+      "\021.ResVersionConfig\0325\n\023AbilityHashMapEntr" +
+      "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032?\n\021Blo" +
+      "ckInfoMapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 \001" +
+      "(\0132\n.BlockInfo:\0028\001B\033\n\031emu.grasscutter.ne" +
+      "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -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", "PKKKINOCFMJ", "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", "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", });
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_descriptor =
       internal_static_PlayerLoginRsp_descriptor.getNestedTypes().get(0);
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryCodexMonsterBeKilledNumRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryCodexMonsterBeKilledNumRspOuterClass.java
index 3428b3ce9..f3b29cf52 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QueryCodexMonsterBeKilledNumRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryCodexMonsterBeKilledNumRspOuterClass.java
@@ -19,38 +19,38 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * repeated uint32 DGHFMFFKNBM = 12;
-     * @return A list containing the dGHFMFFKNBM.
+     * repeated uint32 be_captured_num_list = 12;
+     * @return A list containing the beCapturedNumList.
      */
-    java.util.List getDGHFMFFKNBMList();
+    java.util.List getBeCapturedNumListList();
     /**
-     * repeated uint32 DGHFMFFKNBM = 12;
-     * @return The count of dGHFMFFKNBM.
+     * repeated uint32 be_captured_num_list = 12;
+     * @return The count of beCapturedNumList.
      */
-    int getDGHFMFFKNBMCount();
+    int getBeCapturedNumListCount();
     /**
-     * repeated uint32 DGHFMFFKNBM = 12;
+     * repeated uint32 be_captured_num_list = 12;
      * @param index The index of the element to return.
-     * @return The dGHFMFFKNBM at the given index.
+     * @return The beCapturedNumList at the given index.
      */
-    int getDGHFMFFKNBM(int index);
+    int getBeCapturedNumList(int index);
 
     /**
-     * repeated uint32 OHNNNCFNHKF = 8;
-     * @return A list containing the oHNNNCFNHKF.
+     * repeated uint32 be_killed_num_list = 8;
+     * @return A list containing the beKilledNumList.
      */
-    java.util.List getOHNNNCFNHKFList();
+    java.util.List getBeKilledNumListList();
     /**
-     * repeated uint32 OHNNNCFNHKF = 8;
-     * @return The count of oHNNNCFNHKF.
+     * repeated uint32 be_killed_num_list = 8;
+     * @return The count of beKilledNumList.
      */
-    int getOHNNNCFNHKFCount();
+    int getBeKilledNumListCount();
     /**
-     * repeated uint32 OHNNNCFNHKF = 8;
+     * repeated uint32 be_killed_num_list = 8;
      * @param index The index of the element to return.
-     * @return The oHNNNCFNHKF at the given index.
+     * @return The beKilledNumList at the given index.
      */
-    int getOHNNNCFNHKF(int index);
+    int getBeKilledNumList(int index);
 
     /**
      * int32 retcode = 15;
@@ -93,8 +93,8 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       super(builder);
     }
     private QueryCodexMonsterBeKilledNumRsp() {
-      dGHFMFFKNBM_ = emptyIntList();
-      oHNNNCFNHKF_ = emptyIntList();
+      beCapturedNumList_ = emptyIntList();
+      beKilledNumList_ = emptyIntList();
       codexIdList_ = emptyIntList();
     }
 
@@ -152,42 +152,42 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
             }
             case 64: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                oHNNNCFNHKF_ = newIntList();
+                beKilledNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              oHNNNCFNHKF_.addInt(input.readUInt32());
+              beKilledNumList_.addInt(input.readUInt32());
               break;
             }
             case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                oHNNNCFNHKF_ = newIntList();
+                beKilledNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                oHNNNCFNHKF_.addInt(input.readUInt32());
+                beKilledNumList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 96: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                dGHFMFFKNBM_ = newIntList();
+                beCapturedNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              dGHFMFFKNBM_.addInt(input.readUInt32());
+              beCapturedNumList_.addInt(input.readUInt32());
               break;
             }
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                dGHFMFFKNBM_ = newIntList();
+                beCapturedNumList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                dGHFMFFKNBM_.addInt(input.readUInt32());
+                beCapturedNumList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -216,10 +216,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
           codexIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          oHNNNCFNHKF_.makeImmutable(); // C
+          beKilledNumList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          dGHFMFFKNBM_.makeImmutable(); // C
+          beCapturedNumList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -238,61 +238,61 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
               emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.class, emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.Builder.class);
     }
 
-    public static final int DGHFMFFKNBM_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList dGHFMFFKNBM_;
+    public static final int BE_CAPTURED_NUM_LIST_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList beCapturedNumList_;
     /**
-     * repeated uint32 DGHFMFFKNBM = 12;
-     * @return A list containing the dGHFMFFKNBM.
+     * repeated uint32 be_captured_num_list = 12;
+     * @return A list containing the beCapturedNumList.
      */
     @java.lang.Override
     public java.util.List
-        getDGHFMFFKNBMList() {
-      return dGHFMFFKNBM_;
+        getBeCapturedNumListList() {
+      return beCapturedNumList_;
     }
     /**
-     * repeated uint32 DGHFMFFKNBM = 12;
-     * @return The count of dGHFMFFKNBM.
+     * repeated uint32 be_captured_num_list = 12;
+     * @return The count of beCapturedNumList.
      */
-    public int getDGHFMFFKNBMCount() {
-      return dGHFMFFKNBM_.size();
+    public int getBeCapturedNumListCount() {
+      return beCapturedNumList_.size();
     }
     /**
-     * repeated uint32 DGHFMFFKNBM = 12;
+     * repeated uint32 be_captured_num_list = 12;
      * @param index The index of the element to return.
-     * @return The dGHFMFFKNBM at the given index.
+     * @return The beCapturedNumList at the given index.
      */
-    public int getDGHFMFFKNBM(int index) {
-      return dGHFMFFKNBM_.getInt(index);
+    public int getBeCapturedNumList(int index) {
+      return beCapturedNumList_.getInt(index);
     }
-    private int dGHFMFFKNBMMemoizedSerializedSize = -1;
+    private int beCapturedNumListMemoizedSerializedSize = -1;
 
-    public static final int OHNNNCFNHKF_FIELD_NUMBER = 8;
-    private com.google.protobuf.Internal.IntList oHNNNCFNHKF_;
+    public static final int BE_KILLED_NUM_LIST_FIELD_NUMBER = 8;
+    private com.google.protobuf.Internal.IntList beKilledNumList_;
     /**
-     * repeated uint32 OHNNNCFNHKF = 8;
-     * @return A list containing the oHNNNCFNHKF.
+     * repeated uint32 be_killed_num_list = 8;
+     * @return A list containing the beKilledNumList.
      */
     @java.lang.Override
     public java.util.List
-        getOHNNNCFNHKFList() {
-      return oHNNNCFNHKF_;
+        getBeKilledNumListList() {
+      return beKilledNumList_;
     }
     /**
-     * repeated uint32 OHNNNCFNHKF = 8;
-     * @return The count of oHNNNCFNHKF.
+     * repeated uint32 be_killed_num_list = 8;
+     * @return The count of beKilledNumList.
      */
-    public int getOHNNNCFNHKFCount() {
-      return oHNNNCFNHKF_.size();
+    public int getBeKilledNumListCount() {
+      return beKilledNumList_.size();
     }
     /**
-     * repeated uint32 OHNNNCFNHKF = 8;
+     * repeated uint32 be_killed_num_list = 8;
      * @param index The index of the element to return.
-     * @return The oHNNNCFNHKF at the given index.
+     * @return The beKilledNumList at the given index.
      */
-    public int getOHNNNCFNHKF(int index) {
-      return oHNNNCFNHKF_.getInt(index);
+    public int getBeKilledNumList(int index) {
+      return beKilledNumList_.getInt(index);
     }
-    private int oHNNNCFNHKFMemoizedSerializedSize = -1;
+    private int beKilledNumListMemoizedSerializedSize = -1;
 
     public static final int RETCODE_FIELD_NUMBER = 15;
     private int retcode_;
@@ -355,19 +355,19 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       for (int i = 0; i < codexIdList_.size(); i++) {
         output.writeUInt32NoTag(codexIdList_.getInt(i));
       }
-      if (getOHNNNCFNHKFList().size() > 0) {
+      if (getBeKilledNumListList().size() > 0) {
         output.writeUInt32NoTag(66);
-        output.writeUInt32NoTag(oHNNNCFNHKFMemoizedSerializedSize);
+        output.writeUInt32NoTag(beKilledNumListMemoizedSerializedSize);
       }
-      for (int i = 0; i < oHNNNCFNHKF_.size(); i++) {
-        output.writeUInt32NoTag(oHNNNCFNHKF_.getInt(i));
+      for (int i = 0; i < beKilledNumList_.size(); i++) {
+        output.writeUInt32NoTag(beKilledNumList_.getInt(i));
       }
-      if (getDGHFMFFKNBMList().size() > 0) {
+      if (getBeCapturedNumListList().size() > 0) {
         output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(dGHFMFFKNBMMemoizedSerializedSize);
+        output.writeUInt32NoTag(beCapturedNumListMemoizedSerializedSize);
       }
-      for (int i = 0; i < dGHFMFFKNBM_.size(); i++) {
-        output.writeUInt32NoTag(dGHFMFFKNBM_.getInt(i));
+      for (int i = 0; i < beCapturedNumList_.size(); i++) {
+        output.writeUInt32NoTag(beCapturedNumList_.getInt(i));
       }
       if (retcode_ != 0) {
         output.writeInt32(15, retcode_);
@@ -397,31 +397,31 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < oHNNNCFNHKF_.size(); i++) {
+        for (int i = 0; i < beKilledNumList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(oHNNNCFNHKF_.getInt(i));
+            .computeUInt32SizeNoTag(beKilledNumList_.getInt(i));
         }
         size += dataSize;
-        if (!getOHNNNCFNHKFList().isEmpty()) {
+        if (!getBeKilledNumListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        oHNNNCFNHKFMemoizedSerializedSize = dataSize;
+        beKilledNumListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < dGHFMFFKNBM_.size(); i++) {
+        for (int i = 0; i < beCapturedNumList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(dGHFMFFKNBM_.getInt(i));
+            .computeUInt32SizeNoTag(beCapturedNumList_.getInt(i));
         }
         size += dataSize;
-        if (!getDGHFMFFKNBMList().isEmpty()) {
+        if (!getBeCapturedNumListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        dGHFMFFKNBMMemoizedSerializedSize = dataSize;
+        beCapturedNumListMemoizedSerializedSize = dataSize;
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -442,10 +442,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       }
       emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp other = (emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp) obj;
 
-      if (!getDGHFMFFKNBMList()
-          .equals(other.getDGHFMFFKNBMList())) return false;
-      if (!getOHNNNCFNHKFList()
-          .equals(other.getOHNNNCFNHKFList())) return false;
+      if (!getBeCapturedNumListList()
+          .equals(other.getBeCapturedNumListList())) return false;
+      if (!getBeKilledNumListList()
+          .equals(other.getBeKilledNumListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!getCodexIdListList()
@@ -461,13 +461,13 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getDGHFMFFKNBMCount() > 0) {
-        hash = (37 * hash) + DGHFMFFKNBM_FIELD_NUMBER;
-        hash = (53 * hash) + getDGHFMFFKNBMList().hashCode();
+      if (getBeCapturedNumListCount() > 0) {
+        hash = (37 * hash) + BE_CAPTURED_NUM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getBeCapturedNumListList().hashCode();
       }
-      if (getOHNNNCFNHKFCount() > 0) {
-        hash = (37 * hash) + OHNNNCFNHKF_FIELD_NUMBER;
-        hash = (53 * hash) + getOHNNNCFNHKFList().hashCode();
+      if (getBeKilledNumListCount() > 0) {
+        hash = (37 * hash) + BE_KILLED_NUM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getBeKilledNumListList().hashCode();
       }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
@@ -613,9 +613,9 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        dGHFMFFKNBM_ = emptyIntList();
+        beCapturedNumList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        oHNNNCFNHKF_ = emptyIntList();
+        beKilledNumList_ = 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)) {
-          dGHFMFFKNBM_.makeImmutable();
+          beCapturedNumList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.dGHFMFFKNBM_ = dGHFMFFKNBM_;
+        result.beCapturedNumList_ = beCapturedNumList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          oHNNNCFNHKF_.makeImmutable();
+          beKilledNumList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.oHNNNCFNHKF_ = oHNNNCFNHKF_;
+        result.beKilledNumList_ = beKilledNumList_;
         result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000004) != 0)) {
           codexIdList_.makeImmutable();
@@ -712,23 +712,23 @@ 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.dGHFMFFKNBM_.isEmpty()) {
-          if (dGHFMFFKNBM_.isEmpty()) {
-            dGHFMFFKNBM_ = other.dGHFMFFKNBM_;
+        if (!other.beCapturedNumList_.isEmpty()) {
+          if (beCapturedNumList_.isEmpty()) {
+            beCapturedNumList_ = other.beCapturedNumList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureDGHFMFFKNBMIsMutable();
-            dGHFMFFKNBM_.addAll(other.dGHFMFFKNBM_);
+            ensureBeCapturedNumListIsMutable();
+            beCapturedNumList_.addAll(other.beCapturedNumList_);
           }
           onChanged();
         }
-        if (!other.oHNNNCFNHKF_.isEmpty()) {
-          if (oHNNNCFNHKF_.isEmpty()) {
-            oHNNNCFNHKF_ = other.oHNNNCFNHKF_;
+        if (!other.beKilledNumList_.isEmpty()) {
+          if (beKilledNumList_.isEmpty()) {
+            beKilledNumList_ = other.beKilledNumList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureOHNNNCFNHKFIsMutable();
-            oHNNNCFNHKF_.addAll(other.oHNNNCFNHKF_);
+            ensureBeKilledNumListIsMutable();
+            beKilledNumList_.addAll(other.beKilledNumList_);
           }
           onChanged();
         }
@@ -775,159 +775,159 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList dGHFMFFKNBM_ = emptyIntList();
-      private void ensureDGHFMFFKNBMIsMutable() {
+      private com.google.protobuf.Internal.IntList beCapturedNumList_ = emptyIntList();
+      private void ensureBeCapturedNumListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          dGHFMFFKNBM_ = mutableCopy(dGHFMFFKNBM_);
+          beCapturedNumList_ = mutableCopy(beCapturedNumList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * repeated uint32 DGHFMFFKNBM = 12;
-       * @return A list containing the dGHFMFFKNBM.
+       * repeated uint32 be_captured_num_list = 12;
+       * @return A list containing the beCapturedNumList.
        */
       public java.util.List
-          getDGHFMFFKNBMList() {
+          getBeCapturedNumListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(dGHFMFFKNBM_) : dGHFMFFKNBM_;
+                 java.util.Collections.unmodifiableList(beCapturedNumList_) : beCapturedNumList_;
       }
       /**
-       * repeated uint32 DGHFMFFKNBM = 12;
-       * @return The count of dGHFMFFKNBM.
+       * repeated uint32 be_captured_num_list = 12;
+       * @return The count of beCapturedNumList.
        */
-      public int getDGHFMFFKNBMCount() {
-        return dGHFMFFKNBM_.size();
+      public int getBeCapturedNumListCount() {
+        return beCapturedNumList_.size();
       }
       /**
-       * repeated uint32 DGHFMFFKNBM = 12;
+       * repeated uint32 be_captured_num_list = 12;
        * @param index The index of the element to return.
-       * @return The dGHFMFFKNBM at the given index.
+       * @return The beCapturedNumList at the given index.
        */
-      public int getDGHFMFFKNBM(int index) {
-        return dGHFMFFKNBM_.getInt(index);
+      public int getBeCapturedNumList(int index) {
+        return beCapturedNumList_.getInt(index);
       }
       /**
-       * repeated uint32 DGHFMFFKNBM = 12;
+       * repeated uint32 be_captured_num_list = 12;
        * @param index The index to set the value at.
-       * @param value The dGHFMFFKNBM to set.
+       * @param value The beCapturedNumList to set.
        * @return This builder for chaining.
        */
-      public Builder setDGHFMFFKNBM(
+      public Builder setBeCapturedNumList(
           int index, int value) {
-        ensureDGHFMFFKNBMIsMutable();
-        dGHFMFFKNBM_.setInt(index, value);
+        ensureBeCapturedNumListIsMutable();
+        beCapturedNumList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 DGHFMFFKNBM = 12;
-       * @param value The dGHFMFFKNBM to add.
+       * repeated uint32 be_captured_num_list = 12;
+       * @param value The beCapturedNumList to add.
        * @return This builder for chaining.
        */
-      public Builder addDGHFMFFKNBM(int value) {
-        ensureDGHFMFFKNBMIsMutable();
-        dGHFMFFKNBM_.addInt(value);
+      public Builder addBeCapturedNumList(int value) {
+        ensureBeCapturedNumListIsMutable();
+        beCapturedNumList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 DGHFMFFKNBM = 12;
-       * @param values The dGHFMFFKNBM to add.
+       * repeated uint32 be_captured_num_list = 12;
+       * @param values The beCapturedNumList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllDGHFMFFKNBM(
+      public Builder addAllBeCapturedNumList(
           java.lang.Iterable values) {
-        ensureDGHFMFFKNBMIsMutable();
+        ensureBeCapturedNumListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, dGHFMFFKNBM_);
+            values, beCapturedNumList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 DGHFMFFKNBM = 12;
+       * repeated uint32 be_captured_num_list = 12;
        * @return This builder for chaining.
        */
-      public Builder clearDGHFMFFKNBM() {
-        dGHFMFFKNBM_ = emptyIntList();
+      public Builder clearBeCapturedNumList() {
+        beCapturedNumList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList oHNNNCFNHKF_ = emptyIntList();
-      private void ensureOHNNNCFNHKFIsMutable() {
+      private com.google.protobuf.Internal.IntList beKilledNumList_ = emptyIntList();
+      private void ensureBeKilledNumListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          oHNNNCFNHKF_ = mutableCopy(oHNNNCFNHKF_);
+          beKilledNumList_ = mutableCopy(beKilledNumList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 OHNNNCFNHKF = 8;
-       * @return A list containing the oHNNNCFNHKF.
+       * repeated uint32 be_killed_num_list = 8;
+       * @return A list containing the beKilledNumList.
        */
       public java.util.List
-          getOHNNNCFNHKFList() {
+          getBeKilledNumListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(oHNNNCFNHKF_) : oHNNNCFNHKF_;
+                 java.util.Collections.unmodifiableList(beKilledNumList_) : beKilledNumList_;
       }
       /**
-       * repeated uint32 OHNNNCFNHKF = 8;
-       * @return The count of oHNNNCFNHKF.
+       * repeated uint32 be_killed_num_list = 8;
+       * @return The count of beKilledNumList.
        */
-      public int getOHNNNCFNHKFCount() {
-        return oHNNNCFNHKF_.size();
+      public int getBeKilledNumListCount() {
+        return beKilledNumList_.size();
       }
       /**
-       * repeated uint32 OHNNNCFNHKF = 8;
+       * repeated uint32 be_killed_num_list = 8;
        * @param index The index of the element to return.
-       * @return The oHNNNCFNHKF at the given index.
+       * @return The beKilledNumList at the given index.
        */
-      public int getOHNNNCFNHKF(int index) {
-        return oHNNNCFNHKF_.getInt(index);
+      public int getBeKilledNumList(int index) {
+        return beKilledNumList_.getInt(index);
       }
       /**
-       * repeated uint32 OHNNNCFNHKF = 8;
+       * repeated uint32 be_killed_num_list = 8;
        * @param index The index to set the value at.
-       * @param value The oHNNNCFNHKF to set.
+       * @param value The beKilledNumList to set.
        * @return This builder for chaining.
        */
-      public Builder setOHNNNCFNHKF(
+      public Builder setBeKilledNumList(
           int index, int value) {
-        ensureOHNNNCFNHKFIsMutable();
-        oHNNNCFNHKF_.setInt(index, value);
+        ensureBeKilledNumListIsMutable();
+        beKilledNumList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 OHNNNCFNHKF = 8;
-       * @param value The oHNNNCFNHKF to add.
+       * repeated uint32 be_killed_num_list = 8;
+       * @param value The beKilledNumList to add.
        * @return This builder for chaining.
        */
-      public Builder addOHNNNCFNHKF(int value) {
-        ensureOHNNNCFNHKFIsMutable();
-        oHNNNCFNHKF_.addInt(value);
+      public Builder addBeKilledNumList(int value) {
+        ensureBeKilledNumListIsMutable();
+        beKilledNumList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 OHNNNCFNHKF = 8;
-       * @param values The oHNNNCFNHKF to add.
+       * repeated uint32 be_killed_num_list = 8;
+       * @param values The beKilledNumList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllOHNNNCFNHKF(
+      public Builder addAllBeKilledNumList(
           java.lang.Iterable values) {
-        ensureOHNNNCFNHKFIsMutable();
+        ensureBeKilledNumListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, oHNNNCFNHKF_);
+            values, beKilledNumList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 OHNNNCFNHKF = 8;
+       * repeated uint32 be_killed_num_list = 8;
        * @return This builder for chaining.
        */
-      public Builder clearOHNNNCFNHKF() {
-        oHNNNCFNHKF_ = emptyIntList();
+      public Builder clearBeKilledNumList() {
+        beKilledNumList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1110,10 +1110,11 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n%QueryCodexMonsterBeKilledNumRsp.proto\"" +
-      "s\n\037QueryCodexMonsterBeKilledNumRsp\022\023\n\013DG" +
-      "HFMFFKNBM\030\014 \003(\r\022\023\n\013OHNNNCFNHKF\030\010 \003(\r\022\017\n\007" +
-      "retcode\030\017 \001(\005\022\025\n\rcodex_id_list\030\005 \003(\rB\033\n\031" +
-      "emu.grasscutter.net.protob\006proto3"
+      "\203\001\n\037QueryCodexMonsterBeKilledNumRsp\022\034\n\024b" +
+      "e_captured_num_list\030\014 \003(\r\022\032\n\022be_killed_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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1124,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[] { "DGHFMFFKNBM", "OHNNNCFNHKF", "Retcode", "CodexIdList", });
+        new java.lang.String[] { "BeCapturedNumList", "BeKilledNumList", "Retcode", "CodexIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java
index 57c878bbc..d22ee5989 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java
@@ -19,6 +19,10 @@ public final class QueryPathRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     * 
+     * Obf: LFJGAFPHNNE
+     * 

+     *
      * int32 query_id = 6;
      * @return The queryId.
      */
@@ -55,15 +59,15 @@ public final class QueryPathRspOuterClass {
     int getRetcode();
 
     /**
-     * .QueryPathRsp.PathStatusType query_status = 15;
+     * .PathStatusType query_status = 15;
      * @return The enum numeric value on the wire for queryStatus.
      */
     int getQueryStatusValue();
     /**
-     * .QueryPathRsp.PathStatusType query_status = 15;
+     * .PathStatusType query_status = 15;
      * @return The queryStatus.
      */
-    emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType getQueryStatus();
+    emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus();
   }
   /**
    * 
@@ -178,130 +182,13 @@ public final class QueryPathRspOuterClass {
               emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.class, emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.Builder.class);
     }
 
+    public static final int QUERY_ID_FIELD_NUMBER = 6;
+    private int queryId_;
     /**
      * 
      * Obf: LFJGAFPHNNE
      * 

      *
-     * Protobuf enum {@code QueryPathRsp.PathStatusType}
-     */
-    public enum PathStatusType
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * PathStatusType_StatusFail = 0;
-       */
-      PathStatusType_StatusFail(0),
-      /**
-       * PathStatusType_StatusSucc = 1;
-       */
-      PathStatusType_StatusSucc(1),
-      /**
-       * PathStatusType_StatusPartial = 2;
-       */
-      PathStatusType_StatusPartial(2),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * PathStatusType_StatusFail = 0;
-       */
-      public static final int PathStatusType_StatusFail_VALUE = 0;
-      /**
-       * PathStatusType_StatusSucc = 1;
-       */
-      public static final int PathStatusType_StatusSucc_VALUE = 1;
-      /**
-       * PathStatusType_StatusPartial = 2;
-       */
-      public static final int PathStatusType_StatusPartial_VALUE = 2;
-
-
-      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 PathStatusType 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 PathStatusType forNumber(int value) {
-        switch (value) {
-          case 0: return PathStatusType_StatusFail;
-          case 1: return PathStatusType_StatusSucc;
-          case 2: return PathStatusType_StatusPartial;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          PathStatusType> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap() {
-              public PathStatusType findValueByNumber(int number) {
-                return PathStatusType.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.QueryPathRspOuterClass.QueryPathRsp.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final PathStatusType[] VALUES = values();
-
-      public static PathStatusType 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 PathStatusType(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:QueryPathRsp.PathStatusType)
-    }
-
-    public static final int QUERY_ID_FIELD_NUMBER = 6;
-    private int queryId_;
-    /**
      * int32 query_id = 6;
      * @return The queryId.
      */
@@ -364,20 +251,20 @@ public final class QueryPathRspOuterClass {
     public static final int QUERY_STATUS_FIELD_NUMBER = 15;
     private int queryStatus_;
     /**
-     * .QueryPathRsp.PathStatusType query_status = 15;
+     * .PathStatusType query_status = 15;
      * @return The enum numeric value on the wire for queryStatus.
      */
     @java.lang.Override public int getQueryStatusValue() {
       return queryStatus_;
     }
     /**
-     * .QueryPathRsp.PathStatusType query_status = 15;
+     * .PathStatusType query_status = 15;
      * @return The queryStatus.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType getQueryStatus() {
+    @java.lang.Override public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
       @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType result = emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType.valueOf(queryStatus_);
-      return result == null ? emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType.UNRECOGNIZED : result;
+      emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
+      return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -403,7 +290,7 @@ public final class QueryPathRspOuterClass {
       if (retcode_ != 0) {
         output.writeInt32(8, retcode_);
       }
-      if (queryStatus_ != emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType.PathStatusType_StatusFail.getNumber()) {
+      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
         output.writeEnum(15, queryStatus_);
       }
       unknownFields.writeTo(output);
@@ -427,7 +314,7 @@ public final class QueryPathRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(8, retcode_);
       }
-      if (queryStatus_ != emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType.PathStatusType_StatusFail.getNumber()) {
+      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(15, queryStatus_);
       }
@@ -779,6 +666,10 @@ public final class QueryPathRspOuterClass {
 
       private int queryId_ ;
       /**
+       * 
+       * Obf: LFJGAFPHNNE
+       * 

+       *
        * int32 query_id = 6;
        * @return The queryId.
        */
@@ -787,6 +678,10 @@ public final class QueryPathRspOuterClass {
         return queryId_;
       }
       /**
+       * 
+       * Obf: LFJGAFPHNNE
+       * 

+       *
        * int32 query_id = 6;
        * @param value The queryId to set.
        * @return This builder for chaining.
@@ -798,6 +693,10 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
+       * 
+       * Obf: LFJGAFPHNNE
+       * 

+       *
        * int32 query_id = 6;
        * @return This builder for chaining.
        */
@@ -1081,14 +980,14 @@ public final class QueryPathRspOuterClass {
 
       private int queryStatus_ = 0;
       /**
-       * .QueryPathRsp.PathStatusType query_status = 15;
+       * .PathStatusType query_status = 15;
        * @return The enum numeric value on the wire for queryStatus.
        */
       @java.lang.Override public int getQueryStatusValue() {
         return queryStatus_;
       }
       /**
-       * .QueryPathRsp.PathStatusType query_status = 15;
+       * .PathStatusType query_status = 15;
        * @param value The enum numeric value on the wire for queryStatus to set.
        * @return This builder for chaining.
        */
@@ -1099,21 +998,21 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * .QueryPathRsp.PathStatusType query_status = 15;
+       * .PathStatusType query_status = 15;
        * @return The queryStatus.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType getQueryStatus() {
+      public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
         @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType result = emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType.valueOf(queryStatus_);
-        return result == null ? emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType.UNRECOGNIZED : result;
+        emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
+        return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
       }
       /**
-       * .QueryPathRsp.PathStatusType query_status = 15;
+       * .PathStatusType query_status = 15;
        * @param value The queryStatus to set.
        * @return This builder for chaining.
        */
-      public Builder setQueryStatus(emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.PathStatusType value) {
+      public Builder setQueryStatus(emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1123,7 +1022,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * .QueryPathRsp.PathStatusType query_status = 15;
+       * .PathStatusType query_status = 15;
        * @return This builder for chaining.
        */
       public Builder clearQueryStatus() {
@@ -1199,19 +1098,18 @@ public final class QueryPathRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022QueryPathRsp.proto\032\014Vector.proto\"\361\001\n\014Q" +
-      "ueryPathRsp\022\020\n\010query_id\030\006 \001(\005\022\030\n\007corners" +
-      "\030\001 \003(\0132\007.Vector\022\017\n\007retcode\030\010 \001(\005\0222\n\014quer" +
-      "y_status\030\017 \001(\0162\034.QueryPathRsp.PathStatus" +
-      "Type\"p\n\016PathStatusType\022\035\n\031PathStatusType" +
-      "_StatusFail\020\000\022\035\n\031PathStatusType_StatusSu" +
-      "cc\020\001\022 \n\034PathStatusType_StatusPartial\020\002B\033" +
-      "\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\022QueryPathRsp.proto\032\014Vector.proto\032\024Path" +
+      "StatusType.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" +
+      "ob\006proto3"
     };
     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(),
         });
     internal_static_QueryPathRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -1220,6 +1118,7 @@ public final class QueryPathRspOuterClass {
         internal_static_QueryPathRsp_descriptor,
         new java.lang.String[] { "QueryId", "Corners", "Retcode", "QueryStatus", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java
index 7f7ac04aa..073757d26 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java
@@ -31,21 +31,21 @@ public final class ReliquaryUpgradeRspOuterClass {
     int getPowerUpRate();
 
     /**
-     * repeated uint32 JNPAMCBCIMC = 14;
-     * @return A list containing the jNPAMCBCIMC.
+     * repeated uint32 cur_append_prop_list = 14;
+     * @return A list containing the curAppendPropList.
      */
-    java.util.List getJNPAMCBCIMCList();
+    java.util.List getCurAppendPropListList();
     /**
-     * repeated uint32 JNPAMCBCIMC = 14;
-     * @return The count of jNPAMCBCIMC.
+     * repeated uint32 cur_append_prop_list = 14;
+     * @return The count of curAppendPropList.
      */
-    int getJNPAMCBCIMCCount();
+    int getCurAppendPropListCount();
     /**
-     * repeated uint32 JNPAMCBCIMC = 14;
+     * repeated uint32 cur_append_prop_list = 14;
      * @param index The index of the element to return.
-     * @return The jNPAMCBCIMC at the given index.
+     * @return The curAppendPropList at the given index.
      */
-    int getJNPAMCBCIMC(int index);
+    int getCurAppendPropList(int index);
 
     /**
      * uint32 old_level = 8;
@@ -54,21 +54,21 @@ public final class ReliquaryUpgradeRspOuterClass {
     int getOldLevel();
 
     /**
-     * repeated uint32 FJJPDKBCGND = 15;
-     * @return A list containing the fJJPDKBCGND.
+     * repeated uint32 old_append_prop_list = 15;
+     * @return A list containing the oldAppendPropList.
      */
-    java.util.List getFJJPDKBCGNDList();
+    java.util.List getOldAppendPropListList();
     /**
-     * repeated uint32 FJJPDKBCGND = 15;
-     * @return The count of fJJPDKBCGND.
+     * repeated uint32 old_append_prop_list = 15;
+     * @return The count of oldAppendPropList.
      */
-    int getFJJPDKBCGNDCount();
+    int getOldAppendPropListCount();
     /**
-     * repeated uint32 FJJPDKBCGND = 15;
+     * repeated uint32 old_append_prop_list = 15;
      * @param index The index of the element to return.
-     * @return The fJJPDKBCGND at the given index.
+     * @return The oldAppendPropList at the given index.
      */
-    int getFJJPDKBCGND(int index);
+    int getOldAppendPropList(int index);
 
     /**
      * uint64 target_reliquary_guid = 5;
@@ -100,8 +100,8 @@ public final class ReliquaryUpgradeRspOuterClass {
       super(builder);
     }
     private ReliquaryUpgradeRsp() {
-      jNPAMCBCIMC_ = emptyIntList();
-      fJJPDKBCGND_ = emptyIntList();
+      curAppendPropList_ = emptyIntList();
+      oldAppendPropList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -162,42 +162,42 @@ public final class ReliquaryUpgradeRspOuterClass {
             }
             case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                jNPAMCBCIMC_ = newIntList();
+                curAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              jNPAMCBCIMC_.addInt(input.readUInt32());
+              curAppendPropList_.addInt(input.readUInt32());
               break;
             }
             case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                jNPAMCBCIMC_ = newIntList();
+                curAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                jNPAMCBCIMC_.addInt(input.readUInt32());
+                curAppendPropList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 120: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                fJJPDKBCGND_ = newIntList();
+                oldAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              fJJPDKBCGND_.addInt(input.readUInt32());
+              oldAppendPropList_.addInt(input.readUInt32());
               break;
             }
             case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                fJJPDKBCGND_ = newIntList();
+                oldAppendPropList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                fJJPDKBCGND_.addInt(input.readUInt32());
+                oldAppendPropList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -218,10 +218,10 @@ public final class ReliquaryUpgradeRspOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          jNPAMCBCIMC_.makeImmutable(); // C
+          curAppendPropList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          fJJPDKBCGND_.makeImmutable(); // C
+          oldAppendPropList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -262,33 +262,33 @@ public final class ReliquaryUpgradeRspOuterClass {
       return powerUpRate_;
     }
 
-    public static final int JNPAMCBCIMC_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList jNPAMCBCIMC_;
+    public static final int CUR_APPEND_PROP_LIST_FIELD_NUMBER = 14;
+    private com.google.protobuf.Internal.IntList curAppendPropList_;
     /**
-     * repeated uint32 JNPAMCBCIMC = 14;
-     * @return A list containing the jNPAMCBCIMC.
+     * repeated uint32 cur_append_prop_list = 14;
+     * @return A list containing the curAppendPropList.
      */
     @java.lang.Override
     public java.util.List
-        getJNPAMCBCIMCList() {
-      return jNPAMCBCIMC_;
+        getCurAppendPropListList() {
+      return curAppendPropList_;
     }
     /**
-     * repeated uint32 JNPAMCBCIMC = 14;
-     * @return The count of jNPAMCBCIMC.
+     * repeated uint32 cur_append_prop_list = 14;
+     * @return The count of curAppendPropList.
      */
-    public int getJNPAMCBCIMCCount() {
-      return jNPAMCBCIMC_.size();
+    public int getCurAppendPropListCount() {
+      return curAppendPropList_.size();
     }
     /**
-     * repeated uint32 JNPAMCBCIMC = 14;
+     * repeated uint32 cur_append_prop_list = 14;
      * @param index The index of the element to return.
-     * @return The jNPAMCBCIMC at the given index.
+     * @return The curAppendPropList at the given index.
      */
-    public int getJNPAMCBCIMC(int index) {
-      return jNPAMCBCIMC_.getInt(index);
+    public int getCurAppendPropList(int index) {
+      return curAppendPropList_.getInt(index);
     }
-    private int jNPAMCBCIMCMemoizedSerializedSize = -1;
+    private int curAppendPropListMemoizedSerializedSize = -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 FJJPDKBCGND_FIELD_NUMBER = 15;
-    private com.google.protobuf.Internal.IntList fJJPDKBCGND_;
+    public static final int OLD_APPEND_PROP_LIST_FIELD_NUMBER = 15;
+    private com.google.protobuf.Internal.IntList oldAppendPropList_;
     /**
-     * repeated uint32 FJJPDKBCGND = 15;
-     * @return A list containing the fJJPDKBCGND.
+     * repeated uint32 old_append_prop_list = 15;
+     * @return A list containing the oldAppendPropList.
      */
     @java.lang.Override
     public java.util.List
-        getFJJPDKBCGNDList() {
-      return fJJPDKBCGND_;
+        getOldAppendPropListList() {
+      return oldAppendPropList_;
     }
     /**
-     * repeated uint32 FJJPDKBCGND = 15;
-     * @return The count of fJJPDKBCGND.
+     * repeated uint32 old_append_prop_list = 15;
+     * @return The count of oldAppendPropList.
      */
-    public int getFJJPDKBCGNDCount() {
-      return fJJPDKBCGND_.size();
+    public int getOldAppendPropListCount() {
+      return oldAppendPropList_.size();
     }
     /**
-     * repeated uint32 FJJPDKBCGND = 15;
+     * repeated uint32 old_append_prop_list = 15;
      * @param index The index of the element to return.
-     * @return The fJJPDKBCGND at the given index.
+     * @return The oldAppendPropList at the given index.
      */
-    public int getFJJPDKBCGND(int index) {
-      return fJJPDKBCGND_.getInt(index);
+    public int getOldAppendPropList(int index) {
+      return oldAppendPropList_.getInt(index);
     }
-    private int fJJPDKBCGNDMemoizedSerializedSize = -1;
+    private int oldAppendPropListMemoizedSerializedSize = -1;
 
     public static final int TARGET_RELIQUARY_GUID_FIELD_NUMBER = 5;
     private long targetReliquaryGuid_;
@@ -381,19 +381,19 @@ public final class ReliquaryUpgradeRspOuterClass {
       if (curLevel_ != 0) {
         output.writeUInt32(13, curLevel_);
       }
-      if (getJNPAMCBCIMCList().size() > 0) {
+      if (getCurAppendPropListList().size() > 0) {
         output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(jNPAMCBCIMCMemoizedSerializedSize);
+        output.writeUInt32NoTag(curAppendPropListMemoizedSerializedSize);
       }
-      for (int i = 0; i < jNPAMCBCIMC_.size(); i++) {
-        output.writeUInt32NoTag(jNPAMCBCIMC_.getInt(i));
+      for (int i = 0; i < curAppendPropList_.size(); i++) {
+        output.writeUInt32NoTag(curAppendPropList_.getInt(i));
       }
-      if (getFJJPDKBCGNDList().size() > 0) {
+      if (getOldAppendPropListList().size() > 0) {
         output.writeUInt32NoTag(122);
-        output.writeUInt32NoTag(fJJPDKBCGNDMemoizedSerializedSize);
+        output.writeUInt32NoTag(oldAppendPropListMemoizedSerializedSize);
       }
-      for (int i = 0; i < fJJPDKBCGND_.size(); i++) {
-        output.writeUInt32NoTag(fJJPDKBCGND_.getInt(i));
+      for (int i = 0; i < oldAppendPropList_.size(); i++) {
+        output.writeUInt32NoTag(oldAppendPropList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -426,31 +426,31 @@ public final class ReliquaryUpgradeRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < jNPAMCBCIMC_.size(); i++) {
+        for (int i = 0; i < curAppendPropList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(jNPAMCBCIMC_.getInt(i));
+            .computeUInt32SizeNoTag(curAppendPropList_.getInt(i));
         }
         size += dataSize;
-        if (!getJNPAMCBCIMCList().isEmpty()) {
+        if (!getCurAppendPropListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        jNPAMCBCIMCMemoizedSerializedSize = dataSize;
+        curAppendPropListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < fJJPDKBCGND_.size(); i++) {
+        for (int i = 0; i < oldAppendPropList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(fJJPDKBCGND_.getInt(i));
+            .computeUInt32SizeNoTag(oldAppendPropList_.getInt(i));
         }
         size += dataSize;
-        if (!getFJJPDKBCGNDList().isEmpty()) {
+        if (!getOldAppendPropListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        fJJPDKBCGNDMemoizedSerializedSize = dataSize;
+        oldAppendPropListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -471,12 +471,12 @@ public final class ReliquaryUpgradeRspOuterClass {
           != other.getCurLevel()) return false;
       if (getPowerUpRate()
           != other.getPowerUpRate()) return false;
-      if (!getJNPAMCBCIMCList()
-          .equals(other.getJNPAMCBCIMCList())) return false;
+      if (!getCurAppendPropListList()
+          .equals(other.getCurAppendPropListList())) return false;
       if (getOldLevel()
           != other.getOldLevel()) return false;
-      if (!getFJJPDKBCGNDList()
-          .equals(other.getFJJPDKBCGNDList())) return false;
+      if (!getOldAppendPropListList()
+          .equals(other.getOldAppendPropListList())) return false;
       if (getTargetReliquaryGuid()
           != other.getTargetReliquaryGuid()) return false;
       if (getRetcode()
@@ -496,15 +496,15 @@ public final class ReliquaryUpgradeRspOuterClass {
       hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + POWER_UP_RATE_FIELD_NUMBER;
       hash = (53 * hash) + getPowerUpRate();
-      if (getJNPAMCBCIMCCount() > 0) {
-        hash = (37 * hash) + JNPAMCBCIMC_FIELD_NUMBER;
-        hash = (53 * hash) + getJNPAMCBCIMCList().hashCode();
+      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 (getFJJPDKBCGNDCount() > 0) {
-        hash = (37 * hash) + FJJPDKBCGND_FIELD_NUMBER;
-        hash = (53 * hash) + getFJJPDKBCGNDList().hashCode();
+      if (getOldAppendPropListCount() > 0) {
+        hash = (37 * hash) + OLD_APPEND_PROP_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getOldAppendPropListList().hashCode();
       }
       hash = (37 * hash) + TARGET_RELIQUARY_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
@@ -653,11 +653,11 @@ public final class ReliquaryUpgradeRspOuterClass {
 
         powerUpRate_ = 0;
 
-        jNPAMCBCIMC_ = emptyIntList();
+        curAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         oldLevel_ = 0;
 
-        fJJPDKBCGND_ = emptyIntList();
+        oldAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         targetReliquaryGuid_ = 0L;
 
@@ -693,16 +693,16 @@ public final class ReliquaryUpgradeRspOuterClass {
         result.curLevel_ = curLevel_;
         result.powerUpRate_ = powerUpRate_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          jNPAMCBCIMC_.makeImmutable();
+          curAppendPropList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.jNPAMCBCIMC_ = jNPAMCBCIMC_;
+        result.curAppendPropList_ = curAppendPropList_;
         result.oldLevel_ = oldLevel_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          fJJPDKBCGND_.makeImmutable();
+          oldAppendPropList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.fJJPDKBCGND_ = fJJPDKBCGND_;
+        result.oldAppendPropList_ = oldAppendPropList_;
         result.targetReliquaryGuid_ = targetReliquaryGuid_;
         result.retcode_ = retcode_;
         onBuilt();
@@ -759,26 +759,26 @@ public final class ReliquaryUpgradeRspOuterClass {
         if (other.getPowerUpRate() != 0) {
           setPowerUpRate(other.getPowerUpRate());
         }
-        if (!other.jNPAMCBCIMC_.isEmpty()) {
-          if (jNPAMCBCIMC_.isEmpty()) {
-            jNPAMCBCIMC_ = other.jNPAMCBCIMC_;
+        if (!other.curAppendPropList_.isEmpty()) {
+          if (curAppendPropList_.isEmpty()) {
+            curAppendPropList_ = other.curAppendPropList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureJNPAMCBCIMCIsMutable();
-            jNPAMCBCIMC_.addAll(other.jNPAMCBCIMC_);
+            ensureCurAppendPropListIsMutable();
+            curAppendPropList_.addAll(other.curAppendPropList_);
           }
           onChanged();
         }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
-        if (!other.fJJPDKBCGND_.isEmpty()) {
-          if (fJJPDKBCGND_.isEmpty()) {
-            fJJPDKBCGND_ = other.fJJPDKBCGND_;
+        if (!other.oldAppendPropList_.isEmpty()) {
+          if (oldAppendPropList_.isEmpty()) {
+            oldAppendPropList_ = other.oldAppendPropList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureFJJPDKBCGNDIsMutable();
-            fJJPDKBCGND_.addAll(other.fJJPDKBCGND_);
+            ensureOldAppendPropListIsMutable();
+            oldAppendPropList_.addAll(other.oldAppendPropList_);
           }
           onChanged();
         }
@@ -880,80 +880,80 @@ public final class ReliquaryUpgradeRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList jNPAMCBCIMC_ = emptyIntList();
-      private void ensureJNPAMCBCIMCIsMutable() {
+      private com.google.protobuf.Internal.IntList curAppendPropList_ = emptyIntList();
+      private void ensureCurAppendPropListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          jNPAMCBCIMC_ = mutableCopy(jNPAMCBCIMC_);
+          curAppendPropList_ = mutableCopy(curAppendPropList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * repeated uint32 JNPAMCBCIMC = 14;
-       * @return A list containing the jNPAMCBCIMC.
+       * repeated uint32 cur_append_prop_list = 14;
+       * @return A list containing the curAppendPropList.
        */
       public java.util.List
-          getJNPAMCBCIMCList() {
+          getCurAppendPropListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(jNPAMCBCIMC_) : jNPAMCBCIMC_;
+                 java.util.Collections.unmodifiableList(curAppendPropList_) : curAppendPropList_;
       }
       /**
-       * repeated uint32 JNPAMCBCIMC = 14;
-       * @return The count of jNPAMCBCIMC.
+       * repeated uint32 cur_append_prop_list = 14;
+       * @return The count of curAppendPropList.
        */
-      public int getJNPAMCBCIMCCount() {
-        return jNPAMCBCIMC_.size();
+      public int getCurAppendPropListCount() {
+        return curAppendPropList_.size();
       }
       /**
-       * repeated uint32 JNPAMCBCIMC = 14;
+       * repeated uint32 cur_append_prop_list = 14;
        * @param index The index of the element to return.
-       * @return The jNPAMCBCIMC at the given index.
+       * @return The curAppendPropList at the given index.
        */
-      public int getJNPAMCBCIMC(int index) {
-        return jNPAMCBCIMC_.getInt(index);
+      public int getCurAppendPropList(int index) {
+        return curAppendPropList_.getInt(index);
       }
       /**
-       * repeated uint32 JNPAMCBCIMC = 14;
+       * repeated uint32 cur_append_prop_list = 14;
        * @param index The index to set the value at.
-       * @param value The jNPAMCBCIMC to set.
+       * @param value The curAppendPropList to set.
        * @return This builder for chaining.
        */
-      public Builder setJNPAMCBCIMC(
+      public Builder setCurAppendPropList(
           int index, int value) {
-        ensureJNPAMCBCIMCIsMutable();
-        jNPAMCBCIMC_.setInt(index, value);
+        ensureCurAppendPropListIsMutable();
+        curAppendPropList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JNPAMCBCIMC = 14;
-       * @param value The jNPAMCBCIMC to add.
+       * repeated uint32 cur_append_prop_list = 14;
+       * @param value The curAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addJNPAMCBCIMC(int value) {
-        ensureJNPAMCBCIMCIsMutable();
-        jNPAMCBCIMC_.addInt(value);
+      public Builder addCurAppendPropList(int value) {
+        ensureCurAppendPropListIsMutable();
+        curAppendPropList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JNPAMCBCIMC = 14;
-       * @param values The jNPAMCBCIMC to add.
+       * repeated uint32 cur_append_prop_list = 14;
+       * @param values The curAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllJNPAMCBCIMC(
+      public Builder addAllCurAppendPropList(
           java.lang.Iterable values) {
-        ensureJNPAMCBCIMCIsMutable();
+        ensureCurAppendPropListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, jNPAMCBCIMC_);
+            values, curAppendPropList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JNPAMCBCIMC = 14;
+       * repeated uint32 cur_append_prop_list = 14;
        * @return This builder for chaining.
        */
-      public Builder clearJNPAMCBCIMC() {
-        jNPAMCBCIMC_ = emptyIntList();
+      public Builder clearCurAppendPropList() {
+        curAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -990,80 +990,80 @@ public final class ReliquaryUpgradeRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList fJJPDKBCGND_ = emptyIntList();
-      private void ensureFJJPDKBCGNDIsMutable() {
+      private com.google.protobuf.Internal.IntList oldAppendPropList_ = emptyIntList();
+      private void ensureOldAppendPropListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          fJJPDKBCGND_ = mutableCopy(fJJPDKBCGND_);
+          oldAppendPropList_ = mutableCopy(oldAppendPropList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 FJJPDKBCGND = 15;
-       * @return A list containing the fJJPDKBCGND.
+       * repeated uint32 old_append_prop_list = 15;
+       * @return A list containing the oldAppendPropList.
        */
       public java.util.List
-          getFJJPDKBCGNDList() {
+          getOldAppendPropListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(fJJPDKBCGND_) : fJJPDKBCGND_;
+                 java.util.Collections.unmodifiableList(oldAppendPropList_) : oldAppendPropList_;
       }
       /**
-       * repeated uint32 FJJPDKBCGND = 15;
-       * @return The count of fJJPDKBCGND.
+       * repeated uint32 old_append_prop_list = 15;
+       * @return The count of oldAppendPropList.
        */
-      public int getFJJPDKBCGNDCount() {
-        return fJJPDKBCGND_.size();
+      public int getOldAppendPropListCount() {
+        return oldAppendPropList_.size();
       }
       /**
-       * repeated uint32 FJJPDKBCGND = 15;
+       * repeated uint32 old_append_prop_list = 15;
        * @param index The index of the element to return.
-       * @return The fJJPDKBCGND at the given index.
+       * @return The oldAppendPropList at the given index.
        */
-      public int getFJJPDKBCGND(int index) {
-        return fJJPDKBCGND_.getInt(index);
+      public int getOldAppendPropList(int index) {
+        return oldAppendPropList_.getInt(index);
       }
       /**
-       * repeated uint32 FJJPDKBCGND = 15;
+       * repeated uint32 old_append_prop_list = 15;
        * @param index The index to set the value at.
-       * @param value The fJJPDKBCGND to set.
+       * @param value The oldAppendPropList to set.
        * @return This builder for chaining.
        */
-      public Builder setFJJPDKBCGND(
+      public Builder setOldAppendPropList(
           int index, int value) {
-        ensureFJJPDKBCGNDIsMutable();
-        fJJPDKBCGND_.setInt(index, value);
+        ensureOldAppendPropListIsMutable();
+        oldAppendPropList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 FJJPDKBCGND = 15;
-       * @param value The fJJPDKBCGND to add.
+       * repeated uint32 old_append_prop_list = 15;
+       * @param value The oldAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addFJJPDKBCGND(int value) {
-        ensureFJJPDKBCGNDIsMutable();
-        fJJPDKBCGND_.addInt(value);
+      public Builder addOldAppendPropList(int value) {
+        ensureOldAppendPropListIsMutable();
+        oldAppendPropList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 FJJPDKBCGND = 15;
-       * @param values The fJJPDKBCGND to add.
+       * repeated uint32 old_append_prop_list = 15;
+       * @param values The oldAppendPropList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllFJJPDKBCGND(
+      public Builder addAllOldAppendPropList(
           java.lang.Iterable values) {
-        ensureFJJPDKBCGNDIsMutable();
+        ensureOldAppendPropListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, fJJPDKBCGND_);
+            values, oldAppendPropList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 FJJPDKBCGND = 15;
+       * repeated uint32 old_append_prop_list = 15;
        * @return This builder for chaining.
        */
-      public Builder clearFJJPDKBCGND() {
-        fJJPDKBCGND_ = emptyIntList();
+      public Builder clearOldAppendPropList() {
+        oldAppendPropList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1197,12 +1197,13 @@ public final class ReliquaryUpgradeRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\031ReliquaryUpgradeRsp.proto\"\254\001\n\023Reliquar" +
+      "\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\023\n\013JNPAMCBCIMC\030\016 \003(\r\022\021\n\tol" +
-      "d_level\030\010 \001(\r\022\023\n\013FJJPDKBCGND\030\017 \003(\r\022\035\n\025ta" +
-      "rget_reliquary_guid\030\005 \001(\004\022\017\n\007retcode\030\n \001" +
-      "(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "up_rate\030\013 \001(\r\022\034\n\024cur_append_prop_list\030\016 " +
+      "\003(\r\022\021\n\told_level\030\010 \001(\r\022\034\n\024old_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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1213,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", "JNPAMCBCIMC", "OldLevel", "FJJPDKBCGND", "TargetReliquaryGuid", "Retcode", });
+        new java.lang.String[] { "CurLevel", "PowerUpRate", "CurAppendPropList", "OldLevel", "OldAppendPropList", "TargetReliquaryGuid", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
index d63601286..f42f4dfe6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
@@ -46,10 +46,10 @@ public final class SceneTeamAvatarOuterClass {
     int getPlayerUid();
 
     /**
-     * bool GNPKDDJADKH = 15;
-     * @return The gNPKDDJADKH.
+     * bool is_on_scene = 15;
+     * @return The isOnScene.
      */
-    boolean getGNPKDDJADKH();
+    boolean getIsOnScene();
 
     /**
      * .AbilitySyncStateInfo weapon_ability_info = 11;
@@ -175,16 +175,16 @@ public final class SceneTeamAvatarOuterClass {
     emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder();
 
     /**
-     * bool NIFBCGDKCNF = 1765;
-     * @return The nIFBCGDKCNF.
+     * bool is_player_cur_avatar = 1765;
+     * @return The isPlayerCurAvatar.
      */
-    boolean getNIFBCGDKCNF();
+    boolean getIsPlayerCurAvatar();
 
     /**
-     * bool BJHAOMGBCLC = 13;
-     * @return The bJHAOMGBCLC.
+     * bool is_reconnect = 13;
+     * @return The isReconnect.
      */
-    boolean getBJHAOMGBCLC();
+    boolean getIsReconnect();
   }
   /**
    * 
@@ -343,7 +343,7 @@ public final class SceneTeamAvatarOuterClass {
             }
             case 104: {
 
-              bJHAOMGBCLC_ = input.readBool();
+              isReconnect_ = input.readBool();
               break;
             }
             case 114: {
@@ -361,12 +361,12 @@ public final class SceneTeamAvatarOuterClass {
             }
             case 120: {
 
-              gNPKDDJADKH_ = input.readBool();
+              isOnScene_ = input.readBool();
               break;
             }
             case 14120: {
 
-              nIFBCGDKCNF_ = input.readBool();
+              isPlayerCurAvatar_ = input.readBool();
               break;
             }
             default: {
@@ -452,15 +452,15 @@ public final class SceneTeamAvatarOuterClass {
       return playerUid_;
     }
 
-    public static final int GNPKDDJADKH_FIELD_NUMBER = 15;
-    private boolean gNPKDDJADKH_;
+    public static final int IS_ON_SCENE_FIELD_NUMBER = 15;
+    private boolean isOnScene_;
     /**
-     * bool GNPKDDJADKH = 15;
-     * @return The gNPKDDJADKH.
+     * bool is_on_scene = 15;
+     * @return The isOnScene.
      */
     @java.lang.Override
-    public boolean getGNPKDDJADKH() {
-      return gNPKDDJADKH_;
+    public boolean getIsOnScene() {
+      return isOnScene_;
     }
 
     public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 11;
@@ -677,26 +677,26 @@ public final class SceneTeamAvatarOuterClass {
       return getSceneAvatarInfo();
     }
 
-    public static final int NIFBCGDKCNF_FIELD_NUMBER = 1765;
-    private boolean nIFBCGDKCNF_;
+    public static final int IS_PLAYER_CUR_AVATAR_FIELD_NUMBER = 1765;
+    private boolean isPlayerCurAvatar_;
     /**
-     * bool NIFBCGDKCNF = 1765;
-     * @return The nIFBCGDKCNF.
+     * bool is_player_cur_avatar = 1765;
+     * @return The isPlayerCurAvatar.
      */
     @java.lang.Override
-    public boolean getNIFBCGDKCNF() {
-      return nIFBCGDKCNF_;
+    public boolean getIsPlayerCurAvatar() {
+      return isPlayerCurAvatar_;
     }
 
-    public static final int BJHAOMGBCLC_FIELD_NUMBER = 13;
-    private boolean bJHAOMGBCLC_;
+    public static final int IS_RECONNECT_FIELD_NUMBER = 13;
+    private boolean isReconnect_;
     /**
-     * bool BJHAOMGBCLC = 13;
-     * @return The bJHAOMGBCLC.
+     * bool is_reconnect = 13;
+     * @return The isReconnect.
      */
     @java.lang.Override
-    public boolean getBJHAOMGBCLC() {
-      return bJHAOMGBCLC_;
+    public boolean getIsReconnect() {
+      return isReconnect_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -749,17 +749,17 @@ public final class SceneTeamAvatarOuterClass {
       if (avatarGuid_ != 0L) {
         output.writeUInt64(12, avatarGuid_);
       }
-      if (bJHAOMGBCLC_ != false) {
-        output.writeBool(13, bJHAOMGBCLC_);
+      if (isReconnect_ != false) {
+        output.writeBool(13, isReconnect_);
       }
       if (sceneAvatarInfo_ != null) {
         output.writeMessage(14, getSceneAvatarInfo());
       }
-      if (gNPKDDJADKH_ != false) {
-        output.writeBool(15, gNPKDDJADKH_);
+      if (isOnScene_ != false) {
+        output.writeBool(15, isOnScene_);
       }
-      if (nIFBCGDKCNF_ != false) {
-        output.writeBool(1765, nIFBCGDKCNF_);
+      if (isPlayerCurAvatar_ != false) {
+        output.writeBool(1765, isPlayerCurAvatar_);
       }
       unknownFields.writeTo(output);
     }
@@ -818,21 +818,21 @@ public final class SceneTeamAvatarOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(12, avatarGuid_);
       }
-      if (bJHAOMGBCLC_ != false) {
+      if (isReconnect_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, bJHAOMGBCLC_);
+          .computeBoolSize(13, isReconnect_);
       }
       if (sceneAvatarInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(14, getSceneAvatarInfo());
       }
-      if (gNPKDDJADKH_ != false) {
+      if (isOnScene_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, gNPKDDJADKH_);
+          .computeBoolSize(15, isOnScene_);
       }
-      if (nIFBCGDKCNF_ != false) {
+      if (isPlayerCurAvatar_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1765, nIFBCGDKCNF_);
+          .computeBoolSize(1765, isPlayerCurAvatar_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -858,8 +858,8 @@ public final class SceneTeamAvatarOuterClass {
           != other.getWeaponEntityId()) return false;
       if (getPlayerUid()
           != other.getPlayerUid()) return false;
-      if (getGNPKDDJADKH()
-          != other.getGNPKDDJADKH()) return false;
+      if (getIsOnScene()
+          != other.getIsOnScene()) return false;
       if (hasWeaponAbilityInfo() != other.hasWeaponAbilityInfo()) return false;
       if (hasWeaponAbilityInfo()) {
         if (!getWeaponAbilityInfo()
@@ -895,10 +895,10 @@ public final class SceneTeamAvatarOuterClass {
         if (!getSceneAvatarInfo()
             .equals(other.getSceneAvatarInfo())) return false;
       }
-      if (getNIFBCGDKCNF()
-          != other.getNIFBCGDKCNF()) return false;
-      if (getBJHAOMGBCLC()
-          != other.getBJHAOMGBCLC()) return false;
+      if (getIsPlayerCurAvatar()
+          != other.getIsPlayerCurAvatar()) return false;
+      if (getIsReconnect()
+          != other.getIsReconnect()) 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) + GNPKDDJADKH_FIELD_NUMBER;
+      hash = (37 * hash) + IS_ON_SCENE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getGNPKDDJADKH());
+          getIsOnScene());
       if (hasWeaponAbilityInfo()) {
         hash = (37 * hash) + WEAPON_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getWeaponAbilityInfo().hashCode();
@@ -955,12 +955,12 @@ public final class SceneTeamAvatarOuterClass {
         hash = (37 * hash) + SCENE_AVATAR_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getSceneAvatarInfo().hashCode();
       }
-      hash = (37 * hash) + NIFBCGDKCNF_FIELD_NUMBER;
+      hash = (37 * hash) + IS_PLAYER_CUR_AVATAR_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getNIFBCGDKCNF());
-      hash = (37 * hash) + BJHAOMGBCLC_FIELD_NUMBER;
+          getIsPlayerCurAvatar());
+      hash = (37 * hash) + IS_RECONNECT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getBJHAOMGBCLC());
+          getIsReconnect());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1109,7 +1109,7 @@ public final class SceneTeamAvatarOuterClass {
 
         playerUid_ = 0;
 
-        gNPKDDJADKH_ = false;
+        isOnScene_ = false;
 
         if (weaponAbilityInfoBuilder_ == null) {
           weaponAbilityInfo_ = null;
@@ -1155,9 +1155,9 @@ public final class SceneTeamAvatarOuterClass {
           sceneAvatarInfo_ = null;
           sceneAvatarInfoBuilder_ = null;
         }
-        nIFBCGDKCNF_ = false;
+        isPlayerCurAvatar_ = false;
 
-        bJHAOMGBCLC_ = false;
+        isReconnect_ = false;
 
         return this;
       }
@@ -1193,7 +1193,7 @@ public final class SceneTeamAvatarOuterClass {
         }
         result.weaponEntityId_ = weaponEntityId_;
         result.playerUid_ = playerUid_;
-        result.gNPKDDJADKH_ = gNPKDDJADKH_;
+        result.isOnScene_ = isOnScene_;
         if (weaponAbilityInfoBuilder_ == null) {
           result.weaponAbilityInfo_ = weaponAbilityInfo_;
         } else {
@@ -1232,8 +1232,8 @@ public final class SceneTeamAvatarOuterClass {
         } else {
           result.sceneAvatarInfo_ = sceneAvatarInfoBuilder_.build();
         }
-        result.nIFBCGDKCNF_ = nIFBCGDKCNF_;
-        result.bJHAOMGBCLC_ = bJHAOMGBCLC_;
+        result.isPlayerCurAvatar_ = isPlayerCurAvatar_;
+        result.isReconnect_ = isReconnect_;
         onBuilt();
         return result;
       }
@@ -1291,8 +1291,8 @@ public final class SceneTeamAvatarOuterClass {
         if (other.getPlayerUid() != 0) {
           setPlayerUid(other.getPlayerUid());
         }
-        if (other.getGNPKDDJADKH() != false) {
-          setGNPKDDJADKH(other.getGNPKDDJADKH());
+        if (other.getIsOnScene() != false) {
+          setIsOnScene(other.getIsOnScene());
         }
         if (other.hasWeaponAbilityInfo()) {
           mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
@@ -1347,11 +1347,11 @@ public final class SceneTeamAvatarOuterClass {
         if (other.hasSceneAvatarInfo()) {
           mergeSceneAvatarInfo(other.getSceneAvatarInfo());
         }
-        if (other.getNIFBCGDKCNF() != false) {
-          setNIFBCGDKCNF(other.getNIFBCGDKCNF());
+        if (other.getIsPlayerCurAvatar() != false) {
+          setIsPlayerCurAvatar(other.getIsPlayerCurAvatar());
         }
-        if (other.getBJHAOMGBCLC() != false) {
-          setBJHAOMGBCLC(other.getBJHAOMGBCLC());
+        if (other.getIsReconnect() != false) {
+          setIsReconnect(other.getIsReconnect());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1564,33 +1564,33 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
-      private boolean gNPKDDJADKH_ ;
+      private boolean isOnScene_ ;
       /**
-       * bool GNPKDDJADKH = 15;
-       * @return The gNPKDDJADKH.
+       * bool is_on_scene = 15;
+       * @return The isOnScene.
        */
       @java.lang.Override
-      public boolean getGNPKDDJADKH() {
-        return gNPKDDJADKH_;
+      public boolean getIsOnScene() {
+        return isOnScene_;
       }
       /**
-       * bool GNPKDDJADKH = 15;
-       * @param value The gNPKDDJADKH to set.
+       * bool is_on_scene = 15;
+       * @param value The isOnScene to set.
        * @return This builder for chaining.
        */
-      public Builder setGNPKDDJADKH(boolean value) {
+      public Builder setIsOnScene(boolean value) {
         
-        gNPKDDJADKH_ = value;
+        isOnScene_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool GNPKDDJADKH = 15;
+       * bool is_on_scene = 15;
        * @return This builder for chaining.
        */
-      public Builder clearGNPKDDJADKH() {
+      public Builder clearIsOnScene() {
         
-        gNPKDDJADKH_ = false;
+        isOnScene_ = false;
         onChanged();
         return this;
       }
@@ -2554,64 +2554,64 @@ public final class SceneTeamAvatarOuterClass {
         return sceneAvatarInfoBuilder_;
       }
 
-      private boolean nIFBCGDKCNF_ ;
+      private boolean isPlayerCurAvatar_ ;
       /**
-       * bool NIFBCGDKCNF = 1765;
-       * @return The nIFBCGDKCNF.
+       * bool is_player_cur_avatar = 1765;
+       * @return The isPlayerCurAvatar.
        */
       @java.lang.Override
-      public boolean getNIFBCGDKCNF() {
-        return nIFBCGDKCNF_;
+      public boolean getIsPlayerCurAvatar() {
+        return isPlayerCurAvatar_;
       }
       /**
-       * bool NIFBCGDKCNF = 1765;
-       * @param value The nIFBCGDKCNF to set.
+       * bool is_player_cur_avatar = 1765;
+       * @param value The isPlayerCurAvatar to set.
        * @return This builder for chaining.
        */
-      public Builder setNIFBCGDKCNF(boolean value) {
+      public Builder setIsPlayerCurAvatar(boolean value) {
         
-        nIFBCGDKCNF_ = value;
+        isPlayerCurAvatar_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool NIFBCGDKCNF = 1765;
+       * bool is_player_cur_avatar = 1765;
        * @return This builder for chaining.
        */
-      public Builder clearNIFBCGDKCNF() {
+      public Builder clearIsPlayerCurAvatar() {
         
-        nIFBCGDKCNF_ = false;
+        isPlayerCurAvatar_ = false;
         onChanged();
         return this;
       }
 
-      private boolean bJHAOMGBCLC_ ;
+      private boolean isReconnect_ ;
       /**
-       * bool BJHAOMGBCLC = 13;
-       * @return The bJHAOMGBCLC.
+       * bool is_reconnect = 13;
+       * @return The isReconnect.
        */
       @java.lang.Override
-      public boolean getBJHAOMGBCLC() {
-        return bJHAOMGBCLC_;
+      public boolean getIsReconnect() {
+        return isReconnect_;
       }
       /**
-       * bool BJHAOMGBCLC = 13;
-       * @param value The bJHAOMGBCLC to set.
+       * bool is_reconnect = 13;
+       * @param value The isReconnect to set.
        * @return This builder for chaining.
        */
-      public Builder setBJHAOMGBCLC(boolean value) {
+      public Builder setIsReconnect(boolean value) {
         
-        bJHAOMGBCLC_ = value;
+        isReconnect_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool BJHAOMGBCLC = 13;
+       * bool is_reconnect = 13;
        * @return This builder for chaining.
        */
-      public Builder clearBJHAOMGBCLC() {
+      public Builder clearIsReconnect() {
         
-        bJHAOMGBCLC_ = false;
+        isReconnect_ = false;
         onChanged();
         return this;
       }
@@ -2686,10 +2686,10 @@ public final class SceneTeamAvatarOuterClass {
       ".proto\032\032AbilitySyncStateInfo.proto\032\020Serv" +
       "erBuff.proto\032\020AvatarInfo.proto\032\031AbilityC" +
       "ontrolBlock.proto\032\025SceneAvatarInfo.proto" +
-      "\"\216\004\n\017SceneTeamAvatar\022+\n\021scene_entity_inf" +
+      "\"\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\013GNPKD" +
-      "DJADKH\030\017 \001(\010\0222\n\023weapon_ability_info\030\013 \001(" +
+      "ty_id\030\010 \001(\r\022\022\n\nplayer_uid\030\003 \001(\r\022\023\n\013is_on" +
+      "_scene\030\017 \001(\010\0222\n\023weapon_ability_info\030\013 \001(" +
       "\0132\025.AbilitySyncStateInfo\022%\n\020server_buff_" +
       "list\030\n \003(\0132\013.ServerBuff\0222\n\023avatar_abilit" +
       "y_info\030\007 \001(\0132\025.AbilitySyncStateInfo\022\023\n\013w" +
@@ -2698,9 +2698,9 @@ public final class SceneTeamAvatarOuterClass {
       "guid\030\014 \001(\004\0223\n\025ability_control_block\030\001 \001(" +
       "\0132\024.AbilityControlBlock\022\020\n\010scene_id\030\002 \001(" +
       "\r\022+\n\021scene_avatar_info\030\016 \001(\0132\020.SceneAvat" +
-      "arInfo\022\024\n\013NIFBCGDKCNF\030\345\r \001(\010\022\023\n\013BJHAOMGB" +
-      "CLC\030\r \001(\010B\033\n\031emu.grasscutter.net.protob\006" +
-      "proto3"
+      "arInfo\022\035\n\024is_player_cur_avatar\030\345\r \001(\010\022\024\n" +
+      "\014is_reconnect\030\r \001(\010B\033\n\031emu.grasscutter.n" +
+      "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -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", "GNPKDDJADKH", "WeaponAbilityInfo", "ServerBuffList", "AvatarAbilityInfo", "WeaponGuid", "AvatarInfo", "EntityId", "AvatarGuid", "AbilityControlBlock", "SceneId", "SceneAvatarInfo", "NIFBCGDKCNF", "BJHAOMGBCLC", });
+        new java.lang.String[] { "SceneEntityInfo", "WeaponEntityId", "PlayerUid", "IsOnScene", "WeaponAbilityInfo", "ServerBuffList", "AvatarAbilityInfo", "WeaponGuid", "AvatarInfo", "EntityId", "AvatarGuid", "AbilityControlBlock", "SceneId", "SceneAvatarInfo", "IsPlayerCurAvatar", "IsReconnect", });
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServerCondMeetQuestListUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerCondMeetQuestListUpdateNotifyOuterClass.java
index d21d0e460..93f166cd4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerCondMeetQuestListUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerCondMeetQuestListUpdateNotifyOuterClass.java
@@ -19,38 +19,38 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * repeated uint32 LCHIHDJDDNH = 6;
-     * @return A list containing the lCHIHDJDDNH.
+     * repeated uint32 add_quest_id_list = 6;
+     * @return A list containing the addQuestIdList.
      */
-    java.util.List getLCHIHDJDDNHList();
+    java.util.List getAddQuestIdListList();
     /**
-     * repeated uint32 LCHIHDJDDNH = 6;
-     * @return The count of lCHIHDJDDNH.
+     * repeated uint32 add_quest_id_list = 6;
+     * @return The count of addQuestIdList.
      */
-    int getLCHIHDJDDNHCount();
+    int getAddQuestIdListCount();
     /**
-     * repeated uint32 LCHIHDJDDNH = 6;
+     * repeated uint32 add_quest_id_list = 6;
      * @param index The index of the element to return.
-     * @return The lCHIHDJDDNH at the given index.
+     * @return The addQuestIdList at the given index.
      */
-    int getLCHIHDJDDNH(int index);
+    int getAddQuestIdList(int index);
 
     /**
-     * repeated uint32 JPJIINJKPBH = 9;
-     * @return A list containing the jPJIINJKPBH.
+     * repeated uint32 del_quest_id_list = 9;
+     * @return A list containing the delQuestIdList.
      */
-    java.util.List getJPJIINJKPBHList();
+    java.util.List getDelQuestIdListList();
     /**
-     * repeated uint32 JPJIINJKPBH = 9;
-     * @return The count of jPJIINJKPBH.
+     * repeated uint32 del_quest_id_list = 9;
+     * @return The count of delQuestIdList.
      */
-    int getJPJIINJKPBHCount();
+    int getDelQuestIdListCount();
     /**
-     * repeated uint32 JPJIINJKPBH = 9;
+     * repeated uint32 del_quest_id_list = 9;
      * @param index The index of the element to return.
-     * @return The jPJIINJKPBH at the given index.
+     * @return The delQuestIdList at the given index.
      */
-    int getJPJIINJKPBH(int index);
+    int getDelQuestIdList(int index);
   }
   /**
    * 
@@ -70,8 +70,8 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       super(builder);
     }
     private ServerCondMeetQuestListUpdateNotify() {
-      lCHIHDJDDNH_ = emptyIntList();
-      jPJIINJKPBH_ = emptyIntList();
+      addQuestIdList_ = emptyIntList();
+      delQuestIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -107,42 +107,42 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
               break;
             case 48: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                lCHIHDJDDNH_ = newIntList();
+                addQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              lCHIHDJDDNH_.addInt(input.readUInt32());
+              addQuestIdList_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                lCHIHDJDDNH_ = newIntList();
+                addQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                lCHIHDJDDNH_.addInt(input.readUInt32());
+                addQuestIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 72: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                jPJIINJKPBH_ = newIntList();
+                delQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              jPJIINJKPBH_.addInt(input.readUInt32());
+              delQuestIdList_.addInt(input.readUInt32());
               break;
             }
             case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                jPJIINJKPBH_ = newIntList();
+                delQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                jPJIINJKPBH_.addInt(input.readUInt32());
+                delQuestIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -163,10 +163,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          lCHIHDJDDNH_.makeImmutable(); // C
+          addQuestIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          jPJIINJKPBH_.makeImmutable(); // C
+          delQuestIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -185,61 +185,61 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.class, emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.Builder.class);
     }
 
-    public static final int LCHIHDJDDNH_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList lCHIHDJDDNH_;
+    public static final int ADD_QUEST_ID_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList addQuestIdList_;
     /**
-     * repeated uint32 LCHIHDJDDNH = 6;
-     * @return A list containing the lCHIHDJDDNH.
+     * repeated uint32 add_quest_id_list = 6;
+     * @return A list containing the addQuestIdList.
      */
     @java.lang.Override
     public java.util.List
-        getLCHIHDJDDNHList() {
-      return lCHIHDJDDNH_;
+        getAddQuestIdListList() {
+      return addQuestIdList_;
     }
     /**
-     * repeated uint32 LCHIHDJDDNH = 6;
-     * @return The count of lCHIHDJDDNH.
+     * repeated uint32 add_quest_id_list = 6;
+     * @return The count of addQuestIdList.
      */
-    public int getLCHIHDJDDNHCount() {
-      return lCHIHDJDDNH_.size();
+    public int getAddQuestIdListCount() {
+      return addQuestIdList_.size();
     }
     /**
-     * repeated uint32 LCHIHDJDDNH = 6;
+     * repeated uint32 add_quest_id_list = 6;
      * @param index The index of the element to return.
-     * @return The lCHIHDJDDNH at the given index.
+     * @return The addQuestIdList at the given index.
      */
-    public int getLCHIHDJDDNH(int index) {
-      return lCHIHDJDDNH_.getInt(index);
+    public int getAddQuestIdList(int index) {
+      return addQuestIdList_.getInt(index);
     }
-    private int lCHIHDJDDNHMemoizedSerializedSize = -1;
+    private int addQuestIdListMemoizedSerializedSize = -1;
 
-    public static final int JPJIINJKPBH_FIELD_NUMBER = 9;
-    private com.google.protobuf.Internal.IntList jPJIINJKPBH_;
+    public static final int DEL_QUEST_ID_LIST_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.IntList delQuestIdList_;
     /**
-     * repeated uint32 JPJIINJKPBH = 9;
-     * @return A list containing the jPJIINJKPBH.
+     * repeated uint32 del_quest_id_list = 9;
+     * @return A list containing the delQuestIdList.
      */
     @java.lang.Override
     public java.util.List
-        getJPJIINJKPBHList() {
-      return jPJIINJKPBH_;
+        getDelQuestIdListList() {
+      return delQuestIdList_;
     }
     /**
-     * repeated uint32 JPJIINJKPBH = 9;
-     * @return The count of jPJIINJKPBH.
+     * repeated uint32 del_quest_id_list = 9;
+     * @return The count of delQuestIdList.
      */
-    public int getJPJIINJKPBHCount() {
-      return jPJIINJKPBH_.size();
+    public int getDelQuestIdListCount() {
+      return delQuestIdList_.size();
     }
     /**
-     * repeated uint32 JPJIINJKPBH = 9;
+     * repeated uint32 del_quest_id_list = 9;
      * @param index The index of the element to return.
-     * @return The jPJIINJKPBH at the given index.
+     * @return The delQuestIdList at the given index.
      */
-    public int getJPJIINJKPBH(int index) {
-      return jPJIINJKPBH_.getInt(index);
+    public int getDelQuestIdList(int index) {
+      return delQuestIdList_.getInt(index);
     }
-    private int jPJIINJKPBHMemoizedSerializedSize = -1;
+    private int delQuestIdListMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -256,19 +256,19 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getLCHIHDJDDNHList().size() > 0) {
+      if (getAddQuestIdListList().size() > 0) {
         output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(lCHIHDJDDNHMemoizedSerializedSize);
+        output.writeUInt32NoTag(addQuestIdListMemoizedSerializedSize);
       }
-      for (int i = 0; i < lCHIHDJDDNH_.size(); i++) {
-        output.writeUInt32NoTag(lCHIHDJDDNH_.getInt(i));
+      for (int i = 0; i < addQuestIdList_.size(); i++) {
+        output.writeUInt32NoTag(addQuestIdList_.getInt(i));
       }
-      if (getJPJIINJKPBHList().size() > 0) {
+      if (getDelQuestIdListList().size() > 0) {
         output.writeUInt32NoTag(74);
-        output.writeUInt32NoTag(jPJIINJKPBHMemoizedSerializedSize);
+        output.writeUInt32NoTag(delQuestIdListMemoizedSerializedSize);
       }
-      for (int i = 0; i < jPJIINJKPBH_.size(); i++) {
-        output.writeUInt32NoTag(jPJIINJKPBH_.getInt(i));
+      for (int i = 0; i < delQuestIdList_.size(); i++) {
+        output.writeUInt32NoTag(delQuestIdList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -281,31 +281,31 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       size = 0;
       {
         int dataSize = 0;
-        for (int i = 0; i < lCHIHDJDDNH_.size(); i++) {
+        for (int i = 0; i < addQuestIdList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(lCHIHDJDDNH_.getInt(i));
+            .computeUInt32SizeNoTag(addQuestIdList_.getInt(i));
         }
         size += dataSize;
-        if (!getLCHIHDJDDNHList().isEmpty()) {
+        if (!getAddQuestIdListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        lCHIHDJDDNHMemoizedSerializedSize = dataSize;
+        addQuestIdListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < jPJIINJKPBH_.size(); i++) {
+        for (int i = 0; i < delQuestIdList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(jPJIINJKPBH_.getInt(i));
+            .computeUInt32SizeNoTag(delQuestIdList_.getInt(i));
         }
         size += dataSize;
-        if (!getJPJIINJKPBHList().isEmpty()) {
+        if (!getDelQuestIdListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        jPJIINJKPBHMemoizedSerializedSize = dataSize;
+        delQuestIdListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -322,10 +322,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify other = (emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify) obj;
 
-      if (!getLCHIHDJDDNHList()
-          .equals(other.getLCHIHDJDDNHList())) return false;
-      if (!getJPJIINJKPBHList()
-          .equals(other.getJPJIINJKPBHList())) return false;
+      if (!getAddQuestIdListList()
+          .equals(other.getAddQuestIdListList())) return false;
+      if (!getDelQuestIdListList()
+          .equals(other.getDelQuestIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -337,13 +337,13 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getLCHIHDJDDNHCount() > 0) {
-        hash = (37 * hash) + LCHIHDJDDNH_FIELD_NUMBER;
-        hash = (53 * hash) + getLCHIHDJDDNHList().hashCode();
+      if (getAddQuestIdListCount() > 0) {
+        hash = (37 * hash) + ADD_QUEST_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAddQuestIdListList().hashCode();
       }
-      if (getJPJIINJKPBHCount() > 0) {
-        hash = (37 * hash) + JPJIINJKPBH_FIELD_NUMBER;
-        hash = (53 * hash) + getJPJIINJKPBHList().hashCode();
+      if (getDelQuestIdListCount() > 0) {
+        hash = (37 * hash) + DEL_QUEST_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDelQuestIdListList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -483,9 +483,9 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        lCHIHDJDDNH_ = emptyIntList();
+        addQuestIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        jPJIINJKPBH_ = emptyIntList();
+        delQuestIdList_ = 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)) {
-          lCHIHDJDDNH_.makeImmutable();
+          addQuestIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.lCHIHDJDDNH_ = lCHIHDJDDNH_;
+        result.addQuestIdList_ = addQuestIdList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          jPJIINJKPBH_.makeImmutable();
+          delQuestIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.jPJIINJKPBH_ = jPJIINJKPBH_;
+        result.delQuestIdList_ = delQuestIdList_;
         onBuilt();
         return result;
       }
@@ -572,23 +572,23 @@ 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.lCHIHDJDDNH_.isEmpty()) {
-          if (lCHIHDJDDNH_.isEmpty()) {
-            lCHIHDJDDNH_ = other.lCHIHDJDDNH_;
+        if (!other.addQuestIdList_.isEmpty()) {
+          if (addQuestIdList_.isEmpty()) {
+            addQuestIdList_ = other.addQuestIdList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureLCHIHDJDDNHIsMutable();
-            lCHIHDJDDNH_.addAll(other.lCHIHDJDDNH_);
+            ensureAddQuestIdListIsMutable();
+            addQuestIdList_.addAll(other.addQuestIdList_);
           }
           onChanged();
         }
-        if (!other.jPJIINJKPBH_.isEmpty()) {
-          if (jPJIINJKPBH_.isEmpty()) {
-            jPJIINJKPBH_ = other.jPJIINJKPBH_;
+        if (!other.delQuestIdList_.isEmpty()) {
+          if (delQuestIdList_.isEmpty()) {
+            delQuestIdList_ = other.delQuestIdList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureJPJIINJKPBHIsMutable();
-            jPJIINJKPBH_.addAll(other.jPJIINJKPBH_);
+            ensureDelQuestIdListIsMutable();
+            delQuestIdList_.addAll(other.delQuestIdList_);
           }
           onChanged();
         }
@@ -622,159 +622,159 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList lCHIHDJDDNH_ = emptyIntList();
-      private void ensureLCHIHDJDDNHIsMutable() {
+      private com.google.protobuf.Internal.IntList addQuestIdList_ = emptyIntList();
+      private void ensureAddQuestIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          lCHIHDJDDNH_ = mutableCopy(lCHIHDJDDNH_);
+          addQuestIdList_ = mutableCopy(addQuestIdList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * repeated uint32 LCHIHDJDDNH = 6;
-       * @return A list containing the lCHIHDJDDNH.
+       * repeated uint32 add_quest_id_list = 6;
+       * @return A list containing the addQuestIdList.
        */
       public java.util.List
-          getLCHIHDJDDNHList() {
+          getAddQuestIdListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(lCHIHDJDDNH_) : lCHIHDJDDNH_;
+                 java.util.Collections.unmodifiableList(addQuestIdList_) : addQuestIdList_;
       }
       /**
-       * repeated uint32 LCHIHDJDDNH = 6;
-       * @return The count of lCHIHDJDDNH.
+       * repeated uint32 add_quest_id_list = 6;
+       * @return The count of addQuestIdList.
        */
-      public int getLCHIHDJDDNHCount() {
-        return lCHIHDJDDNH_.size();
+      public int getAddQuestIdListCount() {
+        return addQuestIdList_.size();
       }
       /**
-       * repeated uint32 LCHIHDJDDNH = 6;
+       * repeated uint32 add_quest_id_list = 6;
        * @param index The index of the element to return.
-       * @return The lCHIHDJDDNH at the given index.
+       * @return The addQuestIdList at the given index.
        */
-      public int getLCHIHDJDDNH(int index) {
-        return lCHIHDJDDNH_.getInt(index);
+      public int getAddQuestIdList(int index) {
+        return addQuestIdList_.getInt(index);
       }
       /**
-       * repeated uint32 LCHIHDJDDNH = 6;
+       * repeated uint32 add_quest_id_list = 6;
        * @param index The index to set the value at.
-       * @param value The lCHIHDJDDNH to set.
+       * @param value The addQuestIdList to set.
        * @return This builder for chaining.
        */
-      public Builder setLCHIHDJDDNH(
+      public Builder setAddQuestIdList(
           int index, int value) {
-        ensureLCHIHDJDDNHIsMutable();
-        lCHIHDJDDNH_.setInt(index, value);
+        ensureAddQuestIdListIsMutable();
+        addQuestIdList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 LCHIHDJDDNH = 6;
-       * @param value The lCHIHDJDDNH to add.
+       * repeated uint32 add_quest_id_list = 6;
+       * @param value The addQuestIdList to add.
        * @return This builder for chaining.
        */
-      public Builder addLCHIHDJDDNH(int value) {
-        ensureLCHIHDJDDNHIsMutable();
-        lCHIHDJDDNH_.addInt(value);
+      public Builder addAddQuestIdList(int value) {
+        ensureAddQuestIdListIsMutable();
+        addQuestIdList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 LCHIHDJDDNH = 6;
-       * @param values The lCHIHDJDDNH to add.
+       * repeated uint32 add_quest_id_list = 6;
+       * @param values The addQuestIdList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllLCHIHDJDDNH(
+      public Builder addAllAddQuestIdList(
           java.lang.Iterable values) {
-        ensureLCHIHDJDDNHIsMutable();
+        ensureAddQuestIdListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, lCHIHDJDDNH_);
+            values, addQuestIdList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 LCHIHDJDDNH = 6;
+       * repeated uint32 add_quest_id_list = 6;
        * @return This builder for chaining.
        */
-      public Builder clearLCHIHDJDDNH() {
-        lCHIHDJDDNH_ = emptyIntList();
+      public Builder clearAddQuestIdList() {
+        addQuestIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList jPJIINJKPBH_ = emptyIntList();
-      private void ensureJPJIINJKPBHIsMutable() {
+      private com.google.protobuf.Internal.IntList delQuestIdList_ = emptyIntList();
+      private void ensureDelQuestIdListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          jPJIINJKPBH_ = mutableCopy(jPJIINJKPBH_);
+          delQuestIdList_ = mutableCopy(delQuestIdList_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 JPJIINJKPBH = 9;
-       * @return A list containing the jPJIINJKPBH.
+       * repeated uint32 del_quest_id_list = 9;
+       * @return A list containing the delQuestIdList.
        */
       public java.util.List
-          getJPJIINJKPBHList() {
+          getDelQuestIdListList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(jPJIINJKPBH_) : jPJIINJKPBH_;
+                 java.util.Collections.unmodifiableList(delQuestIdList_) : delQuestIdList_;
       }
       /**
-       * repeated uint32 JPJIINJKPBH = 9;
-       * @return The count of jPJIINJKPBH.
+       * repeated uint32 del_quest_id_list = 9;
+       * @return The count of delQuestIdList.
        */
-      public int getJPJIINJKPBHCount() {
-        return jPJIINJKPBH_.size();
+      public int getDelQuestIdListCount() {
+        return delQuestIdList_.size();
       }
       /**
-       * repeated uint32 JPJIINJKPBH = 9;
+       * repeated uint32 del_quest_id_list = 9;
        * @param index The index of the element to return.
-       * @return The jPJIINJKPBH at the given index.
+       * @return The delQuestIdList at the given index.
        */
-      public int getJPJIINJKPBH(int index) {
-        return jPJIINJKPBH_.getInt(index);
+      public int getDelQuestIdList(int index) {
+        return delQuestIdList_.getInt(index);
       }
       /**
-       * repeated uint32 JPJIINJKPBH = 9;
+       * repeated uint32 del_quest_id_list = 9;
        * @param index The index to set the value at.
-       * @param value The jPJIINJKPBH to set.
+       * @param value The delQuestIdList to set.
        * @return This builder for chaining.
        */
-      public Builder setJPJIINJKPBH(
+      public Builder setDelQuestIdList(
           int index, int value) {
-        ensureJPJIINJKPBHIsMutable();
-        jPJIINJKPBH_.setInt(index, value);
+        ensureDelQuestIdListIsMutable();
+        delQuestIdList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JPJIINJKPBH = 9;
-       * @param value The jPJIINJKPBH to add.
+       * repeated uint32 del_quest_id_list = 9;
+       * @param value The delQuestIdList to add.
        * @return This builder for chaining.
        */
-      public Builder addJPJIINJKPBH(int value) {
-        ensureJPJIINJKPBHIsMutable();
-        jPJIINJKPBH_.addInt(value);
+      public Builder addDelQuestIdList(int value) {
+        ensureDelQuestIdListIsMutable();
+        delQuestIdList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JPJIINJKPBH = 9;
-       * @param values The jPJIINJKPBH to add.
+       * repeated uint32 del_quest_id_list = 9;
+       * @param values The delQuestIdList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllJPJIINJKPBH(
+      public Builder addAllDelQuestIdList(
           java.lang.Iterable values) {
-        ensureJPJIINJKPBHIsMutable();
+        ensureDelQuestIdListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, jPJIINJKPBH_);
+            values, delQuestIdList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JPJIINJKPBH = 9;
+       * repeated uint32 del_quest_id_list = 9;
        * @return This builder for chaining.
        */
-      public Builder clearJPJIINJKPBH() {
-        jPJIINJKPBH_ = emptyIntList();
+      public Builder clearDelQuestIdList() {
+        delQuestIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -847,10 +847,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n)ServerCondMeetQuestListUpdateNotify.pr" +
-      "oto\"O\n#ServerCondMeetQuestListUpdateNoti" +
-      "fy\022\023\n\013LCHIHDJDDNH\030\006 \003(\r\022\023\n\013JPJIINJKPBH\030\t" +
-      " \003(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
-      "3"
+      "oto\"[\n#ServerCondMeetQuestListUpdateNoti" +
+      "fy\022\031\n\021add_quest_id_list\030\006 \003(\r\022\031\n\021del_que" +
+      "st_id_list\030\t \003(\rB\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -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[] { "LCHIHDJDDNH", "JPJIINJKPBH", });
+        new java.lang.String[] { "AddQuestIdList", "DelQuestIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
index dcba1b9b6..51747200a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
@@ -61,10 +61,10 @@ public final class ShopGoodsOuterClass {
         int index);
 
     /**
-     * uint32 AAINEEHFPBJ = 1690;
-     * @return The aAINEEHFPBJ.
+     * uint32 scoin = 1690;
+     * @return The scoin.
      */
-    int getAAINEEHFPBJ();
+    int getScoin();
 
     /**
      * uint32 bought_num = 14;
@@ -108,10 +108,10 @@ public final class ShopGoodsOuterClass {
     int getPreGoodsIdList(int index);
 
     /**
-     * uint32 KANFIKNKONL = 10;
-     * @return The kANFIKNKONL.
+     * uint32 mcoin = 10;
+     * @return The mcoin.
      */
-    int getKANFIKNKONL();
+    int getMcoin();
 
     /**
      * .ItemParam goods_item = 1;
@@ -135,28 +135,28 @@ public final class ShopGoodsOuterClass {
     int getNODBIKCALJI();
 
     /**
-     * uint32 EKGBDJFIDJO = 2;
-     * @return The eKGBDJFIDJO.
+     * uint32 buy_limit = 2;
+     * @return The buyLimit.
      */
-    int getEKGBDJFIDJO();
+    int getBuyLimit();
 
     /**
-     * uint32 KKKOCADJCHM = 898;
-     * @return The kKKOCADJCHM.
+     * uint32 min_level = 898;
+     * @return The minLevel.
      */
-    int getKKKOCADJCHM();
+    int getMinLevel();
 
     /**
-     * uint32 OENMLOAFHMJ = 1946;
-     * @return The oENMLOAFHMJ.
+     * uint32 max_level = 1946;
+     * @return The maxLevel.
      */
-    int getOENMLOAFHMJ();
+    int getMaxLevel();
 
     /**
-     * uint32 BDBHIJCECNP = 7;
-     * @return The bDBHIJCECNP.
+     * uint32 goods_id = 7;
+     * @return The goodsId.
      */
-    int getBDBHIJCECNP();
+    int getGoodsId();
 
     /**
      * uint32 end_time = 6;
@@ -243,7 +243,7 @@ public final class ShopGoodsOuterClass {
             }
             case 16: {
 
-              eKGBDJFIDJO_ = input.readUInt32();
+              buyLimit_ = input.readUInt32();
               break;
             }
             case 26: {
@@ -288,7 +288,7 @@ public final class ShopGoodsOuterClass {
             }
             case 56: {
 
-              bDBHIJCECNP_ = input.readUInt32();
+              goodsId_ = input.readUInt32();
               break;
             }
             case 64: {
@@ -303,7 +303,7 @@ public final class ShopGoodsOuterClass {
             }
             case 80: {
 
-              kANFIKNKONL_ = input.readUInt32();
+              mcoin_ = input.readUInt32();
               break;
             }
             case 88: {
@@ -333,7 +333,7 @@ public final class ShopGoodsOuterClass {
             }
             case 7184: {
 
-              kKKOCADJCHM_ = input.readUInt32();
+              minLevel_ = input.readUInt32();
               break;
             }
             case 7384: {
@@ -343,12 +343,12 @@ public final class ShopGoodsOuterClass {
             }
             case 13520: {
 
-              aAINEEHFPBJ_ = input.readUInt32();
+              scoin_ = input.readUInt32();
               break;
             }
             case 15568: {
 
-              oENMLOAFHMJ_ = input.readUInt32();
+              maxLevel_ = input.readUInt32();
               break;
             }
             case 15600: {
@@ -467,15 +467,15 @@ public final class ShopGoodsOuterClass {
       return costItemList_.get(index);
     }
 
-    public static final int AAINEEHFPBJ_FIELD_NUMBER = 1690;
-    private int aAINEEHFPBJ_;
+    public static final int SCOIN_FIELD_NUMBER = 1690;
+    private int scoin_;
     /**
-     * uint32 AAINEEHFPBJ = 1690;
-     * @return The aAINEEHFPBJ.
+     * uint32 scoin = 1690;
+     * @return The scoin.
      */
     @java.lang.Override
-    public int getAAINEEHFPBJ() {
-      return aAINEEHFPBJ_;
+    public int getScoin() {
+      return scoin_;
     }
 
     public static final int BOUGHT_NUM_FIELD_NUMBER = 14;
@@ -550,15 +550,15 @@ public final class ShopGoodsOuterClass {
     }
     private int preGoodsIdListMemoizedSerializedSize = -1;
 
-    public static final int KANFIKNKONL_FIELD_NUMBER = 10;
-    private int kANFIKNKONL_;
+    public static final int MCOIN_FIELD_NUMBER = 10;
+    private int mcoin_;
     /**
-     * uint32 KANFIKNKONL = 10;
-     * @return The kANFIKNKONL.
+     * uint32 mcoin = 10;
+     * @return The mcoin.
      */
     @java.lang.Override
-    public int getKANFIKNKONL() {
-      return kANFIKNKONL_;
+    public int getMcoin() {
+      return mcoin_;
     }
 
     public static final int GOODS_ITEM_FIELD_NUMBER = 1;
@@ -598,48 +598,48 @@ public final class ShopGoodsOuterClass {
       return nODBIKCALJI_;
     }
 
-    public static final int EKGBDJFIDJO_FIELD_NUMBER = 2;
-    private int eKGBDJFIDJO_;
+    public static final int BUY_LIMIT_FIELD_NUMBER = 2;
+    private int buyLimit_;
     /**
-     * uint32 EKGBDJFIDJO = 2;
-     * @return The eKGBDJFIDJO.
+     * uint32 buy_limit = 2;
+     * @return The buyLimit.
      */
     @java.lang.Override
-    public int getEKGBDJFIDJO() {
-      return eKGBDJFIDJO_;
+    public int getBuyLimit() {
+      return buyLimit_;
     }
 
-    public static final int KKKOCADJCHM_FIELD_NUMBER = 898;
-    private int kKKOCADJCHM_;
+    public static final int MIN_LEVEL_FIELD_NUMBER = 898;
+    private int minLevel_;
     /**
-     * uint32 KKKOCADJCHM = 898;
-     * @return The kKKOCADJCHM.
+     * uint32 min_level = 898;
+     * @return The minLevel.
      */
     @java.lang.Override
-    public int getKKKOCADJCHM() {
-      return kKKOCADJCHM_;
+    public int getMinLevel() {
+      return minLevel_;
     }
 
-    public static final int OENMLOAFHMJ_FIELD_NUMBER = 1946;
-    private int oENMLOAFHMJ_;
+    public static final int MAX_LEVEL_FIELD_NUMBER = 1946;
+    private int maxLevel_;
     /**
-     * uint32 OENMLOAFHMJ = 1946;
-     * @return The oENMLOAFHMJ.
+     * uint32 max_level = 1946;
+     * @return The maxLevel.
      */
     @java.lang.Override
-    public int getOENMLOAFHMJ() {
-      return oENMLOAFHMJ_;
+    public int getMaxLevel() {
+      return maxLevel_;
     }
 
-    public static final int BDBHIJCECNP_FIELD_NUMBER = 7;
-    private int bDBHIJCECNP_;
+    public static final int GOODS_ID_FIELD_NUMBER = 7;
+    private int goodsId_;
     /**
-     * uint32 BDBHIJCECNP = 7;
-     * @return The bDBHIJCECNP.
+     * uint32 goods_id = 7;
+     * @return The goodsId.
      */
     @java.lang.Override
-    public int getBDBHIJCECNP() {
-      return bDBHIJCECNP_;
+    public int getGoodsId() {
+      return goodsId_;
     }
 
     public static final int END_TIME_FIELD_NUMBER = 6;
@@ -693,8 +693,8 @@ public final class ShopGoodsOuterClass {
       if (goodsItem_ != null) {
         output.writeMessage(1, getGoodsItem());
       }
-      if (eKGBDJFIDJO_ != 0) {
-        output.writeUInt32(2, eKGBDJFIDJO_);
+      if (buyLimit_ != 0) {
+        output.writeUInt32(2, buyLimit_);
       }
       for (int i = 0; i < costItemList_.size(); i++) {
         output.writeMessage(3, costItemList_.get(i));
@@ -712,8 +712,8 @@ public final class ShopGoodsOuterClass {
       if (endTime_ != 0) {
         output.writeUInt32(6, endTime_);
       }
-      if (bDBHIJCECNP_ != 0) {
-        output.writeUInt32(7, bDBHIJCECNP_);
+      if (goodsId_ != 0) {
+        output.writeUInt32(7, goodsId_);
       }
       if (jOMBNPMFHGG_ != 0) {
         output.writeUInt32(8, jOMBNPMFHGG_);
@@ -721,8 +721,8 @@ public final class ShopGoodsOuterClass {
       if (nextRefreshTime_ != 0) {
         output.writeUInt32(9, nextRefreshTime_);
       }
-      if (kANFIKNKONL_ != 0) {
-        output.writeUInt32(10, kANFIKNKONL_);
+      if (mcoin_ != 0) {
+        output.writeUInt32(10, mcoin_);
       }
       if (fEMEEIEHBBL_ != 0) {
         output.writeUInt32(11, fEMEEIEHBBL_);
@@ -739,17 +739,17 @@ public final class ShopGoodsOuterClass {
       if (hcoin_ != 0) {
         output.writeUInt32(15, hcoin_);
       }
-      if (kKKOCADJCHM_ != 0) {
-        output.writeUInt32(898, kKKOCADJCHM_);
+      if (minLevel_ != 0) {
+        output.writeUInt32(898, minLevel_);
       }
       if (dIHOGOJNKHB_ != 0) {
         output.writeUInt32(923, dIHOGOJNKHB_);
       }
-      if (aAINEEHFPBJ_ != 0) {
-        output.writeUInt32(1690, aAINEEHFPBJ_);
+      if (scoin_ != 0) {
+        output.writeUInt32(1690, scoin_);
       }
-      if (oENMLOAFHMJ_ != 0) {
-        output.writeUInt32(1946, oENMLOAFHMJ_);
+      if (maxLevel_ != 0) {
+        output.writeUInt32(1946, maxLevel_);
       }
       if (bNEKKILPEKF_ != 0) {
         output.writeUInt32(1950, bNEKKILPEKF_);
@@ -767,9 +767,9 @@ public final class ShopGoodsOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, getGoodsItem());
       }
-      if (eKGBDJFIDJO_ != 0) {
+      if (buyLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, eKGBDJFIDJO_);
+          .computeUInt32Size(2, buyLimit_);
       }
       for (int i = 0; i < costItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -797,9 +797,9 @@ public final class ShopGoodsOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(6, endTime_);
       }
-      if (bDBHIJCECNP_ != 0) {
+      if (goodsId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, bDBHIJCECNP_);
+          .computeUInt32Size(7, goodsId_);
       }
       if (jOMBNPMFHGG_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -809,9 +809,9 @@ public final class ShopGoodsOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(9, nextRefreshTime_);
       }
-      if (kANFIKNKONL_ != 0) {
+      if (mcoin_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, kANFIKNKONL_);
+          .computeUInt32Size(10, mcoin_);
       }
       if (fEMEEIEHBBL_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -833,21 +833,21 @@ public final class ShopGoodsOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(15, hcoin_);
       }
-      if (kKKOCADJCHM_ != 0) {
+      if (minLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(898, kKKOCADJCHM_);
+          .computeUInt32Size(898, minLevel_);
       }
       if (dIHOGOJNKHB_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(923, dIHOGOJNKHB_);
       }
-      if (aAINEEHFPBJ_ != 0) {
+      if (scoin_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1690, aAINEEHFPBJ_);
+          .computeUInt32Size(1690, scoin_);
       }
-      if (oENMLOAFHMJ_ != 0) {
+      if (maxLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1946, oENMLOAFHMJ_);
+          .computeUInt32Size(1946, maxLevel_);
       }
       if (bNEKKILPEKF_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -876,8 +876,8 @@ public final class ShopGoodsOuterClass {
           != other.getJOMBNPMFHGG()) return false;
       if (!getCostItemListList()
           .equals(other.getCostItemListList())) return false;
-      if (getAAINEEHFPBJ()
-          != other.getAAINEEHFPBJ()) return false;
+      if (getScoin()
+          != other.getScoin()) return false;
       if (getBoughtNum()
           != other.getBoughtNum()) return false;
       if (getDIHOGOJNKHB()
@@ -888,8 +888,8 @@ public final class ShopGoodsOuterClass {
           != other.getBNEKKILPEKF()) return false;
       if (!getPreGoodsIdListList()
           .equals(other.getPreGoodsIdListList())) return false;
-      if (getKANFIKNKONL()
-          != other.getKANFIKNKONL()) return false;
+      if (getMcoin()
+          != other.getMcoin()) return false;
       if (hasGoodsItem() != other.hasGoodsItem()) return false;
       if (hasGoodsItem()) {
         if (!getGoodsItem()
@@ -897,14 +897,14 @@ public final class ShopGoodsOuterClass {
       }
       if (getNODBIKCALJI()
           != other.getNODBIKCALJI()) return false;
-      if (getEKGBDJFIDJO()
-          != other.getEKGBDJFIDJO()) return false;
-      if (getKKKOCADJCHM()
-          != other.getKKKOCADJCHM()) return false;
-      if (getOENMLOAFHMJ()
-          != other.getOENMLOAFHMJ()) return false;
-      if (getBDBHIJCECNP()
-          != other.getBDBHIJCECNP()) return false;
+      if (getBuyLimit()
+          != other.getBuyLimit()) return false;
+      if (getMinLevel()
+          != other.getMinLevel()) return false;
+      if (getMaxLevel()
+          != other.getMaxLevel()) return false;
+      if (getGoodsId()
+          != other.getGoodsId()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
       if (getHcoin()
@@ -932,8 +932,8 @@ public final class ShopGoodsOuterClass {
         hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getCostItemListList().hashCode();
       }
-      hash = (37 * hash) + AAINEEHFPBJ_FIELD_NUMBER;
-      hash = (53 * hash) + getAAINEEHFPBJ();
+      hash = (37 * hash) + SCOIN_FIELD_NUMBER;
+      hash = (53 * hash) + getScoin();
       hash = (37 * hash) + BOUGHT_NUM_FIELD_NUMBER;
       hash = (53 * hash) + getBoughtNum();
       hash = (37 * hash) + DIHOGOJNKHB_FIELD_NUMBER;
@@ -946,22 +946,22 @@ public final class ShopGoodsOuterClass {
         hash = (37 * hash) + PREGOODSIDLIST_FIELD_NUMBER;
         hash = (53 * hash) + getPreGoodsIdListList().hashCode();
       }
-      hash = (37 * hash) + KANFIKNKONL_FIELD_NUMBER;
-      hash = (53 * hash) + getKANFIKNKONL();
+      hash = (37 * hash) + MCOIN_FIELD_NUMBER;
+      hash = (53 * hash) + getMcoin();
       if (hasGoodsItem()) {
         hash = (37 * hash) + GOODS_ITEM_FIELD_NUMBER;
         hash = (53 * hash) + getGoodsItem().hashCode();
       }
       hash = (37 * hash) + NODBIKCALJI_FIELD_NUMBER;
       hash = (53 * hash) + getNODBIKCALJI();
-      hash = (37 * hash) + EKGBDJFIDJO_FIELD_NUMBER;
-      hash = (53 * hash) + getEKGBDJFIDJO();
-      hash = (37 * hash) + KKKOCADJCHM_FIELD_NUMBER;
-      hash = (53 * hash) + getKKKOCADJCHM();
-      hash = (37 * hash) + OENMLOAFHMJ_FIELD_NUMBER;
-      hash = (53 * hash) + getOENMLOAFHMJ();
-      hash = (37 * hash) + BDBHIJCECNP_FIELD_NUMBER;
-      hash = (53 * hash) + getBDBHIJCECNP();
+      hash = (37 * hash) + BUY_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getBuyLimit();
+      hash = (37 * hash) + MIN_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getMinLevel();
+      hash = (37 * hash) + MAX_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getMaxLevel();
+      hash = (37 * hash) + GOODS_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGoodsId();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
       hash = (37 * hash) + HCOIN_FIELD_NUMBER;
@@ -1118,7 +1118,7 @@ public final class ShopGoodsOuterClass {
         } else {
           costItemListBuilder_.clear();
         }
-        aAINEEHFPBJ_ = 0;
+        scoin_ = 0;
 
         boughtNum_ = 0;
 
@@ -1130,7 +1130,7 @@ public final class ShopGoodsOuterClass {
 
         preGoodsIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
-        kANFIKNKONL_ = 0;
+        mcoin_ = 0;
 
         if (goodsItemBuilder_ == null) {
           goodsItem_ = null;
@@ -1140,13 +1140,13 @@ public final class ShopGoodsOuterClass {
         }
         nODBIKCALJI_ = 0;
 
-        eKGBDJFIDJO_ = 0;
+        buyLimit_ = 0;
 
-        kKKOCADJCHM_ = 0;
+        minLevel_ = 0;
 
-        oENMLOAFHMJ_ = 0;
+        maxLevel_ = 0;
 
-        bDBHIJCECNP_ = 0;
+        goodsId_ = 0;
 
         endTime_ = 0;
 
@@ -1193,7 +1193,7 @@ public final class ShopGoodsOuterClass {
         } else {
           result.costItemList_ = costItemListBuilder_.build();
         }
-        result.aAINEEHFPBJ_ = aAINEEHFPBJ_;
+        result.scoin_ = scoin_;
         result.boughtNum_ = boughtNum_;
         result.dIHOGOJNKHB_ = dIHOGOJNKHB_;
         result.beginTime_ = beginTime_;
@@ -1203,17 +1203,17 @@ public final class ShopGoodsOuterClass {
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.preGoodsIdList_ = preGoodsIdList_;
-        result.kANFIKNKONL_ = kANFIKNKONL_;
+        result.mcoin_ = mcoin_;
         if (goodsItemBuilder_ == null) {
           result.goodsItem_ = goodsItem_;
         } else {
           result.goodsItem_ = goodsItemBuilder_.build();
         }
         result.nODBIKCALJI_ = nODBIKCALJI_;
-        result.eKGBDJFIDJO_ = eKGBDJFIDJO_;
-        result.kKKOCADJCHM_ = kKKOCADJCHM_;
-        result.oENMLOAFHMJ_ = oENMLOAFHMJ_;
-        result.bDBHIJCECNP_ = bDBHIJCECNP_;
+        result.buyLimit_ = buyLimit_;
+        result.minLevel_ = minLevel_;
+        result.maxLevel_ = maxLevel_;
+        result.goodsId_ = goodsId_;
         result.endTime_ = endTime_;
         result.hcoin_ = hcoin_;
         result.nextRefreshTime_ = nextRefreshTime_;
@@ -1300,8 +1300,8 @@ public final class ShopGoodsOuterClass {
             }
           }
         }
-        if (other.getAAINEEHFPBJ() != 0) {
-          setAAINEEHFPBJ(other.getAAINEEHFPBJ());
+        if (other.getScoin() != 0) {
+          setScoin(other.getScoin());
         }
         if (other.getBoughtNum() != 0) {
           setBoughtNum(other.getBoughtNum());
@@ -1325,8 +1325,8 @@ public final class ShopGoodsOuterClass {
           }
           onChanged();
         }
-        if (other.getKANFIKNKONL() != 0) {
-          setKANFIKNKONL(other.getKANFIKNKONL());
+        if (other.getMcoin() != 0) {
+          setMcoin(other.getMcoin());
         }
         if (other.hasGoodsItem()) {
           mergeGoodsItem(other.getGoodsItem());
@@ -1334,17 +1334,17 @@ public final class ShopGoodsOuterClass {
         if (other.getNODBIKCALJI() != 0) {
           setNODBIKCALJI(other.getNODBIKCALJI());
         }
-        if (other.getEKGBDJFIDJO() != 0) {
-          setEKGBDJFIDJO(other.getEKGBDJFIDJO());
+        if (other.getBuyLimit() != 0) {
+          setBuyLimit(other.getBuyLimit());
         }
-        if (other.getKKKOCADJCHM() != 0) {
-          setKKKOCADJCHM(other.getKKKOCADJCHM());
+        if (other.getMinLevel() != 0) {
+          setMinLevel(other.getMinLevel());
         }
-        if (other.getOENMLOAFHMJ() != 0) {
-          setOENMLOAFHMJ(other.getOENMLOAFHMJ());
+        if (other.getMaxLevel() != 0) {
+          setMaxLevel(other.getMaxLevel());
         }
-        if (other.getBDBHIJCECNP() != 0) {
-          setBDBHIJCECNP(other.getBDBHIJCECNP());
+        if (other.getGoodsId() != 0) {
+          setGoodsId(other.getGoodsId());
         }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
@@ -1718,33 +1718,33 @@ public final class ShopGoodsOuterClass {
         return costItemListBuilder_;
       }
 
-      private int aAINEEHFPBJ_ ;
+      private int scoin_ ;
       /**
-       * uint32 AAINEEHFPBJ = 1690;
-       * @return The aAINEEHFPBJ.
+       * uint32 scoin = 1690;
+       * @return The scoin.
        */
       @java.lang.Override
-      public int getAAINEEHFPBJ() {
-        return aAINEEHFPBJ_;
+      public int getScoin() {
+        return scoin_;
       }
       /**
-       * uint32 AAINEEHFPBJ = 1690;
-       * @param value The aAINEEHFPBJ to set.
+       * uint32 scoin = 1690;
+       * @param value The scoin to set.
        * @return This builder for chaining.
        */
-      public Builder setAAINEEHFPBJ(int value) {
+      public Builder setScoin(int value) {
         
-        aAINEEHFPBJ_ = value;
+        scoin_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 AAINEEHFPBJ = 1690;
+       * uint32 scoin = 1690;
        * @return This builder for chaining.
        */
-      public Builder clearAAINEEHFPBJ() {
+      public Builder clearScoin() {
         
-        aAINEEHFPBJ_ = 0;
+        scoin_ = 0;
         onChanged();
         return this;
       }
@@ -1952,33 +1952,33 @@ public final class ShopGoodsOuterClass {
         return this;
       }
 
-      private int kANFIKNKONL_ ;
+      private int mcoin_ ;
       /**
-       * uint32 KANFIKNKONL = 10;
-       * @return The kANFIKNKONL.
+       * uint32 mcoin = 10;
+       * @return The mcoin.
        */
       @java.lang.Override
-      public int getKANFIKNKONL() {
-        return kANFIKNKONL_;
+      public int getMcoin() {
+        return mcoin_;
       }
       /**
-       * uint32 KANFIKNKONL = 10;
-       * @param value The kANFIKNKONL to set.
+       * uint32 mcoin = 10;
+       * @param value The mcoin to set.
        * @return This builder for chaining.
        */
-      public Builder setKANFIKNKONL(int value) {
+      public Builder setMcoin(int value) {
         
-        kANFIKNKONL_ = value;
+        mcoin_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 KANFIKNKONL = 10;
+       * uint32 mcoin = 10;
        * @return This builder for chaining.
        */
-      public Builder clearKANFIKNKONL() {
+      public Builder clearMcoin() {
         
-        kANFIKNKONL_ = 0;
+        mcoin_ = 0;
         onChanged();
         return this;
       }
@@ -2133,126 +2133,126 @@ public final class ShopGoodsOuterClass {
         return this;
       }
 
-      private int eKGBDJFIDJO_ ;
+      private int buyLimit_ ;
       /**
-       * uint32 EKGBDJFIDJO = 2;
-       * @return The eKGBDJFIDJO.
+       * uint32 buy_limit = 2;
+       * @return The buyLimit.
        */
       @java.lang.Override
-      public int getEKGBDJFIDJO() {
-        return eKGBDJFIDJO_;
+      public int getBuyLimit() {
+        return buyLimit_;
       }
       /**
-       * uint32 EKGBDJFIDJO = 2;
-       * @param value The eKGBDJFIDJO to set.
+       * uint32 buy_limit = 2;
+       * @param value The buyLimit to set.
        * @return This builder for chaining.
        */
-      public Builder setEKGBDJFIDJO(int value) {
+      public Builder setBuyLimit(int value) {
         
-        eKGBDJFIDJO_ = value;
+        buyLimit_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 EKGBDJFIDJO = 2;
+       * uint32 buy_limit = 2;
        * @return This builder for chaining.
        */
-      public Builder clearEKGBDJFIDJO() {
+      public Builder clearBuyLimit() {
         
-        eKGBDJFIDJO_ = 0;
+        buyLimit_ = 0;
         onChanged();
         return this;
       }
 
-      private int kKKOCADJCHM_ ;
+      private int minLevel_ ;
       /**
-       * uint32 KKKOCADJCHM = 898;
-       * @return The kKKOCADJCHM.
+       * uint32 min_level = 898;
+       * @return The minLevel.
        */
       @java.lang.Override
-      public int getKKKOCADJCHM() {
-        return kKKOCADJCHM_;
+      public int getMinLevel() {
+        return minLevel_;
       }
       /**
-       * uint32 KKKOCADJCHM = 898;
-       * @param value The kKKOCADJCHM to set.
+       * uint32 min_level = 898;
+       * @param value The minLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setKKKOCADJCHM(int value) {
+      public Builder setMinLevel(int value) {
         
-        kKKOCADJCHM_ = value;
+        minLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 KKKOCADJCHM = 898;
+       * uint32 min_level = 898;
        * @return This builder for chaining.
        */
-      public Builder clearKKKOCADJCHM() {
+      public Builder clearMinLevel() {
         
-        kKKOCADJCHM_ = 0;
+        minLevel_ = 0;
         onChanged();
         return this;
       }
 
-      private int oENMLOAFHMJ_ ;
+      private int maxLevel_ ;
       /**
-       * uint32 OENMLOAFHMJ = 1946;
-       * @return The oENMLOAFHMJ.
+       * uint32 max_level = 1946;
+       * @return The maxLevel.
        */
       @java.lang.Override
-      public int getOENMLOAFHMJ() {
-        return oENMLOAFHMJ_;
+      public int getMaxLevel() {
+        return maxLevel_;
       }
       /**
-       * uint32 OENMLOAFHMJ = 1946;
-       * @param value The oENMLOAFHMJ to set.
+       * uint32 max_level = 1946;
+       * @param value The maxLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setOENMLOAFHMJ(int value) {
+      public Builder setMaxLevel(int value) {
         
-        oENMLOAFHMJ_ = value;
+        maxLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 OENMLOAFHMJ = 1946;
+       * uint32 max_level = 1946;
        * @return This builder for chaining.
        */
-      public Builder clearOENMLOAFHMJ() {
+      public Builder clearMaxLevel() {
         
-        oENMLOAFHMJ_ = 0;
+        maxLevel_ = 0;
         onChanged();
         return this;
       }
 
-      private int bDBHIJCECNP_ ;
+      private int goodsId_ ;
       /**
-       * uint32 BDBHIJCECNP = 7;
-       * @return The bDBHIJCECNP.
+       * uint32 goods_id = 7;
+       * @return The goodsId.
        */
       @java.lang.Override
-      public int getBDBHIJCECNP() {
-        return bDBHIJCECNP_;
+      public int getGoodsId() {
+        return goodsId_;
       }
       /**
-       * uint32 BDBHIJCECNP = 7;
-       * @param value The bDBHIJCECNP to set.
+       * uint32 goods_id = 7;
+       * @param value The goodsId to set.
        * @return This builder for chaining.
        */
-      public Builder setBDBHIJCECNP(int value) {
+      public Builder setGoodsId(int value) {
         
-        bDBHIJCECNP_ = value;
+        goodsId_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 BDBHIJCECNP = 7;
+       * uint32 goods_id = 7;
        * @return This builder for chaining.
        */
-      public Builder clearBDBHIJCECNP() {
+      public Builder clearGoodsId() {
         
-        bDBHIJCECNP_ = 0;
+        goodsId_ = 0;
         onChanged();
         return this;
       }
@@ -2416,20 +2416,19 @@ public final class ShopGoodsOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017ShopGoods.proto\032\017ItemParam.proto\"\314\003\n\tS" +
+      "\n\017ShopGoods.proto\032\017ItemParam.proto\"\267\003\n\tS" +
       "hopGoods\022\023\n\013NPBGGAMEDJG\030\004 \001(\r\022\023\n\013FEMEEIE" +
       "HBBL\030\013 \001(\r\022\023\n\013JOMBNPMFHGG\030\010 \001(\r\022\"\n\016cost_" +
-      "item_list\030\003 \003(\0132\n.ItemParam\022\024\n\013AAINEEHFP" +
-      "BJ\030\232\r \001(\r\022\022\n\nbought_num\030\016 \001(\r\022\024\n\013DIHOGOJ" +
-      "NKHB\030\233\007 \001(\r\022\022\n\nbegin_time\030\r \001(\r\022\024\n\013BNEKK" +
-      "ILPEKF\030\236\017 \001(\r\022\026\n\016preGoodsIdList\030\005 \003(\r\022\023\n" +
-      "\013KANFIKNKONL\030\n \001(\r\022\036\n\ngoods_item\030\001 \001(\0132\n" +
-      ".ItemParam\022\023\n\013NODBIKCALJI\030\014 \001(\r\022\023\n\013EKGBD" +
-      "JFIDJO\030\002 \001(\r\022\024\n\013KKKOCADJCHM\030\202\007 \001(\r\022\024\n\013OE" +
-      "NMLOAFHMJ\030\232\017 \001(\r\022\023\n\013BDBHIJCECNP\030\007 \001(\r\022\020\n" +
-      "\010end_time\030\006 \001(\r\022\r\n\005hcoin\030\017 \001(\r\022\031\n\021next_r" +
-      "efresh_time\030\t \001(\rB\033\n\031emu.grasscutter.net" +
-      ".protob\006proto3"
+      "item_list\030\003 \003(\0132\n.ItemParam\022\016\n\005scoin\030\232\r " +
+      "\001(\r\022\022\n\nbought_num\030\016 \001(\r\022\024\n\013DIHOGOJNKHB\030\233" +
+      "\007 \001(\r\022\022\n\nbegin_time\030\r \001(\r\022\024\n\013BNEKKILPEKF" +
+      "\030\236\017 \001(\r\022\026\n\016preGoodsIdList\030\005 \003(\r\022\r\n\005mcoin" +
+      "\030\n \001(\r\022\036\n\ngoods_item\030\001 \001(\0132\n.ItemParam\022\023" +
+      "\n\013NODBIKCALJI\030\014 \001(\r\022\021\n\tbuy_limit\030\002 \001(\r\022\022" +
+      "\n\tmin_level\030\202\007 \001(\r\022\022\n\tmax_level\030\232\017 \001(\r\022\020" +
+      "\n\010goods_id\030\007 \001(\r\022\020\n\010end_time\030\006 \001(\r\022\r\n\005hc" +
+      "oin\030\017 \001(\r\022\031\n\021next_refresh_time\030\t \001(\rB\033\n\031" +
+      "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2441,7 +2440,7 @@ public final class ShopGoodsOuterClass {
     internal_static_ShopGoods_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShopGoods_descriptor,
-        new java.lang.String[] { "NPBGGAMEDJG", "FEMEEIEHBBL", "JOMBNPMFHGG", "CostItemList", "AAINEEHFPBJ", "BoughtNum", "DIHOGOJNKHB", "BeginTime", "BNEKKILPEKF", "PreGoodsIdList", "KANFIKNKONL", "GoodsItem", "NODBIKCALJI", "EKGBDJFIDJO", "KKKOCADJCHM", "OENMLOAFHMJ", "BDBHIJCECNP", "EndTime", "Hcoin", "NextRefreshTime", });
+        new java.lang.String[] { "NPBGGAMEDJG", "FEMEEIEHBBL", "JOMBNPMFHGG", "CostItemList", "Scoin", "BoughtNum", "DIHOGOJNKHB", "BeginTime", "BNEKKILPEKF", "PreGoodsIdList", "Mcoin", "GoodsItem", "NODBIKCALJI", "BuyLimit", "MinLevel", "MaxLevel", "GoodsId", "EndTime", "Hcoin", "NextRefreshTime", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StatusOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StatusOuterClass.java
new file mode 100644
index 000000000..5eea5ca03
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StatusOuterClass.java
@@ -0,0 +1,164 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: Status.proto
+
+package emu.grasscutter.net.proto;
+
+public final class StatusOuterClass {
+  private StatusOuterClass() {}
+  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 Status}
+   */
+  public enum Status
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * STATUS_INVALID = 0;
+     */
+    STATUS_INVALID(0),
+    /**
+     * STATUS_UNFINISHED = 1;
+     */
+    STATUS_UNFINISHED(1),
+    /**
+     * STATUS_FINISHED = 2;
+     */
+    STATUS_FINISHED(2),
+    /**
+     * STATUS_REWARD_TAKEN = 3;
+     */
+    STATUS_REWARD_TAKEN(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * STATUS_INVALID = 0;
+     */
+    public static final int STATUS_INVALID_VALUE = 0;
+    /**
+     * STATUS_UNFINISHED = 1;
+     */
+    public static final int STATUS_UNFINISHED_VALUE = 1;
+    /**
+     * STATUS_FINISHED = 2;
+     */
+    public static final int STATUS_FINISHED_VALUE = 2;
+    /**
+     * STATUS_REWARD_TAKEN = 3;
+     */
+    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
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        Status> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            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.StatusOuterClass.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:Status)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\014Status.proto*a\n\006Status\022\022\n\016STATUS_INVAL" +
+      "ID\020\000\022\025\n\021STATUS_UNFINISHED\020\001\022\023\n\017STATUS_FI" +
+      "NISHED\020\002\022\027\n\023STATUS_REWARD_TAKEN\020\003B\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)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java
index d4115cddd..5e3513ca1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java
@@ -213,6 +213,123 @@ public final class TowerLevelEndNotifyOuterClass {
               emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.class, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder.class);
     }
 
+    /**
+     * Protobuf enum {@code TowerLevelEndNotify.ContinueStateType}
+     */
+    public enum ContinueStateType
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE = 0;
+       */
+      CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE(0),
+      /**
+       * CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL = 1;
+       */
+      CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL(1),
+      /**
+       * CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR = 2;
+       */
+      CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR(2),
+      UNRECOGNIZED(-1),
+      ;
+
+      /**
+       * CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE = 0;
+       */
+      public static final int CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE_VALUE = 0;
+      /**
+       * CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL = 1;
+       */
+      public static final int CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL_VALUE = 1;
+      /**
+       * CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR = 2;
+       */
+      public static final int CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR_VALUE = 2;
+
+
+      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 ContinueStateType 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 ContinueStateType forNumber(int value) {
+        switch (value) {
+          case 0: return CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE;
+          case 1: return CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL;
+          case 2: return CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          ContinueStateType> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public ContinueStateType findValueByNumber(int number) {
+                return ContinueStateType.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.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final ContinueStateType[] VALUES = values();
+
+      public static ContinueStateType 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 ContinueStateType(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:TowerLevelEndNotify.ContinueStateType)
+    }
+
     public static final int FINISHED_STAR_COND_LIST_FIELD_NUMBER = 14;
     private com.google.protobuf.Internal.IntList finishedStarCondList_;
     /**
@@ -1237,12 +1354,15 @@ public final class TowerLevelEndNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031TowerLevelEndNotify.proto\032\017ItemParam.p" +
-      "roto\"\237\001\n\023TowerLevelEndNotify\022\037\n\027finished" +
+      "roto\"\273\002\n\023TowerLevelEndNotify\022\037\n\027finished" +
       "_star_cond_list\030\016 \003(\r\022\022\n\nis_success\030\007 \001(" +
       "\010\022\026\n\016continue_state\030\004 \001(\r\022$\n\020reward_item" +
       "_list\030\r \003(\0132\n.ItemParam\022\025\n\rnext_floor_id" +
-      "\030\005 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
-      "to3"
+      "\030\005 \001(\r\"\231\001\n\021ContinueStateType\022(\n$CONTINUE" +
+      "_STATE_TYPE_CAN_NOT_CONTINUE\020\000\022,\n(CONTIN" +
+      "UE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL\020\001\022,\n(" +
+      "CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR" +
+      "\020\002B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarActivityRewardDetailInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarActivityRewardDetailInfoOuterClass.java
index bc9710127..c18b9480b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarActivityRewardDetailInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarActivityRewardDetailInfoOuterClass.java
@@ -19,10 +19,10 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * bool NPBJPLFAJNH = 6;
-     * @return The nPBJPLFAJNH.
+     * bool passed_dungeon = 6;
+     * @return The passedDungeon.
      */
-    boolean getNPBJPLFAJNH();
+    boolean getPassedDungeon();
 
     /**
      * uint32 reward_id = 15;
@@ -31,10 +31,10 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
     int getRewardId();
 
     /**
-     * bool JMNALMMBDLH = 8;
-     * @return The jMNALMMBDLH.
+     * bool received_reward = 8;
+     * @return The receivedReward.
      */
-    boolean getJMNALMMBDLH();
+    boolean getReceivedReward();
 
     /**
      * uint32 trial_avatar_index_id = 4;
@@ -98,12 +98,12 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
             }
             case 48: {
 
-              nPBJPLFAJNH_ = input.readBool();
+              passedDungeon_ = input.readBool();
               break;
             }
             case 64: {
 
-              jMNALMMBDLH_ = input.readBool();
+              receivedReward_ = input.readBool();
               break;
             }
             case 120: {
@@ -143,15 +143,15 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
               emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo.class, emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo.Builder.class);
     }
 
-    public static final int NPBJPLFAJNH_FIELD_NUMBER = 6;
-    private boolean nPBJPLFAJNH_;
+    public static final int PASSED_DUNGEON_FIELD_NUMBER = 6;
+    private boolean passedDungeon_;
     /**
-     * bool NPBJPLFAJNH = 6;
-     * @return The nPBJPLFAJNH.
+     * bool passed_dungeon = 6;
+     * @return The passedDungeon.
      */
     @java.lang.Override
-    public boolean getNPBJPLFAJNH() {
-      return nPBJPLFAJNH_;
+    public boolean getPassedDungeon() {
+      return passedDungeon_;
     }
 
     public static final int REWARD_ID_FIELD_NUMBER = 15;
@@ -165,15 +165,15 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
       return rewardId_;
     }
 
-    public static final int JMNALMMBDLH_FIELD_NUMBER = 8;
-    private boolean jMNALMMBDLH_;
+    public static final int RECEIVED_REWARD_FIELD_NUMBER = 8;
+    private boolean receivedReward_;
     /**
-     * bool JMNALMMBDLH = 8;
-     * @return The jMNALMMBDLH.
+     * bool received_reward = 8;
+     * @return The receivedReward.
      */
     @java.lang.Override
-    public boolean getJMNALMMBDLH() {
-      return jMNALMMBDLH_;
+    public boolean getReceivedReward() {
+      return receivedReward_;
     }
 
     public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 4;
@@ -204,11 +204,11 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
       if (trialAvatarIndexId_ != 0) {
         output.writeUInt32(4, trialAvatarIndexId_);
       }
-      if (nPBJPLFAJNH_ != false) {
-        output.writeBool(6, nPBJPLFAJNH_);
+      if (passedDungeon_ != false) {
+        output.writeBool(6, passedDungeon_);
       }
-      if (jMNALMMBDLH_ != false) {
-        output.writeBool(8, jMNALMMBDLH_);
+      if (receivedReward_ != false) {
+        output.writeBool(8, receivedReward_);
       }
       if (rewardId_ != 0) {
         output.writeUInt32(15, rewardId_);
@@ -226,13 +226,13 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(4, trialAvatarIndexId_);
       }
-      if (nPBJPLFAJNH_ != false) {
+      if (passedDungeon_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, nPBJPLFAJNH_);
+          .computeBoolSize(6, passedDungeon_);
       }
-      if (jMNALMMBDLH_ != false) {
+      if (receivedReward_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, jMNALMMBDLH_);
+          .computeBoolSize(8, receivedReward_);
       }
       if (rewardId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -253,12 +253,12 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
       }
       emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo other = (emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo) obj;
 
-      if (getNPBJPLFAJNH()
-          != other.getNPBJPLFAJNH()) return false;
+      if (getPassedDungeon()
+          != other.getPassedDungeon()) return false;
       if (getRewardId()
           != other.getRewardId()) return false;
-      if (getJMNALMMBDLH()
-          != other.getJMNALMMBDLH()) return false;
+      if (getReceivedReward()
+          != other.getReceivedReward()) return false;
       if (getTrialAvatarIndexId()
           != other.getTrialAvatarIndexId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -272,14 +272,14 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + NPBJPLFAJNH_FIELD_NUMBER;
+      hash = (37 * hash) + PASSED_DUNGEON_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getNPBJPLFAJNH());
+          getPassedDungeon());
       hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRewardId();
-      hash = (37 * hash) + JMNALMMBDLH_FIELD_NUMBER;
+      hash = (37 * hash) + RECEIVED_REWARD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getJMNALMMBDLH());
+          getReceivedReward());
       hash = (37 * hash) + TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTrialAvatarIndexId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -419,11 +419,11 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        nPBJPLFAJNH_ = false;
+        passedDungeon_ = false;
 
         rewardId_ = 0;
 
-        jMNALMMBDLH_ = false;
+        receivedReward_ = false;
 
         trialAvatarIndexId_ = 0;
 
@@ -453,9 +453,9 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo buildPartial() {
         emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo result = new emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo(this);
-        result.nPBJPLFAJNH_ = nPBJPLFAJNH_;
+        result.passedDungeon_ = passedDungeon_;
         result.rewardId_ = rewardId_;
-        result.jMNALMMBDLH_ = jMNALMMBDLH_;
+        result.receivedReward_ = receivedReward_;
         result.trialAvatarIndexId_ = trialAvatarIndexId_;
         onBuilt();
         return result;
@@ -505,14 +505,14 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo other) {
         if (other == emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo.getDefaultInstance()) return this;
-        if (other.getNPBJPLFAJNH() != false) {
-          setNPBJPLFAJNH(other.getNPBJPLFAJNH());
+        if (other.getPassedDungeon() != false) {
+          setPassedDungeon(other.getPassedDungeon());
         }
         if (other.getRewardId() != 0) {
           setRewardId(other.getRewardId());
         }
-        if (other.getJMNALMMBDLH() != false) {
-          setJMNALMMBDLH(other.getJMNALMMBDLH());
+        if (other.getReceivedReward() != false) {
+          setReceivedReward(other.getReceivedReward());
         }
         if (other.getTrialAvatarIndexId() != 0) {
           setTrialAvatarIndexId(other.getTrialAvatarIndexId());
@@ -546,33 +546,33 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
         return this;
       }
 
-      private boolean nPBJPLFAJNH_ ;
+      private boolean passedDungeon_ ;
       /**
-       * bool NPBJPLFAJNH = 6;
-       * @return The nPBJPLFAJNH.
+       * bool passed_dungeon = 6;
+       * @return The passedDungeon.
        */
       @java.lang.Override
-      public boolean getNPBJPLFAJNH() {
-        return nPBJPLFAJNH_;
+      public boolean getPassedDungeon() {
+        return passedDungeon_;
       }
       /**
-       * bool NPBJPLFAJNH = 6;
-       * @param value The nPBJPLFAJNH to set.
+       * bool passed_dungeon = 6;
+       * @param value The passedDungeon to set.
        * @return This builder for chaining.
        */
-      public Builder setNPBJPLFAJNH(boolean value) {
+      public Builder setPassedDungeon(boolean value) {
         
-        nPBJPLFAJNH_ = value;
+        passedDungeon_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool NPBJPLFAJNH = 6;
+       * bool passed_dungeon = 6;
        * @return This builder for chaining.
        */
-      public Builder clearNPBJPLFAJNH() {
+      public Builder clearPassedDungeon() {
         
-        nPBJPLFAJNH_ = false;
+        passedDungeon_ = false;
         onChanged();
         return this;
       }
@@ -608,33 +608,33 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
         return this;
       }
 
-      private boolean jMNALMMBDLH_ ;
+      private boolean receivedReward_ ;
       /**
-       * bool JMNALMMBDLH = 8;
-       * @return The jMNALMMBDLH.
+       * bool received_reward = 8;
+       * @return The receivedReward.
        */
       @java.lang.Override
-      public boolean getJMNALMMBDLH() {
-        return jMNALMMBDLH_;
+      public boolean getReceivedReward() {
+        return receivedReward_;
       }
       /**
-       * bool JMNALMMBDLH = 8;
-       * @param value The jMNALMMBDLH to set.
+       * bool received_reward = 8;
+       * @param value The receivedReward to set.
        * @return This builder for chaining.
        */
-      public Builder setJMNALMMBDLH(boolean value) {
+      public Builder setReceivedReward(boolean value) {
         
-        jMNALMMBDLH_ = value;
+        receivedReward_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool JMNALMMBDLH = 8;
+       * bool received_reward = 8;
        * @return This builder for chaining.
        */
-      public Builder clearJMNALMMBDLH() {
+      public Builder clearReceivedReward() {
         
-        jMNALMMBDLH_ = false;
+        receivedReward_ = false;
         onChanged();
         return this;
       }
@@ -737,11 +737,11 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n)TrialAvatarActivityRewardDetailInfo.pr" +
-      "oto\"\201\001\n#TrialAvatarActivityRewardDetailI" +
-      "nfo\022\023\n\013NPBJPLFAJNH\030\006 \001(\010\022\021\n\treward_id\030\017 " +
-      "\001(\r\022\023\n\013JMNALMMBDLH\030\010 \001(\010\022\035\n\025trial_avatar" +
-      "_index_id\030\004 \001(\rB\033\n\031emu.grasscutter.net.p" +
-      "rotob\006proto3"
+      "oto\"\210\001\n#TrialAvatarActivityRewardDetailI" +
+      "nfo\022\026\n\016passed_dungeon\030\006 \001(\010\022\021\n\treward_id" +
+      "\030\017 \001(\r\022\027\n\017received_reward\030\010 \001(\010\022\035\n\025trial" +
+      "_avatar_index_id\030\004 \001(\rB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -752,7 +752,7 @@ public final class TrialAvatarActivityRewardDetailInfoOuterClass {
     internal_static_TrialAvatarActivityRewardDetailInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TrialAvatarActivityRewardDetailInfo_descriptor,
-        new java.lang.String[] { "NPBJPLFAJNH", "RewardId", "JMNALMMBDLH", "TrialAvatarIndexId", });
+        new java.lang.String[] { "PassedDungeon", "RewardId", "ReceivedReward", "TrialAvatarIndexId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
index a6d824184..b6094efbc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
@@ -121,6 +121,222 @@ public final class TrialAvatarGrantRecordOuterClass {
               emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.class, emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.Builder.class);
     }
 
+    /**
+     * Protobuf enum {@code TrialAvatarGrantRecord.GrantReason}
+     */
+    public enum GrantReason
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * GRANT_REASON_INVALID = 0;
+       */
+      GRANT_REASON_INVALID(0),
+      /**
+       * GRANT_REASON_BY_QUEST = 1;
+       */
+      GRANT_REASON_BY_QUEST(1),
+      /**
+       * GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY = 2;
+       */
+      GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY(2),
+      /**
+       * GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE = 3;
+       */
+      GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE(3),
+      /**
+       * GRANT_REASON_BY_MIST_TRIAL_ACTIVITY = 4;
+       */
+      GRANT_REASON_BY_MIST_TRIAL_ACTIVITY(4),
+      /**
+       * GRANT_REASON_BY_SUMO_ACTIVITY = 5;
+       */
+      GRANT_REASON_BY_SUMO_ACTIVITY(5),
+      /**
+       * GRANT_REASON_BY_POTION_ACTIVITY = 6;
+       */
+      GRANT_REASON_BY_POTION_ACTIVITY(6),
+      /**
+       * GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY = 7;
+       */
+      GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY(7),
+      /**
+       * GRANT_REASON_BY_IRODORI_MASTER = 8;
+       */
+      GRANT_REASON_BY_IRODORI_MASTER(8),
+      /**
+       * GRANT_REASON_BY_GM = 9;
+       */
+      GRANT_REASON_BY_GM(9),
+      /**
+       * GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY = 10;
+       */
+      GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY(10),
+      /**
+       * GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY = 11;
+       */
+      GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY(11),
+      /**
+       * GRANT_REASON_BY_VINTAGE_HUNTING = 12;
+       */
+      GRANT_REASON_BY_VINTAGE_HUNTING(12),
+      /**
+       * GRANT_REASON_BY_CHAR_AMUSEMENT = 13;
+       */
+      GRANT_REASON_BY_CHAR_AMUSEMENT(13),
+      UNRECOGNIZED(-1),
+      ;
+
+      /**
+       * GRANT_REASON_INVALID = 0;
+       */
+      public static final int GRANT_REASON_INVALID_VALUE = 0;
+      /**
+       * GRANT_REASON_BY_QUEST = 1;
+       */
+      public static final int GRANT_REASON_BY_QUEST_VALUE = 1;
+      /**
+       * GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY = 2;
+       */
+      public static final int GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY_VALUE = 2;
+      /**
+       * GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE = 3;
+       */
+      public static final int GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE_VALUE = 3;
+      /**
+       * GRANT_REASON_BY_MIST_TRIAL_ACTIVITY = 4;
+       */
+      public static final int GRANT_REASON_BY_MIST_TRIAL_ACTIVITY_VALUE = 4;
+      /**
+       * GRANT_REASON_BY_SUMO_ACTIVITY = 5;
+       */
+      public static final int GRANT_REASON_BY_SUMO_ACTIVITY_VALUE = 5;
+      /**
+       * GRANT_REASON_BY_POTION_ACTIVITY = 6;
+       */
+      public static final int GRANT_REASON_BY_POTION_ACTIVITY_VALUE = 6;
+      /**
+       * GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY = 7;
+       */
+      public static final int GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY_VALUE = 7;
+      /**
+       * GRANT_REASON_BY_IRODORI_MASTER = 8;
+       */
+      public static final int GRANT_REASON_BY_IRODORI_MASTER_VALUE = 8;
+      /**
+       * GRANT_REASON_BY_GM = 9;
+       */
+      public static final int GRANT_REASON_BY_GM_VALUE = 9;
+      /**
+       * GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY = 10;
+       */
+      public static final int GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY_VALUE = 10;
+      /**
+       * GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY = 11;
+       */
+      public static final int GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY_VALUE = 11;
+      /**
+       * GRANT_REASON_BY_VINTAGE_HUNTING = 12;
+       */
+      public static final int GRANT_REASON_BY_VINTAGE_HUNTING_VALUE = 12;
+      /**
+       * GRANT_REASON_BY_CHAR_AMUSEMENT = 13;
+       */
+      public static final int GRANT_REASON_BY_CHAR_AMUSEMENT_VALUE = 13;
+
+
+      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 GrantReason 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 GrantReason forNumber(int value) {
+        switch (value) {
+          case 0: return GRANT_REASON_INVALID;
+          case 1: return GRANT_REASON_BY_QUEST;
+          case 2: return GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY;
+          case 3: return GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE;
+          case 4: return GRANT_REASON_BY_MIST_TRIAL_ACTIVITY;
+          case 5: return GRANT_REASON_BY_SUMO_ACTIVITY;
+          case 6: return GRANT_REASON_BY_POTION_ACTIVITY;
+          case 7: return GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY;
+          case 8: return GRANT_REASON_BY_IRODORI_MASTER;
+          case 9: return GRANT_REASON_BY_GM;
+          case 10: return GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY;
+          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;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          GrantReason> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public GrantReason findValueByNumber(int number) {
+                return GrantReason.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.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final GrantReason[] VALUES = values();
+
+      public static GrantReason 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 GrantReason(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:TrialAvatarGrantRecord.GrantReason)
+    }
+
     public static final int GRANT_REASON_FIELD_NUMBER = 1;
     private int grantReason_;
     /**
@@ -594,10 +810,24 @@ public final class TrialAvatarGrantRecordOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034TrialAvatarGrantRecord.proto\"L\n\026TrialA" +
-      "vatarGrantRecord\022\024\n\014grant_reason\030\001 \001(\r\022\034" +
-      "\n\024from_parent_quest_id\030\002 \001(\rB\033\n\031emu.gras" +
-      "scutter.net.protob\006proto3"
+      "\n\034TrialAvatarGrantRecord.proto\"\346\004\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" +
+      "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" +
+      "_DUNGEON_ELEMENT_CHALLENGE\020\003\022\'\n#GRANT_RE" +
+      "ASON_BY_MIST_TRIAL_ACTIVITY\020\004\022!\n\035GRANT_R" +
+      "EASON_BY_SUMO_ACTIVITY\020\005\022#\n\037GRANT_REASON" +
+      "_BY_POTION_ACTIVITY\020\006\022)\n%GRANT_REASON_BY" +
+      "_CRYSTAL_LINK_ACTIVITY\020\007\022\"\n\036GRANT_REASON" +
+      "_BY_IRODORI_MASTER\020\010\022\026\n\022GRANT_REASON_BY_" +
+      "GM\020\t\022+\n\'GRANT_REASON_BY_INSTABLE_SPRAY_A" +
+      "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" +
+      "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java
index 86611d170..9a4f97624 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java
@@ -19,16 +19,16 @@ public final class WeaponPromoteRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * uint32 MCLHMKNEIKH = 4;
-     * @return The mCLHMKNEIKH.
+     * uint32 old_promote_level = 4;
+     * @return The oldPromoteLevel.
      */
-    int getMCLHMKNEIKH();
+    int getOldPromoteLevel();
 
     /**
-     * uint32 GDNPFIPFIOJ = 14;
-     * @return The gDNPFIPFIOJ.
+     * uint32 cur_promote_level = 14;
+     * @return The curPromoteLevel.
      */
-    int getGDNPFIPFIOJ();
+    int getCurPromoteLevel();
 
     /**
      * int32 retcode = 6;
@@ -99,7 +99,7 @@ public final class WeaponPromoteRspOuterClass {
             }
             case 32: {
 
-              mCLHMKNEIKH_ = input.readUInt32();
+              oldPromoteLevel_ = input.readUInt32();
               break;
             }
             case 48: {
@@ -109,7 +109,7 @@ public final class WeaponPromoteRspOuterClass {
             }
             case 112: {
 
-              gDNPFIPFIOJ_ = input.readUInt32();
+              curPromoteLevel_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,26 +144,26 @@ public final class WeaponPromoteRspOuterClass {
               emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.class, emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.Builder.class);
     }
 
-    public static final int MCLHMKNEIKH_FIELD_NUMBER = 4;
-    private int mCLHMKNEIKH_;
+    public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 4;
+    private int oldPromoteLevel_;
     /**
-     * uint32 MCLHMKNEIKH = 4;
-     * @return The mCLHMKNEIKH.
+     * uint32 old_promote_level = 4;
+     * @return The oldPromoteLevel.
      */
     @java.lang.Override
-    public int getMCLHMKNEIKH() {
-      return mCLHMKNEIKH_;
+    public int getOldPromoteLevel() {
+      return oldPromoteLevel_;
     }
 
-    public static final int GDNPFIPFIOJ_FIELD_NUMBER = 14;
-    private int gDNPFIPFIOJ_;
+    public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 14;
+    private int curPromoteLevel_;
     /**
-     * uint32 GDNPFIPFIOJ = 14;
-     * @return The gDNPFIPFIOJ.
+     * uint32 cur_promote_level = 14;
+     * @return The curPromoteLevel.
      */
     @java.lang.Override
-    public int getGDNPFIPFIOJ() {
-      return gDNPFIPFIOJ_;
+    public int getCurPromoteLevel() {
+      return curPromoteLevel_;
     }
 
     public static final int RETCODE_FIELD_NUMBER = 6;
@@ -205,14 +205,14 @@ public final class WeaponPromoteRspOuterClass {
       if (targetWeaponGuid_ != 0L) {
         output.writeUInt64(3, targetWeaponGuid_);
       }
-      if (mCLHMKNEIKH_ != 0) {
-        output.writeUInt32(4, mCLHMKNEIKH_);
+      if (oldPromoteLevel_ != 0) {
+        output.writeUInt32(4, oldPromoteLevel_);
       }
       if (retcode_ != 0) {
         output.writeInt32(6, retcode_);
       }
-      if (gDNPFIPFIOJ_ != 0) {
-        output.writeUInt32(14, gDNPFIPFIOJ_);
+      if (curPromoteLevel_ != 0) {
+        output.writeUInt32(14, curPromoteLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -227,17 +227,17 @@ public final class WeaponPromoteRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(3, targetWeaponGuid_);
       }
-      if (mCLHMKNEIKH_ != 0) {
+      if (oldPromoteLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, mCLHMKNEIKH_);
+          .computeUInt32Size(4, oldPromoteLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(6, retcode_);
       }
-      if (gDNPFIPFIOJ_ != 0) {
+      if (curPromoteLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, gDNPFIPFIOJ_);
+          .computeUInt32Size(14, curPromoteLevel_);
       }
       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 (getMCLHMKNEIKH()
-          != other.getMCLHMKNEIKH()) return false;
-      if (getGDNPFIPFIOJ()
-          != other.getGDNPFIPFIOJ()) return false;
+      if (getOldPromoteLevel()
+          != other.getOldPromoteLevel()) return false;
+      if (getCurPromoteLevel()
+          != other.getCurPromoteLevel()) 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) + MCLHMKNEIKH_FIELD_NUMBER;
-      hash = (53 * hash) + getMCLHMKNEIKH();
-      hash = (37 * hash) + GDNPFIPFIOJ_FIELD_NUMBER;
-      hash = (53 * hash) + getGDNPFIPFIOJ();
+      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) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
@@ -420,9 +420,9 @@ public final class WeaponPromoteRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        mCLHMKNEIKH_ = 0;
+        oldPromoteLevel_ = 0;
 
-        gDNPFIPFIOJ_ = 0;
+        curPromoteLevel_ = 0;
 
         retcode_ = 0;
 
@@ -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.mCLHMKNEIKH_ = mCLHMKNEIKH_;
-        result.gDNPFIPFIOJ_ = gDNPFIPFIOJ_;
+        result.oldPromoteLevel_ = oldPromoteLevel_;
+        result.curPromoteLevel_ = curPromoteLevel_;
         result.retcode_ = retcode_;
         result.targetWeaponGuid_ = targetWeaponGuid_;
         onBuilt();
@@ -506,11 +506,11 @@ 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.getMCLHMKNEIKH() != 0) {
-          setMCLHMKNEIKH(other.getMCLHMKNEIKH());
+        if (other.getOldPromoteLevel() != 0) {
+          setOldPromoteLevel(other.getOldPromoteLevel());
         }
-        if (other.getGDNPFIPFIOJ() != 0) {
-          setGDNPFIPFIOJ(other.getGDNPFIPFIOJ());
+        if (other.getCurPromoteLevel() != 0) {
+          setCurPromoteLevel(other.getCurPromoteLevel());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
@@ -547,64 +547,64 @@ public final class WeaponPromoteRspOuterClass {
         return this;
       }
 
-      private int mCLHMKNEIKH_ ;
+      private int oldPromoteLevel_ ;
       /**
-       * uint32 MCLHMKNEIKH = 4;
-       * @return The mCLHMKNEIKH.
+       * uint32 old_promote_level = 4;
+       * @return The oldPromoteLevel.
        */
       @java.lang.Override
-      public int getMCLHMKNEIKH() {
-        return mCLHMKNEIKH_;
+      public int getOldPromoteLevel() {
+        return oldPromoteLevel_;
       }
       /**
-       * uint32 MCLHMKNEIKH = 4;
-       * @param value The mCLHMKNEIKH to set.
+       * uint32 old_promote_level = 4;
+       * @param value The oldPromoteLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setMCLHMKNEIKH(int value) {
+      public Builder setOldPromoteLevel(int value) {
         
-        mCLHMKNEIKH_ = value;
+        oldPromoteLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 MCLHMKNEIKH = 4;
+       * uint32 old_promote_level = 4;
        * @return This builder for chaining.
        */
-      public Builder clearMCLHMKNEIKH() {
+      public Builder clearOldPromoteLevel() {
         
-        mCLHMKNEIKH_ = 0;
+        oldPromoteLevel_ = 0;
         onChanged();
         return this;
       }
 
-      private int gDNPFIPFIOJ_ ;
+      private int curPromoteLevel_ ;
       /**
-       * uint32 GDNPFIPFIOJ = 14;
-       * @return The gDNPFIPFIOJ.
+       * uint32 cur_promote_level = 14;
+       * @return The curPromoteLevel.
        */
       @java.lang.Override
-      public int getGDNPFIPFIOJ() {
-        return gDNPFIPFIOJ_;
+      public int getCurPromoteLevel() {
+        return curPromoteLevel_;
       }
       /**
-       * uint32 GDNPFIPFIOJ = 14;
-       * @param value The gDNPFIPFIOJ to set.
+       * uint32 cur_promote_level = 14;
+       * @param value The curPromoteLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setGDNPFIPFIOJ(int value) {
+      public Builder setCurPromoteLevel(int value) {
         
-        gDNPFIPFIOJ_ = value;
+        curPromoteLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 GDNPFIPFIOJ = 14;
+       * uint32 cur_promote_level = 14;
        * @return This builder for chaining.
        */
-      public Builder clearGDNPFIPFIOJ() {
+      public Builder clearCurPromoteLevel() {
         
-        gDNPFIPFIOJ_ = 0;
+        curPromoteLevel_ = 0;
         onChanged();
         return this;
       }
@@ -737,11 +737,11 @@ public final class WeaponPromoteRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026WeaponPromoteRsp.proto\"i\n\020WeaponPromot" +
-      "eRsp\022\023\n\013MCLHMKNEIKH\030\004 \001(\r\022\023\n\013GDNPFIPFIOJ" +
-      "\030\016 \001(\r\022\017\n\007retcode\030\006 \001(\005\022\032\n\022target_weapon" +
-      "_guid\030\003 \001(\004B\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "\n\026WeaponPromoteRsp.proto\"u\n\020WeaponPromot" +
+      "eRsp\022\031\n\021old_promote_level\030\004 \001(\r\022\031\n\021cur_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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -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[] { "MCLHMKNEIKH", "GDNPFIPFIOJ", "Retcode", "TargetWeaponGuid", });
+        new java.lang.String[] { "OldPromoteLevel", "CurPromoteLevel", "Retcode", "TargetWeaponGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java
index b2048015f..b35532882 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java
@@ -19,51 +19,51 @@ public final class WidgetCoolDownNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
     java.util.List 
-        getMPJGKFJBHECList();
+        getNormalCoolDownDataListList();
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getMPJGKFJBHEC(int index);
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index);
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
-    int getMPJGKFJBHECCount();
+    int getNormalCoolDownDataListCount();
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
     java.util.List 
-        getMPJGKFJBHECOrBuilderList();
+        getNormalCoolDownDataListOrBuilderList();
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getMPJGKFJBHECOrBuilder(
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
         int index);
 
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
     java.util.List 
-        getPEOHMDJKMKOList();
+        getGroupCoolDownDataListList();
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getPEOHMDJKMKO(int index);
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index);
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
-    int getPEOHMDJKMKOCount();
+    int getGroupCoolDownDataListCount();
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
     java.util.List 
-        getPEOHMDJKMKOOrBuilderList();
+        getGroupCoolDownDataListOrBuilderList();
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
-    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getPEOHMDJKMKOOrBuilder(
+    emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder(
         int index);
   }
   /**
@@ -84,8 +84,8 @@ public final class WidgetCoolDownNotifyOuterClass {
       super(builder);
     }
     private WidgetCoolDownNotify() {
-      mPJGKFJBHEC_ = java.util.Collections.emptyList();
-      pEOHMDJKMKO_ = java.util.Collections.emptyList();
+      normalCoolDownDataList_ = java.util.Collections.emptyList();
+      groupCoolDownDataList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -121,19 +121,19 @@ public final class WidgetCoolDownNotifyOuterClass {
               break;
             case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                mPJGKFJBHEC_ = new java.util.ArrayList();
+                normalCoolDownDataList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              mPJGKFJBHEC_.add(
+              normalCoolDownDataList_.add(
                   input.readMessage(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.parser(), extensionRegistry));
               break;
             }
             case 82: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                pEOHMDJKMKO_ = new java.util.ArrayList();
+                groupCoolDownDataList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              pEOHMDJKMKO_.add(
+              groupCoolDownDataList_.add(
                   input.readMessage(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.parser(), extensionRegistry));
               break;
             }
@@ -153,10 +153,10 @@ public final class WidgetCoolDownNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          mPJGKFJBHEC_ = java.util.Collections.unmodifiableList(mPJGKFJBHEC_);
+          normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          pEOHMDJKMKO_ = java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+          groupCoolDownDataList_ = java.util.Collections.unmodifiableList(groupCoolDownDataList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -175,84 +175,84 @@ public final class WidgetCoolDownNotifyOuterClass {
               emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.class, emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.Builder.class);
     }
 
-    public static final int MPJGKFJBHEC_FIELD_NUMBER = 7;
-    private java.util.List mPJGKFJBHEC_;
+    public static final int NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 7;
+    private java.util.List normalCoolDownDataList_;
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
     @java.lang.Override
-    public java.util.List getMPJGKFJBHECList() {
-      return mPJGKFJBHEC_;
+    public java.util.List getNormalCoolDownDataListList() {
+      return normalCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
     @java.lang.Override
     public java.util.List 
-        getMPJGKFJBHECOrBuilderList() {
-      return mPJGKFJBHEC_;
+        getNormalCoolDownDataListOrBuilderList() {
+      return normalCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
     @java.lang.Override
-    public int getMPJGKFJBHECCount() {
-      return mPJGKFJBHEC_.size();
+    public int getNormalCoolDownDataListCount() {
+      return normalCoolDownDataList_.size();
     }
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getMPJGKFJBHEC(int index) {
-      return mPJGKFJBHEC_.get(index);
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
+      return normalCoolDownDataList_.get(index);
     }
     /**
-     * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getMPJGKFJBHECOrBuilder(
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
         int index) {
-      return mPJGKFJBHEC_.get(index);
+      return normalCoolDownDataList_.get(index);
     }
 
-    public static final int PEOHMDJKMKO_FIELD_NUMBER = 10;
-    private java.util.List pEOHMDJKMKO_;
+    public static final int GROUP_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 10;
+    private java.util.List groupCoolDownDataList_;
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
     @java.lang.Override
-    public java.util.List getPEOHMDJKMKOList() {
-      return pEOHMDJKMKO_;
+    public java.util.List getGroupCoolDownDataListList() {
+      return groupCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
     @java.lang.Override
     public java.util.List 
-        getPEOHMDJKMKOOrBuilderList() {
-      return pEOHMDJKMKO_;
+        getGroupCoolDownDataListOrBuilderList() {
+      return groupCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
     @java.lang.Override
-    public int getPEOHMDJKMKOCount() {
-      return pEOHMDJKMKO_.size();
+    public int getGroupCoolDownDataListCount() {
+      return groupCoolDownDataList_.size();
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getPEOHMDJKMKO(int index) {
-      return pEOHMDJKMKO_.get(index);
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index) {
+      return groupCoolDownDataList_.get(index);
     }
     /**
-     * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getPEOHMDJKMKOOrBuilder(
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder(
         int index) {
-      return pEOHMDJKMKO_.get(index);
+      return groupCoolDownDataList_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -269,11 +269,11 @@ public final class WidgetCoolDownNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < mPJGKFJBHEC_.size(); i++) {
-        output.writeMessage(7, mPJGKFJBHEC_.get(i));
+      for (int i = 0; i < normalCoolDownDataList_.size(); i++) {
+        output.writeMessage(7, normalCoolDownDataList_.get(i));
       }
-      for (int i = 0; i < pEOHMDJKMKO_.size(); i++) {
-        output.writeMessage(10, pEOHMDJKMKO_.get(i));
+      for (int i = 0; i < groupCoolDownDataList_.size(); i++) {
+        output.writeMessage(10, groupCoolDownDataList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -284,13 +284,13 @@ public final class WidgetCoolDownNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < mPJGKFJBHEC_.size(); i++) {
+      for (int i = 0; i < normalCoolDownDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, mPJGKFJBHEC_.get(i));
+          .computeMessageSize(7, normalCoolDownDataList_.get(i));
       }
-      for (int i = 0; i < pEOHMDJKMKO_.size(); i++) {
+      for (int i = 0; i < groupCoolDownDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, pEOHMDJKMKO_.get(i));
+          .computeMessageSize(10, groupCoolDownDataList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -307,10 +307,10 @@ public final class WidgetCoolDownNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify other = (emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify) obj;
 
-      if (!getMPJGKFJBHECList()
-          .equals(other.getMPJGKFJBHECList())) return false;
-      if (!getPEOHMDJKMKOList()
-          .equals(other.getPEOHMDJKMKOList())) return false;
+      if (!getNormalCoolDownDataListList()
+          .equals(other.getNormalCoolDownDataListList())) return false;
+      if (!getGroupCoolDownDataListList()
+          .equals(other.getGroupCoolDownDataListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -322,13 +322,13 @@ public final class WidgetCoolDownNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getMPJGKFJBHECCount() > 0) {
-        hash = (37 * hash) + MPJGKFJBHEC_FIELD_NUMBER;
-        hash = (53 * hash) + getMPJGKFJBHECList().hashCode();
+      if (getNormalCoolDownDataListCount() > 0) {
+        hash = (37 * hash) + NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getNormalCoolDownDataListList().hashCode();
       }
-      if (getPEOHMDJKMKOCount() > 0) {
-        hash = (37 * hash) + PEOHMDJKMKO_FIELD_NUMBER;
-        hash = (53 * hash) + getPEOHMDJKMKOList().hashCode();
+      if (getGroupCoolDownDataListCount() > 0) {
+        hash = (37 * hash) + GROUP_COOL_DOWN_DATA_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getGroupCoolDownDataListList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -463,24 +463,24 @@ public final class WidgetCoolDownNotifyOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getMPJGKFJBHECFieldBuilder();
-          getPEOHMDJKMKOFieldBuilder();
+          getNormalCoolDownDataListFieldBuilder();
+          getGroupCoolDownDataListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (mPJGKFJBHECBuilder_ == null) {
-          mPJGKFJBHEC_ = java.util.Collections.emptyList();
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          mPJGKFJBHECBuilder_.clear();
+          normalCoolDownDataListBuilder_.clear();
         }
-        if (pEOHMDJKMKOBuilder_ == null) {
-          pEOHMDJKMKO_ = java.util.Collections.emptyList();
+        if (groupCoolDownDataListBuilder_ == null) {
+          groupCoolDownDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
-          pEOHMDJKMKOBuilder_.clear();
+          groupCoolDownDataListBuilder_.clear();
         }
         return this;
       }
@@ -509,23 +509,23 @@ public final class WidgetCoolDownNotifyOuterClass {
       public emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify buildPartial() {
         emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify result = new emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify(this);
         int from_bitField0_ = bitField0_;
-        if (mPJGKFJBHECBuilder_ == null) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
-            mPJGKFJBHEC_ = java.util.Collections.unmodifiableList(mPJGKFJBHEC_);
+            normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
             bitField0_ = (bitField0_ & ~0x00000001);
           }
-          result.mPJGKFJBHEC_ = mPJGKFJBHEC_;
+          result.normalCoolDownDataList_ = normalCoolDownDataList_;
         } else {
-          result.mPJGKFJBHEC_ = mPJGKFJBHECBuilder_.build();
+          result.normalCoolDownDataList_ = normalCoolDownDataListBuilder_.build();
         }
-        if (pEOHMDJKMKOBuilder_ == null) {
+        if (groupCoolDownDataListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
-            pEOHMDJKMKO_ = java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+            groupCoolDownDataList_ = java.util.Collections.unmodifiableList(groupCoolDownDataList_);
             bitField0_ = (bitField0_ & ~0x00000002);
           }
-          result.pEOHMDJKMKO_ = pEOHMDJKMKO_;
+          result.groupCoolDownDataList_ = groupCoolDownDataList_;
         } else {
-          result.pEOHMDJKMKO_ = pEOHMDJKMKOBuilder_.build();
+          result.groupCoolDownDataList_ = groupCoolDownDataListBuilder_.build();
         }
         onBuilt();
         return result;
@@ -575,55 +575,55 @@ public final class WidgetCoolDownNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify other) {
         if (other == emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.getDefaultInstance()) return this;
-        if (mPJGKFJBHECBuilder_ == null) {
-          if (!other.mPJGKFJBHEC_.isEmpty()) {
-            if (mPJGKFJBHEC_.isEmpty()) {
-              mPJGKFJBHEC_ = other.mPJGKFJBHEC_;
+        if (normalCoolDownDataListBuilder_ == null) {
+          if (!other.normalCoolDownDataList_.isEmpty()) {
+            if (normalCoolDownDataList_.isEmpty()) {
+              normalCoolDownDataList_ = other.normalCoolDownDataList_;
               bitField0_ = (bitField0_ & ~0x00000001);
             } else {
-              ensureMPJGKFJBHECIsMutable();
-              mPJGKFJBHEC_.addAll(other.mPJGKFJBHEC_);
+              ensureNormalCoolDownDataListIsMutable();
+              normalCoolDownDataList_.addAll(other.normalCoolDownDataList_);
             }
             onChanged();
           }
         } else {
-          if (!other.mPJGKFJBHEC_.isEmpty()) {
-            if (mPJGKFJBHECBuilder_.isEmpty()) {
-              mPJGKFJBHECBuilder_.dispose();
-              mPJGKFJBHECBuilder_ = null;
-              mPJGKFJBHEC_ = other.mPJGKFJBHEC_;
+          if (!other.normalCoolDownDataList_.isEmpty()) {
+            if (normalCoolDownDataListBuilder_.isEmpty()) {
+              normalCoolDownDataListBuilder_.dispose();
+              normalCoolDownDataListBuilder_ = null;
+              normalCoolDownDataList_ = other.normalCoolDownDataList_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              mPJGKFJBHECBuilder_ = 
+              normalCoolDownDataListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getMPJGKFJBHECFieldBuilder() : null;
+                   getNormalCoolDownDataListFieldBuilder() : null;
             } else {
-              mPJGKFJBHECBuilder_.addAllMessages(other.mPJGKFJBHEC_);
+              normalCoolDownDataListBuilder_.addAllMessages(other.normalCoolDownDataList_);
             }
           }
         }
-        if (pEOHMDJKMKOBuilder_ == null) {
-          if (!other.pEOHMDJKMKO_.isEmpty()) {
-            if (pEOHMDJKMKO_.isEmpty()) {
-              pEOHMDJKMKO_ = other.pEOHMDJKMKO_;
+        if (groupCoolDownDataListBuilder_ == null) {
+          if (!other.groupCoolDownDataList_.isEmpty()) {
+            if (groupCoolDownDataList_.isEmpty()) {
+              groupCoolDownDataList_ = other.groupCoolDownDataList_;
               bitField0_ = (bitField0_ & ~0x00000002);
             } else {
-              ensurePEOHMDJKMKOIsMutable();
-              pEOHMDJKMKO_.addAll(other.pEOHMDJKMKO_);
+              ensureGroupCoolDownDataListIsMutable();
+              groupCoolDownDataList_.addAll(other.groupCoolDownDataList_);
             }
             onChanged();
           }
         } else {
-          if (!other.pEOHMDJKMKO_.isEmpty()) {
-            if (pEOHMDJKMKOBuilder_.isEmpty()) {
-              pEOHMDJKMKOBuilder_.dispose();
-              pEOHMDJKMKOBuilder_ = null;
-              pEOHMDJKMKO_ = other.pEOHMDJKMKO_;
+          if (!other.groupCoolDownDataList_.isEmpty()) {
+            if (groupCoolDownDataListBuilder_.isEmpty()) {
+              groupCoolDownDataListBuilder_.dispose();
+              groupCoolDownDataListBuilder_ = null;
+              groupCoolDownDataList_ = other.groupCoolDownDataList_;
               bitField0_ = (bitField0_ & ~0x00000002);
-              pEOHMDJKMKOBuilder_ = 
+              groupCoolDownDataListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getPEOHMDJKMKOFieldBuilder() : null;
+                   getGroupCoolDownDataListFieldBuilder() : null;
             } else {
-              pEOHMDJKMKOBuilder_.addAllMessages(other.pEOHMDJKMKO_);
+              groupCoolDownDataListBuilder_.addAllMessages(other.groupCoolDownDataList_);
             }
           }
         }
@@ -657,484 +657,484 @@ public final class WidgetCoolDownNotifyOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List mPJGKFJBHEC_ =
+      private java.util.List normalCoolDownDataList_ =
         java.util.Collections.emptyList();
-      private void ensureMPJGKFJBHECIsMutable() {
+      private void ensureNormalCoolDownDataListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          mPJGKFJBHEC_ = new java.util.ArrayList(mPJGKFJBHEC_);
+          normalCoolDownDataList_ = new java.util.ArrayList(normalCoolDownDataList_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> mPJGKFJBHECBuilder_;
+          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> normalCoolDownDataListBuilder_;
 
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public java.util.List getMPJGKFJBHECList() {
-        if (mPJGKFJBHECBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(mPJGKFJBHEC_);
+      public java.util.List getNormalCoolDownDataListList() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
         } else {
-          return mPJGKFJBHECBuilder_.getMessageList();
+          return normalCoolDownDataListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public int getMPJGKFJBHECCount() {
-        if (mPJGKFJBHECBuilder_ == null) {
-          return mPJGKFJBHEC_.size();
+      public int getNormalCoolDownDataListCount() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.size();
         } else {
-          return mPJGKFJBHECBuilder_.getCount();
+          return normalCoolDownDataListBuilder_.getCount();
         }
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getMPJGKFJBHEC(int index) {
-        if (mPJGKFJBHECBuilder_ == null) {
-          return mPJGKFJBHEC_.get(index);
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.get(index);
         } else {
-          return mPJGKFJBHECBuilder_.getMessage(index);
+          return normalCoolDownDataListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder setMPJGKFJBHEC(
+      public Builder setNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (mPJGKFJBHECBuilder_ == null) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureMPJGKFJBHECIsMutable();
-          mPJGKFJBHEC_.set(index, value);
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.set(index, value);
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.setMessage(index, value);
+          normalCoolDownDataListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder setMPJGKFJBHEC(
+      public Builder setNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (mPJGKFJBHECBuilder_ == null) {
-          ensureMPJGKFJBHECIsMutable();
-          mPJGKFJBHEC_.set(index, builderForValue.build());
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.setMessage(index, builderForValue.build());
+          normalCoolDownDataListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder addMPJGKFJBHEC(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (mPJGKFJBHECBuilder_ == null) {
+      public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureMPJGKFJBHECIsMutable();
-          mPJGKFJBHEC_.add(value);
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(value);
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.addMessage(value);
+          normalCoolDownDataListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder addMPJGKFJBHEC(
+      public Builder addNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (mPJGKFJBHECBuilder_ == null) {
+        if (normalCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureMPJGKFJBHECIsMutable();
-          mPJGKFJBHEC_.add(index, value);
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(index, value);
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.addMessage(index, value);
+          normalCoolDownDataListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder addMPJGKFJBHEC(
+      public Builder addNormalCoolDownDataList(
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (mPJGKFJBHECBuilder_ == null) {
-          ensureMPJGKFJBHECIsMutable();
-          mPJGKFJBHEC_.add(builderForValue.build());
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(builderForValue.build());
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.addMessage(builderForValue.build());
+          normalCoolDownDataListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder addMPJGKFJBHEC(
+      public Builder addNormalCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (mPJGKFJBHECBuilder_ == null) {
-          ensureMPJGKFJBHECIsMutable();
-          mPJGKFJBHEC_.add(index, builderForValue.build());
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.addMessage(index, builderForValue.build());
+          normalCoolDownDataListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder addAllMPJGKFJBHEC(
+      public Builder addAllNormalCoolDownDataList(
           java.lang.Iterable values) {
-        if (mPJGKFJBHECBuilder_ == null) {
-          ensureMPJGKFJBHECIsMutable();
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, mPJGKFJBHEC_);
+              values, normalCoolDownDataList_);
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.addAllMessages(values);
+          normalCoolDownDataListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder clearMPJGKFJBHEC() {
-        if (mPJGKFJBHECBuilder_ == null) {
-          mPJGKFJBHEC_ = java.util.Collections.emptyList();
+      public Builder clearNormalCoolDownDataList() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.clear();
+          normalCoolDownDataListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public Builder removeMPJGKFJBHEC(int index) {
-        if (mPJGKFJBHECBuilder_ == null) {
-          ensureMPJGKFJBHECIsMutable();
-          mPJGKFJBHEC_.remove(index);
+      public Builder removeNormalCoolDownDataList(int index) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.remove(index);
           onChanged();
         } else {
-          mPJGKFJBHECBuilder_.remove(index);
+          normalCoolDownDataListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getMPJGKFJBHECBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getNormalCoolDownDataListBuilder(
           int index) {
-        return getMPJGKFJBHECFieldBuilder().getBuilder(index);
+        return getNormalCoolDownDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getMPJGKFJBHECOrBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
           int index) {
-        if (mPJGKFJBHECBuilder_ == null) {
-          return mPJGKFJBHEC_.get(index);  } else {
-          return mPJGKFJBHECBuilder_.getMessageOrBuilder(index);
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.get(index);  } else {
+          return normalCoolDownDataListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
       public java.util.List 
-           getMPJGKFJBHECOrBuilderList() {
-        if (mPJGKFJBHECBuilder_ != null) {
-          return mPJGKFJBHECBuilder_.getMessageOrBuilderList();
+           getNormalCoolDownDataListOrBuilderList() {
+        if (normalCoolDownDataListBuilder_ != null) {
+          return normalCoolDownDataListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(mPJGKFJBHEC_);
+          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
         }
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addMPJGKFJBHECBuilder() {
-        return getMPJGKFJBHECFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder() {
+        return getNormalCoolDownDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addMPJGKFJBHECBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder(
           int index) {
-        return getMPJGKFJBHECFieldBuilder().addBuilder(
+        return getNormalCoolDownDataListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData MPJGKFJBHEC = 7;
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
        */
       public java.util.List 
-           getMPJGKFJBHECBuilderList() {
-        return getMPJGKFJBHECFieldBuilder().getBuilderList();
+           getNormalCoolDownDataListBuilderList() {
+        return getNormalCoolDownDataListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> 
-          getMPJGKFJBHECFieldBuilder() {
-        if (mPJGKFJBHECBuilder_ == null) {
-          mPJGKFJBHECBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getNormalCoolDownDataListFieldBuilder() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder>(
-                  mPJGKFJBHEC_,
+                  normalCoolDownDataList_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
-          mPJGKFJBHEC_ = null;
+          normalCoolDownDataList_ = null;
         }
-        return mPJGKFJBHECBuilder_;
+        return normalCoolDownDataListBuilder_;
       }
 
-      private java.util.List pEOHMDJKMKO_ =
+      private java.util.List groupCoolDownDataList_ =
         java.util.Collections.emptyList();
-      private void ensurePEOHMDJKMKOIsMutable() {
+      private void ensureGroupCoolDownDataListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          pEOHMDJKMKO_ = new java.util.ArrayList(pEOHMDJKMKO_);
+          groupCoolDownDataList_ = new java.util.ArrayList(groupCoolDownDataList_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> pEOHMDJKMKOBuilder_;
+          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> groupCoolDownDataListBuilder_;
 
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public java.util.List getPEOHMDJKMKOList() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+      public java.util.List getGroupCoolDownDataListList() {
+        if (groupCoolDownDataListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(groupCoolDownDataList_);
         } else {
-          return pEOHMDJKMKOBuilder_.getMessageList();
+          return groupCoolDownDataListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public int getPEOHMDJKMKOCount() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return pEOHMDJKMKO_.size();
+      public int getGroupCoolDownDataListCount() {
+        if (groupCoolDownDataListBuilder_ == null) {
+          return groupCoolDownDataList_.size();
         } else {
-          return pEOHMDJKMKOBuilder_.getCount();
+          return groupCoolDownDataListBuilder_.getCount();
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getPEOHMDJKMKO(int index) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return pEOHMDJKMKO_.get(index);
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index) {
+        if (groupCoolDownDataListBuilder_ == null) {
+          return groupCoolDownDataList_.get(index);
         } else {
-          return pEOHMDJKMKOBuilder_.getMessage(index);
+          return groupCoolDownDataListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder setPEOHMDJKMKO(
+      public Builder setGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (pEOHMDJKMKOBuilder_ == null) {
+        if (groupCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.set(index, value);
+          ensureGroupCoolDownDataListIsMutable();
+          groupCoolDownDataList_.set(index, value);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.setMessage(index, value);
+          groupCoolDownDataListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder setPEOHMDJKMKO(
+      public Builder setGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.set(index, builderForValue.build());
+        if (groupCoolDownDataListBuilder_ == null) {
+          ensureGroupCoolDownDataListIsMutable();
+          groupCoolDownDataList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.setMessage(index, builderForValue.build());
+          groupCoolDownDataListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder addPEOHMDJKMKO(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (pEOHMDJKMKOBuilder_ == null) {
+      public Builder addGroupCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
+        if (groupCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(value);
+          ensureGroupCoolDownDataListIsMutable();
+          groupCoolDownDataList_.add(value);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(value);
+          groupCoolDownDataListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder addPEOHMDJKMKO(
+      public Builder addGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (pEOHMDJKMKOBuilder_ == null) {
+        if (groupCoolDownDataListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(index, value);
+          ensureGroupCoolDownDataListIsMutable();
+          groupCoolDownDataList_.add(index, value);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(index, value);
+          groupCoolDownDataListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder addPEOHMDJKMKO(
+      public Builder addGroupCoolDownDataList(
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(builderForValue.build());
+        if (groupCoolDownDataListBuilder_ == null) {
+          ensureGroupCoolDownDataListIsMutable();
+          groupCoolDownDataList_.add(builderForValue.build());
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(builderForValue.build());
+          groupCoolDownDataListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder addPEOHMDJKMKO(
+      public Builder addGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.add(index, builderForValue.build());
+        if (groupCoolDownDataListBuilder_ == null) {
+          ensureGroupCoolDownDataListIsMutable();
+          groupCoolDownDataList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addMessage(index, builderForValue.build());
+          groupCoolDownDataListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder addAllPEOHMDJKMKO(
+      public Builder addAllGroupCoolDownDataList(
           java.lang.Iterable values) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
+        if (groupCoolDownDataListBuilder_ == null) {
+          ensureGroupCoolDownDataListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, pEOHMDJKMKO_);
+              values, groupCoolDownDataList_);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.addAllMessages(values);
+          groupCoolDownDataListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder clearPEOHMDJKMKO() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          pEOHMDJKMKO_ = java.util.Collections.emptyList();
+      public Builder clearGroupCoolDownDataList() {
+        if (groupCoolDownDataListBuilder_ == null) {
+          groupCoolDownDataList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.clear();
+          groupCoolDownDataListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public Builder removePEOHMDJKMKO(int index) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          ensurePEOHMDJKMKOIsMutable();
-          pEOHMDJKMKO_.remove(index);
+      public Builder removeGroupCoolDownDataList(int index) {
+        if (groupCoolDownDataListBuilder_ == null) {
+          ensureGroupCoolDownDataListIsMutable();
+          groupCoolDownDataList_.remove(index);
           onChanged();
         } else {
-          pEOHMDJKMKOBuilder_.remove(index);
+          groupCoolDownDataListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getPEOHMDJKMKOBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getGroupCoolDownDataListBuilder(
           int index) {
-        return getPEOHMDJKMKOFieldBuilder().getBuilder(index);
+        return getGroupCoolDownDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getPEOHMDJKMKOOrBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder(
           int index) {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          return pEOHMDJKMKO_.get(index);  } else {
-          return pEOHMDJKMKOBuilder_.getMessageOrBuilder(index);
+        if (groupCoolDownDataListBuilder_ == null) {
+          return groupCoolDownDataList_.get(index);  } else {
+          return groupCoolDownDataListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
       public java.util.List 
-           getPEOHMDJKMKOOrBuilderList() {
-        if (pEOHMDJKMKOBuilder_ != null) {
-          return pEOHMDJKMKOBuilder_.getMessageOrBuilderList();
+           getGroupCoolDownDataListOrBuilderList() {
+        if (groupCoolDownDataListBuilder_ != null) {
+          return groupCoolDownDataListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(pEOHMDJKMKO_);
+          return java.util.Collections.unmodifiableList(groupCoolDownDataList_);
         }
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addPEOHMDJKMKOBuilder() {
-        return getPEOHMDJKMKOFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addGroupCoolDownDataListBuilder() {
+        return getGroupCoolDownDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addPEOHMDJKMKOBuilder(
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addGroupCoolDownDataListBuilder(
           int index) {
-        return getPEOHMDJKMKOFieldBuilder().addBuilder(
+        return getGroupCoolDownDataListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData PEOHMDJKMKO = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
        */
       public java.util.List 
-           getPEOHMDJKMKOBuilderList() {
-        return getPEOHMDJKMKOFieldBuilder().getBuilderList();
+           getGroupCoolDownDataListBuilderList() {
+        return getGroupCoolDownDataListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> 
-          getPEOHMDJKMKOFieldBuilder() {
-        if (pEOHMDJKMKOBuilder_ == null) {
-          pEOHMDJKMKOBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getGroupCoolDownDataListFieldBuilder() {
+        if (groupCoolDownDataListBuilder_ == null) {
+          groupCoolDownDataListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder>(
-                  pEOHMDJKMKO_,
+                  groupCoolDownDataList_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
-          pEOHMDJKMKO_ = null;
+          groupCoolDownDataList_ = null;
         }
-        return pEOHMDJKMKOBuilder_;
+        return groupCoolDownDataListBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1204,10 +1204,11 @@ public final class WidgetCoolDownNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032WidgetCoolDownNotify.proto\032\030WidgetCool" +
-      "DownData.proto\"j\n\024WidgetCoolDownNotify\022(" +
-      "\n\013MPJGKFJBHEC\030\007 \003(\0132\023.WidgetCoolDownData" +
-      "\022(\n\013PEOHMDJKMKO\030\n \003(\0132\023.WidgetCoolDownDa" +
-      "taB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "DownData.proto\"\207\001\n\024WidgetCoolDownNotify\022" +
+      "7\n\032normal_cool_down_data_list\030\007 \003(\0132\023.Wi" +
+      "dgetCoolDownData\0226\n\031group_cool_down_data" +
+      "_list\030\n \003(\0132\023.WidgetCoolDownDataB\033\n\031emu." +
+      "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1219,7 +1220,7 @@ public final class WidgetCoolDownNotifyOuterClass {
     internal_static_WidgetCoolDownNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WidgetCoolDownNotify_descriptor,
-        new java.lang.String[] { "MPJGKFJBHEC", "PEOHMDJKMKO", });
+        new java.lang.String[] { "NormalCoolDownDataList", "GroupCoolDownDataList", });
     emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.getDescriptor();
   }
 
diff --git a/src/main/java/emu/grasscutter/GameConstants.java b/src/main/java/emu/grasscutter/GameConstants.java
index 8640dfaa3..535eb305a 100644
--- a/src/main/java/emu/grasscutter/GameConstants.java
+++ b/src/main/java/emu/grasscutter/GameConstants.java
@@ -6,7 +6,7 @@ import emu.grasscutter.utils.Utils;
 import java.util.Arrays;
 
 public final class GameConstants {
-    public static String VERSION = "3.7.0";
+    public static String VERSION = "4.0.0";
     public static boolean DEBUG = false;
 
     public static final int DEFAULT_TEAMS = 4;
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityItem.java b/src/main/java/emu/grasscutter/game/entity/EntityItem.java
index 6e150d2fe..3946ab3f3 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityItem.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityItem.java
@@ -3,11 +3,8 @@ package emu.grasscutter.game.entity;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.world.Position;
-import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
@@ -22,6 +19,7 @@ import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
 import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
 import emu.grasscutter.utils.helpers.ProtoHelper;
@@ -147,7 +145,7 @@ public class EntityItem extends EntityBaseGadget {
         SceneGadgetInfo.Builder gadgetInfo =
                 SceneGadgetInfo.newBuilder()
                         .setGadgetId(this.getItemData().getGadgetId())
-                        .setTrifleItem(this.getItem().toProto())
+                        .setTrifleGadget(TrifleGadget.newBuilder().setItem(this.getItem().toProto()))
                         .setBornType(GadgetBornType.GADGET_BORN_TYPE_IN_AIR)
                         .setAuthorityPeerId(this.getWorld().getHostPeerId())
                         .setIsEnableInteract(true);
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireWorkReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireWorkReq.java
index abeeb6f17..e18d9249a 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireWorkReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireWorkReq.java
@@ -3,7 +3,7 @@ package emu.grasscutter.server.packet.recv;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FireWorkReqOuterClass;
+import emu.grasscutter.net.proto.LaunchFireworksReqOuterClass.LaunchFireworksReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketFireworkNotify;
 import emu.grasscutter.server.packet.send.PacketFireworkRsp;
@@ -12,9 +12,8 @@ import emu.grasscutter.server.packet.send.PacketFireworkRsp;
 public class HandlerFireWorkReq extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-
-        var req = FireWorkReqOuterClass.FireWorkReq.parseFrom(payload);
-        session.send(new PacketFireworkNotify(req.getFireWorkData()));
+        var req = LaunchFireworksReq.parseFrom(payload);
+        session.send(new PacketFireworkNotify(req.getSchemeData()));
         session.send(new PacketFireworkRsp());
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireworkSetReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireworkSetReq.java
index 75a59b9f9..79ff30311 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireworkSetReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerFireworkSetReq.java
@@ -1,21 +1,17 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FireworkSetReqOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.ReformFireworksReqOuterClass.ReformFireworksReq;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketFireworkSetNotify;
-import emu.grasscutter.server.packet.send.PacketFireworkSetRsp;
+import emu.grasscutter.server.packet.send.*;
 
 @Opcodes(PacketOpcodes.FireworkSetReq)
 public class HandlerFireworkSetReq extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var req = ReformFireworksReq.parseFrom(payload);
 
-        var req = FireworkSetReqOuterClass.FireworkSetReq.parseFrom(payload);
-
-        session.send(new PacketFireworkSetNotify(req.getData()));
+        session.send(new PacketFireworkSetNotify(req.getFireworksReformData()));
         session.send(new PacketFireworkSetRsp());
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkNotify.java
index aa7352529..d050e97af 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkNotify.java
@@ -1,19 +1,13 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FireWorkDataOuterClass;
-import emu.grasscutter.net.proto.FireWorkNotifyOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.FireworksLaunchDataNotifyOuterClass.FireworksLaunchDataNotify;
+import emu.grasscutter.net.proto.FireworksLaunchSchemeDataOuterClass.FireworksLaunchSchemeData;
 
 public class PacketFireworkNotify extends BasePacket {
-
-    public PacketFireworkNotify(FireWorkDataOuterClass.FireWorkData pinfo) {
+    public PacketFireworkNotify(FireworksLaunchSchemeData data) {
         super(PacketOpcodes.FireworkNotify);
 
-        var proto = FireWorkNotifyOuterClass.FireWorkNotify.newBuilder();
-
-        proto.addFireWorkData(pinfo);
-
-        setData(proto.build());
+        this.setData(FireworksLaunchDataNotify.newBuilder().addSchemeDataList(data));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetNotify.java
index 211dce5d8..cc36c013e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetNotify.java
@@ -1,19 +1,14 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FireworkSetDataOuterClass;
-import emu.grasscutter.net.proto.FireworkSetNotifyOuterClass;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.FireworksReformDataNotifyOuterClass.FireworksReformDataNotify;
+import emu.grasscutter.net.proto.FireworksReformDataOuterClass.FireworksReformData;
 
 public class PacketFireworkSetNotify extends BasePacket {
 
-    public PacketFireworkSetNotify(FireworkSetDataOuterClass.FireworkSetData notify) {
+    public PacketFireworkSetNotify(FireworksReformData data) {
         super(PacketOpcodes.FireworkSetNotify);
 
-        var proto = FireworkSetNotifyOuterClass.FireworkSetNotify.newBuilder();
-
-        proto.setCode(1).addData(notify);
-
-        setData(proto.build());
+        this.setData(FireworksReformDataNotify.newBuilder().addFireworksReformDataList(data));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetRsp.java
index 8f240c670..ae11c96af 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFireworkSetRsp.java
@@ -1,11 +1,13 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
+import emu.grasscutter.net.proto.ReformFireworksRspOuterClass.ReformFireworksRsp;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 
 public class PacketFireworkSetRsp extends BasePacket {
-
     public PacketFireworkSetRsp() {
         super(PacketOpcodes.FireworkSetRsp);
+
+        this.setData(ReformFireworksRsp.newBuilder().setRetcode(Retcode.RET_SUCC.getNumber()));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java
index 9a886a9e1..fac0dbbaa 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java
@@ -14,7 +14,7 @@ public class PacketGachaWishRsp extends BasePacket {
                 GachaWishRsp.newBuilder()
                         .setGachaType(gachaType)
                         .setGachaScheduleId(scheduleId)
-                        .setTenCostItemId(itemId)
+                        .setWishItemId(itemId)
                         .setWishProgress(progress)
                         .setWishMaxProgress(maxProgress)
                         .build();
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java
index 2f681d75c..7b749aa3b 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java
+++ b/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")
-                        .setRegPlatform(3)
+                        .setEMFDHANIAHH(3) // setRegPlatform
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .build();
 
@@ -46,7 +46,7 @@ public class PacketGetPlayerTokenRsp extends BasePacket {
                         .setRetcode(retcode)
                         .setMsg(msg)
                         .setBlackUidEndTime(blackEndTime)
-                        .setRegPlatform(3)
+                        .setEMFDHANIAHH(3) // setRegPlatform
                         .setCountryCode("US")
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .build();
@@ -73,7 +73,7 @@ public class PacketGetPlayerTokenRsp extends BasePacket {
                         .setChannelId(1)
                         .setCountryCode("US")
                         .setClientVersionRandomKey("c25-314dd05b0b5f")
-                        .setRegPlatform(3)
+                        .setEMFDHANIAHH(3) // setRegPlatform
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .setServerRandKey(encryptedSeed)
                         .setSign(encryptedSeedSign)
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
index 83e101f7e..8505a4da5 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
@@ -1,13 +1,11 @@
 package emu.grasscutter.server.packet.send;
 
-import static emu.grasscutter.config.Configuration.GAME_INFO;
-import static emu.grasscutter.config.Configuration.lr;
+import static emu.grasscutter.config.Configuration.*;
 
 import com.google.protobuf.ByteString;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerRunMode;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp;
 import emu.grasscutter.net.proto.QueryCurrRegionHttpRspOuterClass;
 import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo;
@@ -64,9 +62,9 @@ public class PacketPlayerLoginRsp extends BasePacket {
                         .setResVersionConfig(info.getResVersionConfig())
                         .setClientVersionSuffix(info.getClientVersionSuffix())
                         .setClientSilenceVersionSuffix(info.getClientSilenceVersionSuffix())
-                        .setIsScOpen(false)
+                        // .setIsScOpen(false)
                         // .setScInfo(ByteString.copyFrom(new byte[] {}))
-                        .setRegisterCps("mihoyo")
+                        // .setRegisterCps("mihoyo")
                         .setCountryCode("US")
                         .build();