diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java index c08ce8a10..b09f87f12 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java @@ -19,59 +19,59 @@ public final class AbilityFireworkBornTypeOuterClass { com.google.protobuf.MessageOrBuilder { /** - * uint32 effect_index = 14; + * .Vector move_dir = 4; + * @return Whether the moveDir field is set. + */ + boolean hasMoveDir(); + /** + * .Vector move_dir = 4; + * @return The moveDir. + */ + emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); + /** + * .Vector move_dir = 4; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); + + /** + * uint32 effect_index = 7; * @return The effectIndex. */ int getEffectIndex(); /** - * .Vector rot = 5; - * @return Whether the rot field is set. - */ - boolean hasRot(); - /** - * .Vector rot = 5; - * @return The rot. - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); - /** - * .Vector rot = 5; - */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); - - /** - * .Vector pos = 12; + * .Vector pos = 2; * @return Whether the pos field is set. */ boolean hasPos(); /** - * .Vector pos = 12; + * .Vector pos = 2; * @return The pos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); /** - * .Vector pos = 12; + * .Vector pos = 2; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); /** - * .Vector move_dir = 15; - * @return Whether the moveDir field is set. + * .Vector rot = 6; + * @return Whether the rot field is set. */ - boolean hasMoveDir(); + boolean hasRot(); /** - * .Vector move_dir = 15; - * @return The moveDir. + * .Vector rot = 6; + * @return The rot. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); /** - * .Vector move_dir = 15; + * .Vector rot = 6; */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); } /** *
-   * Obf: KNMNMIBIHEK
+   * Obf: IEELHDCPPBO
    * 
* * Protobuf type {@code AbilityFireworkBornType} @@ -118,20 +118,7 @@ public final class AbilityFireworkBornTypeOuterClass { case 0: done = true; break; - case 42: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (rot_ != null) { - subBuilder = rot_.toBuilder(); - } - rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(rot_); - rot_ = subBuilder.buildPartial(); - } - - break; - } - case 98: { + case 18: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (pos_ != null) { subBuilder = pos_.toBuilder(); @@ -144,12 +131,7 @@ public final class AbilityFireworkBornTypeOuterClass { break; } - case 112: { - - effectIndex_ = input.readUInt32(); - break; - } - case 122: { + case 34: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (moveDir_ != null) { subBuilder = moveDir_.toBuilder(); @@ -162,6 +144,24 @@ public final class AbilityFireworkBornTypeOuterClass { break; } + case 50: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (rot_ != null) { + subBuilder = rot_.toBuilder(); + } + rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(rot_); + rot_ = subBuilder.buildPartial(); + } + + break; + } + case 56: { + + effectIndex_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -194,73 +194,10 @@ public final class AbilityFireworkBornTypeOuterClass { emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.class, emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.Builder.class); } - public static final int EFFECT_INDEX_FIELD_NUMBER = 14; - private int effectIndex_; - /** - * uint32 effect_index = 14; - * @return The effectIndex. - */ - @java.lang.Override - public int getEffectIndex() { - return effectIndex_; - } - - public static final int ROT_FIELD_NUMBER = 5; - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; - /** - * .Vector rot = 5; - * @return Whether the rot field is set. - */ - @java.lang.Override - public boolean hasRot() { - return rot_ != null; - } - /** - * .Vector rot = 5; - * @return The rot. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { - return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; - } - /** - * .Vector rot = 5; - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { - return getRot(); - } - - public static final int POS_FIELD_NUMBER = 12; - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; - /** - * .Vector pos = 12; - * @return Whether the pos field is set. - */ - @java.lang.Override - public boolean hasPos() { - return pos_ != null; - } - /** - * .Vector pos = 12; - * @return The pos. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } - /** - * .Vector pos = 12; - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - return getPos(); - } - - public static final int MOVE_DIR_FIELD_NUMBER = 15; + public static final int MOVE_DIR_FIELD_NUMBER = 4; private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; * @return Whether the moveDir field is set. */ @java.lang.Override @@ -268,7 +205,7 @@ public final class AbilityFireworkBornTypeOuterClass { return moveDir_ != null; } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; * @return The moveDir. */ @java.lang.Override @@ -276,13 +213,76 @@ public final class AbilityFireworkBornTypeOuterClass { return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { return getMoveDir(); } + public static final int EFFECT_INDEX_FIELD_NUMBER = 7; + private int effectIndex_; + /** + * uint32 effect_index = 7; + * @return The effectIndex. + */ + @java.lang.Override + public int getEffectIndex() { + return effectIndex_; + } + + public static final int POS_FIELD_NUMBER = 2; + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + /** + * .Vector pos = 2; + * @return Whether the pos field is set. + */ + @java.lang.Override + public boolean hasPos() { + return pos_ != null; + } + /** + * .Vector pos = 2; + * @return The pos. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } + /** + * .Vector pos = 2; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + return getPos(); + } + + public static final int ROT_FIELD_NUMBER = 6; + private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; + /** + * .Vector rot = 6; + * @return Whether the rot field is set. + */ + @java.lang.Override + public boolean hasRot() { + return rot_ != null; + } + /** + * .Vector rot = 6; + * @return The rot. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { + return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + } + /** + * .Vector rot = 6; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { + return getRot(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -297,17 +297,17 @@ public final class AbilityFireworkBornTypeOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (rot_ != null) { - output.writeMessage(5, getRot()); - } if (pos_ != null) { - output.writeMessage(12, getPos()); - } - if (effectIndex_ != 0) { - output.writeUInt32(14, effectIndex_); + output.writeMessage(2, getPos()); } if (moveDir_ != null) { - output.writeMessage(15, getMoveDir()); + output.writeMessage(4, getMoveDir()); + } + if (rot_ != null) { + output.writeMessage(6, getRot()); + } + if (effectIndex_ != 0) { + output.writeUInt32(7, effectIndex_); } unknownFields.writeTo(output); } @@ -318,21 +318,21 @@ public final class AbilityFireworkBornTypeOuterClass { if (size != -1) return size; size = 0; - if (rot_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getRot()); - } if (pos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, getPos()); - } - if (effectIndex_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, effectIndex_); + .computeMessageSize(2, getPos()); } if (moveDir_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getMoveDir()); + .computeMessageSize(4, getMoveDir()); + } + if (rot_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, getRot()); + } + if (effectIndex_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(7, effectIndex_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -349,22 +349,22 @@ public final class AbilityFireworkBornTypeOuterClass { } emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType other = (emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType) obj; + if (hasMoveDir() != other.hasMoveDir()) return false; + if (hasMoveDir()) { + if (!getMoveDir() + .equals(other.getMoveDir())) return false; + } if (getEffectIndex() != other.getEffectIndex()) return false; - if (hasRot() != other.hasRot()) return false; - if (hasRot()) { - if (!getRot() - .equals(other.getRot())) return false; - } if (hasPos() != other.hasPos()) return false; if (hasPos()) { if (!getPos() .equals(other.getPos())) return false; } - if (hasMoveDir() != other.hasMoveDir()) return false; - if (hasMoveDir()) { - if (!getMoveDir() - .equals(other.getMoveDir())) return false; + if (hasRot() != other.hasRot()) return false; + if (hasRot()) { + if (!getRot() + .equals(other.getRot())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -377,19 +377,19 @@ public final class AbilityFireworkBornTypeOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasMoveDir()) { + hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; + hash = (53 * hash) + getMoveDir().hashCode(); + } hash = (37 * hash) + EFFECT_INDEX_FIELD_NUMBER; hash = (53 * hash) + getEffectIndex(); - if (hasRot()) { - hash = (37 * hash) + ROT_FIELD_NUMBER; - hash = (53 * hash) + getRot().hashCode(); - } if (hasPos()) { hash = (37 * hash) + POS_FIELD_NUMBER; hash = (53 * hash) + getPos().hashCode(); } - if (hasMoveDir()) { - hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; - hash = (53 * hash) + getMoveDir().hashCode(); + if (hasRot()) { + hash = (37 * hash) + ROT_FIELD_NUMBER; + hash = (53 * hash) + getRot().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -488,7 +488,7 @@ public final class AbilityFireworkBornTypeOuterClass { } /** *
-     * Obf: KNMNMIBIHEK
+     * Obf: IEELHDCPPBO
      * 
* * Protobuf type {@code AbilityFireworkBornType} @@ -528,25 +528,25 @@ public final class AbilityFireworkBornTypeOuterClass { @java.lang.Override public Builder clear() { super.clear(); + if (moveDirBuilder_ == null) { + moveDir_ = null; + } else { + moveDir_ = null; + moveDirBuilder_ = null; + } effectIndex_ = 0; - if (rotBuilder_ == null) { - rot_ = null; - } else { - rot_ = null; - rotBuilder_ = null; - } if (posBuilder_ == null) { pos_ = null; } else { pos_ = null; posBuilder_ = null; } - if (moveDirBuilder_ == null) { - moveDir_ = null; + if (rotBuilder_ == null) { + rot_ = null; } else { - moveDir_ = null; - moveDirBuilder_ = null; + rot_ = null; + rotBuilder_ = null; } return this; } @@ -574,21 +574,21 @@ public final class AbilityFireworkBornTypeOuterClass { @java.lang.Override public emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType buildPartial() { emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType result = new emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType(this); - result.effectIndex_ = effectIndex_; - if (rotBuilder_ == null) { - result.rot_ = rot_; + if (moveDirBuilder_ == null) { + result.moveDir_ = moveDir_; } else { - result.rot_ = rotBuilder_.build(); + result.moveDir_ = moveDirBuilder_.build(); } + result.effectIndex_ = effectIndex_; if (posBuilder_ == null) { result.pos_ = pos_; } else { result.pos_ = posBuilder_.build(); } - if (moveDirBuilder_ == null) { - result.moveDir_ = moveDir_; + if (rotBuilder_ == null) { + result.rot_ = rot_; } else { - result.moveDir_ = moveDirBuilder_.build(); + result.rot_ = rotBuilder_.build(); } onBuilt(); return result; @@ -638,17 +638,17 @@ public final class AbilityFireworkBornTypeOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType other) { if (other == emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.getDefaultInstance()) return this; + if (other.hasMoveDir()) { + mergeMoveDir(other.getMoveDir()); + } if (other.getEffectIndex() != 0) { setEffectIndex(other.getEffectIndex()); } - if (other.hasRot()) { - mergeRot(other.getRot()); - } if (other.hasPos()) { mergePos(other.getPos()); } - if (other.hasMoveDir()) { - mergeMoveDir(other.getMoveDir()); + if (other.hasRot()) { + mergeRot(other.getRot()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -679,287 +679,18 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } - private int effectIndex_ ; - /** - * uint32 effect_index = 14; - * @return The effectIndex. - */ - @java.lang.Override - public int getEffectIndex() { - return effectIndex_; - } - /** - * uint32 effect_index = 14; - * @param value The effectIndex to set. - * @return This builder for chaining. - */ - public Builder setEffectIndex(int value) { - - effectIndex_ = value; - onChanged(); - return this; - } - /** - * uint32 effect_index = 14; - * @return This builder for chaining. - */ - public Builder clearEffectIndex() { - - effectIndex_ = 0; - onChanged(); - return this; - } - - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; - /** - * .Vector rot = 5; - * @return Whether the rot field is set. - */ - public boolean hasRot() { - return rotBuilder_ != null || rot_ != null; - } - /** - * .Vector rot = 5; - * @return The rot. - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { - if (rotBuilder_ == null) { - return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; - } else { - return rotBuilder_.getMessage(); - } - } - /** - * .Vector rot = 5; - */ - public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (rotBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - rot_ = value; - onChanged(); - } else { - rotBuilder_.setMessage(value); - } - - return this; - } - /** - * .Vector rot = 5; - */ - public Builder setRot( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (rotBuilder_ == null) { - rot_ = builderForValue.build(); - onChanged(); - } else { - rotBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .Vector rot = 5; - */ - public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (rotBuilder_ == null) { - if (rot_ != null) { - rot_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial(); - } else { - rot_ = value; - } - onChanged(); - } else { - rotBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .Vector rot = 5; - */ - public Builder clearRot() { - if (rotBuilder_ == null) { - rot_ = null; - onChanged(); - } else { - rot_ = null; - rotBuilder_ = null; - } - - return this; - } - /** - * .Vector rot = 5; - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { - - onChanged(); - return getRotFieldBuilder().getBuilder(); - } - /** - * .Vector rot = 5; - */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { - if (rotBuilder_ != null) { - return rotBuilder_.getMessageOrBuilder(); - } else { - return rot_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; - } - } - /** - * .Vector rot = 5; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getRotFieldBuilder() { - if (rotBuilder_ == null) { - rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getRot(), - getParentForChildren(), - isClean()); - rot_ = null; - } - return rotBuilder_; - } - - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; - /** - * .Vector pos = 12; - * @return Whether the pos field is set. - */ - public boolean hasPos() { - return posBuilder_ != null || pos_ != null; - } - /** - * .Vector pos = 12; - * @return The pos. - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - if (posBuilder_ == null) { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } else { - return posBuilder_.getMessage(); - } - } - /** - * .Vector pos = 12; - */ - public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - pos_ = value; - onChanged(); - } else { - posBuilder_.setMessage(value); - } - - return this; - } - /** - * .Vector pos = 12; - */ - public Builder setPos( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (posBuilder_ == null) { - pos_ = builderForValue.build(); - onChanged(); - } else { - posBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .Vector pos = 12; - */ - public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (pos_ != null) { - pos_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); - } else { - pos_ = value; - } - onChanged(); - } else { - posBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .Vector pos = 12; - */ - public Builder clearPos() { - if (posBuilder_ == null) { - pos_ = null; - onChanged(); - } else { - pos_ = null; - posBuilder_ = null; - } - - return this; - } - /** - * .Vector pos = 12; - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { - - onChanged(); - return getPosFieldBuilder().getBuilder(); - } - /** - * .Vector pos = 12; - */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - if (posBuilder_ != null) { - return posBuilder_.getMessageOrBuilder(); - } else { - return pos_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } - } - /** - * .Vector pos = 12; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getPosFieldBuilder() { - if (posBuilder_ == null) { - posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getPos(), - getParentForChildren(), - isClean()); - pos_ = null; - } - return posBuilder_; - } - private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> moveDirBuilder_; /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; * @return Whether the moveDir field is set. */ public boolean hasMoveDir() { return moveDirBuilder_ != null || moveDir_ != null; } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; * @return The moveDir. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { @@ -970,7 +701,7 @@ public final class AbilityFireworkBornTypeOuterClass { } } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ public Builder setMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (moveDirBuilder_ == null) { @@ -986,7 +717,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ public Builder setMoveDir( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -1000,7 +731,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ public Builder mergeMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (moveDirBuilder_ == null) { @@ -1018,7 +749,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ public Builder clearMoveDir() { if (moveDirBuilder_ == null) { @@ -1032,7 +763,7 @@ public final class AbilityFireworkBornTypeOuterClass { return this; } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMoveDirBuilder() { @@ -1040,7 +771,7 @@ public final class AbilityFireworkBornTypeOuterClass { return getMoveDirFieldBuilder().getBuilder(); } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { if (moveDirBuilder_ != null) { @@ -1051,7 +782,7 @@ public final class AbilityFireworkBornTypeOuterClass { } } /** - * .Vector move_dir = 15; + * .Vector move_dir = 4; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -1066,6 +797,275 @@ public final class AbilityFireworkBornTypeOuterClass { } return moveDirBuilder_; } + + private int effectIndex_ ; + /** + * uint32 effect_index = 7; + * @return The effectIndex. + */ + @java.lang.Override + public int getEffectIndex() { + return effectIndex_; + } + /** + * uint32 effect_index = 7; + * @param value The effectIndex to set. + * @return This builder for chaining. + */ + public Builder setEffectIndex(int value) { + + effectIndex_ = value; + onChanged(); + return this; + } + /** + * uint32 effect_index = 7; + * @return This builder for chaining. + */ + public Builder clearEffectIndex() { + + effectIndex_ = 0; + onChanged(); + return this; + } + + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; + /** + * .Vector pos = 2; + * @return Whether the pos field is set. + */ + public boolean hasPos() { + return posBuilder_ != null || pos_ != null; + } + /** + * .Vector pos = 2; + * @return The pos. + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + if (posBuilder_ == null) { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } else { + return posBuilder_.getMessage(); + } + } + /** + * .Vector pos = 2; + */ + public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + pos_ = value; + onChanged(); + } else { + posBuilder_.setMessage(value); + } + + return this; + } + /** + * .Vector pos = 2; + */ + public Builder setPos( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (posBuilder_ == null) { + pos_ = builderForValue.build(); + onChanged(); + } else { + posBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .Vector pos = 2; + */ + public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (pos_ != null) { + pos_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); + } else { + pos_ = value; + } + onChanged(); + } else { + posBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .Vector pos = 2; + */ + public Builder clearPos() { + if (posBuilder_ == null) { + pos_ = null; + onChanged(); + } else { + pos_ = null; + posBuilder_ = null; + } + + return this; + } + /** + * .Vector pos = 2; + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { + + onChanged(); + return getPosFieldBuilder().getBuilder(); + } + /** + * .Vector pos = 2; + */ + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + if (posBuilder_ != null) { + return posBuilder_.getMessageOrBuilder(); + } else { + return pos_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } + } + /** + * .Vector pos = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getPosFieldBuilder() { + if (posBuilder_ == null) { + posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getPos(), + getParentForChildren(), + isClean()); + pos_ = null; + } + return posBuilder_; + } + + private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; + /** + * .Vector rot = 6; + * @return Whether the rot field is set. + */ + public boolean hasRot() { + return rotBuilder_ != null || rot_ != null; + } + /** + * .Vector rot = 6; + * @return The rot. + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { + if (rotBuilder_ == null) { + return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + } else { + return rotBuilder_.getMessage(); + } + } + /** + * .Vector rot = 6; + */ + public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (rotBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + rot_ = value; + onChanged(); + } else { + rotBuilder_.setMessage(value); + } + + return this; + } + /** + * .Vector rot = 6; + */ + public Builder setRot( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (rotBuilder_ == null) { + rot_ = builderForValue.build(); + onChanged(); + } else { + rotBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .Vector rot = 6; + */ + public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (rotBuilder_ == null) { + if (rot_ != null) { + rot_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial(); + } else { + rot_ = value; + } + onChanged(); + } else { + rotBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .Vector rot = 6; + */ + public Builder clearRot() { + if (rotBuilder_ == null) { + rot_ = null; + onChanged(); + } else { + rot_ = null; + rotBuilder_ = null; + } + + return this; + } + /** + * .Vector rot = 6; + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { + + onChanged(); + return getRotFieldBuilder().getBuilder(); + } + /** + * .Vector rot = 6; + */ + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { + if (rotBuilder_ != null) { + return rotBuilder_.getMessageOrBuilder(); + } else { + return rot_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + } + } + /** + * .Vector rot = 6; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getRotFieldBuilder() { + if (rotBuilder_ == null) { + rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getRot(), + getParentForChildren(), + isClean()); + rot_ = null; + } + return rotBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1134,9 +1134,9 @@ public final class AbilityFireworkBornTypeOuterClass { static { java.lang.String[] descriptorData = { "\n\035AbilityFireworkBornType.proto\032\014Vector." + - "proto\"v\n\027AbilityFireworkBornType\022\024\n\014effe" + - "ct_index\030\016 \001(\r\022\024\n\003rot\030\005 \001(\0132\007.Vector\022\024\n\003" + - "pos\030\014 \001(\0132\007.Vector\022\031\n\010move_dir\030\017 \001(\0132\007.V" + + "proto\"v\n\027AbilityFireworkBornType\022\031\n\010move" + + "_dir\030\004 \001(\0132\007.Vector\022\024\n\014effect_index\030\007 \001(" + + "\r\022\024\n\003pos\030\002 \001(\0132\007.Vector\022\024\n\003rot\030\006 \001(\0132\007.V" + "ectorB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; @@ -1150,7 +1150,7 @@ public final class AbilityFireworkBornTypeOuterClass { internal_static_AbilityFireworkBornType_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AbilityFireworkBornType_descriptor, - new java.lang.String[] { "EffectIndex", "Rot", "Pos", "MoveDir", }); + new java.lang.String[] { "MoveDir", "EffectIndex", "Pos", "Rot", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java index 861b526e8..c83f9778c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java @@ -19,23 +19,23 @@ public final class AbilityMetaSetPoseParameterOuterClass { com.google.protobuf.MessageOrBuilder { /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; * @return Whether the value field is set. */ boolean hasValue(); /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; * @return The value. */ emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue(); /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder(); } /** *
-   * Obf: AFDPLNIIALH
+   * Obf: FOHAAJOMMPL
    * 
* * Protobuf type {@code AbilityMetaSetPoseParameter} @@ -82,7 +82,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { case 0: done = true; break; - case 10: { + case 122: { emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder subBuilder = null; if (value_ != null) { subBuilder = value_.toBuilder(); @@ -127,10 +127,10 @@ public final class AbilityMetaSetPoseParameterOuterClass { emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.class, emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.Builder.class); } - public static final int VALUE_FIELD_NUMBER = 1; + public static final int VALUE_FIELD_NUMBER = 15; private emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value_; /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; * @return Whether the value field is set. */ @java.lang.Override @@ -138,7 +138,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return value_ != null; } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; * @return The value. */ @java.lang.Override @@ -146,7 +146,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return value_ == null ? emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.getDefaultInstance() : value_; } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ @java.lang.Override public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() { @@ -168,7 +168,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (value_ != null) { - output.writeMessage(1, getValue()); + output.writeMessage(15, getValue()); } unknownFields.writeTo(output); } @@ -181,7 +181,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { size = 0; if (value_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getValue()); + .computeMessageSize(15, getValue()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -315,7 +315,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { } /** *
-     * Obf: AFDPLNIIALH
+     * Obf: FOHAAJOMMPL
      * 
* * Protobuf type {@code AbilityMetaSetPoseParameter} @@ -476,14 +476,14 @@ public final class AbilityMetaSetPoseParameterOuterClass { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder> valueBuilder_; /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; * @return Whether the value field is set. */ public boolean hasValue() { return valueBuilder_ != null || value_ != null; } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; * @return The value. */ public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue() { @@ -494,7 +494,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { } } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ public Builder setValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) { if (valueBuilder_ == null) { @@ -510,7 +510,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ public Builder setValue( emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder builderForValue) { @@ -524,7 +524,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ public Builder mergeValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) { if (valueBuilder_ == null) { @@ -542,7 +542,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ public Builder clearValue() { if (valueBuilder_ == null) { @@ -556,7 +556,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return this; } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder getValueBuilder() { @@ -564,7 +564,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { return getValueFieldBuilder().getBuilder(); } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { @@ -575,7 +575,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { } } /** - * .AnimatorParameterValueInfoPair value = 1; + * .AnimatorParameterValueInfoPair value = 15; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder> @@ -659,7 +659,7 @@ public final class AbilityMetaSetPoseParameterOuterClass { java.lang.String[] descriptorData = { "\n!AbilityMetaSetPoseParameter.proto\032$Ani" + "matorParameterValueInfoPair.proto\"M\n\033Abi" + - "lityMetaSetPoseParameter\022.\n\005value\030\001 \001(\0132" + + "lityMetaSetPoseParameter\022.\n\005value\030\017 \001(\0132" + "\037.AnimatorParameterValueInfoPairB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinCostStaminaOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinCostStaminaOuterClass.java new file mode 100644 index 000000000..b1483ff53 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinCostStaminaOuterClass.java @@ -0,0 +1,537 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: AbilityMixinCostStamina.proto + +package emu.grasscutter.net.proto; + +public final class AbilityMixinCostStaminaOuterClass { + private AbilityMixinCostStaminaOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface AbilityMixinCostStaminaOrBuilder extends + // @@protoc_insertion_point(interface_extends:AbilityMixinCostStamina) + com.google.protobuf.MessageOrBuilder { + + /** + * bool is_swim = 7; + * @return The isSwim. + */ + boolean getIsSwim(); + } + /** + * Protobuf type {@code AbilityMixinCostStamina} + */ + public static final class AbilityMixinCostStamina extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:AbilityMixinCostStamina) + AbilityMixinCostStaminaOrBuilder { + private static final long serialVersionUID = 0L; + // Use AbilityMixinCostStamina.newBuilder() to construct. + private AbilityMixinCostStamina(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private AbilityMixinCostStamina() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new AbilityMixinCostStamina(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private AbilityMixinCostStamina( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 56: { + + isSwim_ = input.readBool(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.class, emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.Builder.class); + } + + public static final int IS_SWIM_FIELD_NUMBER = 7; + private boolean isSwim_; + /** + * bool is_swim = 7; + * @return The isSwim. + */ + @java.lang.Override + public boolean getIsSwim() { + return isSwim_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (isSwim_ != false) { + output.writeBool(7, isSwim_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (isSwim_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(7, isSwim_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina other = (emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina) obj; + + if (getIsSwim() + != other.getIsSwim()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + IS_SWIM_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsSwim()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code AbilityMixinCostStamina} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:AbilityMixinCostStamina) + emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStaminaOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.class, emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + isSwim_ = false; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.internal_static_AbilityMixinCostStamina_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina getDefaultInstanceForType() { + return emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina build() { + emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina buildPartial() { + emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina result = new emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina(this); + result.isSwim_ = isSwim_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina) { + return mergeFrom((emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina other) { + if (other == emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.getDefaultInstance()) return this; + if (other.getIsSwim() != false) { + setIsSwim(other.getIsSwim()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private boolean isSwim_ ; + /** + * bool is_swim = 7; + * @return The isSwim. + */ + @java.lang.Override + public boolean getIsSwim() { + return isSwim_; + } + /** + * bool is_swim = 7; + * @param value The isSwim to set. + * @return This builder for chaining. + */ + public Builder setIsSwim(boolean value) { + + isSwim_ = value; + onChanged(); + return this; + } + /** + * bool is_swim = 7; + * @return This builder for chaining. + */ + public Builder clearIsSwim() { + + isSwim_ = false; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:AbilityMixinCostStamina) + } + + // @@protoc_insertion_point(class_scope:AbilityMixinCostStamina) + private static final emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina(); + } + + public static emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AbilityMixinCostStamina parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new AbilityMixinCostStamina(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_AbilityMixinCostStamina_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_AbilityMixinCostStamina_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\035AbilityMixinCostStamina.proto\"*\n\027Abili" + + "tyMixinCostStamina\022\017\n\007is_swim\030\007 \001(\010B\033\n\031e" + + "mu.grasscutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_AbilityMixinCostStamina_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_AbilityMixinCostStamina_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_AbilityMixinCostStamina_descriptor, + new java.lang.String[] { "IsSwim", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} 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 ccc423c4c..c4a6e1679 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(); /** - * .Status status = 10; + * .Achievement.Status status = 10; * @return The enum numeric value on the wire for status. */ int getStatusValue(); /** - * .Status status = 10; + * .Achievement.Status status = 10; * @return The status. */ - emu.grasscutter.net.proto.StatusOuterClass.Status getStatus(); + emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus(); /** * uint32 total_progress = 4; @@ -161,6 +161,132 @@ public final class AchievementOuterClass { emu.grasscutter.net.proto.AchievementOuterClass.Achievement.class, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder.class); } + /** + * Protobuf enum {@code Achievement.Status} + */ + public enum Status + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 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.AchievementOuterClass.Achievement.getDescriptor().getEnumTypes().get(0); + } + + private static final Status[] VALUES = values(); + + public static Status valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private Status(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:Achievement.Status) + } + public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 15; private int finishTimestamp_; /** @@ -175,20 +301,20 @@ public final class AchievementOuterClass { public static final int STATUS_FIELD_NUMBER = 10; private int status_; /** - * .Status status = 10; + * .Achievement.Status status = 10; * @return The enum numeric value on the wire for status. */ @java.lang.Override public int getStatusValue() { return status_; } /** - * .Status status = 10; + * .Achievement.Status status = 10; * @return The status. */ - @java.lang.Override public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() { + @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() { @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.StatusOuterClass.Status result = emu.grasscutter.net.proto.StatusOuterClass.Status.valueOf(status_); - return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result; + emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_); + return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result; } public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4; @@ -244,7 +370,7 @@ public final class AchievementOuterClass { if (id_ != 0) { output.writeUInt32(5, id_); } - if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) { + if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) { output.writeEnum(10, status_); } if (curProgress_ != 0) { @@ -270,7 +396,7 @@ public final class AchievementOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(5, id_); } - if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) { + if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(10, status_); } @@ -630,14 +756,14 @@ public final class AchievementOuterClass { private int status_ = 0; /** - * .Status status = 10; + * .Achievement.Status status = 10; * @return The enum numeric value on the wire for status. */ @java.lang.Override public int getStatusValue() { return status_; } /** - * .Status status = 10; + * .Achievement.Status status = 10; * @param value The enum numeric value on the wire for status to set. * @return This builder for chaining. */ @@ -648,21 +774,21 @@ public final class AchievementOuterClass { return this; } /** - * .Status status = 10; + * .Achievement.Status status = 10; * @return The status. */ @java.lang.Override - public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() { + public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() { @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.StatusOuterClass.Status result = emu.grasscutter.net.proto.StatusOuterClass.Status.valueOf(status_); - return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result; + emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_); + return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result; } /** - * .Status status = 10; + * .Achievement.Status status = 10; * @param value The status to set. * @return This builder for chaining. */ - public Builder setStatus(emu.grasscutter.net.proto.StatusOuterClass.Status value) { + public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status value) { if (value == null) { throw new NullPointerException(); } @@ -672,7 +798,7 @@ public final class AchievementOuterClass { return this; } /** - * .Status status = 10; + * .Achievement.Status status = 10; * @return This builder for chaining. */ public Builder clearStatus() { @@ -841,16 +967,18 @@ public final class AchievementOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\021Achievement.proto\032\014Status.proto\"z\n\013Ach" + - "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" + "\n\021Achievement.proto\"\351\001\n\013Achievement\022\030\n\020f" + + "inish_timestamp\030\017 \001(\r\022#\n\006status\030\n \001(\0162\023." + + "Achievement.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(\r\"a\n\006" + + "Status\022\022\n\016STATUS_INVALID\020\000\022\025\n\021STATUS_UNF" + + "INISHED\020\001\022\023\n\017STATUS_FINISHED\020\002\022\027\n\023STATUS" + + "_REWARD_TAKEN\020\003B\033\n\031emu.grasscutter.net.p" + + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.StatusOuterClass.getDescriptor(), }); internal_static_Achievement_descriptor = getDescriptor().getMessageTypes().get(0); @@ -858,7 +986,6 @@ public final class AchievementOuterClass { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Achievement_descriptor, new java.lang.String[] { "FinishTimestamp", "Status", "TotalProgress", "CurProgress", "Id", }); - emu.grasscutter.net.proto.StatusOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java index c89788826..b5de9ab1c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java @@ -19,15 +19,15 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { com.google.protobuf.MessageOrBuilder { /** - * uint32 schedule_id = 14; + * uint32 schedule_id = 6; * @return The scheduleId. */ int getScheduleId(); } /** *
-   * CmdId: 4453
-   * Obf: FKDKFJNGBMH
+   * CmdId: 8127
+   * Obf: KMIKAFFCKAL
    * 
* * Protobuf type {@code ActivityGetFriendGiftWishListReq} @@ -74,7 +74,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { case 0: done = true; break; - case 112: { + case 48: { scheduleId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.class, emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.Builder.class); } - public static final int SCHEDULE_ID_FIELD_NUMBER = 14; + public static final int SCHEDULE_ID_FIELD_NUMBER = 6; private int scheduleId_; /** - * uint32 schedule_id = 14; + * uint32 schedule_id = 6; * @return The scheduleId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (scheduleId_ != 0) { - output.writeUInt32(14, scheduleId_); + output.writeUInt32(6, scheduleId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { size = 0; if (scheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, scheduleId_); + .computeUInt32Size(6, scheduleId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { } /** *
-     * CmdId: 4453
-     * Obf: FKDKFJNGBMH
+     * CmdId: 8127
+     * Obf: KMIKAFFCKAL
      * 
* * Protobuf type {@code ActivityGetFriendGiftWishListReq} @@ -431,7 +431,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { private int scheduleId_ ; /** - * uint32 schedule_id = 14; + * uint32 schedule_id = 6; * @return The scheduleId. */ @java.lang.Override @@ -439,7 +439,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { return scheduleId_; } /** - * uint32 schedule_id = 14; + * uint32 schedule_id = 6; * @param value The scheduleId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { return this; } /** - * uint32 schedule_id = 14; + * uint32 schedule_id = 6; * @return This builder for chaining. */ public Builder clearScheduleId() { @@ -528,7 +528,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass { java.lang.String[] descriptorData = { "\n&ActivityGetFriendGiftWishListReq.proto" + "\"7\n ActivityGetFriendGiftWishListReq\022\023\n\013" + - "schedule_id\030\016 \001(\rB\033\n\031emu.grasscutter.net" + + "schedule_id\030\006 \001(\rB\033\n\031emu.grasscutter.net" + ".protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor 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 0f7c1f29b..fdb853ff1 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java @@ -141,21 +141,21 @@ public final class ActivityInfoOuterClass { int key); /** - * repeated uint32 DCPENBLPKHK = 12; - * @return A list containing the dCPENBLPKHK. + * repeated uint32 meet_cond_list = 12; + * @return A list containing the meetCondList. */ - java.util.List getDCPENBLPKHKList(); + java.util.List getMeetCondListList(); /** - * repeated uint32 DCPENBLPKHK = 12; - * @return The count of dCPENBLPKHK. + * repeated uint32 meet_cond_list = 12; + * @return The count of meetCondList. */ - int getDCPENBLPKHKCount(); + int getMeetCondListCount(); /** - * repeated uint32 DCPENBLPKHK = 12; + * repeated uint32 meet_cond_list = 12; * @param index The index of the element to return. - * @return The dCPENBLPKHK at the given index. + * @return The meetCondList at the given index. */ - int getDCPENBLPKHK(int index); + int getMeetCondList(int index); /** * bool DKJDABCNGBP = 13; @@ -264,21 +264,21 @@ public final class ActivityInfoOuterClass { int key); /** - * repeated uint32 meet_cond_list = 4; - * @return A list containing the meetCondList. + * repeated uint32 PHCOMIFAIJD = 4; + * @return A list containing the pHCOMIFAIJD. */ - java.util.List getMeetCondListList(); + java.util.List getPHCOMIFAIJDList(); /** - * repeated uint32 meet_cond_list = 4; - * @return The count of meetCondList. + * repeated uint32 PHCOMIFAIJD = 4; + * @return The count of pHCOMIFAIJD. */ - int getMeetCondListCount(); + int getPHCOMIFAIJDCount(); /** - * repeated uint32 meet_cond_list = 4; + * repeated uint32 PHCOMIFAIJD = 4; * @param index The index of the element to return. - * @return The meetCondList at the given index. + * @return The pHCOMIFAIJD at the given index. */ - int getMeetCondList(int index); + int getPHCOMIFAIJD(int index); /** * repeated .ActivityPushTipsData activity_push_tips_data_list = 643; @@ -1601,8 +1601,8 @@ public final class ActivityInfoOuterClass { dNMOEAFCDGC_ = emptyIntList(); watcherInfoList_ = java.util.Collections.emptyList(); lJLDCLMAMNL_ = emptyIntList(); - dCPENBLPKHK_ = emptyIntList(); meetCondList_ = emptyIntList(); + pHCOMIFAIJD_ = emptyIntList(); activityPushTipsDataList_ = java.util.Collections.emptyList(); } @@ -1654,21 +1654,21 @@ public final class ActivityInfoOuterClass { } case 32: { if (!((mutable_bitField0_ & 0x00000040) != 0)) { - meetCondList_ = newIntList(); + pHCOMIFAIJD_ = newIntList(); mutable_bitField0_ |= 0x00000040; } - meetCondList_.addInt(input.readUInt32()); + pHCOMIFAIJD_.addInt(input.readUInt32()); break; } case 34: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) { - meetCondList_ = newIntList(); + pHCOMIFAIJD_ = newIntList(); mutable_bitField0_ |= 0x00000040; } while (input.getBytesUntilLimit() > 0) { - meetCondList_.addInt(input.readUInt32()); + pHCOMIFAIJD_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -1750,21 +1750,21 @@ public final class ActivityInfoOuterClass { } case 96: { if (!((mutable_bitField0_ & 0x00000010) != 0)) { - dCPENBLPKHK_ = newIntList(); + meetCondList_ = newIntList(); mutable_bitField0_ |= 0x00000010; } - dCPENBLPKHK_.addInt(input.readUInt32()); + meetCondList_.addInt(input.readUInt32()); break; } case 98: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) { - dCPENBLPKHK_ = newIntList(); + meetCondList_ = newIntList(); mutable_bitField0_ |= 0x00000010; } while (input.getBytesUntilLimit() > 0) { - dCPENBLPKHK_.addInt(input.readUInt32()); + meetCondList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -3056,13 +3056,13 @@ public final class ActivityInfoOuterClass { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000040) != 0)) { - meetCondList_.makeImmutable(); // C + pHCOMIFAIJD_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { watcherInfoList_ = java.util.Collections.unmodifiableList(watcherInfoList_); } if (((mutable_bitField0_ & 0x00000010) != 0)) { - dCPENBLPKHK_.makeImmutable(); // C + meetCondList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000004) != 0)) { lJLDCLMAMNL_.makeImmutable(); // C @@ -3543,33 +3543,33 @@ public final class ActivityInfoOuterClass { return map.get(key); } - public static final int DCPENBLPKHK_FIELD_NUMBER = 12; - private com.google.protobuf.Internal.IntList dCPENBLPKHK_; + public static final int MEET_COND_LIST_FIELD_NUMBER = 12; + private com.google.protobuf.Internal.IntList meetCondList_; /** - * repeated uint32 DCPENBLPKHK = 12; - * @return A list containing the dCPENBLPKHK. + * repeated uint32 meet_cond_list = 12; + * @return A list containing the meetCondList. */ @java.lang.Override public java.util.List - getDCPENBLPKHKList() { - return dCPENBLPKHK_; + getMeetCondListList() { + return meetCondList_; } /** - * repeated uint32 DCPENBLPKHK = 12; - * @return The count of dCPENBLPKHK. + * repeated uint32 meet_cond_list = 12; + * @return The count of meetCondList. */ - public int getDCPENBLPKHKCount() { - return dCPENBLPKHK_.size(); + public int getMeetCondListCount() { + return meetCondList_.size(); } /** - * repeated uint32 DCPENBLPKHK = 12; + * repeated uint32 meet_cond_list = 12; * @param index The index of the element to return. - * @return The dCPENBLPKHK at the given index. + * @return The meetCondList at the given index. */ - public int getDCPENBLPKHK(int index) { - return dCPENBLPKHK_.getInt(index); + public int getMeetCondList(int index) { + return meetCondList_.getInt(index); } - private int dCPENBLPKHKMemoizedSerializedSize = -1; + private int meetCondListMemoizedSerializedSize = -1; public static final int DKJDABCNGBP_FIELD_NUMBER = 13; private boolean dKJDABCNGBP_; @@ -3784,33 +3784,33 @@ public final class ActivityInfoOuterClass { return map.get(key); } - public static final int MEET_COND_LIST_FIELD_NUMBER = 4; - private com.google.protobuf.Internal.IntList meetCondList_; + public static final int PHCOMIFAIJD_FIELD_NUMBER = 4; + private com.google.protobuf.Internal.IntList pHCOMIFAIJD_; /** - * repeated uint32 meet_cond_list = 4; - * @return A list containing the meetCondList. + * repeated uint32 PHCOMIFAIJD = 4; + * @return A list containing the pHCOMIFAIJD. */ @java.lang.Override public java.util.List - getMeetCondListList() { - return meetCondList_; + getPHCOMIFAIJDList() { + return pHCOMIFAIJD_; } /** - * repeated uint32 meet_cond_list = 4; - * @return The count of meetCondList. + * repeated uint32 PHCOMIFAIJD = 4; + * @return The count of pHCOMIFAIJD. */ - public int getMeetCondListCount() { - return meetCondList_.size(); + public int getPHCOMIFAIJDCount() { + return pHCOMIFAIJD_.size(); } /** - * repeated uint32 meet_cond_list = 4; + * repeated uint32 PHCOMIFAIJD = 4; * @param index The index of the element to return. - * @return The meetCondList at the given index. + * @return The pHCOMIFAIJD at the given index. */ - public int getMeetCondList(int index) { - return meetCondList_.getInt(index); + public int getPHCOMIFAIJD(int index) { + return pHCOMIFAIJD_.getInt(index); } - private int meetCondListMemoizedSerializedSize = -1; + private int pHCOMIFAIJDMemoizedSerializedSize = -1; public static final int ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER = 643; private java.util.List activityPushTipsDataList_; @@ -6511,12 +6511,12 @@ public final class ActivityInfoOuterClass { if (activityId_ != 0) { output.writeUInt32(3, activityId_); } - if (getMeetCondListList().size() > 0) { + if (getPHCOMIFAIJDList().size() > 0) { output.writeUInt32NoTag(34); - output.writeUInt32NoTag(meetCondListMemoizedSerializedSize); + output.writeUInt32NoTag(pHCOMIFAIJDMemoizedSerializedSize); } - for (int i = 0; i < meetCondList_.size(); i++) { - output.writeUInt32NoTag(meetCondList_.getInt(i)); + for (int i = 0; i < pHCOMIFAIJD_.size(); i++) { + output.writeUInt32NoTag(pHCOMIFAIJD_.getInt(i)); } if (scheduleId_ != 0) { output.writeUInt32(5, scheduleId_); @@ -6539,12 +6539,12 @@ public final class ActivityInfoOuterClass { if (endTime_ != 0) { output.writeUInt32(11, endTime_); } - if (getDCPENBLPKHKList().size() > 0) { + if (getMeetCondListList().size() > 0) { output.writeUInt32NoTag(98); - output.writeUInt32NoTag(dCPENBLPKHKMemoizedSerializedSize); + output.writeUInt32NoTag(meetCondListMemoizedSerializedSize); } - for (int i = 0; i < dCPENBLPKHK_.size(); i++) { - output.writeUInt32NoTag(dCPENBLPKHK_.getInt(i)); + for (int i = 0; i < meetCondList_.size(); i++) { + output.writeUInt32NoTag(meetCondList_.getInt(i)); } if (dKJDABCNGBP_ != false) { output.writeBool(13, dKJDABCNGBP_); @@ -6877,17 +6877,17 @@ public final class ActivityInfoOuterClass { } { int dataSize = 0; - for (int i = 0; i < meetCondList_.size(); i++) { + for (int i = 0; i < pHCOMIFAIJD_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(meetCondList_.getInt(i)); + .computeUInt32SizeNoTag(pHCOMIFAIJD_.getInt(i)); } size += dataSize; - if (!getMeetCondListList().isEmpty()) { + if (!getPHCOMIFAIJDList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - meetCondListMemoizedSerializedSize = dataSize; + pHCOMIFAIJDMemoizedSerializedSize = dataSize; } if (scheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -6919,17 +6919,17 @@ public final class ActivityInfoOuterClass { } { int dataSize = 0; - for (int i = 0; i < dCPENBLPKHK_.size(); i++) { + for (int i = 0; i < meetCondList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(dCPENBLPKHK_.getInt(i)); + .computeUInt32SizeNoTag(meetCondList_.getInt(i)); } size += dataSize; - if (!getDCPENBLPKHKList().isEmpty()) { + if (!getMeetCondListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - dCPENBLPKHKMemoizedSerializedSize = dataSize; + meetCondListMemoizedSerializedSize = dataSize; } if (dKJDABCNGBP_ != false) { size += com.google.protobuf.CodedOutputStream @@ -7388,8 +7388,8 @@ public final class ActivityInfoOuterClass { != other.getScheduleId()) return false; if (!internalGetActivityCoinMap().equals( other.internalGetActivityCoinMap())) return false; - if (!getDCPENBLPKHKList() - .equals(other.getDCPENBLPKHKList())) return false; + if (!getMeetCondListList() + .equals(other.getMeetCondListList())) return false; if (getDKJDABCNGBP() != other.getDKJDABCNGBP()) return false; if (getBeginTime() @@ -7416,8 +7416,8 @@ public final class ActivityInfoOuterClass { != other.getEndTime()) return false; if (!internalGetWishGiftNumMap().equals( other.internalGetWishGiftNumMap())) return false; - if (!getMeetCondListList() - .equals(other.getMeetCondListList())) return false; + if (!getPHCOMIFAIJDList() + .equals(other.getPHCOMIFAIJDList())) return false; if (!getActivityPushTipsDataListList() .equals(other.getActivityPushTipsDataListList())) return false; if (!getDetailCase().equals(other.getDetailCase())) return false; @@ -7804,9 +7804,9 @@ public final class ActivityInfoOuterClass { hash = (37 * hash) + ACTIVITY_COIN_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetActivityCoinMap().hashCode(); } - if (getDCPENBLPKHKCount() > 0) { - hash = (37 * hash) + DCPENBLPKHK_FIELD_NUMBER; - hash = (53 * hash) + getDCPENBLPKHKList().hashCode(); + if (getMeetCondListCount() > 0) { + hash = (37 * hash) + MEET_COND_LIST_FIELD_NUMBER; + hash = (53 * hash) + getMeetCondListList().hashCode(); } hash = (37 * hash) + DKJDABCNGBP_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( @@ -7841,9 +7841,9 @@ public final class ActivityInfoOuterClass { hash = (37 * hash) + WISH_GIFT_NUM_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetWishGiftNumMap().hashCode(); } - if (getMeetCondListCount() > 0) { - hash = (37 * hash) + MEET_COND_LIST_FIELD_NUMBER; - hash = (53 * hash) + getMeetCondListList().hashCode(); + if (getPHCOMIFAIJDCount() > 0) { + hash = (37 * hash) + PHCOMIFAIJD_FIELD_NUMBER; + hash = (53 * hash) + getPHCOMIFAIJDList().hashCode(); } if (getActivityPushTipsDataListCount() > 0) { hash = (37 * hash) + ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER; @@ -8379,7 +8379,7 @@ public final class ActivityInfoOuterClass { scheduleId_ = 0; internalGetMutableActivityCoinMap().clear(); - dCPENBLPKHK_ = emptyIntList(); + meetCondList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000010); dKJDABCNGBP_ = false; @@ -8406,7 +8406,7 @@ public final class ActivityInfoOuterClass { endTime_ = 0; internalGetMutableWishGiftNumMap().clear(); - meetCondList_ = emptyIntList(); + pHCOMIFAIJD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000040); if (activityPushTipsDataListBuilder_ == null) { activityPushTipsDataList_ = java.util.Collections.emptyList(); @@ -8470,10 +8470,10 @@ public final class ActivityInfoOuterClass { result.activityCoinMap_ = internalGetActivityCoinMap(); result.activityCoinMap_.makeImmutable(); if (((bitField0_ & 0x00000010) != 0)) { - dCPENBLPKHK_.makeImmutable(); + meetCondList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000010); } - result.dCPENBLPKHK_ = dCPENBLPKHK_; + result.meetCondList_ = meetCondList_; result.dKJDABCNGBP_ = dKJDABCNGBP_; result.beginTime_ = beginTime_; result.iNGFNLLCDOL_ = iNGFNLLCDOL_; @@ -8489,10 +8489,10 @@ public final class ActivityInfoOuterClass { result.wishGiftNumMap_ = internalGetWishGiftNumMap(); result.wishGiftNumMap_.makeImmutable(); if (((bitField0_ & 0x00000040) != 0)) { - meetCondList_.makeImmutable(); + pHCOMIFAIJD_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000040); } - result.meetCondList_ = meetCondList_; + result.pHCOMIFAIJD_ = pHCOMIFAIJD_; if (activityPushTipsDataListBuilder_ == null) { if (((bitField0_ & 0x00000080) != 0)) { activityPushTipsDataList_ = java.util.Collections.unmodifiableList(activityPushTipsDataList_); @@ -9209,13 +9209,13 @@ public final class ActivityInfoOuterClass { } internalGetMutableActivityCoinMap().mergeFrom( other.internalGetActivityCoinMap()); - if (!other.dCPENBLPKHK_.isEmpty()) { - if (dCPENBLPKHK_.isEmpty()) { - dCPENBLPKHK_ = other.dCPENBLPKHK_; + if (!other.meetCondList_.isEmpty()) { + if (meetCondList_.isEmpty()) { + meetCondList_ = other.meetCondList_; bitField0_ = (bitField0_ & ~0x00000010); } else { - ensureDCPENBLPKHKIsMutable(); - dCPENBLPKHK_.addAll(other.dCPENBLPKHK_); + ensureMeetCondListIsMutable(); + meetCondList_.addAll(other.meetCondList_); } onChanged(); } @@ -9257,13 +9257,13 @@ public final class ActivityInfoOuterClass { } internalGetMutableWishGiftNumMap().mergeFrom( other.internalGetWishGiftNumMap()); - if (!other.meetCondList_.isEmpty()) { - if (meetCondList_.isEmpty()) { - meetCondList_ = other.meetCondList_; + if (!other.pHCOMIFAIJD_.isEmpty()) { + if (pHCOMIFAIJD_.isEmpty()) { + pHCOMIFAIJD_ = other.pHCOMIFAIJD_; bitField0_ = (bitField0_ & ~0x00000040); } else { - ensureMeetCondListIsMutable(); - meetCondList_.addAll(other.meetCondList_); + ensurePHCOMIFAIJDIsMutable(); + pHCOMIFAIJD_.addAll(other.pHCOMIFAIJD_); } onChanged(); } @@ -10364,80 +10364,80 @@ public final class ActivityInfoOuterClass { return this; } - private com.google.protobuf.Internal.IntList dCPENBLPKHK_ = emptyIntList(); - private void ensureDCPENBLPKHKIsMutable() { + private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList(); + private void ensureMeetCondListIsMutable() { if (!((bitField0_ & 0x00000010) != 0)) { - dCPENBLPKHK_ = mutableCopy(dCPENBLPKHK_); + meetCondList_ = mutableCopy(meetCondList_); bitField0_ |= 0x00000010; } } /** - * repeated uint32 DCPENBLPKHK = 12; - * @return A list containing the dCPENBLPKHK. + * repeated uint32 meet_cond_list = 12; + * @return A list containing the meetCondList. */ public java.util.List - getDCPENBLPKHKList() { + getMeetCondListList() { return ((bitField0_ & 0x00000010) != 0) ? - java.util.Collections.unmodifiableList(dCPENBLPKHK_) : dCPENBLPKHK_; + java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_; } /** - * repeated uint32 DCPENBLPKHK = 12; - * @return The count of dCPENBLPKHK. + * repeated uint32 meet_cond_list = 12; + * @return The count of meetCondList. */ - public int getDCPENBLPKHKCount() { - return dCPENBLPKHK_.size(); + public int getMeetCondListCount() { + return meetCondList_.size(); } /** - * repeated uint32 DCPENBLPKHK = 12; + * repeated uint32 meet_cond_list = 12; * @param index The index of the element to return. - * @return The dCPENBLPKHK at the given index. + * @return The meetCondList at the given index. */ - public int getDCPENBLPKHK(int index) { - return dCPENBLPKHK_.getInt(index); + public int getMeetCondList(int index) { + return meetCondList_.getInt(index); } /** - * repeated uint32 DCPENBLPKHK = 12; + * repeated uint32 meet_cond_list = 12; * @param index The index to set the value at. - * @param value The dCPENBLPKHK to set. + * @param value The meetCondList to set. * @return This builder for chaining. */ - public Builder setDCPENBLPKHK( + public Builder setMeetCondList( int index, int value) { - ensureDCPENBLPKHKIsMutable(); - dCPENBLPKHK_.setInt(index, value); + ensureMeetCondListIsMutable(); + meetCondList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 DCPENBLPKHK = 12; - * @param value The dCPENBLPKHK to add. + * repeated uint32 meet_cond_list = 12; + * @param value The meetCondList to add. * @return This builder for chaining. */ - public Builder addDCPENBLPKHK(int value) { - ensureDCPENBLPKHKIsMutable(); - dCPENBLPKHK_.addInt(value); + public Builder addMeetCondList(int value) { + ensureMeetCondListIsMutable(); + meetCondList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 DCPENBLPKHK = 12; - * @param values The dCPENBLPKHK to add. + * repeated uint32 meet_cond_list = 12; + * @param values The meetCondList to add. * @return This builder for chaining. */ - public Builder addAllDCPENBLPKHK( + public Builder addAllMeetCondList( java.lang.Iterable values) { - ensureDCPENBLPKHKIsMutable(); + ensureMeetCondListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, dCPENBLPKHK_); + values, meetCondList_); onChanged(); return this; } /** - * repeated uint32 DCPENBLPKHK = 12; + * repeated uint32 meet_cond_list = 12; * @return This builder for chaining. */ - public Builder clearDCPENBLPKHK() { - dCPENBLPKHK_ = emptyIntList(); + public Builder clearMeetCondList() { + meetCondList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; @@ -10943,80 +10943,80 @@ public final class ActivityInfoOuterClass { return this; } - private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList(); - private void ensureMeetCondListIsMutable() { + private com.google.protobuf.Internal.IntList pHCOMIFAIJD_ = emptyIntList(); + private void ensurePHCOMIFAIJDIsMutable() { if (!((bitField0_ & 0x00000040) != 0)) { - meetCondList_ = mutableCopy(meetCondList_); + pHCOMIFAIJD_ = mutableCopy(pHCOMIFAIJD_); bitField0_ |= 0x00000040; } } /** - * repeated uint32 meet_cond_list = 4; - * @return A list containing the meetCondList. + * repeated uint32 PHCOMIFAIJD = 4; + * @return A list containing the pHCOMIFAIJD. */ public java.util.List - getMeetCondListList() { + getPHCOMIFAIJDList() { return ((bitField0_ & 0x00000040) != 0) ? - java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_; + java.util.Collections.unmodifiableList(pHCOMIFAIJD_) : pHCOMIFAIJD_; } /** - * repeated uint32 meet_cond_list = 4; - * @return The count of meetCondList. + * repeated uint32 PHCOMIFAIJD = 4; + * @return The count of pHCOMIFAIJD. */ - public int getMeetCondListCount() { - return meetCondList_.size(); + public int getPHCOMIFAIJDCount() { + return pHCOMIFAIJD_.size(); } /** - * repeated uint32 meet_cond_list = 4; + * repeated uint32 PHCOMIFAIJD = 4; * @param index The index of the element to return. - * @return The meetCondList at the given index. + * @return The pHCOMIFAIJD at the given index. */ - public int getMeetCondList(int index) { - return meetCondList_.getInt(index); + public int getPHCOMIFAIJD(int index) { + return pHCOMIFAIJD_.getInt(index); } /** - * repeated uint32 meet_cond_list = 4; + * repeated uint32 PHCOMIFAIJD = 4; * @param index The index to set the value at. - * @param value The meetCondList to set. + * @param value The pHCOMIFAIJD to set. * @return This builder for chaining. */ - public Builder setMeetCondList( + public Builder setPHCOMIFAIJD( int index, int value) { - ensureMeetCondListIsMutable(); - meetCondList_.setInt(index, value); + ensurePHCOMIFAIJDIsMutable(); + pHCOMIFAIJD_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 meet_cond_list = 4; - * @param value The meetCondList to add. + * repeated uint32 PHCOMIFAIJD = 4; + * @param value The pHCOMIFAIJD to add. * @return This builder for chaining. */ - public Builder addMeetCondList(int value) { - ensureMeetCondListIsMutable(); - meetCondList_.addInt(value); + public Builder addPHCOMIFAIJD(int value) { + ensurePHCOMIFAIJDIsMutable(); + pHCOMIFAIJD_.addInt(value); onChanged(); return this; } /** - * repeated uint32 meet_cond_list = 4; - * @param values The meetCondList to add. + * repeated uint32 PHCOMIFAIJD = 4; + * @param values The pHCOMIFAIJD to add. * @return This builder for chaining. */ - public Builder addAllMeetCondList( + public Builder addAllPHCOMIFAIJD( java.lang.Iterable values) { - ensureMeetCondListIsMutable(); + ensurePHCOMIFAIJDIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, meetCondList_); + values, pHCOMIFAIJD_); onChanged(); return this; } /** - * repeated uint32 meet_cond_list = 4; + * repeated uint32 PHCOMIFAIJD = 4; * @return This builder for chaining. */ - public Builder clearMeetCondList() { - meetCondList_ = emptyIntList(); + public Builder clearPHCOMIFAIJD() { + pHCOMIFAIJD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; @@ -23399,16 +23399,16 @@ public final class ActivityInfoOuterClass { "\010\022\024\n\013LJLDCLMAMNL\030\342\003 \003(\r\022\023\n\013PJJKJGALLGD\030\020" + " \001(\010\022\025\n\ractivity_type\030\001 \001(\r\022\023\n\013schedule_" + "id\030\005 \001(\r\022>\n\021activity_coin_map\030\232\014 \003(\0132\".A" + - "ctivityInfo.ActivityCoinMapEntry\022\023\n\013DCPE" + - "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 " + + "ctivityInfo.ActivityCoinMapEntry\022\026\n\016meet" + + "_cond_list\030\014 \003(\r\022\023\n\013DKJDABCNGBP\030\r \001(\010\022\022\n" + + "\nbegin_time\030\002 \001(\r\022\024\n\013INGFNLLCDOL\030\335\005 \001(\r\022" + + "\023\n\013ENNDKMJIMHN\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_star" + + "t_time\030\322\007 \001(\r\022\024\n\013ABMOPKOIMPA\030\215\004 \001(\010\022\024\n\013F" + + "GFGECAAKJM\030\247\r \001(\r\022\024\n\013GFEMIEBKKKL\030\335\010 \001(\010\022" + + "\024\n\013CEFIPNKPEKA\030\355\004 \001(\r\022\020\n\010end_time\030\013 \001(\r\022" + + "=\n\021wish_gift_num_map\030\234\007 \003(\0132!.ActivityIn" + + "fo.WishGiftNumMapEntry\022\023\n\013PHCOMIFAIJD\030\004 " + "\003(\r\022<\n\034activity_push_tips_data_list\030\203\005 \003" + "(\0132\025.ActivityPushTipsData\0223\n\rsam_lamp_in" + "fo\030\n \001(\0132\032.SeaLampActivityDetailInfoH\000\0224" + @@ -23632,7 +23632,7 @@ public final class ActivityInfoOuterClass { internal_static_ActivityInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ActivityInfo_descriptor, - new java.lang.String[] { "ActivityId", "DNMOEAFCDGC", "WatcherInfoList", "IsFinished", "LJLDCLMAMNL", "PJJKJGALLGD", "ActivityType", "ScheduleId", "ActivityCoinMap", "DCPENBLPKHK", "DKJDABCNGBP", "BeginTime", "INGFNLLCDOL", "ENNDKMJIMHN", "CurScore", "BKJNDLLNAML", "FirstDayStartTime", "ABMOPKOIMPA", "FGFGECAAKJM", "GFEMIEBKKKL", "CEFIPNKPEKA", "EndTime", "WishGiftNumMap", "MeetCondList", "ActivityPushTipsDataList", "SamLampInfo", "CrucibleInfo", "SalesmanInfo", "TrialAvatarInfo", "DeliveryInfo", "AsterInfo", "FlightInfo", "DragonSpineInfo", "EffigyInfo", "TreasureMapInfo", "BlessingInfo", "SeaLampInfo", "ExpeditionInfo", "ArenaChallengeInfo", "FleurFairInfo", "WaterSpiritInfo", "ChallnelerSlabInfo", "MistTrialActivityInfo", "HideAndSeekInfo", "FindHilichurlInfo", "SummerTimeInfo", "BuoyantCombatInfo", "EchoShellInfo", "BounceConjuringInfo", "BlitzRushInfo", "ChessInfo", "SumoInfo", "MoonfinTrialInfo", "LunaRiteInfo", "PlantFlowerInfo", "MusicGameInfo", "RoguelikeDungoenInfo", "DigInfo", "HachiInfo", "WinterCampInfo", "PotionInfo", "TanukiTravelActivityInfo", "LanternRiteActivityInfo", "MichiaeMatsuriInfo", "BartenderInfo", "UgcInfo", "CrystalLinkInfo", "IrodoriInfo", "PhotoInfo", "SpiceInfo", "GachaInfo", "LuminanceStoneChallengeInfo", "RogueDiaryInfo", "SummerTimeV2Info", "IslandPartyInfo", "GearInfo", "GravenInnocenceInfo", "InstableSprayInfo", "MuqadasPotionInfo", "TreasureSeelieInfo", "RockBoardExploreInfo", "VintageInfo", "WindFieldInfo", "FungusFighterInfo", "CharAmusementInfo", "EffigyChallengeInfo", "CoinCollectInfo", "BrickBreakerInfo", "DuelHeartInfo", "SeaLampV3Info", "TeamChainInfo", "ElectroherculesBattleInfo", "GcgFestivalInfo", "FleurFairV2Info", "FungusFighterV2Info", "AkaFesInfo", "SandwormCannonDetailInfo", "SorushTrialInfo", "JourneyInfo", "EffigyChallengeV4Info", "GcgPveInfo", "UgcV2Info", "PenumbraAdventureInfo", "AnimalViewInfo", "ActivityMultiCharacterInfo", "GcgPveInfiniteInfo", "ToyBattleInfo", "PhotoUnderseaInfo", "FontaineGatherInfo", "GcgPvePuzzleInfo", "Detail", }); + new java.lang.String[] { "ActivityId", "DNMOEAFCDGC", "WatcherInfoList", "IsFinished", "LJLDCLMAMNL", "PJJKJGALLGD", "ActivityType", "ScheduleId", "ActivityCoinMap", "MeetCondList", "DKJDABCNGBP", "BeginTime", "INGFNLLCDOL", "ENNDKMJIMHN", "CurScore", "BKJNDLLNAML", "FirstDayStartTime", "ABMOPKOIMPA", "FGFGECAAKJM", "GFEMIEBKKKL", "CEFIPNKPEKA", "EndTime", "WishGiftNumMap", "PHCOMIFAIJD", "ActivityPushTipsDataList", "SamLampInfo", "CrucibleInfo", "SalesmanInfo", "TrialAvatarInfo", "DeliveryInfo", "AsterInfo", "FlightInfo", "DragonSpineInfo", "EffigyInfo", "TreasureMapInfo", "BlessingInfo", "SeaLampInfo", "ExpeditionInfo", "ArenaChallengeInfo", "FleurFairInfo", "WaterSpiritInfo", "ChallnelerSlabInfo", "MistTrialActivityInfo", "HideAndSeekInfo", "FindHilichurlInfo", "SummerTimeInfo", "BuoyantCombatInfo", "EchoShellInfo", "BounceConjuringInfo", "BlitzRushInfo", "ChessInfo", "SumoInfo", "MoonfinTrialInfo", "LunaRiteInfo", "PlantFlowerInfo", "MusicGameInfo", "RoguelikeDungoenInfo", "DigInfo", "HachiInfo", "WinterCampInfo", "PotionInfo", "TanukiTravelActivityInfo", "LanternRiteActivityInfo", "MichiaeMatsuriInfo", "BartenderInfo", "UgcInfo", "CrystalLinkInfo", "IrodoriInfo", "PhotoInfo", "SpiceInfo", "GachaInfo", "LuminanceStoneChallengeInfo", "RogueDiaryInfo", "SummerTimeV2Info", "IslandPartyInfo", "GearInfo", "GravenInnocenceInfo", "InstableSprayInfo", "MuqadasPotionInfo", "TreasureSeelieInfo", "RockBoardExploreInfo", "VintageInfo", "WindFieldInfo", "FungusFighterInfo", "CharAmusementInfo", "EffigyChallengeInfo", "CoinCollectInfo", "BrickBreakerInfo", "DuelHeartInfo", "SeaLampV3Info", "TeamChainInfo", "ElectroherculesBattleInfo", "GcgFestivalInfo", "FleurFairV2Info", "FungusFighterV2Info", "AkaFesInfo", "SandwormCannonDetailInfo", "SorushTrialInfo", "JourneyInfo", "EffigyChallengeV4Info", "GcgPveInfo", "UgcV2Info", "PenumbraAdventureInfo", "AnimalViewInfo", "ActivityMultiCharacterInfo", "GcgPveInfiniteInfo", "ToyBattleInfo", "PhotoUnderseaInfo", "FontaineGatherInfo", "GcgPvePuzzleInfo", "Detail", }); internal_static_ActivityInfo_ActivityCoinMapEntry_descriptor = internal_static_ActivityInfo_descriptor.getNestedTypes().get(0); internal_static_ActivityInfo_ActivityCoinMapEntry_fieldAccessorTable = new 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 59953a028..3864e1b98 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 cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ java.util.List - getCoolDownGroupDataListList(); + getNormalCoolDownDataListList(); /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index); + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index); /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - int getCoolDownGroupDataListCount(); + int getNormalCoolDownDataListCount(); /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ java.util.List - getCoolDownGroupDataListOrBuilderList(); + getNormalCoolDownDataListOrBuilderList(); /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder( + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( int index); /** @@ -136,27 +136,27 @@ public final class AllWidgetDataNotifyOuterClass { emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxDataOrBuilder getLunchBoxDataOrBuilder(); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ java.util.List - getNormalCoolDownDataListList(); + getCoolDownGroupDataListList(); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index); + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - int getNormalCoolDownDataListCount(); + int getCoolDownGroupDataListCount(); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ java.util.List - getNormalCoolDownDataListOrBuilderList(); + getCoolDownGroupDataListOrBuilderList(); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder( int index); /** @@ -303,9 +303,9 @@ public final class AllWidgetDataNotifyOuterClass { private AllWidgetDataNotify() { oneoffGatherPointDetectorDataList_ = java.util.Collections.emptyList(); clientCollectorDataList_ = java.util.Collections.emptyList(); - coolDownGroupDataList_ = java.util.Collections.emptyList(); - anchorPointList_ = java.util.Collections.emptyList(); normalCoolDownDataList_ = java.util.Collections.emptyList(); + anchorPointList_ = java.util.Collections.emptyList(); + coolDownGroupDataList_ = 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)) { - coolDownGroupDataList_ = new java.util.ArrayList(); + normalCoolDownDataList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } - coolDownGroupDataList_.add( + normalCoolDownDataList_.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)) { - normalCoolDownDataList_ = new java.util.ArrayList(); + coolDownGroupDataList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } - normalCoolDownDataList_.add( + coolDownGroupDataList_.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)) { - coolDownGroupDataList_ = java.util.Collections.unmodifiableList(coolDownGroupDataList_); + normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_); } 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)) { - normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_); + coolDownGroupDataList_ = java.util.Collections.unmodifiableList(coolDownGroupDataList_); } 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 COOL_DOWN_GROUP_DATA_LIST_FIELD_NUMBER = 8; - private java.util.List coolDownGroupDataList_; + public static final int NORMALCOOLDOWNDATALIST_FIELD_NUMBER = 8; + private java.util.List normalCoolDownDataList_; /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ @java.lang.Override - public java.util.List getCoolDownGroupDataListList() { - return coolDownGroupDataList_; + public java.util.List getNormalCoolDownDataListList() { + return normalCoolDownDataList_; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ @java.lang.Override public java.util.List - getCoolDownGroupDataListOrBuilderList() { - return coolDownGroupDataList_; + getNormalCoolDownDataListOrBuilderList() { + return normalCoolDownDataList_; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ @java.lang.Override - public int getCoolDownGroupDataListCount() { - return coolDownGroupDataList_.size(); + public int getNormalCoolDownDataListCount() { + return normalCoolDownDataList_.size(); } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ @java.lang.Override - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index) { - return coolDownGroupDataList_.get(index); + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) { + return normalCoolDownDataList_.get(index); } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ @java.lang.Override - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( int index) { - return coolDownGroupDataList_.get(index); + return normalCoolDownDataList_.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 NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 14; - private java.util.List normalCoolDownDataList_; + public static final int COOLDOWNGROUPDATALIST_FIELD_NUMBER = 14; + private java.util.List coolDownGroupDataList_; /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ @java.lang.Override - public java.util.List getNormalCoolDownDataListList() { - return normalCoolDownDataList_; + public java.util.List getCoolDownGroupDataListList() { + return coolDownGroupDataList_; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ @java.lang.Override public java.util.List - getNormalCoolDownDataListOrBuilderList() { - return normalCoolDownDataList_; + getCoolDownGroupDataListOrBuilderList() { + return coolDownGroupDataList_; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ @java.lang.Override - public int getNormalCoolDownDataListCount() { - return normalCoolDownDataList_.size(); + public int getCoolDownGroupDataListCount() { + return coolDownGroupDataList_.size(); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ @java.lang.Override - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) { - return normalCoolDownDataList_.get(index); + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index) { + return coolDownGroupDataList_.get(index); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ @java.lang.Override - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder( int index) { - return normalCoolDownDataList_.get(index); + return coolDownGroupDataList_.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 < coolDownGroupDataList_.size(); i++) { - output.writeMessage(8, coolDownGroupDataList_.get(i)); + for (int i = 0; i < normalCoolDownDataList_.size(); i++) { + output.writeMessage(8, normalCoolDownDataList_.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 < normalCoolDownDataList_.size(); i++) { - output.writeMessage(14, normalCoolDownDataList_.get(i)); + for (int i = 0; i < coolDownGroupDataList_.size(); i++) { + output.writeMessage(14, coolDownGroupDataList_.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 < coolDownGroupDataList_.size(); i++) { + for (int i = 0; i < normalCoolDownDataList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, coolDownGroupDataList_.get(i)); + .computeMessageSize(8, normalCoolDownDataList_.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 < normalCoolDownDataList_.size(); i++) { + for (int i = 0; i < coolDownGroupDataList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, normalCoolDownDataList_.get(i)); + .computeMessageSize(14, coolDownGroupDataList_.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 (!getCoolDownGroupDataListList() - .equals(other.getCoolDownGroupDataListList())) return false; + if (!getNormalCoolDownDataListList() + .equals(other.getNormalCoolDownDataListList())) 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 (!getNormalCoolDownDataListList() - .equals(other.getNormalCoolDownDataListList())) return false; + if (!getCoolDownGroupDataListList() + .equals(other.getCoolDownGroupDataListList())) 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 (getCoolDownGroupDataListCount() > 0) { - hash = (37 * hash) + COOL_DOWN_GROUP_DATA_LIST_FIELD_NUMBER; - hash = (53 * hash) + getCoolDownGroupDataListList().hashCode(); + if (getNormalCoolDownDataListCount() > 0) { + hash = (37 * hash) + NORMALCOOLDOWNDATALIST_FIELD_NUMBER; + hash = (53 * hash) + getNormalCoolDownDataListList().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 (getNormalCoolDownDataListCount() > 0) { - hash = (37 * hash) + NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER; - hash = (53 * hash) + getNormalCoolDownDataListList().hashCode(); + if (getCoolDownGroupDataListCount() > 0) { + hash = (37 * hash) + COOLDOWNGROUPDATALIST_FIELD_NUMBER; + hash = (53 * hash) + getCoolDownGroupDataListList().hashCode(); } if (hasELIOJBDGIMJ()) { hash = (37 * hash) + ELIOJBDGIMJ_FIELD_NUMBER; @@ -1436,9 +1436,9 @@ public final class AllWidgetDataNotifyOuterClass { .alwaysUseFieldBuilders) { getOneoffGatherPointDetectorDataListFieldBuilder(); getClientCollectorDataListFieldBuilder(); - getCoolDownGroupDataListFieldBuilder(); - getAnchorPointListFieldBuilder(); getNormalCoolDownDataListFieldBuilder(); + getAnchorPointListFieldBuilder(); + getCoolDownGroupDataListFieldBuilder(); getSlotListFieldBuilder(); } } @@ -1459,11 +1459,11 @@ public final class AllWidgetDataNotifyOuterClass { } cMFPEOMAJLM_ = 0; - if (coolDownGroupDataListBuilder_ == null) { - coolDownGroupDataList_ = java.util.Collections.emptyList(); + if (normalCoolDownDataListBuilder_ == null) { + normalCoolDownDataList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); } else { - coolDownGroupDataListBuilder_.clear(); + normalCoolDownDataListBuilder_.clear(); } if (anchorPointListBuilder_ == null) { anchorPointList_ = java.util.Collections.emptyList(); @@ -1477,11 +1477,11 @@ public final class AllWidgetDataNotifyOuterClass { lunchBoxData_ = null; lunchBoxDataBuilder_ = null; } - if (normalCoolDownDataListBuilder_ == null) { - normalCoolDownDataList_ = java.util.Collections.emptyList(); + if (coolDownGroupDataListBuilder_ == null) { + coolDownGroupDataList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000010); } else { - normalCoolDownDataListBuilder_.clear(); + coolDownGroupDataListBuilder_.clear(); } if (eLIOJBDGIMJBuilder_ == null) { eLIOJBDGIMJ_ = null; @@ -1565,14 +1565,14 @@ public final class AllWidgetDataNotifyOuterClass { result.clientCollectorDataList_ = clientCollectorDataListBuilder_.build(); } result.cMFPEOMAJLM_ = cMFPEOMAJLM_; - if (coolDownGroupDataListBuilder_ == null) { + if (normalCoolDownDataListBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { - coolDownGroupDataList_ = java.util.Collections.unmodifiableList(coolDownGroupDataList_); + normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_); bitField0_ = (bitField0_ & ~0x00000004); } - result.coolDownGroupDataList_ = coolDownGroupDataList_; + result.normalCoolDownDataList_ = normalCoolDownDataList_; } else { - result.coolDownGroupDataList_ = coolDownGroupDataListBuilder_.build(); + result.normalCoolDownDataList_ = normalCoolDownDataListBuilder_.build(); } if (anchorPointListBuilder_ == null) { if (((bitField0_ & 0x00000008) != 0)) { @@ -1588,14 +1588,14 @@ public final class AllWidgetDataNotifyOuterClass { } else { result.lunchBoxData_ = lunchBoxDataBuilder_.build(); } - if (normalCoolDownDataListBuilder_ == null) { + if (coolDownGroupDataListBuilder_ == null) { if (((bitField0_ & 0x00000010) != 0)) { - normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_); + coolDownGroupDataList_ = java.util.Collections.unmodifiableList(coolDownGroupDataList_); bitField0_ = (bitField0_ & ~0x00000010); } - result.normalCoolDownDataList_ = normalCoolDownDataList_; + result.coolDownGroupDataList_ = coolDownGroupDataList_; } else { - result.normalCoolDownDataList_ = normalCoolDownDataListBuilder_.build(); + result.coolDownGroupDataList_ = coolDownGroupDataListBuilder_.build(); } if (eLIOJBDGIMJBuilder_ == null) { result.eLIOJBDGIMJ_ = eLIOJBDGIMJ_; @@ -1740,29 +1740,29 @@ public final class AllWidgetDataNotifyOuterClass { if (other.getCMFPEOMAJLM() != 0) { setCMFPEOMAJLM(other.getCMFPEOMAJLM()); } - if (coolDownGroupDataListBuilder_ == null) { - if (!other.coolDownGroupDataList_.isEmpty()) { - if (coolDownGroupDataList_.isEmpty()) { - coolDownGroupDataList_ = other.coolDownGroupDataList_; + if (normalCoolDownDataListBuilder_ == null) { + if (!other.normalCoolDownDataList_.isEmpty()) { + if (normalCoolDownDataList_.isEmpty()) { + normalCoolDownDataList_ = other.normalCoolDownDataList_; bitField0_ = (bitField0_ & ~0x00000004); } else { - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.addAll(other.coolDownGroupDataList_); + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.addAll(other.normalCoolDownDataList_); } onChanged(); } } else { - if (!other.coolDownGroupDataList_.isEmpty()) { - if (coolDownGroupDataListBuilder_.isEmpty()) { - coolDownGroupDataListBuilder_.dispose(); - coolDownGroupDataListBuilder_ = null; - coolDownGroupDataList_ = other.coolDownGroupDataList_; + if (!other.normalCoolDownDataList_.isEmpty()) { + if (normalCoolDownDataListBuilder_.isEmpty()) { + normalCoolDownDataListBuilder_.dispose(); + normalCoolDownDataListBuilder_ = null; + normalCoolDownDataList_ = other.normalCoolDownDataList_; bitField0_ = (bitField0_ & ~0x00000004); - coolDownGroupDataListBuilder_ = + normalCoolDownDataListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getCoolDownGroupDataListFieldBuilder() : null; + getNormalCoolDownDataListFieldBuilder() : null; } else { - coolDownGroupDataListBuilder_.addAllMessages(other.coolDownGroupDataList_); + normalCoolDownDataListBuilder_.addAllMessages(other.normalCoolDownDataList_); } } } @@ -1795,29 +1795,29 @@ public final class AllWidgetDataNotifyOuterClass { if (other.hasLunchBoxData()) { mergeLunchBoxData(other.getLunchBoxData()); } - if (normalCoolDownDataListBuilder_ == null) { - if (!other.normalCoolDownDataList_.isEmpty()) { - if (normalCoolDownDataList_.isEmpty()) { - normalCoolDownDataList_ = other.normalCoolDownDataList_; + if (coolDownGroupDataListBuilder_ == null) { + if (!other.coolDownGroupDataList_.isEmpty()) { + if (coolDownGroupDataList_.isEmpty()) { + coolDownGroupDataList_ = other.coolDownGroupDataList_; bitField0_ = (bitField0_ & ~0x00000010); } else { - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.addAll(other.normalCoolDownDataList_); + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.addAll(other.coolDownGroupDataList_); } onChanged(); } } else { - if (!other.normalCoolDownDataList_.isEmpty()) { - if (normalCoolDownDataListBuilder_.isEmpty()) { - normalCoolDownDataListBuilder_.dispose(); - normalCoolDownDataListBuilder_ = null; - normalCoolDownDataList_ = other.normalCoolDownDataList_; + if (!other.coolDownGroupDataList_.isEmpty()) { + if (coolDownGroupDataListBuilder_.isEmpty()) { + coolDownGroupDataListBuilder_.dispose(); + coolDownGroupDataListBuilder_ = null; + coolDownGroupDataList_ = other.coolDownGroupDataList_; bitField0_ = (bitField0_ & ~0x00000010); - normalCoolDownDataListBuilder_ = + coolDownGroupDataListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getNormalCoolDownDataListFieldBuilder() : null; + getCoolDownGroupDataListFieldBuilder() : null; } else { - normalCoolDownDataListBuilder_.addAllMessages(other.normalCoolDownDataList_); + coolDownGroupDataListBuilder_.addAllMessages(other.coolDownGroupDataList_); } } } @@ -2423,244 +2423,244 @@ public final class AllWidgetDataNotifyOuterClass { return this; } - private java.util.List coolDownGroupDataList_ = + private java.util.List normalCoolDownDataList_ = java.util.Collections.emptyList(); - private void ensureCoolDownGroupDataListIsMutable() { + private void ensureNormalCoolDownDataListIsMutable() { if (!((bitField0_ & 0x00000004) != 0)) { - coolDownGroupDataList_ = new java.util.ArrayList(coolDownGroupDataList_); + normalCoolDownDataList_ = new java.util.ArrayList(normalCoolDownDataList_); 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> coolDownGroupDataListBuilder_; + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> normalCoolDownDataListBuilder_; /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public java.util.List getCoolDownGroupDataListList() { - if (coolDownGroupDataListBuilder_ == null) { - return java.util.Collections.unmodifiableList(coolDownGroupDataList_); + public java.util.List getNormalCoolDownDataListList() { + if (normalCoolDownDataListBuilder_ == null) { + return java.util.Collections.unmodifiableList(normalCoolDownDataList_); } else { - return coolDownGroupDataListBuilder_.getMessageList(); + return normalCoolDownDataListBuilder_.getMessageList(); } } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public int getCoolDownGroupDataListCount() { - if (coolDownGroupDataListBuilder_ == null) { - return coolDownGroupDataList_.size(); + public int getNormalCoolDownDataListCount() { + if (normalCoolDownDataListBuilder_ == null) { + return normalCoolDownDataList_.size(); } else { - return coolDownGroupDataListBuilder_.getCount(); + return normalCoolDownDataListBuilder_.getCount(); } } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index) { - if (coolDownGroupDataListBuilder_ == null) { - return coolDownGroupDataList_.get(index); + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) { + if (normalCoolDownDataListBuilder_ == null) { + return normalCoolDownDataList_.get(index); } else { - return coolDownGroupDataListBuilder_.getMessage(index); + return normalCoolDownDataListBuilder_.getMessage(index); } } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder setCoolDownGroupDataList( + public Builder setNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { - if (coolDownGroupDataListBuilder_ == null) { + if (normalCoolDownDataListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.set(index, value); + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.set(index, value); onChanged(); } else { - coolDownGroupDataListBuilder_.setMessage(index, value); + normalCoolDownDataListBuilder_.setMessage(index, value); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder setCoolDownGroupDataList( + public Builder setNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { - if (coolDownGroupDataListBuilder_ == null) { - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.set(index, builderForValue.build()); + if (normalCoolDownDataListBuilder_ == null) { + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.set(index, builderForValue.build()); onChanged(); } else { - coolDownGroupDataListBuilder_.setMessage(index, builderForValue.build()); + normalCoolDownDataListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder addCoolDownGroupDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { - if (coolDownGroupDataListBuilder_ == null) { + public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { + if (normalCoolDownDataListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.add(value); + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.add(value); onChanged(); } else { - coolDownGroupDataListBuilder_.addMessage(value); + normalCoolDownDataListBuilder_.addMessage(value); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder addCoolDownGroupDataList( + public Builder addNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { - if (coolDownGroupDataListBuilder_ == null) { + if (normalCoolDownDataListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.add(index, value); + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.add(index, value); onChanged(); } else { - coolDownGroupDataListBuilder_.addMessage(index, value); + normalCoolDownDataListBuilder_.addMessage(index, value); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder addCoolDownGroupDataList( + public Builder addNormalCoolDownDataList( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { - if (coolDownGroupDataListBuilder_ == null) { - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.add(builderForValue.build()); + if (normalCoolDownDataListBuilder_ == null) { + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.add(builderForValue.build()); onChanged(); } else { - coolDownGroupDataListBuilder_.addMessage(builderForValue.build()); + normalCoolDownDataListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder addCoolDownGroupDataList( + public Builder addNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { - if (coolDownGroupDataListBuilder_ == null) { - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.add(index, builderForValue.build()); + if (normalCoolDownDataListBuilder_ == null) { + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.add(index, builderForValue.build()); onChanged(); } else { - coolDownGroupDataListBuilder_.addMessage(index, builderForValue.build()); + normalCoolDownDataListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder addAllCoolDownGroupDataList( + public Builder addAllNormalCoolDownDataList( java.lang.Iterable values) { - if (coolDownGroupDataListBuilder_ == null) { - ensureCoolDownGroupDataListIsMutable(); + if (normalCoolDownDataListBuilder_ == null) { + ensureNormalCoolDownDataListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, coolDownGroupDataList_); + values, normalCoolDownDataList_); onChanged(); } else { - coolDownGroupDataListBuilder_.addAllMessages(values); + normalCoolDownDataListBuilder_.addAllMessages(values); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder clearCoolDownGroupDataList() { - if (coolDownGroupDataListBuilder_ == null) { - coolDownGroupDataList_ = java.util.Collections.emptyList(); + public Builder clearNormalCoolDownDataList() { + if (normalCoolDownDataListBuilder_ == null) { + normalCoolDownDataList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); } else { - coolDownGroupDataListBuilder_.clear(); + normalCoolDownDataListBuilder_.clear(); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public Builder removeCoolDownGroupDataList(int index) { - if (coolDownGroupDataListBuilder_ == null) { - ensureCoolDownGroupDataListIsMutable(); - coolDownGroupDataList_.remove(index); + public Builder removeNormalCoolDownDataList(int index) { + if (normalCoolDownDataListBuilder_ == null) { + ensureNormalCoolDownDataListIsMutable(); + normalCoolDownDataList_.remove(index); onChanged(); } else { - coolDownGroupDataListBuilder_.remove(index); + normalCoolDownDataListBuilder_.remove(index); } return this; } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getCoolDownGroupDataListBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getNormalCoolDownDataListBuilder( int index) { - return getCoolDownGroupDataListFieldBuilder().getBuilder(index); + return getNormalCoolDownDataListFieldBuilder().getBuilder(index); } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( int index) { - if (coolDownGroupDataListBuilder_ == null) { - return coolDownGroupDataList_.get(index); } else { - return coolDownGroupDataListBuilder_.getMessageOrBuilder(index); + if (normalCoolDownDataListBuilder_ == null) { + return normalCoolDownDataList_.get(index); } else { + return normalCoolDownDataListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ public java.util.List - getCoolDownGroupDataListOrBuilderList() { - if (coolDownGroupDataListBuilder_ != null) { - return coolDownGroupDataListBuilder_.getMessageOrBuilderList(); + getNormalCoolDownDataListOrBuilderList() { + if (normalCoolDownDataListBuilder_ != null) { + return normalCoolDownDataListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(coolDownGroupDataList_); + return java.util.Collections.unmodifiableList(normalCoolDownDataList_); } } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addCoolDownGroupDataListBuilder() { - return getCoolDownGroupDataListFieldBuilder().addBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder() { + return getNormalCoolDownDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addCoolDownGroupDataListBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder( int index) { - return getCoolDownGroupDataListFieldBuilder().addBuilder( + return getNormalCoolDownDataListFieldBuilder().addBuilder( index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData cool_down_group_data_list = 8; + * repeated .WidgetCoolDownData normalCoolDownDataList = 8; */ public java.util.List - getCoolDownGroupDataListBuilderList() { - return getCoolDownGroupDataListFieldBuilder().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> - getCoolDownGroupDataListFieldBuilder() { - if (coolDownGroupDataListBuilder_ == null) { - coolDownGroupDataListBuilder_ = 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>( - coolDownGroupDataList_, + normalCoolDownDataList_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); - coolDownGroupDataList_ = null; + normalCoolDownDataList_ = null; } - return coolDownGroupDataListBuilder_; + return normalCoolDownDataListBuilder_; } private java.util.List anchorPointList_ = @@ -3022,244 +3022,244 @@ public final class AllWidgetDataNotifyOuterClass { return lunchBoxDataBuilder_; } - private java.util.List normalCoolDownDataList_ = + private java.util.List coolDownGroupDataList_ = java.util.Collections.emptyList(); - private void ensureNormalCoolDownDataListIsMutable() { + private void ensureCoolDownGroupDataListIsMutable() { if (!((bitField0_ & 0x00000010) != 0)) { - normalCoolDownDataList_ = new java.util.ArrayList(normalCoolDownDataList_); + coolDownGroupDataList_ = new java.util.ArrayList(coolDownGroupDataList_); 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> normalCoolDownDataListBuilder_; + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> coolDownGroupDataListBuilder_; /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public java.util.List getNormalCoolDownDataListList() { - if (normalCoolDownDataListBuilder_ == null) { - return java.util.Collections.unmodifiableList(normalCoolDownDataList_); + public java.util.List getCoolDownGroupDataListList() { + if (coolDownGroupDataListBuilder_ == null) { + return java.util.Collections.unmodifiableList(coolDownGroupDataList_); } else { - return normalCoolDownDataListBuilder_.getMessageList(); + return coolDownGroupDataListBuilder_.getMessageList(); } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public int getNormalCoolDownDataListCount() { - if (normalCoolDownDataListBuilder_ == null) { - return normalCoolDownDataList_.size(); + public int getCoolDownGroupDataListCount() { + if (coolDownGroupDataListBuilder_ == null) { + return coolDownGroupDataList_.size(); } else { - return normalCoolDownDataListBuilder_.getCount(); + return coolDownGroupDataListBuilder_.getCount(); } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) { - if (normalCoolDownDataListBuilder_ == null) { - return normalCoolDownDataList_.get(index); + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getCoolDownGroupDataList(int index) { + if (coolDownGroupDataListBuilder_ == null) { + return coolDownGroupDataList_.get(index); } else { - return normalCoolDownDataListBuilder_.getMessage(index); + return coolDownGroupDataListBuilder_.getMessage(index); } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder setNormalCoolDownDataList( + public Builder setCoolDownGroupDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { - if (normalCoolDownDataListBuilder_ == null) { + if (coolDownGroupDataListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.set(index, value); + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.set(index, value); onChanged(); } else { - normalCoolDownDataListBuilder_.setMessage(index, value); + coolDownGroupDataListBuilder_.setMessage(index, value); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder setNormalCoolDownDataList( + public Builder setCoolDownGroupDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { - if (normalCoolDownDataListBuilder_ == null) { - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.set(index, builderForValue.build()); + if (coolDownGroupDataListBuilder_ == null) { + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.set(index, builderForValue.build()); onChanged(); } else { - normalCoolDownDataListBuilder_.setMessage(index, builderForValue.build()); + coolDownGroupDataListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { - if (normalCoolDownDataListBuilder_ == null) { + public Builder addCoolDownGroupDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { + if (coolDownGroupDataListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.add(value); + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.add(value); onChanged(); } else { - normalCoolDownDataListBuilder_.addMessage(value); + coolDownGroupDataListBuilder_.addMessage(value); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder addNormalCoolDownDataList( + public Builder addCoolDownGroupDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { - if (normalCoolDownDataListBuilder_ == null) { + if (coolDownGroupDataListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.add(index, value); + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.add(index, value); onChanged(); } else { - normalCoolDownDataListBuilder_.addMessage(index, value); + coolDownGroupDataListBuilder_.addMessage(index, value); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder addNormalCoolDownDataList( + public Builder addCoolDownGroupDataList( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { - if (normalCoolDownDataListBuilder_ == null) { - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.add(builderForValue.build()); + if (coolDownGroupDataListBuilder_ == null) { + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.add(builderForValue.build()); onChanged(); } else { - normalCoolDownDataListBuilder_.addMessage(builderForValue.build()); + coolDownGroupDataListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder addNormalCoolDownDataList( + public Builder addCoolDownGroupDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { - if (normalCoolDownDataListBuilder_ == null) { - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.add(index, builderForValue.build()); + if (coolDownGroupDataListBuilder_ == null) { + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.add(index, builderForValue.build()); onChanged(); } else { - normalCoolDownDataListBuilder_.addMessage(index, builderForValue.build()); + coolDownGroupDataListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder addAllNormalCoolDownDataList( + public Builder addAllCoolDownGroupDataList( java.lang.Iterable values) { - if (normalCoolDownDataListBuilder_ == null) { - ensureNormalCoolDownDataListIsMutable(); + if (coolDownGroupDataListBuilder_ == null) { + ensureCoolDownGroupDataListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, normalCoolDownDataList_); + values, coolDownGroupDataList_); onChanged(); } else { - normalCoolDownDataListBuilder_.addAllMessages(values); + coolDownGroupDataListBuilder_.addAllMessages(values); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder clearNormalCoolDownDataList() { - if (normalCoolDownDataListBuilder_ == null) { - normalCoolDownDataList_ = java.util.Collections.emptyList(); + public Builder clearCoolDownGroupDataList() { + if (coolDownGroupDataListBuilder_ == null) { + coolDownGroupDataList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000010); onChanged(); } else { - normalCoolDownDataListBuilder_.clear(); + coolDownGroupDataListBuilder_.clear(); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public Builder removeNormalCoolDownDataList(int index) { - if (normalCoolDownDataListBuilder_ == null) { - ensureNormalCoolDownDataListIsMutable(); - normalCoolDownDataList_.remove(index); + public Builder removeCoolDownGroupDataList(int index) { + if (coolDownGroupDataListBuilder_ == null) { + ensureCoolDownGroupDataListIsMutable(); + coolDownGroupDataList_.remove(index); onChanged(); } else { - normalCoolDownDataListBuilder_.remove(index); + coolDownGroupDataListBuilder_.remove(index); } return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getNormalCoolDownDataListBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getCoolDownGroupDataListBuilder( int index) { - return getNormalCoolDownDataListFieldBuilder().getBuilder(index); + return getCoolDownGroupDataListFieldBuilder().getBuilder(index); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getCoolDownGroupDataListOrBuilder( int index) { - if (normalCoolDownDataListBuilder_ == null) { - return normalCoolDownDataList_.get(index); } else { - return normalCoolDownDataListBuilder_.getMessageOrBuilder(index); + if (coolDownGroupDataListBuilder_ == null) { + return coolDownGroupDataList_.get(index); } else { + return coolDownGroupDataListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ public java.util.List - getNormalCoolDownDataListOrBuilderList() { - if (normalCoolDownDataListBuilder_ != null) { - return normalCoolDownDataListBuilder_.getMessageOrBuilderList(); + getCoolDownGroupDataListOrBuilderList() { + if (coolDownGroupDataListBuilder_ != null) { + return coolDownGroupDataListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(normalCoolDownDataList_); + return java.util.Collections.unmodifiableList(coolDownGroupDataList_); } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder() { - return getNormalCoolDownDataListFieldBuilder().addBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addCoolDownGroupDataListBuilder() { + return getCoolDownGroupDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ - public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder( + public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addCoolDownGroupDataListBuilder( int index) { - return getNormalCoolDownDataListFieldBuilder().addBuilder( + return getCoolDownGroupDataListFieldBuilder().addBuilder( index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 14; + * repeated .WidgetCoolDownData coolDownGroupDataList = 14; */ public java.util.List - getNormalCoolDownDataListBuilderList() { - return getNormalCoolDownDataListFieldBuilder().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> - getNormalCoolDownDataListFieldBuilder() { - if (normalCoolDownDataListBuilder_ == null) { - normalCoolDownDataListBuilder_ = 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>( - normalCoolDownDataList_, + coolDownGroupDataList_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); - normalCoolDownDataList_ = null; + coolDownGroupDataList_ = null; } - return normalCoolDownDataListBuilder_; + return coolDownGroupDataListBuilder_; } 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\"\244\005\n\023" + + "Data.proto\032\027WeatherWizardData.proto\"\234\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\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" + "\013CMFPEOMAJLM\030\n \001(\r\0223\n\026normalCoolDownData" + + "List\030\010 \003(\0132\023.WidgetCoolDownData\022+\n\021ancho" + + "r_point_list\030\017 \003(\0132\020.AnchorPointData\022%\n\016" + + "lunch_box_data\030\013 \001(\0132\r.LunchBoxData\0222\n\025c" + + "oolDownGroupDataList\030\016 \003(\0132\023.WidgetCoolD" + + "ownData\022!\n\013ELIOJBDGIMJ\030\014 \001(\0132\014.LANPHFCME" + + "BN\022:\n\031sky_crystal_detector_data\030\001 \001(\0132\027." + + "SkyCrystalDetectorData\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\023weather_wizard_data" + + "\030\002 \001(\0132\022.WeatherWizardDataB\033\n\031emu.grassc" + + "utter.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", "CoolDownGroupDataList", "AnchorPointList", "LunchBoxData", "NormalCoolDownDataList", "ELIOJBDGIMJ", "SkyCrystalDetectorData", "EMPBLGKLCOA", "NNPMMJCEJAO", "HALAOGOBMKJ", "SlotList", "BackgroundActiveWidgetList", "WeatherWizardData", }); + new java.lang.String[] { "OneoffGatherPointDetectorDataList", "ClientCollectorDataList", "CMFPEOMAJLM", "NormalCoolDownDataList", "AnchorPointList", "LunchBoxData", "CoolDownGroupDataList", "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/ChatInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java index cc3df4f0b..e9ecd7432 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java @@ -225,6 +225,10 @@ public final class ChatInfoOuterClass { } /** + *
+     * Obf: LGDLFPKODMA
+     * 
+ * * Protobuf enum {@code ChatInfo.SystemHintType} */ public enum SystemHintType @@ -352,10 +356,6 @@ public final class ChatInfoOuterClass { int getType(); } /** - *
-     * Obf: LGDLFPKODMA
-     * 
- * * Protobuf type {@code ChatInfo.SystemHint} */ public static final class SystemHint extends @@ -604,10 +604,6 @@ public final class ChatInfoOuterClass { return builder; } /** - *
-       * Obf: LGDLFPKODMA
-       * 
- * * Protobuf type {@code ChatInfo.SystemHint} */ public static final class Builder extends 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 54aebca52..6b2e442cb 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 result_item_list = 13; + * repeated .ItemParam totalExtraItemList = 13; */ java.util.List - getResultItemListList(); + getTotalExtraItemListList(); /** - * repeated .ItemParam result_item_list = 13; + * repeated .ItemParam totalExtraItemList = 13; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index); /** - * repeated .ItemParam result_item_list = 13; + * repeated .ItemParam totalExtraItemList = 13; */ - int getResultItemListCount(); + int getTotalExtraItemListCount(); /** - * repeated .ItemParam result_item_list = 13; + * repeated .ItemParam totalExtraItemList = 13; */ java.util.List - getResultItemListOrBuilderList(); + getTotalExtraItemListOrBuilderList(); /** - * repeated .ItemParam result_item_list = 13; + * repeated .ItemParam totalExtraItemList = 13; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder( int index); /** - * repeated .ItemParam total_random_item_list = 15; - */ - java.util.List - getTotalRandomItemListList(); - /** - * repeated .ItemParam total_random_item_list = 15; - */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index); - /** - * repeated .ItemParam total_random_item_list = 15; - */ - int getTotalRandomItemListCount(); - /** - * repeated .ItemParam total_random_item_list = 15; - */ - java.util.List - getTotalRandomItemListOrBuilderList(); - /** - * repeated .ItemParam total_random_item_list = 15; - */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( - int index); - - /** - * repeated .ItemParam total_return_item_list = 11; + * repeated .ItemParam total_return_item_list = 15; */ java.util.List getTotalReturnItemListList(); /** - * repeated .ItemParam total_return_item_list = 11; + * repeated .ItemParam total_return_item_list = 15; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index); /** - * repeated .ItemParam total_return_item_list = 11; + * repeated .ItemParam total_return_item_list = 15; */ int getTotalReturnItemListCount(); /** - * repeated .ItemParam total_return_item_list = 11; + * repeated .ItemParam total_return_item_list = 15; */ java.util.List getTotalReturnItemListOrBuilderList(); /** - * repeated .ItemParam total_return_item_list = 11; + * repeated .ItemParam total_return_item_list = 15; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( int index); /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalRandomItemList = 11; */ java.util.List - getTotalExtraItemListList(); + getTotalRandomItemListList(); /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalRandomItemList = 11; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index); /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalRandomItemList = 11; */ - int getTotalExtraItemListCount(); + int getTotalRandomItemListCount(); /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalRandomItemList = 11; */ java.util.List - getTotalExtraItemListOrBuilderList(); + getTotalRandomItemListOrBuilderList(); /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalRandomItemList = 11; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( + int index); + + /** + * repeated .ItemParam uk10 = 10; + */ + java.util.List + getUk10List(); + /** + * repeated .ItemParam uk10 = 10; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index); + /** + * repeated .ItemParam uk10 = 10; + */ + int getUk10Count(); + /** + * repeated .ItemParam uk10 = 10; + */ + java.util.List + getUk10OrBuilderList(); + /** + * repeated .ItemParam uk10 = 10; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( int index); /** @@ -139,27 +139,27 @@ public final class CombineRspOuterClass { int getRetcode(); /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ java.util.List - getGAEEJPPNJDDList(); + getResultItemListList(); /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGAEEJPPNJDD(int index); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index); /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - int getGAEEJPPNJDDCount(); + int getResultItemListCount(); /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ java.util.List - getGAEEJPPNJDDOrBuilderList(); + getResultItemListOrBuilderList(); /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGAEEJPPNJDDOrBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( int index); /** @@ -204,11 +204,11 @@ public final class CombineRspOuterClass { super(builder); } private CombineRsp() { - 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(); + totalReturnItemList_ = java.util.Collections.emptyList(); + totalRandomItemList_ = java.util.Collections.emptyList(); + uk10_ = java.util.Collections.emptyList(); + resultItemList_ = java.util.Collections.emptyList(); costItemList_ = java.util.Collections.emptyList(); } @@ -274,49 +274,49 @@ public final class CombineRspOuterClass { } case 66: { if (!((mutable_bitField0_ & 0x00000010) != 0)) { - gAEEJPPNJDD_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - gAEEJPPNJDD_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); - break; - } - case 82: { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - totalExtraItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - totalExtraItemList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); - break; - } - case 90: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - totalReturnItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - totalReturnItemList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); - break; - } - case 106: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { resultItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000010; } resultItemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 122: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + case 82: { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { + uk10_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000008; + } + uk10_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } + case 90: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { totalRandomItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000004; } totalRandomItemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } + case 106: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + totalExtraItemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + totalExtraItemList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } + case 122: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + totalReturnItemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + totalReturnItemList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -336,20 +336,20 @@ public final class CombineRspOuterClass { costItemList_ = java.util.Collections.unmodifiableList(costItemList_); } if (((mutable_bitField0_ & 0x00000010) != 0)) { - gAEEJPPNJDD_ = java.util.Collections.unmodifiableList(gAEEJPPNJDD_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_); - } - if (((mutable_bitField0_ & 0x00000001) != 0)) { resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_); } - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { + uk10_ = java.util.Collections.unmodifiableList(uk10_); + } + if (((mutable_bitField0_ & 0x00000004) != 0)) { totalRandomItemList_ = java.util.Collections.unmodifiableList(totalRandomItemList_); } + if (((mutable_bitField0_ & 0x00000001) != 0)) { + totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_); + } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -389,137 +389,17 @@ public final class CombineRspOuterClass { return combineCount_; } - public static final int RESULT_ITEM_LIST_FIELD_NUMBER = 13; - private java.util.List resultItemList_; - /** - * repeated .ItemParam result_item_list = 13; - */ - @java.lang.Override - public java.util.List getResultItemListList() { - return resultItemList_; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - @java.lang.Override - public java.util.List - getResultItemListOrBuilderList() { - return resultItemList_; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - @java.lang.Override - public int getResultItemListCount() { - return resultItemList_.size(); - } - /** - * repeated .ItemParam result_item_list = 13; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { - return resultItemList_.get(index); - } - /** - * repeated .ItemParam result_item_list = 13; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( - int index) { - return resultItemList_.get(index); - } - - public static final int TOTAL_RANDOM_ITEM_LIST_FIELD_NUMBER = 15; - private java.util.List totalRandomItemList_; - /** - * repeated .ItemParam total_random_item_list = 15; - */ - @java.lang.Override - public java.util.List getTotalRandomItemListList() { - return totalRandomItemList_; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - @java.lang.Override - public java.util.List - getTotalRandomItemListOrBuilderList() { - return totalRandomItemList_; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - @java.lang.Override - public int getTotalRandomItemListCount() { - return totalRandomItemList_.size(); - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) { - return totalRandomItemList_.get(index); - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( - int index) { - return totalRandomItemList_.get(index); - } - - public static final int TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER = 11; - private java.util.List totalReturnItemList_; - /** - * repeated .ItemParam total_return_item_list = 11; - */ - @java.lang.Override - public java.util.List getTotalReturnItemListList() { - return totalReturnItemList_; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - @java.lang.Override - public java.util.List - getTotalReturnItemListOrBuilderList() { - return totalReturnItemList_; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - @java.lang.Override - public int getTotalReturnItemListCount() { - return totalReturnItemList_.size(); - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) { - return totalReturnItemList_.get(index); - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( - int index) { - return totalReturnItemList_.get(index); - } - - public static final int TOTAL_EXTRA_ITEM_LIST_FIELD_NUMBER = 10; + public static final int TOTALEXTRAITEMLIST_FIELD_NUMBER = 13; private java.util.List totalExtraItemList_; /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ @java.lang.Override public java.util.List getTotalExtraItemListList() { return totalExtraItemList_; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ @java.lang.Override public java.util.List @@ -527,21 +407,21 @@ public final class CombineRspOuterClass { return totalExtraItemList_; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ @java.lang.Override public int getTotalExtraItemListCount() { return totalExtraItemList_.size(); } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index) { return totalExtraItemList_.get(index); } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder( @@ -549,6 +429,126 @@ public final class CombineRspOuterClass { return totalExtraItemList_.get(index); } + public static final int TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER = 15; + private java.util.List totalReturnItemList_; + /** + * repeated .ItemParam total_return_item_list = 15; + */ + @java.lang.Override + public java.util.List getTotalReturnItemListList() { + return totalReturnItemList_; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + @java.lang.Override + public java.util.List + getTotalReturnItemListOrBuilderList() { + return totalReturnItemList_; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + @java.lang.Override + public int getTotalReturnItemListCount() { + return totalReturnItemList_.size(); + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) { + return totalReturnItemList_.get(index); + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( + int index) { + return totalReturnItemList_.get(index); + } + + public static final int TOTALRANDOMITEMLIST_FIELD_NUMBER = 11; + private java.util.List totalRandomItemList_; + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + @java.lang.Override + public java.util.List getTotalRandomItemListList() { + return totalRandomItemList_; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + @java.lang.Override + public java.util.List + getTotalRandomItemListOrBuilderList() { + return totalRandomItemList_; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + @java.lang.Override + public int getTotalRandomItemListCount() { + return totalRandomItemList_.size(); + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) { + return totalRandomItemList_.get(index); + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( + int index) { + return totalRandomItemList_.get(index); + } + + public static final int UK10_FIELD_NUMBER = 10; + private java.util.List uk10_; + /** + * repeated .ItemParam uk10 = 10; + */ + @java.lang.Override + public java.util.List getUk10List() { + return uk10_; + } + /** + * repeated .ItemParam uk10 = 10; + */ + @java.lang.Override + public java.util.List + getUk10OrBuilderList() { + return uk10_; + } + /** + * repeated .ItemParam uk10 = 10; + */ + @java.lang.Override + public int getUk10Count() { + return uk10_.size(); + } + /** + * repeated .ItemParam uk10 = 10; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index) { + return uk10_.get(index); + } + /** + * repeated .ItemParam uk10 = 10; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( + int index) { + return uk10_.get(index); + } + public static final int AVATAR_GUID_FIELD_NUMBER = 5; private long avatarGuid_; /** @@ -571,44 +571,44 @@ public final class CombineRspOuterClass { return retcode_; } - public static final int GAEEJPPNJDD_FIELD_NUMBER = 8; - private java.util.List gAEEJPPNJDD_; + public static final int RESULT_ITEM_LIST_FIELD_NUMBER = 8; + private java.util.List resultItemList_; /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ @java.lang.Override - public java.util.List getGAEEJPPNJDDList() { - return gAEEJPPNJDD_; + public java.util.List getResultItemListList() { + return resultItemList_; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ @java.lang.Override public java.util.List - getGAEEJPPNJDDOrBuilderList() { - return gAEEJPPNJDD_; + getResultItemListOrBuilderList() { + return resultItemList_; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ @java.lang.Override - public int getGAEEJPPNJDDCount() { - return gAEEJPPNJDD_.size(); + public int getResultItemListCount() { + return resultItemList_.size(); } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGAEEJPPNJDD(int index) { - return gAEEJPPNJDD_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { + return resultItemList_.get(index); } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGAEEJPPNJDDOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( int index) { - return gAEEJPPNJDD_.get(index); + return resultItemList_.get(index); } public static final int COST_ITEM_LIST_FIELD_NUMBER = 4; @@ -680,20 +680,20 @@ public final class CombineRspOuterClass { if (combineId_ != 0) { output.writeUInt32(7, combineId_); } - for (int i = 0; i < gAEEJPPNJDD_.size(); i++) { - output.writeMessage(8, gAEEJPPNJDD_.get(i)); - } - for (int i = 0; i < totalExtraItemList_.size(); i++) { - output.writeMessage(10, totalExtraItemList_.get(i)); - } - for (int i = 0; i < totalReturnItemList_.size(); i++) { - output.writeMessage(11, totalReturnItemList_.get(i)); - } for (int i = 0; i < resultItemList_.size(); i++) { - output.writeMessage(13, resultItemList_.get(i)); + output.writeMessage(8, resultItemList_.get(i)); + } + for (int i = 0; i < uk10_.size(); i++) { + output.writeMessage(10, uk10_.get(i)); } for (int i = 0; i < totalRandomItemList_.size(); i++) { - output.writeMessage(15, totalRandomItemList_.get(i)); + output.writeMessage(11, totalRandomItemList_.get(i)); + } + for (int i = 0; i < totalExtraItemList_.size(); i++) { + output.writeMessage(13, totalExtraItemList_.get(i)); + } + for (int i = 0; i < totalReturnItemList_.size(); i++) { + output.writeMessage(15, totalReturnItemList_.get(i)); } unknownFields.writeTo(output); } @@ -724,25 +724,25 @@ public final class CombineRspOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(7, combineId_); } - for (int i = 0; i < gAEEJPPNJDD_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, gAEEJPPNJDD_.get(i)); - } - for (int i = 0; i < totalExtraItemList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, totalExtraItemList_.get(i)); - } - for (int i = 0; i < totalReturnItemList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, totalReturnItemList_.get(i)); - } for (int i = 0; i < resultItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, resultItemList_.get(i)); + .computeMessageSize(8, resultItemList_.get(i)); + } + for (int i = 0; i < uk10_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, uk10_.get(i)); } for (int i = 0; i < totalRandomItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, totalRandomItemList_.get(i)); + .computeMessageSize(11, totalRandomItemList_.get(i)); + } + for (int i = 0; i < totalExtraItemList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(13, totalExtraItemList_.get(i)); + } + for (int i = 0; i < totalReturnItemList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(15, totalReturnItemList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -763,20 +763,20 @@ public final class CombineRspOuterClass { != other.getCombineId()) return false; if (getCombineCount() != other.getCombineCount()) 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 (!getTotalReturnItemListList() + .equals(other.getTotalReturnItemListList())) return false; + if (!getTotalRandomItemListList() + .equals(other.getTotalRandomItemListList())) return false; + if (!getUk10List() + .equals(other.getUk10List())) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; if (getRetcode() != other.getRetcode()) return false; - if (!getGAEEJPPNJDDList() - .equals(other.getGAEEJPPNJDDList())) return false; + if (!getResultItemListList() + .equals(other.getResultItemListList())) return false; if (!getCostItemListList() .equals(other.getCostItemListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -794,30 +794,30 @@ public final class CombineRspOuterClass { hash = (53 * hash) + getCombineId(); hash = (37 * hash) + COMBINE_COUNT_FIELD_NUMBER; hash = (53 * hash) + getCombineCount(); - if (getResultItemListCount() > 0) { - hash = (37 * hash) + RESULT_ITEM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getResultItemListList().hashCode(); - } - if (getTotalRandomItemListCount() > 0) { - hash = (37 * hash) + TOTAL_RANDOM_ITEM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getTotalRandomItemListList().hashCode(); + if (getTotalExtraItemListCount() > 0) { + hash = (37 * hash) + TOTALEXTRAITEMLIST_FIELD_NUMBER; + hash = (53 * hash) + getTotalExtraItemListList().hashCode(); } if (getTotalReturnItemListCount() > 0) { hash = (37 * hash) + TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getTotalReturnItemListList().hashCode(); } - if (getTotalExtraItemListCount() > 0) { - hash = (37 * hash) + TOTAL_EXTRA_ITEM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getTotalExtraItemListList().hashCode(); + if (getTotalRandomItemListCount() > 0) { + hash = (37 * hash) + TOTALRANDOMITEMLIST_FIELD_NUMBER; + hash = (53 * hash) + getTotalRandomItemListList().hashCode(); + } + if (getUk10Count() > 0) { + hash = (37 * hash) + UK10_FIELD_NUMBER; + hash = (53 * hash) + getUk10List().hashCode(); } hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - if (getGAEEJPPNJDDCount() > 0) { - hash = (37 * hash) + GAEEJPPNJDD_FIELD_NUMBER; - hash = (53 * hash) + getGAEEJPPNJDDList().hashCode(); + if (getResultItemListCount() > 0) { + hash = (37 * hash) + RESULT_ITEM_LIST_FIELD_NUMBER; + hash = (53 * hash) + getResultItemListList().hashCode(); } if (getCostItemListCount() > 0) { hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER; @@ -956,11 +956,11 @@ public final class CombineRspOuterClass { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getResultItemListFieldBuilder(); - getTotalRandomItemListFieldBuilder(); - getTotalReturnItemListFieldBuilder(); getTotalExtraItemListFieldBuilder(); - getGAEEJPPNJDDFieldBuilder(); + getTotalReturnItemListFieldBuilder(); + getTotalRandomItemListFieldBuilder(); + getUk10FieldBuilder(); + getResultItemListFieldBuilder(); getCostItemListFieldBuilder(); } } @@ -971,39 +971,39 @@ public final class CombineRspOuterClass { combineCount_ = 0; - if (resultItemListBuilder_ == null) { - resultItemList_ = java.util.Collections.emptyList(); + if (totalExtraItemListBuilder_ == null) { + totalExtraItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { - resultItemListBuilder_.clear(); - } - if (totalRandomItemListBuilder_ == null) { - totalRandomItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); - } else { - totalRandomItemListBuilder_.clear(); + totalExtraItemListBuilder_.clear(); } if (totalReturnItemListBuilder_ == null) { totalReturnItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); } else { totalReturnItemListBuilder_.clear(); } - if (totalExtraItemListBuilder_ == null) { - totalExtraItemList_ = java.util.Collections.emptyList(); + if (totalRandomItemListBuilder_ == null) { + totalRandomItemList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + totalRandomItemListBuilder_.clear(); + } + if (uk10Builder_ == null) { + uk10_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000008); } else { - totalExtraItemListBuilder_.clear(); + uk10Builder_.clear(); } avatarGuid_ = 0L; retcode_ = 0; - if (gAEEJPPNJDDBuilder_ == null) { - gAEEJPPNJDD_ = java.util.Collections.emptyList(); + if (resultItemListBuilder_ == null) { + resultItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000010); } else { - gAEEJPPNJDDBuilder_.clear(); + resultItemListBuilder_.clear(); } if (costItemListBuilder_ == null) { costItemList_ = java.util.Collections.emptyList(); @@ -1040,52 +1040,52 @@ public final class CombineRspOuterClass { int from_bitField0_ = bitField0_; result.combineId_ = combineId_; result.combineCount_ = combineCount_; - if (resultItemListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.resultItemList_ = resultItemList_; - } else { - result.resultItemList_ = resultItemListBuilder_.build(); - } - if (totalRandomItemListBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { - totalRandomItemList_ = java.util.Collections.unmodifiableList(totalRandomItemList_); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.totalRandomItemList_ = totalRandomItemList_; - } else { - result.totalRandomItemList_ = totalRandomItemListBuilder_.build(); - } - if (totalReturnItemListBuilder_ == null) { - if (((bitField0_ & 0x00000004) != 0)) { - totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_); - bitField0_ = (bitField0_ & ~0x00000004); - } - result.totalReturnItemList_ = totalReturnItemList_; - } else { - result.totalReturnItemList_ = totalReturnItemListBuilder_.build(); - } if (totalExtraItemListBuilder_ == null) { - if (((bitField0_ & 0x00000008) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000001); } result.totalExtraItemList_ = totalExtraItemList_; } else { result.totalExtraItemList_ = totalExtraItemListBuilder_.build(); } + if (totalReturnItemListBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0)) { + totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.totalReturnItemList_ = totalReturnItemList_; + } else { + result.totalReturnItemList_ = totalReturnItemListBuilder_.build(); + } + if (totalRandomItemListBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0)) { + totalRandomItemList_ = java.util.Collections.unmodifiableList(totalRandomItemList_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.totalRandomItemList_ = totalRandomItemList_; + } else { + result.totalRandomItemList_ = totalRandomItemListBuilder_.build(); + } + if (uk10Builder_ == null) { + if (((bitField0_ & 0x00000008) != 0)) { + uk10_ = java.util.Collections.unmodifiableList(uk10_); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.uk10_ = uk10_; + } else { + result.uk10_ = uk10Builder_.build(); + } result.avatarGuid_ = avatarGuid_; result.retcode_ = retcode_; - if (gAEEJPPNJDDBuilder_ == null) { + if (resultItemListBuilder_ == null) { if (((bitField0_ & 0x00000010) != 0)) { - gAEEJPPNJDD_ = java.util.Collections.unmodifiableList(gAEEJPPNJDD_); + resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_); bitField0_ = (bitField0_ & ~0x00000010); } - result.gAEEJPPNJDD_ = gAEEJPPNJDD_; + result.resultItemList_ = resultItemList_; } else { - result.gAEEJPPNJDD_ = gAEEJPPNJDDBuilder_.build(); + result.resultItemList_ = resultItemListBuilder_.build(); } if (costItemListBuilder_ == null) { if (((bitField0_ & 0x00000020) != 0)) { @@ -1150,89 +1150,11 @@ public final class CombineRspOuterClass { if (other.getCombineCount() != 0) { setCombineCount(other.getCombineCount()); } - if (resultItemListBuilder_ == null) { - if (!other.resultItemList_.isEmpty()) { - if (resultItemList_.isEmpty()) { - resultItemList_ = other.resultItemList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureResultItemListIsMutable(); - resultItemList_.addAll(other.resultItemList_); - } - onChanged(); - } - } else { - if (!other.resultItemList_.isEmpty()) { - if (resultItemListBuilder_.isEmpty()) { - resultItemListBuilder_.dispose(); - resultItemListBuilder_ = null; - resultItemList_ = other.resultItemList_; - bitField0_ = (bitField0_ & ~0x00000001); - resultItemListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getResultItemListFieldBuilder() : null; - } else { - resultItemListBuilder_.addAllMessages(other.resultItemList_); - } - } - } - if (totalRandomItemListBuilder_ == null) { - if (!other.totalRandomItemList_.isEmpty()) { - if (totalRandomItemList_.isEmpty()) { - totalRandomItemList_ = other.totalRandomItemList_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.addAll(other.totalRandomItemList_); - } - onChanged(); - } - } else { - if (!other.totalRandomItemList_.isEmpty()) { - if (totalRandomItemListBuilder_.isEmpty()) { - totalRandomItemListBuilder_.dispose(); - totalRandomItemListBuilder_ = null; - totalRandomItemList_ = other.totalRandomItemList_; - bitField0_ = (bitField0_ & ~0x00000002); - totalRandomItemListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getTotalRandomItemListFieldBuilder() : null; - } else { - totalRandomItemListBuilder_.addAllMessages(other.totalRandomItemList_); - } - } - } - if (totalReturnItemListBuilder_ == null) { - if (!other.totalReturnItemList_.isEmpty()) { - if (totalReturnItemList_.isEmpty()) { - totalReturnItemList_ = other.totalReturnItemList_; - bitField0_ = (bitField0_ & ~0x00000004); - } else { - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.addAll(other.totalReturnItemList_); - } - onChanged(); - } - } else { - if (!other.totalReturnItemList_.isEmpty()) { - if (totalReturnItemListBuilder_.isEmpty()) { - totalReturnItemListBuilder_.dispose(); - totalReturnItemListBuilder_ = null; - totalReturnItemList_ = other.totalReturnItemList_; - bitField0_ = (bitField0_ & ~0x00000004); - totalReturnItemListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getTotalReturnItemListFieldBuilder() : null; - } else { - totalReturnItemListBuilder_.addAllMessages(other.totalReturnItemList_); - } - } - } if (totalExtraItemListBuilder_ == null) { if (!other.totalExtraItemList_.isEmpty()) { if (totalExtraItemList_.isEmpty()) { totalExtraItemList_ = other.totalExtraItemList_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureTotalExtraItemListIsMutable(); totalExtraItemList_.addAll(other.totalExtraItemList_); @@ -1245,7 +1167,7 @@ public final class CombineRspOuterClass { totalExtraItemListBuilder_.dispose(); totalExtraItemListBuilder_ = null; totalExtraItemList_ = other.totalExtraItemList_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000001); totalExtraItemListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getTotalExtraItemListFieldBuilder() : null; @@ -1254,35 +1176,113 @@ public final class CombineRspOuterClass { } } } + if (totalReturnItemListBuilder_ == null) { + if (!other.totalReturnItemList_.isEmpty()) { + if (totalReturnItemList_.isEmpty()) { + totalReturnItemList_ = other.totalReturnItemList_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.addAll(other.totalReturnItemList_); + } + onChanged(); + } + } else { + if (!other.totalReturnItemList_.isEmpty()) { + if (totalReturnItemListBuilder_.isEmpty()) { + totalReturnItemListBuilder_.dispose(); + totalReturnItemListBuilder_ = null; + totalReturnItemList_ = other.totalReturnItemList_; + bitField0_ = (bitField0_ & ~0x00000002); + totalReturnItemListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getTotalReturnItemListFieldBuilder() : null; + } else { + totalReturnItemListBuilder_.addAllMessages(other.totalReturnItemList_); + } + } + } + if (totalRandomItemListBuilder_ == null) { + if (!other.totalRandomItemList_.isEmpty()) { + if (totalRandomItemList_.isEmpty()) { + totalRandomItemList_ = other.totalRandomItemList_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.addAll(other.totalRandomItemList_); + } + onChanged(); + } + } else { + if (!other.totalRandomItemList_.isEmpty()) { + if (totalRandomItemListBuilder_.isEmpty()) { + totalRandomItemListBuilder_.dispose(); + totalRandomItemListBuilder_ = null; + totalRandomItemList_ = other.totalRandomItemList_; + bitField0_ = (bitField0_ & ~0x00000004); + totalRandomItemListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getTotalRandomItemListFieldBuilder() : null; + } else { + totalRandomItemListBuilder_.addAllMessages(other.totalRandomItemList_); + } + } + } + if (uk10Builder_ == null) { + if (!other.uk10_.isEmpty()) { + if (uk10_.isEmpty()) { + uk10_ = other.uk10_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureUk10IsMutable(); + uk10_.addAll(other.uk10_); + } + onChanged(); + } + } else { + if (!other.uk10_.isEmpty()) { + if (uk10Builder_.isEmpty()) { + uk10Builder_.dispose(); + uk10Builder_ = null; + uk10_ = other.uk10_; + bitField0_ = (bitField0_ & ~0x00000008); + uk10Builder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getUk10FieldBuilder() : null; + } else { + uk10Builder_.addAllMessages(other.uk10_); + } + } + } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (gAEEJPPNJDDBuilder_ == null) { - if (!other.gAEEJPPNJDD_.isEmpty()) { - if (gAEEJPPNJDD_.isEmpty()) { - gAEEJPPNJDD_ = other.gAEEJPPNJDD_; + if (resultItemListBuilder_ == null) { + if (!other.resultItemList_.isEmpty()) { + if (resultItemList_.isEmpty()) { + resultItemList_ = other.resultItemList_; bitField0_ = (bitField0_ & ~0x00000010); } else { - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.addAll(other.gAEEJPPNJDD_); + ensureResultItemListIsMutable(); + resultItemList_.addAll(other.resultItemList_); } onChanged(); } } else { - if (!other.gAEEJPPNJDD_.isEmpty()) { - if (gAEEJPPNJDDBuilder_.isEmpty()) { - gAEEJPPNJDDBuilder_.dispose(); - gAEEJPPNJDDBuilder_ = null; - gAEEJPPNJDD_ = other.gAEEJPPNJDD_; + if (!other.resultItemList_.isEmpty()) { + if (resultItemListBuilder_.isEmpty()) { + resultItemListBuilder_.dispose(); + resultItemListBuilder_ = null; + resultItemList_ = other.resultItemList_; bitField0_ = (bitField0_ & ~0x00000010); - gAEEJPPNJDDBuilder_ = + resultItemListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getGAEEJPPNJDDFieldBuilder() : null; + getResultItemListFieldBuilder() : null; } else { - gAEEJPPNJDDBuilder_.addAllMessages(other.gAEEJPPNJDD_); + resultItemListBuilder_.addAllMessages(other.resultItemList_); } } } @@ -1404,732 +1404,12 @@ public final class CombineRspOuterClass { return this; } - private java.util.List resultItemList_ = - java.util.Collections.emptyList(); - private void ensureResultItemListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - 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> resultItemListBuilder_; - - /** - * repeated .ItemParam result_item_list = 13; - */ - public java.util.List getResultItemListList() { - if (resultItemListBuilder_ == null) { - return java.util.Collections.unmodifiableList(resultItemList_); - } else { - return resultItemListBuilder_.getMessageList(); - } - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public int getResultItemListCount() { - if (resultItemListBuilder_ == null) { - return resultItemList_.size(); - } else { - return resultItemListBuilder_.getCount(); - } - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { - if (resultItemListBuilder_ == null) { - return resultItemList_.get(index); - } else { - return resultItemListBuilder_.getMessage(index); - } - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder setResultItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (resultItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureResultItemListIsMutable(); - resultItemList_.set(index, value); - onChanged(); - } else { - resultItemListBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder setResultItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.set(index, builderForValue.build()); - onChanged(); - } else { - resultItemListBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder addResultItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (resultItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureResultItemListIsMutable(); - resultItemList_.add(value); - onChanged(); - } else { - resultItemListBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder addResultItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (resultItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureResultItemListIsMutable(); - resultItemList_.add(index, value); - onChanged(); - } else { - resultItemListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder addResultItemList( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.add(builderForValue.build()); - onChanged(); - } else { - resultItemListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder addResultItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.add(index, builderForValue.build()); - onChanged(); - } else { - resultItemListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder addAllResultItemList( - java.lang.Iterable values) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, resultItemList_); - onChanged(); - } else { - resultItemListBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder clearResultItemList() { - if (resultItemListBuilder_ == null) { - resultItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - resultItemListBuilder_.clear(); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public Builder removeResultItemList(int index) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.remove(index); - onChanged(); - } else { - resultItemListBuilder_.remove(index); - } - return this; - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getResultItemListBuilder( - int index) { - return getResultItemListFieldBuilder().getBuilder(index); - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( - int index) { - if (resultItemListBuilder_ == null) { - return resultItemList_.get(index); } else { - return resultItemListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public java.util.List - getResultItemListOrBuilderList() { - if (resultItemListBuilder_ != null) { - return resultItemListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(resultItemList_); - } - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder() { - return getResultItemListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder( - int index) { - return getResultItemListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam result_item_list = 13; - */ - public java.util.List - 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> - 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>( - resultItemList_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - resultItemList_ = null; - } - return resultItemListBuilder_; - } - - private java.util.List totalRandomItemList_ = - java.util.Collections.emptyList(); - private void ensureTotalRandomItemListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - 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> totalRandomItemListBuilder_; - - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public java.util.List getTotalRandomItemListList() { - if (totalRandomItemListBuilder_ == null) { - return java.util.Collections.unmodifiableList(totalRandomItemList_); - } else { - return totalRandomItemListBuilder_.getMessageList(); - } - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public int getTotalRandomItemListCount() { - if (totalRandomItemListBuilder_ == null) { - return totalRandomItemList_.size(); - } else { - return totalRandomItemListBuilder_.getCount(); - } - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) { - if (totalRandomItemListBuilder_ == null) { - return totalRandomItemList_.get(index); - } else { - return totalRandomItemListBuilder_.getMessage(index); - } - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder setTotalRandomItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (totalRandomItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.set(index, value); - onChanged(); - } else { - totalRandomItemListBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder setTotalRandomItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (totalRandomItemListBuilder_ == null) { - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.set(index, builderForValue.build()); - onChanged(); - } else { - totalRandomItemListBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder addTotalRandomItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (totalRandomItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.add(value); - onChanged(); - } else { - totalRandomItemListBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder addTotalRandomItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (totalRandomItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.add(index, value); - onChanged(); - } else { - totalRandomItemListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder addTotalRandomItemList( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (totalRandomItemListBuilder_ == null) { - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.add(builderForValue.build()); - onChanged(); - } else { - totalRandomItemListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder addTotalRandomItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (totalRandomItemListBuilder_ == null) { - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.add(index, builderForValue.build()); - onChanged(); - } else { - totalRandomItemListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder addAllTotalRandomItemList( - java.lang.Iterable values) { - if (totalRandomItemListBuilder_ == null) { - ensureTotalRandomItemListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, totalRandomItemList_); - onChanged(); - } else { - totalRandomItemListBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder clearTotalRandomItemList() { - if (totalRandomItemListBuilder_ == null) { - totalRandomItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); - onChanged(); - } else { - totalRandomItemListBuilder_.clear(); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public Builder removeTotalRandomItemList(int index) { - if (totalRandomItemListBuilder_ == null) { - ensureTotalRandomItemListIsMutable(); - totalRandomItemList_.remove(index); - onChanged(); - } else { - totalRandomItemListBuilder_.remove(index); - } - return this; - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalRandomItemListBuilder( - int index) { - return getTotalRandomItemListFieldBuilder().getBuilder(index); - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( - int index) { - if (totalRandomItemListBuilder_ == null) { - return totalRandomItemList_.get(index); } else { - return totalRandomItemListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public java.util.List - getTotalRandomItemListOrBuilderList() { - if (totalRandomItemListBuilder_ != null) { - return totalRandomItemListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(totalRandomItemList_); - } - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder() { - return getTotalRandomItemListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder( - int index) { - return getTotalRandomItemListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam total_random_item_list = 15; - */ - public java.util.List - 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> - 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>( - totalRandomItemList_, - ((bitField0_ & 0x00000002) != 0), - getParentForChildren(), - isClean()); - totalRandomItemList_ = null; - } - return totalRandomItemListBuilder_; - } - - private java.util.List totalReturnItemList_ = - java.util.Collections.emptyList(); - private void ensureTotalReturnItemListIsMutable() { - if (!((bitField0_ & 0x00000004) != 0)) { - 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> totalReturnItemListBuilder_; - - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public java.util.List getTotalReturnItemListList() { - if (totalReturnItemListBuilder_ == null) { - return java.util.Collections.unmodifiableList(totalReturnItemList_); - } else { - return totalReturnItemListBuilder_.getMessageList(); - } - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public int getTotalReturnItemListCount() { - if (totalReturnItemListBuilder_ == null) { - return totalReturnItemList_.size(); - } else { - return totalReturnItemListBuilder_.getCount(); - } - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) { - if (totalReturnItemListBuilder_ == null) { - return totalReturnItemList_.get(index); - } else { - return totalReturnItemListBuilder_.getMessage(index); - } - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder setTotalReturnItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (totalReturnItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.set(index, value); - onChanged(); - } else { - totalReturnItemListBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder setTotalReturnItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (totalReturnItemListBuilder_ == null) { - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.set(index, builderForValue.build()); - onChanged(); - } else { - totalReturnItemListBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder addTotalReturnItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (totalReturnItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.add(value); - onChanged(); - } else { - totalReturnItemListBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder addTotalReturnItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (totalReturnItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.add(index, value); - onChanged(); - } else { - totalReturnItemListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder addTotalReturnItemList( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (totalReturnItemListBuilder_ == null) { - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.add(builderForValue.build()); - onChanged(); - } else { - totalReturnItemListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder addTotalReturnItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (totalReturnItemListBuilder_ == null) { - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.add(index, builderForValue.build()); - onChanged(); - } else { - totalReturnItemListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder addAllTotalReturnItemList( - java.lang.Iterable values) { - if (totalReturnItemListBuilder_ == null) { - ensureTotalReturnItemListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, totalReturnItemList_); - onChanged(); - } else { - totalReturnItemListBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder clearTotalReturnItemList() { - if (totalReturnItemListBuilder_ == null) { - totalReturnItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); - onChanged(); - } else { - totalReturnItemListBuilder_.clear(); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public Builder removeTotalReturnItemList(int index) { - if (totalReturnItemListBuilder_ == null) { - ensureTotalReturnItemListIsMutable(); - totalReturnItemList_.remove(index); - onChanged(); - } else { - totalReturnItemListBuilder_.remove(index); - } - return this; - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalReturnItemListBuilder( - int index) { - return getTotalReturnItemListFieldBuilder().getBuilder(index); - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( - int index) { - if (totalReturnItemListBuilder_ == null) { - return totalReturnItemList_.get(index); } else { - return totalReturnItemListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public java.util.List - getTotalReturnItemListOrBuilderList() { - if (totalReturnItemListBuilder_ != null) { - return totalReturnItemListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(totalReturnItemList_); - } - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder() { - return getTotalReturnItemListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder( - int index) { - return getTotalReturnItemListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam total_return_item_list = 11; - */ - public java.util.List - 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> - 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>( - totalReturnItemList_, - ((bitField0_ & 0x00000004) != 0), - getParentForChildren(), - isClean()); - totalReturnItemList_ = null; - } - return totalReturnItemListBuilder_; - } - private java.util.List totalExtraItemList_ = java.util.Collections.emptyList(); private void ensureTotalExtraItemListIsMutable() { - if (!((bitField0_ & 0x00000008) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { totalExtraItemList_ = new java.util.ArrayList(totalExtraItemList_); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } @@ -2137,7 +1417,7 @@ public final class CombineRspOuterClass { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> totalExtraItemListBuilder_; /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public java.util.List getTotalExtraItemListList() { if (totalExtraItemListBuilder_ == null) { @@ -2147,7 +1427,7 @@ public final class CombineRspOuterClass { } } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public int getTotalExtraItemListCount() { if (totalExtraItemListBuilder_ == null) { @@ -2157,7 +1437,7 @@ public final class CombineRspOuterClass { } } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index) { if (totalExtraItemListBuilder_ == null) { @@ -2167,7 +1447,7 @@ public final class CombineRspOuterClass { } } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder setTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -2184,7 +1464,7 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder setTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -2198,7 +1478,7 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder addTotalExtraItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (totalExtraItemListBuilder_ == null) { @@ -2214,7 +1494,7 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder addTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -2231,7 +1511,7 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder addTotalExtraItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -2245,7 +1525,7 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder addTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -2259,7 +1539,7 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder addAllTotalExtraItemList( java.lang.Iterable values) { @@ -2274,12 +1554,12 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder clearTotalExtraItemList() { if (totalExtraItemListBuilder_ == null) { totalExtraItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { totalExtraItemListBuilder_.clear(); @@ -2287,7 +1567,7 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public Builder removeTotalExtraItemList(int index) { if (totalExtraItemListBuilder_ == null) { @@ -2300,14 +1580,14 @@ public final class CombineRspOuterClass { return this; } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalExtraItemListBuilder( int index) { return getTotalExtraItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder( int index) { @@ -2317,7 +1597,7 @@ public final class CombineRspOuterClass { } } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public java.util.List getTotalExtraItemListOrBuilderList() { @@ -2328,14 +1608,14 @@ public final class CombineRspOuterClass { } } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalExtraItemListBuilder() { return getTotalExtraItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalExtraItemListBuilder( int index) { @@ -2343,7 +1623,7 @@ public final class CombineRspOuterClass { index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam total_extra_item_list = 10; + * repeated .ItemParam totalExtraItemList = 13; */ public java.util.List getTotalExtraItemListBuilderList() { @@ -2356,7 +1636,7 @@ public final class CombineRspOuterClass { 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>( totalExtraItemList_, - ((bitField0_ & 0x00000008) != 0), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); totalExtraItemList_ = null; @@ -2364,6 +1644,726 @@ public final class CombineRspOuterClass { return totalExtraItemListBuilder_; } + private java.util.List totalReturnItemList_ = + java.util.Collections.emptyList(); + private void ensureTotalReturnItemListIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + totalReturnItemList_ = new java.util.ArrayList(totalReturnItemList_); + 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> totalReturnItemListBuilder_; + + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public java.util.List getTotalReturnItemListList() { + if (totalReturnItemListBuilder_ == null) { + return java.util.Collections.unmodifiableList(totalReturnItemList_); + } else { + return totalReturnItemListBuilder_.getMessageList(); + } + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public int getTotalReturnItemListCount() { + if (totalReturnItemListBuilder_ == null) { + return totalReturnItemList_.size(); + } else { + return totalReturnItemListBuilder_.getCount(); + } + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) { + if (totalReturnItemListBuilder_ == null) { + return totalReturnItemList_.get(index); + } else { + return totalReturnItemListBuilder_.getMessage(index); + } + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder setTotalReturnItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (totalReturnItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.set(index, value); + onChanged(); + } else { + totalReturnItemListBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder setTotalReturnItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (totalReturnItemListBuilder_ == null) { + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.set(index, builderForValue.build()); + onChanged(); + } else { + totalReturnItemListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder addTotalReturnItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (totalReturnItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.add(value); + onChanged(); + } else { + totalReturnItemListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder addTotalReturnItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (totalReturnItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.add(index, value); + onChanged(); + } else { + totalReturnItemListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder addTotalReturnItemList( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (totalReturnItemListBuilder_ == null) { + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.add(builderForValue.build()); + onChanged(); + } else { + totalReturnItemListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder addTotalReturnItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (totalReturnItemListBuilder_ == null) { + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.add(index, builderForValue.build()); + onChanged(); + } else { + totalReturnItemListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder addAllTotalReturnItemList( + java.lang.Iterable values) { + if (totalReturnItemListBuilder_ == null) { + ensureTotalReturnItemListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, totalReturnItemList_); + onChanged(); + } else { + totalReturnItemListBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder clearTotalReturnItemList() { + if (totalReturnItemListBuilder_ == null) { + totalReturnItemList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + totalReturnItemListBuilder_.clear(); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public Builder removeTotalReturnItemList(int index) { + if (totalReturnItemListBuilder_ == null) { + ensureTotalReturnItemListIsMutable(); + totalReturnItemList_.remove(index); + onChanged(); + } else { + totalReturnItemListBuilder_.remove(index); + } + return this; + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalReturnItemListBuilder( + int index) { + return getTotalReturnItemListFieldBuilder().getBuilder(index); + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( + int index) { + if (totalReturnItemListBuilder_ == null) { + return totalReturnItemList_.get(index); } else { + return totalReturnItemListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public java.util.List + getTotalReturnItemListOrBuilderList() { + if (totalReturnItemListBuilder_ != null) { + return totalReturnItemListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(totalReturnItemList_); + } + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder() { + return getTotalReturnItemListFieldBuilder().addBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder( + int index) { + return getTotalReturnItemListFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam total_return_item_list = 15; + */ + public java.util.List + 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> + 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>( + totalReturnItemList_, + ((bitField0_ & 0x00000002) != 0), + getParentForChildren(), + isClean()); + totalReturnItemList_ = null; + } + return totalReturnItemListBuilder_; + } + + private java.util.List totalRandomItemList_ = + java.util.Collections.emptyList(); + private void ensureTotalRandomItemListIsMutable() { + if (!((bitField0_ & 0x00000004) != 0)) { + totalRandomItemList_ = new java.util.ArrayList(totalRandomItemList_); + 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> totalRandomItemListBuilder_; + + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public java.util.List getTotalRandomItemListList() { + if (totalRandomItemListBuilder_ == null) { + return java.util.Collections.unmodifiableList(totalRandomItemList_); + } else { + return totalRandomItemListBuilder_.getMessageList(); + } + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public int getTotalRandomItemListCount() { + if (totalRandomItemListBuilder_ == null) { + return totalRandomItemList_.size(); + } else { + return totalRandomItemListBuilder_.getCount(); + } + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) { + if (totalRandomItemListBuilder_ == null) { + return totalRandomItemList_.get(index); + } else { + return totalRandomItemListBuilder_.getMessage(index); + } + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder setTotalRandomItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (totalRandomItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.set(index, value); + onChanged(); + } else { + totalRandomItemListBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder setTotalRandomItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (totalRandomItemListBuilder_ == null) { + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.set(index, builderForValue.build()); + onChanged(); + } else { + totalRandomItemListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder addTotalRandomItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (totalRandomItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.add(value); + onChanged(); + } else { + totalRandomItemListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder addTotalRandomItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (totalRandomItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.add(index, value); + onChanged(); + } else { + totalRandomItemListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder addTotalRandomItemList( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (totalRandomItemListBuilder_ == null) { + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.add(builderForValue.build()); + onChanged(); + } else { + totalRandomItemListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder addTotalRandomItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (totalRandomItemListBuilder_ == null) { + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.add(index, builderForValue.build()); + onChanged(); + } else { + totalRandomItemListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder addAllTotalRandomItemList( + java.lang.Iterable values) { + if (totalRandomItemListBuilder_ == null) { + ensureTotalRandomItemListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, totalRandomItemList_); + onChanged(); + } else { + totalRandomItemListBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder clearTotalRandomItemList() { + if (totalRandomItemListBuilder_ == null) { + totalRandomItemList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + totalRandomItemListBuilder_.clear(); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public Builder removeTotalRandomItemList(int index) { + if (totalRandomItemListBuilder_ == null) { + ensureTotalRandomItemListIsMutable(); + totalRandomItemList_.remove(index); + onChanged(); + } else { + totalRandomItemListBuilder_.remove(index); + } + return this; + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalRandomItemListBuilder( + int index) { + return getTotalRandomItemListFieldBuilder().getBuilder(index); + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( + int index) { + if (totalRandomItemListBuilder_ == null) { + return totalRandomItemList_.get(index); } else { + return totalRandomItemListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public java.util.List + getTotalRandomItemListOrBuilderList() { + if (totalRandomItemListBuilder_ != null) { + return totalRandomItemListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(totalRandomItemList_); + } + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder() { + return getTotalRandomItemListFieldBuilder().addBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder( + int index) { + return getTotalRandomItemListFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam totalRandomItemList = 11; + */ + public java.util.List + 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> + 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>( + totalRandomItemList_, + ((bitField0_ & 0x00000004) != 0), + getParentForChildren(), + isClean()); + totalRandomItemList_ = null; + } + return totalRandomItemListBuilder_; + } + + private java.util.List uk10_ = + java.util.Collections.emptyList(); + private void ensureUk10IsMutable() { + if (!((bitField0_ & 0x00000008) != 0)) { + uk10_ = new java.util.ArrayList(uk10_); + 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> uk10Builder_; + + /** + * repeated .ItemParam uk10 = 10; + */ + public java.util.List getUk10List() { + if (uk10Builder_ == null) { + return java.util.Collections.unmodifiableList(uk10_); + } else { + return uk10Builder_.getMessageList(); + } + } + /** + * repeated .ItemParam uk10 = 10; + */ + public int getUk10Count() { + if (uk10Builder_ == null) { + return uk10_.size(); + } else { + return uk10Builder_.getCount(); + } + } + /** + * repeated .ItemParam uk10 = 10; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index) { + if (uk10Builder_ == null) { + return uk10_.get(index); + } else { + return uk10Builder_.getMessage(index); + } + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder setUk10( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (uk10Builder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUk10IsMutable(); + uk10_.set(index, value); + onChanged(); + } else { + uk10Builder_.setMessage(index, value); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder setUk10( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.set(index, builderForValue.build()); + onChanged(); + } else { + uk10Builder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder addUk10(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (uk10Builder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUk10IsMutable(); + uk10_.add(value); + onChanged(); + } else { + uk10Builder_.addMessage(value); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder addUk10( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (uk10Builder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUk10IsMutable(); + uk10_.add(index, value); + onChanged(); + } else { + uk10Builder_.addMessage(index, value); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder addUk10( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.add(builderForValue.build()); + onChanged(); + } else { + uk10Builder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder addUk10( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.add(index, builderForValue.build()); + onChanged(); + } else { + uk10Builder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder addAllUk10( + java.lang.Iterable values) { + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, uk10_); + onChanged(); + } else { + uk10Builder_.addAllMessages(values); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder clearUk10() { + if (uk10Builder_ == null) { + uk10_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + } else { + uk10Builder_.clear(); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public Builder removeUk10(int index) { + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.remove(index); + onChanged(); + } else { + uk10Builder_.remove(index); + } + return this; + } + /** + * repeated .ItemParam uk10 = 10; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getUk10Builder( + int index) { + return getUk10FieldBuilder().getBuilder(index); + } + /** + * repeated .ItemParam uk10 = 10; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( + int index) { + if (uk10Builder_ == null) { + return uk10_.get(index); } else { + return uk10Builder_.getMessageOrBuilder(index); + } + } + /** + * repeated .ItemParam uk10 = 10; + */ + public java.util.List + getUk10OrBuilderList() { + if (uk10Builder_ != null) { + return uk10Builder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(uk10_); + } + } + /** + * repeated .ItemParam uk10 = 10; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addUk10Builder() { + return getUk10FieldBuilder().addBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam uk10 = 10; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addUk10Builder( + int index) { + return getUk10FieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam uk10 = 10; + */ + public java.util.List + getUk10BuilderList() { + return getUk10FieldBuilder().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> + getUk10FieldBuilder() { + if (uk10Builder_ == null) { + uk10Builder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( + uk10_, + ((bitField0_ & 0x00000008) != 0), + getParentForChildren(), + isClean()); + uk10_ = null; + } + return uk10Builder_; + } + private long avatarGuid_ ; /** * uint64 avatar_guid = 5; @@ -2426,244 +2426,244 @@ public final class CombineRspOuterClass { return this; } - private java.util.List gAEEJPPNJDD_ = + private java.util.List resultItemList_ = java.util.Collections.emptyList(); - private void ensureGAEEJPPNJDDIsMutable() { + private void ensureResultItemListIsMutable() { if (!((bitField0_ & 0x00000010) != 0)) { - gAEEJPPNJDD_ = new java.util.ArrayList(gAEEJPPNJDD_); + resultItemList_ = new java.util.ArrayList(resultItemList_); bitField0_ |= 0x00000010; } } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> gAEEJPPNJDDBuilder_; + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> resultItemListBuilder_; /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public java.util.List getGAEEJPPNJDDList() { - if (gAEEJPPNJDDBuilder_ == null) { - return java.util.Collections.unmodifiableList(gAEEJPPNJDD_); + public java.util.List getResultItemListList() { + if (resultItemListBuilder_ == null) { + return java.util.Collections.unmodifiableList(resultItemList_); } else { - return gAEEJPPNJDDBuilder_.getMessageList(); + return resultItemListBuilder_.getMessageList(); } } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public int getGAEEJPPNJDDCount() { - if (gAEEJPPNJDDBuilder_ == null) { - return gAEEJPPNJDD_.size(); + public int getResultItemListCount() { + if (resultItemListBuilder_ == null) { + return resultItemList_.size(); } else { - return gAEEJPPNJDDBuilder_.getCount(); + return resultItemListBuilder_.getCount(); } } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGAEEJPPNJDD(int index) { - if (gAEEJPPNJDDBuilder_ == null) { - return gAEEJPPNJDD_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { + if (resultItemListBuilder_ == null) { + return resultItemList_.get(index); } else { - return gAEEJPPNJDDBuilder_.getMessage(index); + return resultItemListBuilder_.getMessage(index); } } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder setGAEEJPPNJDD( + public Builder setResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (gAEEJPPNJDDBuilder_ == null) { + if (resultItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.set(index, value); + ensureResultItemListIsMutable(); + resultItemList_.set(index, value); onChanged(); } else { - gAEEJPPNJDDBuilder_.setMessage(index, value); + resultItemListBuilder_.setMessage(index, value); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder setGAEEJPPNJDD( + public Builder setResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (gAEEJPPNJDDBuilder_ == null) { - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.set(index, builderForValue.build()); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.set(index, builderForValue.build()); onChanged(); } else { - gAEEJPPNJDDBuilder_.setMessage(index, builderForValue.build()); + resultItemListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder addGAEEJPPNJDD(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (gAEEJPPNJDDBuilder_ == null) { + public Builder addResultItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (resultItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.add(value); + ensureResultItemListIsMutable(); + resultItemList_.add(value); onChanged(); } else { - gAEEJPPNJDDBuilder_.addMessage(value); + resultItemListBuilder_.addMessage(value); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder addGAEEJPPNJDD( + public Builder addResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (gAEEJPPNJDDBuilder_ == null) { + if (resultItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.add(index, value); + ensureResultItemListIsMutable(); + resultItemList_.add(index, value); onChanged(); } else { - gAEEJPPNJDDBuilder_.addMessage(index, value); + resultItemListBuilder_.addMessage(index, value); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder addGAEEJPPNJDD( + public Builder addResultItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (gAEEJPPNJDDBuilder_ == null) { - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.add(builderForValue.build()); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.add(builderForValue.build()); onChanged(); } else { - gAEEJPPNJDDBuilder_.addMessage(builderForValue.build()); + resultItemListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder addGAEEJPPNJDD( + public Builder addResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (gAEEJPPNJDDBuilder_ == null) { - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.add(index, builderForValue.build()); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.add(index, builderForValue.build()); onChanged(); } else { - gAEEJPPNJDDBuilder_.addMessage(index, builderForValue.build()); + resultItemListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder addAllGAEEJPPNJDD( + public Builder addAllResultItemList( java.lang.Iterable values) { - if (gAEEJPPNJDDBuilder_ == null) { - ensureGAEEJPPNJDDIsMutable(); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, gAEEJPPNJDD_); + values, resultItemList_); onChanged(); } else { - gAEEJPPNJDDBuilder_.addAllMessages(values); + resultItemListBuilder_.addAllMessages(values); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder clearGAEEJPPNJDD() { - if (gAEEJPPNJDDBuilder_ == null) { - gAEEJPPNJDD_ = java.util.Collections.emptyList(); + public Builder clearResultItemList() { + if (resultItemListBuilder_ == null) { + resultItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000010); onChanged(); } else { - gAEEJPPNJDDBuilder_.clear(); + resultItemListBuilder_.clear(); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public Builder removeGAEEJPPNJDD(int index) { - if (gAEEJPPNJDDBuilder_ == null) { - ensureGAEEJPPNJDDIsMutable(); - gAEEJPPNJDD_.remove(index); + public Builder removeResultItemList(int index) { + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.remove(index); onChanged(); } else { - gAEEJPPNJDDBuilder_.remove(index); + resultItemListBuilder_.remove(index); } return this; } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGAEEJPPNJDDBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getResultItemListBuilder( int index) { - return getGAEEJPPNJDDFieldBuilder().getBuilder(index); + return getResultItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGAEEJPPNJDDOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( int index) { - if (gAEEJPPNJDDBuilder_ == null) { - return gAEEJPPNJDD_.get(index); } else { - return gAEEJPPNJDDBuilder_.getMessageOrBuilder(index); + if (resultItemListBuilder_ == null) { + return resultItemList_.get(index); } else { + return resultItemListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ public java.util.List - getGAEEJPPNJDDOrBuilderList() { - if (gAEEJPPNJDDBuilder_ != null) { - return gAEEJPPNJDDBuilder_.getMessageOrBuilderList(); + getResultItemListOrBuilderList() { + if (resultItemListBuilder_ != null) { + return resultItemListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(gAEEJPPNJDD_); + return java.util.Collections.unmodifiableList(resultItemList_); } } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addGAEEJPPNJDDBuilder() { - return getGAEEJPPNJDDFieldBuilder().addBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder() { + return getResultItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addGAEEJPPNJDDBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder( int index) { - return getGAEEJPPNJDDFieldBuilder().addBuilder( + return getResultItemListFieldBuilder().addBuilder( index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam GAEEJPPNJDD = 8; + * repeated .ItemParam result_item_list = 8; */ public java.util.List - getGAEEJPPNJDDBuilderList() { - return getGAEEJPPNJDDFieldBuilder().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> - getGAEEJPPNJDDFieldBuilder() { - if (gAEEJPPNJDDBuilder_ == null) { - gAEEJPPNJDDBuilder_ = 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>( - gAEEJPPNJDD_, + resultItemList_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); - gAEEJPPNJDD_ = null; + resultItemList_ = null; } - return gAEEJPPNJDDBuilder_; + return resultItemListBuilder_; } private java.util.List costItemList_ = @@ -2972,17 +2972,16 @@ public final class CombineRspOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\020CombineRsp.proto\032\017ItemParam.proto\"\313\002\n\n" + + "\n\020CombineRsp.proto\032\017ItemParam.proto\"\276\002\n\n" + "CombineRsp\022\022\n\ncombine_id\030\007 \001(\r\022\025\n\rcombin" + - "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" + "e_count\030\003 \001(\r\022&\n\022totalExtraItemList\030\r \003(" + + "\0132\n.ItemParam\022*\n\026total_return_item_list\030" + + "\017 \003(\0132\n.ItemParam\022\'\n\023totalRandomItemList" + + "\030\013 \003(\0132\n.ItemParam\022\030\n\004uk10\030\n \003(\0132\n.ItemP" + + "aram\022\023\n\013avatar_guid\030\005 \001(\004\022\017\n\007retcode\030\006 \001" + + "(\005\022$\n\020result_item_list\030\010 \003(\0132\n.ItemParam" + + "\022\"\n\016cost_item_list\030\004 \003(\0132\n.ItemParamB\033\n\031" + + "emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -2994,7 +2993,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", "ResultItemList", "TotalRandomItemList", "TotalReturnItemList", "TotalExtraItemList", "AvatarGuid", "Retcode", "GAEEJPPNJDD", "CostItemList", }); + new java.lang.String[] { "CombineId", "CombineCount", "TotalExtraItemList", "TotalReturnItemList", "TotalRandomItemList", "Uk10", "AvatarGuid", "Retcode", "ResultItemList", "CostItemList", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireWorkDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkDataOuterClass.java new file mode 100644 index 000000000..f211941ad --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkDataOuterClass.java @@ -0,0 +1,914 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireWorkData.proto + +package emu.grasscutter.net.proto; + +public final class FireWorkDataOuterClass { + private FireWorkDataOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface FireWorkDataOrBuilder extends + // @@protoc_insertion_point(interface_extends:FireWorkData) + com.google.protobuf.MessageOrBuilder { + + /** + * uint32 id = 1; + * @return The id. + */ + int getId(); + + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + java.util.List + getFireWorkInstanceList(); + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index); + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + int getFireWorkInstanceCount(); + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + java.util.List + getFireWorkInstanceOrBuilderList(); + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder( + int index); + } + /** + * Protobuf type {@code FireWorkData} + */ + public static final class FireWorkData extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:FireWorkData) + FireWorkDataOrBuilder { + private static final long serialVersionUID = 0L; + // Use FireWorkData.newBuilder() to construct. + private FireWorkData(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private FireWorkData() { + fireWorkInstance_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new FireWorkData(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private FireWorkData( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + + id_ = input.readUInt32(); + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + fireWorkInstance_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + fireWorkInstance_.add( + input.readMessage(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + fireWorkInstance_ = java.util.Collections.unmodifiableList(fireWorkInstance_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.class, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder.class); + } + + public static final int ID_FIELD_NUMBER = 1; + private int id_; + /** + * uint32 id = 1; + * @return The id. + */ + @java.lang.Override + public int getId() { + return id_; + } + + public static final int FIREWORKINSTANCE_FIELD_NUMBER = 2; + private java.util.List fireWorkInstance_; + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + @java.lang.Override + public java.util.List getFireWorkInstanceList() { + return fireWorkInstance_; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + @java.lang.Override + public java.util.List + getFireWorkInstanceOrBuilderList() { + return fireWorkInstance_; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + @java.lang.Override + public int getFireWorkInstanceCount() { + return fireWorkInstance_.size(); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index) { + return fireWorkInstance_.get(index); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder( + int index) { + return fireWorkInstance_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (id_ != 0) { + output.writeUInt32(1, id_); + } + for (int i = 0; i < fireWorkInstance_.size(); i++) { + output.writeMessage(2, fireWorkInstance_.get(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (id_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, id_); + } + for (int i = 0; i < fireWorkInstance_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, fireWorkInstance_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData other = (emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData) obj; + + if (getId() + != other.getId()) return false; + if (!getFireWorkInstanceList() + .equals(other.getFireWorkInstanceList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId(); + if (getFireWorkInstanceCount() > 0) { + hash = (37 * hash) + FIREWORKINSTANCE_FIELD_NUMBER; + hash = (53 * hash) + getFireWorkInstanceList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code FireWorkData} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:FireWorkData) + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.class, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getFireWorkInstanceFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + id_ = 0; + + if (fireWorkInstanceBuilder_ == null) { + fireWorkInstance_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + fireWorkInstanceBuilder_.clear(); + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.FireWorkDataOuterClass.internal_static_FireWorkData_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData build() { + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData buildPartial() { + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData result = new emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData(this); + int from_bitField0_ = bitField0_; + result.id_ = id_; + if (fireWorkInstanceBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + fireWorkInstance_ = java.util.Collections.unmodifiableList(fireWorkInstance_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.fireWorkInstance_ = fireWorkInstance_; + } else { + result.fireWorkInstance_ = fireWorkInstanceBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData) { + return mergeFrom((emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData other) { + if (other == emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance()) return this; + if (other.getId() != 0) { + setId(other.getId()); + } + if (fireWorkInstanceBuilder_ == null) { + if (!other.fireWorkInstance_.isEmpty()) { + if (fireWorkInstance_.isEmpty()) { + fireWorkInstance_ = other.fireWorkInstance_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.addAll(other.fireWorkInstance_); + } + onChanged(); + } + } else { + if (!other.fireWorkInstance_.isEmpty()) { + if (fireWorkInstanceBuilder_.isEmpty()) { + fireWorkInstanceBuilder_.dispose(); + fireWorkInstanceBuilder_ = null; + fireWorkInstance_ = other.fireWorkInstance_; + bitField0_ = (bitField0_ & ~0x00000001); + fireWorkInstanceBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getFireWorkInstanceFieldBuilder() : null; + } else { + fireWorkInstanceBuilder_.addAllMessages(other.fireWorkInstance_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private int id_ ; + /** + * uint32 id = 1; + * @return The id. + */ + @java.lang.Override + public int getId() { + return id_; + } + /** + * uint32 id = 1; + * @param value The id to set. + * @return This builder for chaining. + */ + public Builder setId(int value) { + + id_ = value; + onChanged(); + return this; + } + /** + * uint32 id = 1; + * @return This builder for chaining. + */ + public Builder clearId() { + + id_ = 0; + onChanged(); + return this; + } + + private java.util.List fireWorkInstance_ = + java.util.Collections.emptyList(); + private void ensureFireWorkInstanceIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + fireWorkInstance_ = new java.util.ArrayList(fireWorkInstance_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> fireWorkInstanceBuilder_; + + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public java.util.List getFireWorkInstanceList() { + if (fireWorkInstanceBuilder_ == null) { + return java.util.Collections.unmodifiableList(fireWorkInstance_); + } else { + return fireWorkInstanceBuilder_.getMessageList(); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public int getFireWorkInstanceCount() { + if (fireWorkInstanceBuilder_ == null) { + return fireWorkInstance_.size(); + } else { + return fireWorkInstanceBuilder_.getCount(); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index) { + if (fireWorkInstanceBuilder_ == null) { + return fireWorkInstance_.get(index); + } else { + return fireWorkInstanceBuilder_.getMessage(index); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder setFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) { + if (fireWorkInstanceBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.set(index, value); + onChanged(); + } else { + fireWorkInstanceBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder setFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.set(index, builderForValue.build()); + onChanged(); + } else { + fireWorkInstanceBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder addFireWorkInstance(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) { + if (fireWorkInstanceBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(value); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder addFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) { + if (fireWorkInstanceBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(index, value); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder addFireWorkInstance( + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(builderForValue.build()); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder addFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(index, builderForValue.build()); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder addAllFireWorkInstance( + java.lang.Iterable values) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, fireWorkInstance_); + onChanged(); + } else { + fireWorkInstanceBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder clearFireWorkInstance() { + if (fireWorkInstanceBuilder_ == null) { + fireWorkInstance_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + fireWorkInstanceBuilder_.clear(); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public Builder removeFireWorkInstance(int index) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.remove(index); + onChanged(); + } else { + fireWorkInstanceBuilder_.remove(index); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder getFireWorkInstanceBuilder( + int index) { + return getFireWorkInstanceFieldBuilder().getBuilder(index); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder( + int index) { + if (fireWorkInstanceBuilder_ == null) { + return fireWorkInstance_.get(index); } else { + return fireWorkInstanceBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public java.util.List + getFireWorkInstanceOrBuilderList() { + if (fireWorkInstanceBuilder_ != null) { + return fireWorkInstanceBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(fireWorkInstance_); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder addFireWorkInstanceBuilder() { + return getFireWorkInstanceFieldBuilder().addBuilder( + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance()); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder addFireWorkInstanceBuilder( + int index) { + return getFireWorkInstanceFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance()); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 2; + */ + public java.util.List + getFireWorkInstanceBuilderList() { + return getFireWorkInstanceFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> + getFireWorkInstanceFieldBuilder() { + if (fireWorkInstanceBuilder_ == null) { + fireWorkInstanceBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder>( + fireWorkInstance_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + fireWorkInstance_ = null; + } + return fireWorkInstanceBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:FireWorkData) + } + + // @@protoc_insertion_point(class_scope:FireWorkData) + private static final emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData(); + } + + public static emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FireWorkData parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FireWorkData(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_FireWorkData_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_FireWorkData_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\022FireWorkData.proto\032\026FireWorkInstance.p" + + "roto\"G\n\014FireWorkData\022\n\n\002id\030\001 \001(\r\022+\n\020fire" + + "WorkInstance\030\002 \003(\0132\021.FireWorkInstanceB\033\n" + + "\031emu.grasscutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.getDescriptor(), + }); + internal_static_FireWorkData_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_FireWorkData_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_FireWorkData_descriptor, + new java.lang.String[] { "Id", "FireWorkInstance", }); + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireWorkInstanceOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkInstanceOuterClass.java new file mode 100644 index 000000000..b6cd851c5 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkInstanceOuterClass.java @@ -0,0 +1,646 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireWorkInstance.proto + +package emu.grasscutter.net.proto; + +public final class FireWorkInstanceOuterClass { + private FireWorkInstanceOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface FireWorkInstanceOrBuilder extends + // @@protoc_insertion_point(interface_extends:FireWorkInstance) + com.google.protobuf.MessageOrBuilder { + + /** + * .FireWorkType type = 1; + * @return The enum numeric value on the wire for type. + */ + int getTypeValue(); + /** + * .FireWorkType type = 1; + * @return The type. + */ + emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType getType(); + + /** + * int32 value = 2; + * @return The value. + */ + int getValue(); + } + /** + * Protobuf type {@code FireWorkInstance} + */ + public static final class FireWorkInstance extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:FireWorkInstance) + FireWorkInstanceOrBuilder { + private static final long serialVersionUID = 0L; + // Use FireWorkInstance.newBuilder() to construct. + private FireWorkInstance(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private FireWorkInstance() { + type_ = 0; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new FireWorkInstance(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private FireWorkInstance( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + int rawValue = input.readEnum(); + + type_ = rawValue; + break; + } + case 16: { + + value_ = input.readInt32(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.class, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder.class); + } + + public static final int TYPE_FIELD_NUMBER = 1; + private int type_; + /** + * .FireWorkType type = 1; + * @return The enum numeric value on the wire for type. + */ + @java.lang.Override public int getTypeValue() { + return type_; + } + /** + * .FireWorkType type = 1; + * @return The type. + */ + @java.lang.Override public emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType getType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType result = emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.valueOf(type_); + return result == null ? emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.UNRECOGNIZED : result; + } + + public static final int VALUE_FIELD_NUMBER = 2; + private int value_; + /** + * int32 value = 2; + * @return The value. + */ + @java.lang.Override + public int getValue() { + return value_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (type_ != emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.FireWorkType_ODJKANKMPPJ.getNumber()) { + output.writeEnum(1, type_); + } + if (value_ != 0) { + output.writeInt32(2, value_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (type_ != emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.FireWorkType_ODJKANKMPPJ.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, type_); + } + if (value_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, value_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance other = (emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance) obj; + + if (type_ != other.type_) return false; + if (getValue() + != other.getValue()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TYPE_FIELD_NUMBER; + hash = (53 * hash) + type_; + hash = (37 * hash) + VALUE_FIELD_NUMBER; + hash = (53 * hash) + getValue(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code FireWorkInstance} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:FireWorkInstance) + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.class, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + type_ = 0; + + value_ = 0; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.internal_static_FireWorkInstance_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance build() { + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance buildPartial() { + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance result = new emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance(this); + result.type_ = type_; + result.value_ = value_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance) { + return mergeFrom((emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance other) { + if (other == emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance()) return this; + if (other.type_ != 0) { + setTypeValue(other.getTypeValue()); + } + if (other.getValue() != 0) { + setValue(other.getValue()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int type_ = 0; + /** + * .FireWorkType type = 1; + * @return The enum numeric value on the wire for type. + */ + @java.lang.Override public int getTypeValue() { + return type_; + } + /** + * .FireWorkType type = 1; + * @param value The enum numeric value on the wire for type to set. + * @return This builder for chaining. + */ + public Builder setTypeValue(int value) { + + type_ = value; + onChanged(); + return this; + } + /** + * .FireWorkType type = 1; + * @return The type. + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType getType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType result = emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.valueOf(type_); + return result == null ? emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType.UNRECOGNIZED : result; + } + /** + * .FireWorkType type = 1; + * @param value The type to set. + * @return This builder for chaining. + */ + public Builder setType(emu.grasscutter.net.proto.FireWorkTypeOuterClass.FireWorkType value) { + if (value == null) { + throw new NullPointerException(); + } + + type_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .FireWorkType type = 1; + * @return This builder for chaining. + */ + public Builder clearType() { + + type_ = 0; + onChanged(); + return this; + } + + private int value_ ; + /** + * int32 value = 2; + * @return The value. + */ + @java.lang.Override + public int getValue() { + return value_; + } + /** + * int32 value = 2; + * @param value The value to set. + * @return This builder for chaining. + */ + public Builder setValue(int value) { + + value_ = value; + onChanged(); + return this; + } + /** + * int32 value = 2; + * @return This builder for chaining. + */ + public Builder clearValue() { + + value_ = 0; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:FireWorkInstance) + } + + // @@protoc_insertion_point(class_scope:FireWorkInstance) + private static final emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance(); + } + + public static emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FireWorkInstance parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FireWorkInstance(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_FireWorkInstance_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_FireWorkInstance_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\026FireWorkInstance.proto\032\022FireWorkType.p" + + "roto\">\n\020FireWorkInstance\022\033\n\004type\030\001 \001(\0162\r" + + ".FireWorkType\022\r\n\005value\030\002 \001(\005B\033\n\031emu.gras" + + "scutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.FireWorkTypeOuterClass.getDescriptor(), + }); + internal_static_FireWorkInstance_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_FireWorkInstance_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_FireWorkInstance_descriptor, + new java.lang.String[] { "Type", "Value", }); + emu.grasscutter.net.proto.FireWorkTypeOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireWorkNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkNotifyOuterClass.java new file mode 100644 index 000000000..6068b1009 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkNotifyOuterClass.java @@ -0,0 +1,856 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireWorkNotify.proto + +package emu.grasscutter.net.proto; + +public final class FireWorkNotifyOuterClass { + private FireWorkNotifyOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface FireWorkNotifyOrBuilder extends + // @@protoc_insertion_point(interface_extends:FireWorkNotify) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .FireWorkData fireWorkData = 1; + */ + java.util.List + getFireWorkDataList(); + /** + * repeated .FireWorkData fireWorkData = 1; + */ + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData(int index); + /** + * repeated .FireWorkData fireWorkData = 1; + */ + int getFireWorkDataCount(); + /** + * repeated .FireWorkData fireWorkData = 1; + */ + java.util.List + getFireWorkDataOrBuilderList(); + /** + * repeated .FireWorkData fireWorkData = 1; + */ + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder( + int index); + } + /** + *
+   * CmdId: 6079
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * 
+ * + * Protobuf type {@code FireWorkNotify} + */ + public static final class FireWorkNotify extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:FireWorkNotify) + FireWorkNotifyOrBuilder { + private static final long serialVersionUID = 0L; + // Use FireWorkNotify.newBuilder() to construct. + private FireWorkNotify(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private FireWorkNotify() { + fireWorkData_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new FireWorkNotify(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private FireWorkNotify( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + fireWorkData_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + fireWorkData_.add( + input.readMessage(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + fireWorkData_ = java.util.Collections.unmodifiableList(fireWorkData_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.class, emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.Builder.class); + } + + public static final int FIREWORKDATA_FIELD_NUMBER = 1; + private java.util.List fireWorkData_; + /** + * repeated .FireWorkData fireWorkData = 1; + */ + @java.lang.Override + public java.util.List getFireWorkDataList() { + return fireWorkData_; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + @java.lang.Override + public java.util.List + getFireWorkDataOrBuilderList() { + return fireWorkData_; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + @java.lang.Override + public int getFireWorkDataCount() { + return fireWorkData_.size(); + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData(int index) { + return fireWorkData_.get(index); + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder( + int index) { + return fireWorkData_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < fireWorkData_.size(); i++) { + output.writeMessage(1, fireWorkData_.get(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < fireWorkData_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, fireWorkData_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify other = (emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify) obj; + + if (!getFireWorkDataList() + .equals(other.getFireWorkDataList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getFireWorkDataCount() > 0) { + hash = (37 * hash) + FIREWORKDATA_FIELD_NUMBER; + hash = (53 * hash) + getFireWorkDataList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * CmdId: 6079
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * 
+ * + * Protobuf type {@code FireWorkNotify} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:FireWorkNotify) + emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotifyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.class, emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getFireWorkDataFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (fireWorkDataBuilder_ == null) { + fireWorkData_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + fireWorkDataBuilder_.clear(); + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.internal_static_FireWorkNotify_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify build() { + emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify buildPartial() { + emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify result = new emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify(this); + int from_bitField0_ = bitField0_; + if (fireWorkDataBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + fireWorkData_ = java.util.Collections.unmodifiableList(fireWorkData_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.fireWorkData_ = fireWorkData_; + } else { + result.fireWorkData_ = fireWorkDataBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify) { + return mergeFrom((emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify other) { + if (other == emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify.getDefaultInstance()) return this; + if (fireWorkDataBuilder_ == null) { + if (!other.fireWorkData_.isEmpty()) { + if (fireWorkData_.isEmpty()) { + fireWorkData_ = other.fireWorkData_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureFireWorkDataIsMutable(); + fireWorkData_.addAll(other.fireWorkData_); + } + onChanged(); + } + } else { + if (!other.fireWorkData_.isEmpty()) { + if (fireWorkDataBuilder_.isEmpty()) { + fireWorkDataBuilder_.dispose(); + fireWorkDataBuilder_ = null; + fireWorkData_ = other.fireWorkData_; + bitField0_ = (bitField0_ & ~0x00000001); + fireWorkDataBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getFireWorkDataFieldBuilder() : null; + } else { + fireWorkDataBuilder_.addAllMessages(other.fireWorkData_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List fireWorkData_ = + java.util.Collections.emptyList(); + private void ensureFireWorkDataIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + fireWorkData_ = new java.util.ArrayList(fireWorkData_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> fireWorkDataBuilder_; + + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public java.util.List getFireWorkDataList() { + if (fireWorkDataBuilder_ == null) { + return java.util.Collections.unmodifiableList(fireWorkData_); + } else { + return fireWorkDataBuilder_.getMessageList(); + } + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public int getFireWorkDataCount() { + if (fireWorkDataBuilder_ == null) { + return fireWorkData_.size(); + } else { + return fireWorkDataBuilder_.getCount(); + } + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData(int index) { + if (fireWorkDataBuilder_ == null) { + return fireWorkData_.get(index); + } else { + return fireWorkDataBuilder_.getMessage(index); + } + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder setFireWorkData( + int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) { + if (fireWorkDataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkDataIsMutable(); + fireWorkData_.set(index, value); + onChanged(); + } else { + fireWorkDataBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder setFireWorkData( + int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) { + if (fireWorkDataBuilder_ == null) { + ensureFireWorkDataIsMutable(); + fireWorkData_.set(index, builderForValue.build()); + onChanged(); + } else { + fireWorkDataBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder addFireWorkData(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) { + if (fireWorkDataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkDataIsMutable(); + fireWorkData_.add(value); + onChanged(); + } else { + fireWorkDataBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder addFireWorkData( + int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) { + if (fireWorkDataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkDataIsMutable(); + fireWorkData_.add(index, value); + onChanged(); + } else { + fireWorkDataBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder addFireWorkData( + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) { + if (fireWorkDataBuilder_ == null) { + ensureFireWorkDataIsMutable(); + fireWorkData_.add(builderForValue.build()); + onChanged(); + } else { + fireWorkDataBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder addFireWorkData( + int index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) { + if (fireWorkDataBuilder_ == null) { + ensureFireWorkDataIsMutable(); + fireWorkData_.add(index, builderForValue.build()); + onChanged(); + } else { + fireWorkDataBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder addAllFireWorkData( + java.lang.Iterable values) { + if (fireWorkDataBuilder_ == null) { + ensureFireWorkDataIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, fireWorkData_); + onChanged(); + } else { + fireWorkDataBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder clearFireWorkData() { + if (fireWorkDataBuilder_ == null) { + fireWorkData_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + fireWorkDataBuilder_.clear(); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public Builder removeFireWorkData(int index) { + if (fireWorkDataBuilder_ == null) { + ensureFireWorkDataIsMutable(); + fireWorkData_.remove(index); + onChanged(); + } else { + fireWorkDataBuilder_.remove(index); + } + return this; + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder getFireWorkDataBuilder( + int index) { + return getFireWorkDataFieldBuilder().getBuilder(index); + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder( + int index) { + if (fireWorkDataBuilder_ == null) { + return fireWorkData_.get(index); } else { + return fireWorkDataBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public java.util.List + getFireWorkDataOrBuilderList() { + if (fireWorkDataBuilder_ != null) { + return fireWorkDataBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(fireWorkData_); + } + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder addFireWorkDataBuilder() { + return getFireWorkDataFieldBuilder().addBuilder( + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance()); + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder addFireWorkDataBuilder( + int index) { + return getFireWorkDataFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance()); + } + /** + * repeated .FireWorkData fireWorkData = 1; + */ + public java.util.List + getFireWorkDataBuilderList() { + return getFireWorkDataFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> + getFireWorkDataFieldBuilder() { + if (fireWorkDataBuilder_ == null) { + fireWorkDataBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder>( + fireWorkData_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + fireWorkData_ = null; + } + return fireWorkDataBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:FireWorkNotify) + } + + // @@protoc_insertion_point(class_scope:FireWorkNotify) + private static final emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify(); + } + + public static emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FireWorkNotify parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FireWorkNotify(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkNotifyOuterClass.FireWorkNotify getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_FireWorkNotify_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_FireWorkNotify_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\024FireWorkNotify.proto\032\022FireWorkData.pro" + + "to\"5\n\016FireWorkNotify\022#\n\014fireWorkData\030\001 \003" + + "(\0132\r.FireWorkDataB\033\n\031emu.grasscutter.net" + + ".protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor(), + }); + internal_static_FireWorkNotify_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_FireWorkNotify_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_FireWorkNotify_descriptor, + new java.lang.String[] { "FireWorkData", }); + emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireWorkReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkReqOuterClass.java new file mode 100644 index 000000000..88df2a165 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkReqOuterClass.java @@ -0,0 +1,686 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireWorkReq.proto + +package emu.grasscutter.net.proto; + +public final class FireWorkReqOuterClass { + private FireWorkReqOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface FireWorkReqOrBuilder extends + // @@protoc_insertion_point(interface_extends:FireWorkReq) + com.google.protobuf.MessageOrBuilder { + + /** + * .FireWorkData fireWorkData = 7; + * @return Whether the fireWorkData field is set. + */ + boolean hasFireWorkData(); + /** + * .FireWorkData fireWorkData = 7; + * @return The fireWorkData. + */ + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData(); + /** + * .FireWorkData fireWorkData = 7; + */ + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder(); + } + /** + *
+   * CmdId: 6068
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * IsAllowClient: true
+   * 
+ * + * Protobuf type {@code FireWorkReq} + */ + public static final class FireWorkReq extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:FireWorkReq) + FireWorkReqOrBuilder { + private static final long serialVersionUID = 0L; + // Use FireWorkReq.newBuilder() to construct. + private FireWorkReq(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private FireWorkReq() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new FireWorkReq(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private FireWorkReq( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 58: { + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder subBuilder = null; + if (fireWorkData_ != null) { + subBuilder = fireWorkData_.toBuilder(); + } + fireWorkData_ = input.readMessage(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(fireWorkData_); + fireWorkData_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.class, emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.Builder.class); + } + + public static final int FIREWORKDATA_FIELD_NUMBER = 7; + private emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData fireWorkData_; + /** + * .FireWorkData fireWorkData = 7; + * @return Whether the fireWorkData field is set. + */ + @java.lang.Override + public boolean hasFireWorkData() { + return fireWorkData_ != null; + } + /** + * .FireWorkData fireWorkData = 7; + * @return The fireWorkData. + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData() { + return fireWorkData_ == null ? emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance() : fireWorkData_; + } + /** + * .FireWorkData fireWorkData = 7; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder() { + return getFireWorkData(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (fireWorkData_ != null) { + output.writeMessage(7, getFireWorkData()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (fireWorkData_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, getFireWorkData()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq other = (emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq) obj; + + if (hasFireWorkData() != other.hasFireWorkData()) return false; + if (hasFireWorkData()) { + if (!getFireWorkData() + .equals(other.getFireWorkData())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasFireWorkData()) { + hash = (37 * hash) + FIREWORKDATA_FIELD_NUMBER; + hash = (53 * hash) + getFireWorkData().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * CmdId: 6068
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * IsAllowClient: true
+     * 
+ * + * Protobuf type {@code FireWorkReq} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:FireWorkReq) + emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReqOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.class, emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (fireWorkDataBuilder_ == null) { + fireWorkData_ = null; + } else { + fireWorkData_ = null; + fireWorkDataBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.FireWorkReqOuterClass.internal_static_FireWorkReq_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq build() { + emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq buildPartial() { + emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq result = new emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq(this); + if (fireWorkDataBuilder_ == null) { + result.fireWorkData_ = fireWorkData_; + } else { + result.fireWorkData_ = fireWorkDataBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq) { + return mergeFrom((emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq other) { + if (other == emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq.getDefaultInstance()) return this; + if (other.hasFireWorkData()) { + mergeFireWorkData(other.getFireWorkData()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData fireWorkData_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> fireWorkDataBuilder_; + /** + * .FireWorkData fireWorkData = 7; + * @return Whether the fireWorkData field is set. + */ + public boolean hasFireWorkData() { + return fireWorkDataBuilder_ != null || fireWorkData_ != null; + } + /** + * .FireWorkData fireWorkData = 7; + * @return The fireWorkData. + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData getFireWorkData() { + if (fireWorkDataBuilder_ == null) { + return fireWorkData_ == null ? emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance() : fireWorkData_; + } else { + return fireWorkDataBuilder_.getMessage(); + } + } + /** + * .FireWorkData fireWorkData = 7; + */ + public Builder setFireWorkData(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) { + if (fireWorkDataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + fireWorkData_ = value; + onChanged(); + } else { + fireWorkDataBuilder_.setMessage(value); + } + + return this; + } + /** + * .FireWorkData fireWorkData = 7; + */ + public Builder setFireWorkData( + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder builderForValue) { + if (fireWorkDataBuilder_ == null) { + fireWorkData_ = builderForValue.build(); + onChanged(); + } else { + fireWorkDataBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .FireWorkData fireWorkData = 7; + */ + public Builder mergeFireWorkData(emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData value) { + if (fireWorkDataBuilder_ == null) { + if (fireWorkData_ != null) { + fireWorkData_ = + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.newBuilder(fireWorkData_).mergeFrom(value).buildPartial(); + } else { + fireWorkData_ = value; + } + onChanged(); + } else { + fireWorkDataBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .FireWorkData fireWorkData = 7; + */ + public Builder clearFireWorkData() { + if (fireWorkDataBuilder_ == null) { + fireWorkData_ = null; + onChanged(); + } else { + fireWorkData_ = null; + fireWorkDataBuilder_ = null; + } + + return this; + } + /** + * .FireWorkData fireWorkData = 7; + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder getFireWorkDataBuilder() { + + onChanged(); + return getFireWorkDataFieldBuilder().getBuilder(); + } + /** + * .FireWorkData fireWorkData = 7; + */ + public emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder getFireWorkDataOrBuilder() { + if (fireWorkDataBuilder_ != null) { + return fireWorkDataBuilder_.getMessageOrBuilder(); + } else { + return fireWorkData_ == null ? + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.getDefaultInstance() : fireWorkData_; + } + } + /** + * .FireWorkData fireWorkData = 7; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder> + getFireWorkDataFieldBuilder() { + if (fireWorkDataBuilder_ == null) { + fireWorkDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkData.Builder, emu.grasscutter.net.proto.FireWorkDataOuterClass.FireWorkDataOrBuilder>( + getFireWorkData(), + getParentForChildren(), + isClean()); + fireWorkData_ = null; + } + return fireWorkDataBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:FireWorkReq) + } + + // @@protoc_insertion_point(class_scope:FireWorkReq) + private static final emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq(); + } + + public static emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FireWorkReq parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FireWorkReq(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkReqOuterClass.FireWorkReq getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_FireWorkReq_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_FireWorkReq_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\021FireWorkReq.proto\032\022FireWorkData.proto\"" + + "2\n\013FireWorkReq\022#\n\014fireWorkData\030\007 \001(\0132\r.F" + + "ireWorkDataB\033\n\031emu.grasscutter.net.proto" + + "b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor(), + }); + internal_static_FireWorkReq_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_FireWorkReq_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_FireWorkReq_descriptor, + new java.lang.String[] { "FireWorkData", }); + emu.grasscutter.net.proto.FireWorkDataOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireWorkTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkTypeOuterClass.java new file mode 100644 index 000000000..4c622b9c5 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireWorkTypeOuterClass.java @@ -0,0 +1,185 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireWorkType.proto + +package emu.grasscutter.net.proto; + +public final class FireWorkTypeOuterClass { + private FireWorkTypeOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + /** + * Protobuf enum {@code FireWorkType} + */ + public enum FireWorkType + implements com.google.protobuf.ProtocolMessageEnum { + /** + * FireWorkType_ODJKANKMPPJ = 0; + */ + FireWorkType_ODJKANKMPPJ(0), + /** + * FireWorkType_EFGLHEIODFN = 1; + */ + FireWorkType_EFGLHEIODFN(1), + /** + * FireWorkType_JPBBBCFGHAK = 2; + */ + FireWorkType_JPBBBCFGHAK(2), + /** + * FireWorkType_IDCMGHBHBFH = 3; + */ + FireWorkType_IDCMGHBHBFH(3), + /** + * FireWorkType_ODDBNNDFMBO = 4; + */ + FireWorkType_ODDBNNDFMBO(4), + /** + * FireWorkType_AGIDMOGJOBD = 5; + */ + FireWorkType_AGIDMOGJOBD(5), + UNRECOGNIZED(-1), + ; + + /** + * FireWorkType_ODJKANKMPPJ = 0; + */ + public static final int FireWorkType_ODJKANKMPPJ_VALUE = 0; + /** + * FireWorkType_EFGLHEIODFN = 1; + */ + public static final int FireWorkType_EFGLHEIODFN_VALUE = 1; + /** + * FireWorkType_JPBBBCFGHAK = 2; + */ + public static final int FireWorkType_JPBBBCFGHAK_VALUE = 2; + /** + * FireWorkType_IDCMGHBHBFH = 3; + */ + public static final int FireWorkType_IDCMGHBHBFH_VALUE = 3; + /** + * FireWorkType_ODDBNNDFMBO = 4; + */ + public static final int FireWorkType_ODDBNNDFMBO_VALUE = 4; + /** + * FireWorkType_AGIDMOGJOBD = 5; + */ + public static final int FireWorkType_AGIDMOGJOBD_VALUE = 5; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static FireWorkType valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static FireWorkType forNumber(int value) { + switch (value) { + case 0: return FireWorkType_ODJKANKMPPJ; + case 1: return FireWorkType_EFGLHEIODFN; + case 2: return FireWorkType_JPBBBCFGHAK; + case 3: return FireWorkType_IDCMGHBHBFH; + case 4: return FireWorkType_ODDBNNDFMBO; + case 5: return FireWorkType_AGIDMOGJOBD; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + FireWorkType> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public FireWorkType findValueByNumber(int number) { + return FireWorkType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireWorkTypeOuterClass.getDescriptor().getEnumTypes().get(0); + } + + private static final FireWorkType[] VALUES = values(); + + public static FireWorkType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private FireWorkType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:FireWorkType) + } + + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\022FireWorkType.proto*\302\001\n\014FireWorkType\022\034\n" + + "\030FireWorkType_ODJKANKMPPJ\020\000\022\034\n\030FireWorkT" + + "ype_EFGLHEIODFN\020\001\022\034\n\030FireWorkType_JPBBBC" + + "FGHAK\020\002\022\034\n\030FireWorkType_IDCMGHBHBFH\020\003\022\034\n" + + "\030FireWorkType_ODDBNNDFMBO\020\004\022\034\n\030FireWorkT" + + "ype_AGIDMOGJOBD\020\005B\033\n\031emu.grasscutter.net" + + ".protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetDataOuterClass.java new file mode 100644 index 000000000..47901a5b2 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetDataOuterClass.java @@ -0,0 +1,1109 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireworkSetData.proto + +package emu.grasscutter.net.proto; + +public final class FireworkSetDataOuterClass { + private FireworkSetDataOuterClass() {} + 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 FireworkSetDataOrBuilder extends + // @@protoc_insertion_point(interface_extends:FireworkSetData) + com.google.protobuf.MessageOrBuilder { + + /** + * uint32 id = 1; + * @return The id. + */ + int getId(); + + /** + * repeated uint32 _unknown_field_ = 2; + * @return A list containing the unknownField. + */ + java.util.List getUnknownFieldList(); + /** + * repeated uint32 _unknown_field_ = 2; + * @return The count of unknownField. + */ + int getUnknownFieldCount(); + /** + * repeated uint32 _unknown_field_ = 2; + * @param index The index of the element to return. + * @return The unknownField at the given index. + */ + int getUnknownField(int index); + + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + java.util.List + getFireWorkInstanceList(); + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index); + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + int getFireWorkInstanceCount(); + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + java.util.List + getFireWorkInstanceOrBuilderList(); + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder( + int index); + } + /** + * Protobuf type {@code FireworkSetData} + */ + public static final class FireworkSetData extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:FireworkSetData) + FireworkSetDataOrBuilder { + private static final long serialVersionUID = 0L; + // Use FireworkSetData.newBuilder() to construct. + private FireworkSetData(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private FireworkSetData() { + UnknownField_ = emptyIntList(); + fireWorkInstance_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new FireworkSetData(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private FireworkSetData( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + + id_ = input.readUInt32(); + break; + } + case 16: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + UnknownField_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + UnknownField_.addInt(input.readUInt32()); + break; + } + case 18: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + UnknownField_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + while (input.getBytesUntilLimit() > 0) { + UnknownField_.addInt(input.readUInt32()); + } + input.popLimit(limit); + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + fireWorkInstance_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + fireWorkInstance_.add( + input.readMessage(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + UnknownField_.makeImmutable(); // C + } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + fireWorkInstance_ = java.util.Collections.unmodifiableList(fireWorkInstance_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireworkSetDataOuterClass.internal_static_FireworkSetData_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireworkSetDataOuterClass.internal_static_FireworkSetData_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.class, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder.class); + } + + public static final int ID_FIELD_NUMBER = 1; + private int id_; + /** + * uint32 id = 1; + * @return The id. + */ + @java.lang.Override + public int getId() { + return id_; + } + + public static final int _UNKNOWN_FIELD__FIELD_NUMBER = 2; + private com.google.protobuf.Internal.IntList UnknownField_; + /** + * repeated uint32 _unknown_field_ = 2; + * @return A list containing the unknownField. + */ + @java.lang.Override + public java.util.List + getUnknownFieldList() { + return UnknownField_; + } + /** + * repeated uint32 _unknown_field_ = 2; + * @return The count of unknownField. + */ + public int getUnknownFieldCount() { + return UnknownField_.size(); + } + /** + * repeated uint32 _unknown_field_ = 2; + * @param index The index of the element to return. + * @return The unknownField at the given index. + */ + public int getUnknownField(int index) { + return UnknownField_.getInt(index); + } + private int UnknownFieldMemoizedSerializedSize = -1; + + public static final int FIREWORKINSTANCE_FIELD_NUMBER = 3; + private java.util.List fireWorkInstance_; + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + @java.lang.Override + public java.util.List getFireWorkInstanceList() { + return fireWorkInstance_; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + @java.lang.Override + public java.util.List + getFireWorkInstanceOrBuilderList() { + return fireWorkInstance_; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + @java.lang.Override + public int getFireWorkInstanceCount() { + return fireWorkInstance_.size(); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index) { + return fireWorkInstance_.get(index); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder( + int index) { + return fireWorkInstance_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (id_ != 0) { + output.writeUInt32(1, id_); + } + if (getUnknownFieldList().size() > 0) { + output.writeUInt32NoTag(18); + output.writeUInt32NoTag(UnknownFieldMemoizedSerializedSize); + } + for (int i = 0; i < UnknownField_.size(); i++) { + output.writeUInt32NoTag(UnknownField_.getInt(i)); + } + for (int i = 0; i < fireWorkInstance_.size(); i++) { + output.writeMessage(3, fireWorkInstance_.get(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (id_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, id_); + } + { + int dataSize = 0; + for (int i = 0; i < UnknownField_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(UnknownField_.getInt(i)); + } + size += dataSize; + if (!getUnknownFieldList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + UnknownFieldMemoizedSerializedSize = dataSize; + } + for (int i = 0; i < fireWorkInstance_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, fireWorkInstance_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData other = (emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData) obj; + + if (getId() + != other.getId()) return false; + if (!getUnknownFieldList() + .equals(other.getUnknownFieldList())) return false; + if (!getFireWorkInstanceList() + .equals(other.getFireWorkInstanceList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId(); + if (getUnknownFieldCount() > 0) { + hash = (37 * hash) + _UNKNOWN_FIELD__FIELD_NUMBER; + hash = (53 * hash) + getUnknownFieldList().hashCode(); + } + if (getFireWorkInstanceCount() > 0) { + hash = (37 * hash) + FIREWORKINSTANCE_FIELD_NUMBER; + hash = (53 * hash) + getFireWorkInstanceList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData 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.FireworkSetDataOuterClass.FireworkSetData parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData 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.FireworkSetDataOuterClass.FireworkSetData parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData 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.FireworkSetDataOuterClass.FireworkSetData parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData 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.FireworkSetDataOuterClass.FireworkSetData parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData 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.FireworkSetDataOuterClass.FireworkSetData 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 FireworkSetData} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:FireworkSetData) + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireworkSetDataOuterClass.internal_static_FireworkSetData_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireworkSetDataOuterClass.internal_static_FireworkSetData_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.class, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getFireWorkInstanceFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + id_ = 0; + + UnknownField_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + if (fireWorkInstanceBuilder_ == null) { + fireWorkInstance_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + fireWorkInstanceBuilder_.clear(); + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.FireworkSetDataOuterClass.internal_static_FireworkSetData_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData build() { + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData buildPartial() { + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData result = new emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData(this); + int from_bitField0_ = bitField0_; + result.id_ = id_; + if (((bitField0_ & 0x00000001) != 0)) { + UnknownField_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.UnknownField_ = UnknownField_; + if (fireWorkInstanceBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0)) { + fireWorkInstance_ = java.util.Collections.unmodifiableList(fireWorkInstance_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.fireWorkInstance_ = fireWorkInstance_; + } else { + result.fireWorkInstance_ = fireWorkInstanceBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData) { + return mergeFrom((emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData other) { + if (other == emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance()) return this; + if (other.getId() != 0) { + setId(other.getId()); + } + if (!other.UnknownField_.isEmpty()) { + if (UnknownField_.isEmpty()) { + UnknownField_ = other.UnknownField_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureUnknownFieldIsMutable(); + UnknownField_.addAll(other.UnknownField_); + } + onChanged(); + } + if (fireWorkInstanceBuilder_ == null) { + if (!other.fireWorkInstance_.isEmpty()) { + if (fireWorkInstance_.isEmpty()) { + fireWorkInstance_ = other.fireWorkInstance_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.addAll(other.fireWorkInstance_); + } + onChanged(); + } + } else { + if (!other.fireWorkInstance_.isEmpty()) { + if (fireWorkInstanceBuilder_.isEmpty()) { + fireWorkInstanceBuilder_.dispose(); + fireWorkInstanceBuilder_ = null; + fireWorkInstance_ = other.fireWorkInstance_; + bitField0_ = (bitField0_ & ~0x00000002); + fireWorkInstanceBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getFireWorkInstanceFieldBuilder() : null; + } else { + fireWorkInstanceBuilder_.addAllMessages(other.fireWorkInstance_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private int id_ ; + /** + * uint32 id = 1; + * @return The id. + */ + @java.lang.Override + public int getId() { + return id_; + } + /** + * uint32 id = 1; + * @param value The id to set. + * @return This builder for chaining. + */ + public Builder setId(int value) { + + id_ = value; + onChanged(); + return this; + } + /** + * uint32 id = 1; + * @return This builder for chaining. + */ + public Builder clearId() { + + id_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList UnknownField_ = emptyIntList(); + private void ensureUnknownFieldIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + UnknownField_ = mutableCopy(UnknownField_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated uint32 _unknown_field_ = 2; + * @return A list containing the unknownField. + */ + public java.util.List + getUnknownFieldList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(UnknownField_) : UnknownField_; + } + /** + * repeated uint32 _unknown_field_ = 2; + * @return The count of unknownField. + */ + public int getUnknownFieldCount() { + return UnknownField_.size(); + } + /** + * repeated uint32 _unknown_field_ = 2; + * @param index The index of the element to return. + * @return The unknownField at the given index. + */ + public int getUnknownField(int index) { + return UnknownField_.getInt(index); + } + /** + * repeated uint32 _unknown_field_ = 2; + * @param index The index to set the value at. + * @param value The unknownField to set. + * @return This builder for chaining. + */ + public Builder setUnknownField( + int index, int value) { + ensureUnknownFieldIsMutable(); + UnknownField_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 _unknown_field_ = 2; + * @param value The unknownField to add. + * @return This builder for chaining. + */ + public Builder addUnknownField(int value) { + ensureUnknownFieldIsMutable(); + UnknownField_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 _unknown_field_ = 2; + * @param values The unknownField to add. + * @return This builder for chaining. + */ + public Builder addAllUnknownField( + java.lang.Iterable values) { + ensureUnknownFieldIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, UnknownField_); + onChanged(); + return this; + } + /** + * repeated uint32 _unknown_field_ = 2; + * @return This builder for chaining. + */ + public Builder clearUnknownField() { + UnknownField_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + private java.util.List fireWorkInstance_ = + java.util.Collections.emptyList(); + private void ensureFireWorkInstanceIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + fireWorkInstance_ = new java.util.ArrayList(fireWorkInstance_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> fireWorkInstanceBuilder_; + + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public java.util.List getFireWorkInstanceList() { + if (fireWorkInstanceBuilder_ == null) { + return java.util.Collections.unmodifiableList(fireWorkInstance_); + } else { + return fireWorkInstanceBuilder_.getMessageList(); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public int getFireWorkInstanceCount() { + if (fireWorkInstanceBuilder_ == null) { + return fireWorkInstance_.size(); + } else { + return fireWorkInstanceBuilder_.getCount(); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance getFireWorkInstance(int index) { + if (fireWorkInstanceBuilder_ == null) { + return fireWorkInstance_.get(index); + } else { + return fireWorkInstanceBuilder_.getMessage(index); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder setFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) { + if (fireWorkInstanceBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.set(index, value); + onChanged(); + } else { + fireWorkInstanceBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder setFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.set(index, builderForValue.build()); + onChanged(); + } else { + fireWorkInstanceBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder addFireWorkInstance(emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) { + if (fireWorkInstanceBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(value); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder addFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance value) { + if (fireWorkInstanceBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(index, value); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder addFireWorkInstance( + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(builderForValue.build()); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder addFireWorkInstance( + int index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder builderForValue) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.add(index, builderForValue.build()); + onChanged(); + } else { + fireWorkInstanceBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder addAllFireWorkInstance( + java.lang.Iterable values) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, fireWorkInstance_); + onChanged(); + } else { + fireWorkInstanceBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder clearFireWorkInstance() { + if (fireWorkInstanceBuilder_ == null) { + fireWorkInstance_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + fireWorkInstanceBuilder_.clear(); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public Builder removeFireWorkInstance(int index) { + if (fireWorkInstanceBuilder_ == null) { + ensureFireWorkInstanceIsMutable(); + fireWorkInstance_.remove(index); + onChanged(); + } else { + fireWorkInstanceBuilder_.remove(index); + } + return this; + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder getFireWorkInstanceBuilder( + int index) { + return getFireWorkInstanceFieldBuilder().getBuilder(index); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder getFireWorkInstanceOrBuilder( + int index) { + if (fireWorkInstanceBuilder_ == null) { + return fireWorkInstance_.get(index); } else { + return fireWorkInstanceBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public java.util.List + getFireWorkInstanceOrBuilderList() { + if (fireWorkInstanceBuilder_ != null) { + return fireWorkInstanceBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(fireWorkInstance_); + } + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder addFireWorkInstanceBuilder() { + return getFireWorkInstanceFieldBuilder().addBuilder( + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance()); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder addFireWorkInstanceBuilder( + int index) { + return getFireWorkInstanceFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.getDefaultInstance()); + } + /** + * repeated .FireWorkInstance fireWorkInstance = 3; + */ + public java.util.List + getFireWorkInstanceBuilderList() { + return getFireWorkInstanceFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder> + getFireWorkInstanceFieldBuilder() { + if (fireWorkInstanceBuilder_ == null) { + fireWorkInstanceBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstance.Builder, emu.grasscutter.net.proto.FireWorkInstanceOuterClass.FireWorkInstanceOrBuilder>( + fireWorkInstance_, + ((bitField0_ & 0x00000002) != 0), + getParentForChildren(), + isClean()); + fireWorkInstance_ = null; + } + return fireWorkInstanceBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:FireworkSetData) + } + + // @@protoc_insertion_point(class_scope:FireworkSetData) + private static final emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData(); + } + + public static emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FireworkSetData parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FireworkSetData(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.FireworkSetDataOuterClass.FireworkSetData getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_FireworkSetData_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_FireworkSetData_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\025FireworkSetData.proto\032\026FireWorkInstanc" + + "e.proto\"c\n\017FireworkSetData\022\n\n\002id\030\001 \001(\r\022\027" + + "\n\017_unknown_field_\030\002 \003(\r\022+\n\020fireWorkInsta" + + "nce\030\003 \003(\0132\021.FireWorkInstanceB\033\n\031emu.gras" + + "scutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.getDescriptor(), + }); + internal_static_FireworkSetData_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_FireworkSetData_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_FireworkSetData_descriptor, + new java.lang.String[] { "Id", "UnknownField", "FireWorkInstance", }); + emu.grasscutter.net.proto.FireWorkInstanceOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetNotifyOuterClass.java new file mode 100644 index 000000000..bda9bb336 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetNotifyOuterClass.java @@ -0,0 +1,926 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireworkSetNotify.proto + +package emu.grasscutter.net.proto; + +public final class FireworkSetNotifyOuterClass { + private FireworkSetNotifyOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface FireworkSetNotifyOrBuilder extends + // @@protoc_insertion_point(interface_extends:FireworkSetNotify) + com.google.protobuf.MessageOrBuilder { + + /** + * uint32 code = 1; + * @return The code. + */ + int getCode(); + + /** + * repeated .FireworkSetData data = 9; + */ + java.util.List + getDataList(); + /** + * repeated .FireworkSetData data = 9; + */ + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData(int index); + /** + * repeated .FireworkSetData data = 9; + */ + int getDataCount(); + /** + * repeated .FireworkSetData data = 9; + */ + java.util.List + getDataOrBuilderList(); + /** + * repeated .FireworkSetData data = 9; + */ + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder( + int index); + } + /** + *
+   * CmdId: 5934
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * 
+ * + * Protobuf type {@code FireworkSetNotify} + */ + public static final class FireworkSetNotify extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:FireworkSetNotify) + FireworkSetNotifyOrBuilder { + private static final long serialVersionUID = 0L; + // Use FireworkSetNotify.newBuilder() to construct. + private FireworkSetNotify(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private FireworkSetNotify() { + data_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new FireworkSetNotify(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private FireworkSetNotify( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + + code_ = input.readUInt32(); + break; + } + case 74: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + data_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + data_.add( + input.readMessage(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + data_ = java.util.Collections.unmodifiableList(data_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.class, emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.Builder.class); + } + + public static final int CODE_FIELD_NUMBER = 1; + private int code_; + /** + * uint32 code = 1; + * @return The code. + */ + @java.lang.Override + public int getCode() { + return code_; + } + + public static final int DATA_FIELD_NUMBER = 9; + private java.util.List data_; + /** + * repeated .FireworkSetData data = 9; + */ + @java.lang.Override + public java.util.List getDataList() { + return data_; + } + /** + * repeated .FireworkSetData data = 9; + */ + @java.lang.Override + public java.util.List + getDataOrBuilderList() { + return data_; + } + /** + * repeated .FireworkSetData data = 9; + */ + @java.lang.Override + public int getDataCount() { + return data_.size(); + } + /** + * repeated .FireworkSetData data = 9; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData(int index) { + return data_.get(index); + } + /** + * repeated .FireworkSetData data = 9; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder( + int index) { + return data_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (code_ != 0) { + output.writeUInt32(1, code_); + } + for (int i = 0; i < data_.size(); i++) { + output.writeMessage(9, data_.get(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (code_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, code_); + } + for (int i = 0; i < data_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(9, data_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify other = (emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify) obj; + + if (getCode() + != other.getCode()) return false; + if (!getDataList() + .equals(other.getDataList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CODE_FIELD_NUMBER; + hash = (53 * hash) + getCode(); + if (getDataCount() > 0) { + hash = (37 * hash) + DATA_FIELD_NUMBER; + hash = (53 * hash) + getDataList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * CmdId: 5934
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * 
+ * + * Protobuf type {@code FireworkSetNotify} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:FireworkSetNotify) + emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotifyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.class, emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getDataFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + code_ = 0; + + if (dataBuilder_ == null) { + data_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + dataBuilder_.clear(); + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.internal_static_FireworkSetNotify_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify build() { + emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify buildPartial() { + emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify result = new emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify(this); + int from_bitField0_ = bitField0_; + result.code_ = code_; + if (dataBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + data_ = java.util.Collections.unmodifiableList(data_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.data_ = data_; + } else { + result.data_ = dataBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify) { + return mergeFrom((emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify other) { + if (other == emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify.getDefaultInstance()) return this; + if (other.getCode() != 0) { + setCode(other.getCode()); + } + if (dataBuilder_ == null) { + if (!other.data_.isEmpty()) { + if (data_.isEmpty()) { + data_ = other.data_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureDataIsMutable(); + data_.addAll(other.data_); + } + onChanged(); + } + } else { + if (!other.data_.isEmpty()) { + if (dataBuilder_.isEmpty()) { + dataBuilder_.dispose(); + dataBuilder_ = null; + data_ = other.data_; + bitField0_ = (bitField0_ & ~0x00000001); + dataBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getDataFieldBuilder() : null; + } else { + dataBuilder_.addAllMessages(other.data_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private int code_ ; + /** + * uint32 code = 1; + * @return The code. + */ + @java.lang.Override + public int getCode() { + return code_; + } + /** + * uint32 code = 1; + * @param value The code to set. + * @return This builder for chaining. + */ + public Builder setCode(int value) { + + code_ = value; + onChanged(); + return this; + } + /** + * uint32 code = 1; + * @return This builder for chaining. + */ + public Builder clearCode() { + + code_ = 0; + onChanged(); + return this; + } + + private java.util.List data_ = + java.util.Collections.emptyList(); + private void ensureDataIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + data_ = new java.util.ArrayList(data_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> dataBuilder_; + + /** + * repeated .FireworkSetData data = 9; + */ + public java.util.List getDataList() { + if (dataBuilder_ == null) { + return java.util.Collections.unmodifiableList(data_); + } else { + return dataBuilder_.getMessageList(); + } + } + /** + * repeated .FireworkSetData data = 9; + */ + public int getDataCount() { + if (dataBuilder_ == null) { + return data_.size(); + } else { + return dataBuilder_.getCount(); + } + } + /** + * repeated .FireworkSetData data = 9; + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData(int index) { + if (dataBuilder_ == null) { + return data_.get(index); + } else { + return dataBuilder_.getMessage(index); + } + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder setData( + int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) { + if (dataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDataIsMutable(); + data_.set(index, value); + onChanged(); + } else { + dataBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder setData( + int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) { + if (dataBuilder_ == null) { + ensureDataIsMutable(); + data_.set(index, builderForValue.build()); + onChanged(); + } else { + dataBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder addData(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) { + if (dataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDataIsMutable(); + data_.add(value); + onChanged(); + } else { + dataBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder addData( + int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) { + if (dataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDataIsMutable(); + data_.add(index, value); + onChanged(); + } else { + dataBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder addData( + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) { + if (dataBuilder_ == null) { + ensureDataIsMutable(); + data_.add(builderForValue.build()); + onChanged(); + } else { + dataBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder addData( + int index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) { + if (dataBuilder_ == null) { + ensureDataIsMutable(); + data_.add(index, builderForValue.build()); + onChanged(); + } else { + dataBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder addAllData( + java.lang.Iterable values) { + if (dataBuilder_ == null) { + ensureDataIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, data_); + onChanged(); + } else { + dataBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder clearData() { + if (dataBuilder_ == null) { + data_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + dataBuilder_.clear(); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public Builder removeData(int index) { + if (dataBuilder_ == null) { + ensureDataIsMutable(); + data_.remove(index); + onChanged(); + } else { + dataBuilder_.remove(index); + } + return this; + } + /** + * repeated .FireworkSetData data = 9; + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder getDataBuilder( + int index) { + return getDataFieldBuilder().getBuilder(index); + } + /** + * repeated .FireworkSetData data = 9; + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder( + int index) { + if (dataBuilder_ == null) { + return data_.get(index); } else { + return dataBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .FireworkSetData data = 9; + */ + public java.util.List + getDataOrBuilderList() { + if (dataBuilder_ != null) { + return dataBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(data_); + } + } + /** + * repeated .FireworkSetData data = 9; + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder addDataBuilder() { + return getDataFieldBuilder().addBuilder( + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance()); + } + /** + * repeated .FireworkSetData data = 9; + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder addDataBuilder( + int index) { + return getDataFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance()); + } + /** + * repeated .FireworkSetData data = 9; + */ + public java.util.List + getDataBuilderList() { + return getDataFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> + getDataFieldBuilder() { + if (dataBuilder_ == null) { + dataBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder>( + data_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + data_ = null; + } + return dataBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:FireworkSetNotify) + } + + // @@protoc_insertion_point(class_scope:FireworkSetNotify) + private static final emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify(); + } + + public static emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FireworkSetNotify parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FireworkSetNotify(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetNotifyOuterClass.FireworkSetNotify getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_FireworkSetNotify_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_FireworkSetNotify_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\027FireworkSetNotify.proto\032\025FireworkSetDa" + + "ta.proto\"A\n\021FireworkSetNotify\022\014\n\004code\030\001 " + + "\001(\r\022\036\n\004data\030\t \003(\0132\020.FireworkSetDataB\033\n\031e" + + "mu.grasscutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor(), + }); + internal_static_FireworkSetNotify_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_FireworkSetNotify_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_FireworkSetNotify_descriptor, + new java.lang.String[] { "Code", "Data", }); + emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetReqOuterClass.java new file mode 100644 index 000000000..5fe176d13 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetReqOuterClass.java @@ -0,0 +1,686 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: FireworkSetReq.proto + +package emu.grasscutter.net.proto; + +public final class FireworkSetReqOuterClass { + private FireworkSetReqOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface FireworkSetReqOrBuilder extends + // @@protoc_insertion_point(interface_extends:FireworkSetReq) + com.google.protobuf.MessageOrBuilder { + + /** + * .FireworkSetData data = 2; + * @return Whether the data field is set. + */ + boolean hasData(); + /** + * .FireworkSetData data = 2; + * @return The data. + */ + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData(); + /** + * .FireworkSetData data = 2; + */ + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder(); + } + /** + *
+   * CmdId: 6099
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * IsAllowClient: true
+   * 
+ * + * Protobuf type {@code FireworkSetReq} + */ + public static final class FireworkSetReq extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:FireworkSetReq) + FireworkSetReqOrBuilder { + private static final long serialVersionUID = 0L; + // Use FireworkSetReq.newBuilder() to construct. + private FireworkSetReq(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private FireworkSetReq() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new FireworkSetReq(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private FireworkSetReq( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: { + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder subBuilder = null; + if (data_ != null) { + subBuilder = data_.toBuilder(); + } + data_ = input.readMessage(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(data_); + data_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.class, emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.Builder.class); + } + + public static final int DATA_FIELD_NUMBER = 2; + private emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData data_; + /** + * .FireworkSetData data = 2; + * @return Whether the data field is set. + */ + @java.lang.Override + public boolean hasData() { + return data_ != null; + } + /** + * .FireworkSetData data = 2; + * @return The data. + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData() { + return data_ == null ? emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance() : data_; + } + /** + * .FireworkSetData data = 2; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder() { + return getData(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (data_ != null) { + output.writeMessage(2, getData()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (data_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getData()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq other = (emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq) obj; + + if (hasData() != other.hasData()) return false; + if (hasData()) { + if (!getData() + .equals(other.getData())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasData()) { + hash = (37 * hash) + DATA_FIELD_NUMBER; + hash = (53 * hash) + getData().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * CmdId: 6099
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * IsAllowClient: true
+     * 
+ * + * Protobuf type {@code FireworkSetReq} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:FireworkSetReq) + emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReqOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.class, emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (dataBuilder_ == null) { + data_ = null; + } else { + data_ = null; + dataBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.FireworkSetReqOuterClass.internal_static_FireworkSetReq_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq build() { + emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq buildPartial() { + emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq result = new emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq(this); + if (dataBuilder_ == null) { + result.data_ = data_; + } else { + result.data_ = dataBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq) { + return mergeFrom((emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq other) { + if (other == emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq.getDefaultInstance()) return this; + if (other.hasData()) { + mergeData(other.getData()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData data_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> dataBuilder_; + /** + * .FireworkSetData data = 2; + * @return Whether the data field is set. + */ + public boolean hasData() { + return dataBuilder_ != null || data_ != null; + } + /** + * .FireworkSetData data = 2; + * @return The data. + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData getData() { + if (dataBuilder_ == null) { + return data_ == null ? emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance() : data_; + } else { + return dataBuilder_.getMessage(); + } + } + /** + * .FireworkSetData data = 2; + */ + public Builder setData(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) { + if (dataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + data_ = value; + onChanged(); + } else { + dataBuilder_.setMessage(value); + } + + return this; + } + /** + * .FireworkSetData data = 2; + */ + public Builder setData( + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder builderForValue) { + if (dataBuilder_ == null) { + data_ = builderForValue.build(); + onChanged(); + } else { + dataBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .FireworkSetData data = 2; + */ + public Builder mergeData(emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData value) { + if (dataBuilder_ == null) { + if (data_ != null) { + data_ = + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.newBuilder(data_).mergeFrom(value).buildPartial(); + } else { + data_ = value; + } + onChanged(); + } else { + dataBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .FireworkSetData data = 2; + */ + public Builder clearData() { + if (dataBuilder_ == null) { + data_ = null; + onChanged(); + } else { + data_ = null; + dataBuilder_ = null; + } + + return this; + } + /** + * .FireworkSetData data = 2; + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder getDataBuilder() { + + onChanged(); + return getDataFieldBuilder().getBuilder(); + } + /** + * .FireworkSetData data = 2; + */ + public emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder getDataOrBuilder() { + if (dataBuilder_ != null) { + return dataBuilder_.getMessageOrBuilder(); + } else { + return data_ == null ? + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.getDefaultInstance() : data_; + } + } + /** + * .FireworkSetData data = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder> + getDataFieldBuilder() { + if (dataBuilder_ == null) { + dataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetData.Builder, emu.grasscutter.net.proto.FireworkSetDataOuterClass.FireworkSetDataOrBuilder>( + getData(), + getParentForChildren(), + isClean()); + data_ = null; + } + return dataBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:FireworkSetReq) + } + + // @@protoc_insertion_point(class_scope:FireworkSetReq) + private static final emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq(); + } + + public static emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FireworkSetReq parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FireworkSetReq(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.FireworkSetReqOuterClass.FireworkSetReq getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_FireworkSetReq_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_FireworkSetReq_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\024FireworkSetReq.proto\032\025FireworkSetData." + + "proto\"0\n\016FireworkSetReq\022\036\n\004data\030\002 \001(\0132\020." + + "FireworkSetDataB\033\n\031emu.grasscutter.net.p" + + "rotob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor(), + }); + internal_static_FireworkSetReq_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_FireworkSetReq_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_FireworkSetReq_descriptor, + new java.lang.String[] { "Data", }); + emu.grasscutter.net.proto.FireworkSetDataOuterClass.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ACDCLDJFDFKOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetRsp.java similarity index 63% rename from src/generated/main/java/emu/grasscutter/net/proto/ACDCLDJFDFKOuterClass.java rename to src/generated/main/java/emu/grasscutter/net/proto/FireworkSetRsp.java index d3eb93b9d..73b7fcfd2 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ACDCLDJFDFKOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/FireworkSetRsp.java @@ -1,10 +1,10 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: ACDCLDJFDFK.proto +// source: FireworkSetRsp.proto package emu.grasscutter.net.proto; -public final class ACDCLDJFDFKOuterClass { - private ACDCLDJFDFKOuterClass() {} +public final class FireworkSetRsp { + private FireworkSetRsp() {} public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } @@ -14,40 +14,42 @@ public final class ACDCLDJFDFKOuterClass { registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } - public interface ACDCLDJFDFKOrBuilder extends - // @@protoc_insertion_point(interface_extends:ACDCLDJFDFK) + public interface NBFJOJPCCEK_RspOrBuilder extends + // @@protoc_insertion_point(interface_extends:NBFJOJPCCEK_Rsp) com.google.protobuf.MessageOrBuilder { /** - * uint32 PPLHKCKDHEC = 13; - * @return The pPLHKCKDHEC. + * int32 retcode = 7; + * @return The retcode. */ - int getPPLHKCKDHEC(); + int getRetcode(); } /** *
-   * CmdId: 26672
+   * CmdId: 5969
+   * EnetChannelId: 0
+   * EnetIsReliable: true
    * 
* - * Protobuf type {@code ACDCLDJFDFK} + * Protobuf type {@code NBFJOJPCCEK_Rsp} */ - public static final class ACDCLDJFDFK extends + public static final class NBFJOJPCCEK_Rsp extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:ACDCLDJFDFK) - ACDCLDJFDFKOrBuilder { + // @@protoc_insertion_point(message_implements:NBFJOJPCCEK_Rsp) + NBFJOJPCCEK_RspOrBuilder { private static final long serialVersionUID = 0L; - // Use ACDCLDJFDFK.newBuilder() to construct. - private ACDCLDJFDFK(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use NBFJOJPCCEK_Rsp.newBuilder() to construct. + private NBFJOJPCCEK_Rsp(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private ACDCLDJFDFK() { + private NBFJOJPCCEK_Rsp() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new ACDCLDJFDFK(); + return new NBFJOJPCCEK_Rsp(); } @java.lang.Override @@ -55,7 +57,7 @@ public final class ACDCLDJFDFKOuterClass { getUnknownFields() { return this.unknownFields; } - private ACDCLDJFDFK( + private NBFJOJPCCEK_Rsp( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -73,9 +75,9 @@ public final class ACDCLDJFDFKOuterClass { case 0: done = true; break; - case 104: { + case 56: { - pPLHKCKDHEC_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } default: { @@ -99,26 +101,26 @@ public final class ACDCLDJFDFKOuterClass { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_descriptor; + return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_fieldAccessorTable + return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable .ensureFieldAccessorsInitialized( - emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.class, emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.Builder.class); + emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.class, emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.Builder.class); } - public static final int PPLHKCKDHEC_FIELD_NUMBER = 13; - private int pPLHKCKDHEC_; + public static final int RETCODE_FIELD_NUMBER = 7; + private int retcode_; /** - * uint32 PPLHKCKDHEC = 13; - * @return The pPLHKCKDHEC. + * int32 retcode = 7; + * @return The retcode. */ @java.lang.Override - public int getPPLHKCKDHEC() { - return pPLHKCKDHEC_; + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -135,8 +137,8 @@ public final class ACDCLDJFDFKOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (pPLHKCKDHEC_ != 0) { - output.writeUInt32(13, pPLHKCKDHEC_); + if (retcode_ != 0) { + output.writeInt32(7, retcode_); } unknownFields.writeTo(output); } @@ -147,9 +149,9 @@ public final class ACDCLDJFDFKOuterClass { if (size != -1) return size; size = 0; - if (pPLHKCKDHEC_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, pPLHKCKDHEC_); + .computeInt32Size(7, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -161,13 +163,13 @@ public final class ACDCLDJFDFKOuterClass { if (obj == this) { return true; } - if (!(obj instanceof emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK)) { + if (!(obj instanceof emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp)) { return super.equals(obj); } - emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK other = (emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK) obj; + emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp other = (emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp) obj; - if (getPPLHKCKDHEC() - != other.getPPLHKCKDHEC()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -179,76 +181,76 @@ public final class ACDCLDJFDFKOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PPLHKCKDHEC_FIELD_NUMBER; - hash = (53 * hash) + getPPLHKCKDHEC(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(byte[] data) + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom(java.io.InputStream input) + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseDelimitedFrom(java.io.InputStream input) + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseDelimitedFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parseFrom( + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -261,7 +263,7 @@ public final class ACDCLDJFDFKOuterClass { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK prototype) { + public static Builder newBuilder(emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -278,29 +280,31 @@ public final class ACDCLDJFDFKOuterClass { } /** *
-     * CmdId: 26672
+     * CmdId: 5969
+     * EnetChannelId: 0
+     * EnetIsReliable: true
      * 
* - * Protobuf type {@code ACDCLDJFDFK} + * Protobuf type {@code NBFJOJPCCEK_Rsp} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:ACDCLDJFDFK) - emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFKOrBuilder { + // @@protoc_insertion_point(builder_implements:NBFJOJPCCEK_Rsp) + emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_RspOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_descriptor; + return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_fieldAccessorTable + return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable .ensureFieldAccessorsInitialized( - emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.class, emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.Builder.class); + emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.class, emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.Builder.class); } - // Construct using emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.newBuilder() + // Construct using emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -318,7 +322,7 @@ public final class ACDCLDJFDFKOuterClass { @java.lang.Override public Builder clear() { super.clear(); - pPLHKCKDHEC_ = 0; + retcode_ = 0; return this; } @@ -326,17 +330,17 @@ public final class ACDCLDJFDFKOuterClass { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.internal_static_ACDCLDJFDFK_descriptor; + return emu.grasscutter.net.proto.FireworkSetRsp.internal_static_NBFJOJPCCEK_Rsp_descriptor; } @java.lang.Override - public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK getDefaultInstanceForType() { - return emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.getDefaultInstance(); + public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp getDefaultInstanceForType() { + return emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.getDefaultInstance(); } @java.lang.Override - public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK build() { - emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK result = buildPartial(); + public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp build() { + emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -344,9 +348,9 @@ public final class ACDCLDJFDFKOuterClass { } @java.lang.Override - public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK buildPartial() { - emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK result = new emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK(this); - result.pPLHKCKDHEC_ = pPLHKCKDHEC_; + public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp buildPartial() { + emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp result = new emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp(this); + result.retcode_ = retcode_; onBuilt(); return result; } @@ -385,18 +389,18 @@ public final class ACDCLDJFDFKOuterClass { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK) { - return mergeFrom((emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK)other); + if (other instanceof emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp) { + return mergeFrom((emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK other) { - if (other == emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK.getDefaultInstance()) return this; - if (other.getPPLHKCKDHEC() != 0) { - setPPLHKCKDHEC(other.getPPLHKCKDHEC()); + public Builder mergeFrom(emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp other) { + if (other == emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp.getDefaultInstance()) return this; + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -413,11 +417,11 @@ public final class ACDCLDJFDFKOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK parsedMessage = null; + emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK) e.getUnfinishedMessage(); + parsedMessage = (emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -427,33 +431,33 @@ public final class ACDCLDJFDFKOuterClass { return this; } - private int pPLHKCKDHEC_ ; + private int retcode_ ; /** - * uint32 PPLHKCKDHEC = 13; - * @return The pPLHKCKDHEC. + * int32 retcode = 7; + * @return The retcode. */ @java.lang.Override - public int getPPLHKCKDHEC() { - return pPLHKCKDHEC_; + public int getRetcode() { + return retcode_; } /** - * uint32 PPLHKCKDHEC = 13; - * @param value The pPLHKCKDHEC to set. + * int32 retcode = 7; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setPPLHKCKDHEC(int value) { + public Builder setRetcode(int value) { - pPLHKCKDHEC_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 PPLHKCKDHEC = 13; + * int32 retcode = 7; * @return This builder for chaining. */ - public Builder clearPPLHKCKDHEC() { + public Builder clearRetcode() { - pPLHKCKDHEC_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -470,51 +474,51 @@ public final class ACDCLDJFDFKOuterClass { } - // @@protoc_insertion_point(builder_scope:ACDCLDJFDFK) + // @@protoc_insertion_point(builder_scope:NBFJOJPCCEK_Rsp) } - // @@protoc_insertion_point(class_scope:ACDCLDJFDFK) - private static final emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:NBFJOJPCCEK_Rsp) + private static final emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK(); + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp(); } - public static emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK getDefaultInstance() { + public static emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public ACDCLDJFDFK parsePartialFrom( + public NBFJOJPCCEK_Rsp parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ACDCLDJFDFK(input, extensionRegistry); + return new NBFJOJPCCEK_Rsp(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass.ACDCLDJFDFK getDefaultInstanceForType() { + public emu.grasscutter.net.proto.FireworkSetRsp.NBFJOJPCCEK_Rsp getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_ACDCLDJFDFK_descriptor; + internal_static_NBFJOJPCCEK_Rsp_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_ACDCLDJFDFK_fieldAccessorTable; + internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -524,20 +528,20 @@ public final class ACDCLDJFDFKOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\021ACDCLDJFDFK.proto\"\"\n\013ACDCLDJFDFK\022\023\n\013PP" + - "LHKCKDHEC\030\r \001(\rB\033\n\031emu.grasscutter.net.p" + - "rotob\006proto3" + "\n\024FireworkSetRsp.proto\"\"\n\017NBFJOJPCCEK_Rs" + + "p\022\017\n\007retcode\030\007 \001(\005B\033\n\031emu.grasscutter.ne" + + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }); - internal_static_ACDCLDJFDFK_descriptor = + internal_static_NBFJOJPCCEK_Rsp_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_ACDCLDJFDFK_fieldAccessorTable = new + internal_static_NBFJOJPCCEK_Rsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_ACDCLDJFDFK_descriptor, - new java.lang.String[] { "PPLHKCKDHEC", }); + internal_static_NBFJOJPCCEK_Rsp_descriptor, + new java.lang.String[] { "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) 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 494a707a2..de23757e8 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 queue_id = 13; - * @return The queueId. + * uint32 total_finish_timestamp = 13; + * @return The totalFinishTimestamp. */ - int getQueueId(); + int getTotalFinishTimestamp(); /** * uint32 avatar_id = 8; @@ -31,29 +31,29 @@ public final class ForgeQueueDataOuterClass { int getAvatarId(); /** - * uint32 finish_count = 3; + * uint32 queue_id = 3; + * @return The queueId. + */ + int getQueueId(); + + /** + * uint32 finish_count = 14; * @return The finishCount. */ int getFinishCount(); /** - * uint32 unfinish_count = 14; - * @return The unfinishCount. - */ - int getUnfinishCount(); - - /** - * uint32 total_finish_timestamp = 11; - * @return The totalFinishTimestamp. - */ - int getTotalFinishTimestamp(); - - /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 11; * @return The nextFinishTimestamp. */ int getNextFinishTimestamp(); + /** + * uint32 unfinish_count = 4; + * @return The unfinishCount. + */ + int getUnfinishCount(); + /** * uint32 forge_id = 15; * @return The forgeId. @@ -111,12 +111,12 @@ public final class ForgeQueueDataOuterClass { break; case 24: { - finishCount_ = input.readUInt32(); + queueId_ = input.readUInt32(); break; } case 32: { - nextFinishTimestamp_ = input.readUInt32(); + unfinishCount_ = input.readUInt32(); break; } case 64: { @@ -126,17 +126,17 @@ public final class ForgeQueueDataOuterClass { } case 88: { - totalFinishTimestamp_ = input.readUInt32(); + nextFinishTimestamp_ = input.readUInt32(); break; } case 104: { - queueId_ = input.readUInt32(); + totalFinishTimestamp_ = input.readUInt32(); break; } case 112: { - unfinishCount_ = input.readUInt32(); + finishCount_ = input.readUInt32(); break; } case 120: { @@ -176,15 +176,15 @@ public final class ForgeQueueDataOuterClass { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.class, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.Builder.class); } - public static final int QUEUE_ID_FIELD_NUMBER = 13; - private int queueId_; + public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 13; + private int totalFinishTimestamp_; /** - * uint32 queue_id = 13; - * @return The queueId. + * uint32 total_finish_timestamp = 13; + * @return The totalFinishTimestamp. */ @java.lang.Override - public int getQueueId() { - return queueId_; + public int getTotalFinishTimestamp() { + return totalFinishTimestamp_; } public static final int AVATAR_ID_FIELD_NUMBER = 8; @@ -198,10 +198,21 @@ public final class ForgeQueueDataOuterClass { return avatarId_; } - public static final int FINISH_COUNT_FIELD_NUMBER = 3; + public static final int QUEUE_ID_FIELD_NUMBER = 3; + private int queueId_; + /** + * uint32 queue_id = 3; + * @return The queueId. + */ + @java.lang.Override + public int getQueueId() { + return queueId_; + } + + public static final int FINISH_COUNT_FIELD_NUMBER = 14; private int finishCount_; /** - * uint32 finish_count = 3; + * uint32 finish_count = 14; * @return The finishCount. */ @java.lang.Override @@ -209,32 +220,10 @@ public final class ForgeQueueDataOuterClass { return finishCount_; } - public static final int UNFINISH_COUNT_FIELD_NUMBER = 14; - private int unfinishCount_; - /** - * uint32 unfinish_count = 14; - * @return The unfinishCount. - */ - @java.lang.Override - public int getUnfinishCount() { - return unfinishCount_; - } - - public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 11; - private int totalFinishTimestamp_; - /** - * uint32 total_finish_timestamp = 11; - * @return The totalFinishTimestamp. - */ - @java.lang.Override - public int getTotalFinishTimestamp() { - return totalFinishTimestamp_; - } - - public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 4; + public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 11; private int nextFinishTimestamp_; /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 11; * @return The nextFinishTimestamp. */ @java.lang.Override @@ -242,6 +231,17 @@ public final class ForgeQueueDataOuterClass { return nextFinishTimestamp_; } + public static final int UNFINISH_COUNT_FIELD_NUMBER = 4; + private int unfinishCount_; + /** + * uint32 unfinish_count = 4; + * @return The unfinishCount. + */ + @java.lang.Override + public int getUnfinishCount() { + return unfinishCount_; + } + public static final int FORGE_ID_FIELD_NUMBER = 15; private int forgeId_; /** @@ -267,23 +267,23 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (finishCount_ != 0) { - output.writeUInt32(3, finishCount_); + if (queueId_ != 0) { + output.writeUInt32(3, queueId_); } - if (nextFinishTimestamp_ != 0) { - output.writeUInt32(4, nextFinishTimestamp_); + if (unfinishCount_ != 0) { + output.writeUInt32(4, unfinishCount_); } if (avatarId_ != 0) { output.writeUInt32(8, avatarId_); } + if (nextFinishTimestamp_ != 0) { + output.writeUInt32(11, nextFinishTimestamp_); + } if (totalFinishTimestamp_ != 0) { - output.writeUInt32(11, totalFinishTimestamp_); + output.writeUInt32(13, totalFinishTimestamp_); } - if (queueId_ != 0) { - output.writeUInt32(13, queueId_); - } - if (unfinishCount_ != 0) { - output.writeUInt32(14, unfinishCount_); + if (finishCount_ != 0) { + output.writeUInt32(14, finishCount_); } if (forgeId_ != 0) { output.writeUInt32(15, forgeId_); @@ -297,29 +297,29 @@ public final class ForgeQueueDataOuterClass { if (size != -1) return size; size = 0; - if (finishCount_ != 0) { + if (queueId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, finishCount_); + .computeUInt32Size(3, queueId_); } - if (nextFinishTimestamp_ != 0) { + if (unfinishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, nextFinishTimestamp_); + .computeUInt32Size(4, unfinishCount_); } if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(8, avatarId_); } + if (nextFinishTimestamp_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(11, nextFinishTimestamp_); + } if (totalFinishTimestamp_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, totalFinishTimestamp_); + .computeUInt32Size(13, totalFinishTimestamp_); } - if (queueId_ != 0) { + if (finishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, queueId_); - } - if (unfinishCount_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, unfinishCount_); + .computeUInt32Size(14, finishCount_); } if (forgeId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -340,18 +340,18 @@ public final class ForgeQueueDataOuterClass { } emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData other = (emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData) obj; - if (getQueueId() - != other.getQueueId()) return false; - if (getAvatarId() - != other.getAvatarId()) return false; - if (getFinishCount() - != other.getFinishCount()) return false; - if (getUnfinishCount() - != other.getUnfinishCount()) return false; if (getTotalFinishTimestamp() != other.getTotalFinishTimestamp()) return false; + if (getAvatarId() + != other.getAvatarId()) return false; + if (getQueueId() + != other.getQueueId()) return false; + if (getFinishCount() + != other.getFinishCount()) return false; if (getNextFinishTimestamp() != other.getNextFinishTimestamp()) return false; + if (getUnfinishCount() + != other.getUnfinishCount()) return false; if (getForgeId() != other.getForgeId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -365,18 +365,18 @@ public final class ForgeQueueDataOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER; - hash = (53 * hash) + getQueueId(); - hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarId(); - hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getFinishCount(); - hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getUnfinishCount(); hash = (37 * hash) + TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getTotalFinishTimestamp(); + hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarId(); + hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER; + hash = (53 * hash) + getQueueId(); + hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getFinishCount(); hash = (37 * hash) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getNextFinishTimestamp(); + hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getUnfinishCount(); hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; hash = (53 * hash) + getForgeId(); hash = (29 * hash) + unknownFields.hashCode(); @@ -516,18 +516,18 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public Builder clear() { super.clear(); - queueId_ = 0; + totalFinishTimestamp_ = 0; avatarId_ = 0; + queueId_ = 0; + finishCount_ = 0; - unfinishCount_ = 0; - - totalFinishTimestamp_ = 0; - nextFinishTimestamp_ = 0; + unfinishCount_ = 0; + forgeId_ = 0; return this; @@ -556,12 +556,12 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData buildPartial() { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData result = new emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData(this); - result.queueId_ = queueId_; - result.avatarId_ = avatarId_; - result.finishCount_ = finishCount_; - result.unfinishCount_ = unfinishCount_; result.totalFinishTimestamp_ = totalFinishTimestamp_; + result.avatarId_ = avatarId_; + result.queueId_ = queueId_; + result.finishCount_ = finishCount_; result.nextFinishTimestamp_ = nextFinishTimestamp_; + result.unfinishCount_ = unfinishCount_; result.forgeId_ = forgeId_; onBuilt(); return result; @@ -611,24 +611,24 @@ public final class ForgeQueueDataOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData other) { if (other == emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.getDefaultInstance()) return this; - if (other.getQueueId() != 0) { - setQueueId(other.getQueueId()); + if (other.getTotalFinishTimestamp() != 0) { + setTotalFinishTimestamp(other.getTotalFinishTimestamp()); } if (other.getAvatarId() != 0) { setAvatarId(other.getAvatarId()); } + if (other.getQueueId() != 0) { + setQueueId(other.getQueueId()); + } if (other.getFinishCount() != 0) { setFinishCount(other.getFinishCount()); } - if (other.getUnfinishCount() != 0) { - setUnfinishCount(other.getUnfinishCount()); - } - if (other.getTotalFinishTimestamp() != 0) { - setTotalFinishTimestamp(other.getTotalFinishTimestamp()); - } if (other.getNextFinishTimestamp() != 0) { setNextFinishTimestamp(other.getNextFinishTimestamp()); } + if (other.getUnfinishCount() != 0) { + setUnfinishCount(other.getUnfinishCount()); + } if (other.getForgeId() != 0) { setForgeId(other.getForgeId()); } @@ -661,33 +661,33 @@ public final class ForgeQueueDataOuterClass { return this; } - private int queueId_ ; + private int totalFinishTimestamp_ ; /** - * uint32 queue_id = 13; - * @return The queueId. + * uint32 total_finish_timestamp = 13; + * @return The totalFinishTimestamp. */ @java.lang.Override - public int getQueueId() { - return queueId_; + public int getTotalFinishTimestamp() { + return totalFinishTimestamp_; } /** - * uint32 queue_id = 13; - * @param value The queueId to set. + * uint32 total_finish_timestamp = 13; + * @param value The totalFinishTimestamp to set. * @return This builder for chaining. */ - public Builder setQueueId(int value) { + public Builder setTotalFinishTimestamp(int value) { - queueId_ = value; + totalFinishTimestamp_ = value; onChanged(); return this; } /** - * uint32 queue_id = 13; + * uint32 total_finish_timestamp = 13; * @return This builder for chaining. */ - public Builder clearQueueId() { + public Builder clearTotalFinishTimestamp() { - queueId_ = 0; + totalFinishTimestamp_ = 0; onChanged(); return this; } @@ -723,9 +723,40 @@ public final class ForgeQueueDataOuterClass { return this; } + private int queueId_ ; + /** + * uint32 queue_id = 3; + * @return The queueId. + */ + @java.lang.Override + public int getQueueId() { + return queueId_; + } + /** + * uint32 queue_id = 3; + * @param value The queueId to set. + * @return This builder for chaining. + */ + public Builder setQueueId(int value) { + + queueId_ = value; + onChanged(); + return this; + } + /** + * uint32 queue_id = 3; + * @return This builder for chaining. + */ + public Builder clearQueueId() { + + queueId_ = 0; + onChanged(); + return this; + } + private int finishCount_ ; /** - * uint32 finish_count = 3; + * uint32 finish_count = 14; * @return The finishCount. */ @java.lang.Override @@ -733,7 +764,7 @@ public final class ForgeQueueDataOuterClass { return finishCount_; } /** - * uint32 finish_count = 3; + * uint32 finish_count = 14; * @param value The finishCount to set. * @return This builder for chaining. */ @@ -744,7 +775,7 @@ public final class ForgeQueueDataOuterClass { return this; } /** - * uint32 finish_count = 3; + * uint32 finish_count = 14; * @return This builder for chaining. */ public Builder clearFinishCount() { @@ -754,71 +785,9 @@ public final class ForgeQueueDataOuterClass { return this; } - private int unfinishCount_ ; - /** - * uint32 unfinish_count = 14; - * @return The unfinishCount. - */ - @java.lang.Override - public int getUnfinishCount() { - return unfinishCount_; - } - /** - * uint32 unfinish_count = 14; - * @param value The unfinishCount to set. - * @return This builder for chaining. - */ - public Builder setUnfinishCount(int value) { - - unfinishCount_ = value; - onChanged(); - return this; - } - /** - * uint32 unfinish_count = 14; - * @return This builder for chaining. - */ - public Builder clearUnfinishCount() { - - unfinishCount_ = 0; - onChanged(); - return this; - } - - private int totalFinishTimestamp_ ; - /** - * uint32 total_finish_timestamp = 11; - * @return The totalFinishTimestamp. - */ - @java.lang.Override - public int getTotalFinishTimestamp() { - return totalFinishTimestamp_; - } - /** - * uint32 total_finish_timestamp = 11; - * @param value The totalFinishTimestamp to set. - * @return This builder for chaining. - */ - public Builder setTotalFinishTimestamp(int value) { - - totalFinishTimestamp_ = value; - onChanged(); - return this; - } - /** - * uint32 total_finish_timestamp = 11; - * @return This builder for chaining. - */ - public Builder clearTotalFinishTimestamp() { - - totalFinishTimestamp_ = 0; - onChanged(); - return this; - } - private int nextFinishTimestamp_ ; /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 11; * @return The nextFinishTimestamp. */ @java.lang.Override @@ -826,7 +795,7 @@ public final class ForgeQueueDataOuterClass { return nextFinishTimestamp_; } /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 11; * @param value The nextFinishTimestamp to set. * @return This builder for chaining. */ @@ -837,7 +806,7 @@ public final class ForgeQueueDataOuterClass { return this; } /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 11; * @return This builder for chaining. */ public Builder clearNextFinishTimestamp() { @@ -847,6 +816,37 @@ public final class ForgeQueueDataOuterClass { return this; } + private int unfinishCount_ ; + /** + * uint32 unfinish_count = 4; + * @return The unfinishCount. + */ + @java.lang.Override + public int getUnfinishCount() { + return unfinishCount_; + } + /** + * uint32 unfinish_count = 4; + * @param value The unfinishCount to set. + * @return This builder for chaining. + */ + public Builder setUnfinishCount(int value) { + + unfinishCount_ = value; + onChanged(); + return this; + } + /** + * uint32 unfinish_count = 4; + * @return This builder for chaining. + */ + public Builder clearUnfinishCount() { + + unfinishCount_ = 0; + onChanged(); + return this; + } + private int forgeId_ ; /** * uint32 forge_id = 15; @@ -945,10 +945,10 @@ public final class ForgeQueueDataOuterClass { static { java.lang.String[] descriptorData = { "\n\024ForgeQueueData.proto\"\264\001\n\016ForgeQueueDat" + - "a\022\020\n\010queue_id\030\r \001(\r\022\021\n\tavatar_id\030\010 \001(\r\022\024" + - "\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" + + "a\022\036\n\026total_finish_timestamp\030\r \001(\r\022\021\n\tava" + + "tar_id\030\010 \001(\r\022\020\n\010queue_id\030\003 \001(\r\022\024\n\014finish" + + "_count\030\016 \001(\r\022\035\n\025next_finish_timestamp\030\013 " + + "\001(\r\022\026\n\016unfinish_count\030\004 \001(\r\022\020\n\010forge_id\030" + "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; @@ -961,7 +961,7 @@ public final class ForgeQueueDataOuterClass { internal_static_ForgeQueueData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeQueueData_descriptor, - new java.lang.String[] { "QueueId", "AvatarId", "FinishCount", "UnfinishCount", "TotalFinishTimestamp", "NextFinishTimestamp", "ForgeId", }); + new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "QueueId", "FinishCount", "NextFinishTimestamp", "UnfinishCount", "ForgeId", }); } // @@protoc_insertion_point(outer_class_scope) 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 d6d9e6c19..7dde37122 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java @@ -2780,7 +2780,7 @@ public final class FriendBriefOuterClass { * @return This builder for chaining. */ public Builder setIsGameSource(boolean value) { - + isGameSource_ = value; onChanged(); return this; @@ -2790,7 +2790,7 @@ public final class FriendBriefOuterClass { * @return This builder for chaining. */ public Builder clearIsGameSource() { - + isGameSource_ = false; onChanged(); return this; @@ -2811,7 +2811,7 @@ public final class FriendBriefOuterClass { * @return This builder for chaining. */ public Builder setIsPsnSource(boolean value) { - + isPsnSource_ = value; onChanged(); return this; @@ -2821,7 +2821,7 @@ public final class FriendBriefOuterClass { * @return This builder for chaining. */ public Builder clearIsPsnSource() { - + isPsnSource_ = false; onChanged(); return this; @@ -2896,7 +2896,7 @@ public final class FriendBriefOuterClass { * @return This builder for chaining. */ public Builder setIEAHDCLDOEJ(boolean value) { - + iEAHDCLDOEJ_ = value; onChanged(); return this; @@ -2906,7 +2906,7 @@ public final class FriendBriefOuterClass { * @return This builder for chaining. */ public Builder clearIEAHDCLDOEJ() { - + iEAHDCLDOEJ_ = false; onChanged(); return this; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java index 2d7e9fda0..35a1e720a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java @@ -76,10 +76,10 @@ public final class GetPlayerTokenRspOuterClass { int getPlatformType(); /** - * uint32 EMFDHANIAHH = 1241; - * @return The eMFDHANIAHH. + * uint32 reg_platform = 1241; + * @return The regPlatform. */ - int getEMFDHANIAHH(); + int getRegPlatform(); /** * string account_uid = 3; @@ -504,7 +504,7 @@ public final class GetPlayerTokenRspOuterClass { } case 9928: { - eMFDHANIAHH_ = input.readUInt32(); + regPlatform_ = input.readUInt32(); break; } case 10336: { @@ -710,15 +710,15 @@ public final class GetPlayerTokenRspOuterClass { return platformType_; } - public static final int EMFDHANIAHH_FIELD_NUMBER = 1241; - private int eMFDHANIAHH_; + public static final int REG_PLATFORM_FIELD_NUMBER = 1241; + private int regPlatform_; /** - * uint32 EMFDHANIAHH = 1241; - * @return The eMFDHANIAHH. + * uint32 reg_platform = 1241; + * @return The regPlatform. */ @java.lang.Override - public int getEMFDHANIAHH() { - return eMFDHANIAHH_; + public int getRegPlatform() { + return regPlatform_; } public static final int ACCOUNT_UID_FIELD_NUMBER = 3; @@ -1357,8 +1357,8 @@ public final class GetPlayerTokenRspOuterClass { if (stopServer_ != null) { output.writeMessage(875, getStopServer()); } - if (eMFDHANIAHH_ != 0) { - output.writeUInt32(1241, eMFDHANIAHH_); + if (regPlatform_ != 0) { + output.writeUInt32(1241, regPlatform_); } if (pELBMOHDKHJ_ != false) { output.writeBool(1292, pELBMOHDKHJ_); @@ -1487,9 +1487,9 @@ public final class GetPlayerTokenRspOuterClass { size += com.google.protobuf.CodedOutputStream .computeMessageSize(875, getStopServer()); } - if (eMFDHANIAHH_ != 0) { + if (regPlatform_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1241, eMFDHANIAHH_); + .computeUInt32Size(1241, regPlatform_); } if (pELBMOHDKHJ_ != false) { size += com.google.protobuf.CodedOutputStream @@ -1555,8 +1555,8 @@ public final class GetPlayerTokenRspOuterClass { != other.getChannelId()) return false; if (getPlatformType() != other.getPlatformType()) return false; - if (getEMFDHANIAHH() - != other.getEMFDHANIAHH()) return false; + if (getRegPlatform() + != other.getRegPlatform()) return false; if (!getAccountUid() .equals(other.getAccountUid())) return false; if (getUid() @@ -1635,8 +1635,8 @@ public final class GetPlayerTokenRspOuterClass { hash = (53 * hash) + getChannelId(); hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER; hash = (53 * hash) + getPlatformType(); - hash = (37 * hash) + EMFDHANIAHH_FIELD_NUMBER; - hash = (53 * hash) + getEMFDHANIAHH(); + hash = (37 * hash) + REG_PLATFORM_FIELD_NUMBER; + hash = (53 * hash) + getRegPlatform(); hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER; hash = (53 * hash) + getAccountUid().hashCode(); hash = (37 * hash) + UID_FIELD_NUMBER; @@ -1845,7 +1845,7 @@ public final class GetPlayerTokenRspOuterClass { platformType_ = 0; - eMFDHANIAHH_ = 0; + regPlatform_ = 0; accountUid_ = ""; @@ -1933,7 +1933,7 @@ public final class GetPlayerTokenRspOuterClass { } result.channelId_ = channelId_; result.platformType_ = platformType_; - result.eMFDHANIAHH_ = eMFDHANIAHH_; + result.regPlatform_ = regPlatform_; result.accountUid_ = accountUid_; result.uid_ = uid_; result.tag_ = tag_; @@ -2032,8 +2032,8 @@ public final class GetPlayerTokenRspOuterClass { if (other.getPlatformType() != 0) { setPlatformType(other.getPlatformType()); } - if (other.getEMFDHANIAHH() != 0) { - setEMFDHANIAHH(other.getEMFDHANIAHH()); + if (other.getRegPlatform() != 0) { + setRegPlatform(other.getRegPlatform()); } if (!other.getAccountUid().isEmpty()) { accountUid_ = other.accountUid_; @@ -2504,33 +2504,33 @@ public final class GetPlayerTokenRspOuterClass { return this; } - private int eMFDHANIAHH_ ; + private int regPlatform_ ; /** - * uint32 EMFDHANIAHH = 1241; - * @return The eMFDHANIAHH. + * uint32 reg_platform = 1241; + * @return The regPlatform. */ @java.lang.Override - public int getEMFDHANIAHH() { - return eMFDHANIAHH_; + public int getRegPlatform() { + return regPlatform_; } /** - * uint32 EMFDHANIAHH = 1241; - * @param value The eMFDHANIAHH to set. + * uint32 reg_platform = 1241; + * @param value The regPlatform to set. * @return This builder for chaining. */ - public Builder setEMFDHANIAHH(int value) { + public Builder setRegPlatform(int value) { - eMFDHANIAHH_ = value; + regPlatform_ = value; onChanged(); return this; } /** - * uint32 EMFDHANIAHH = 1241; + * uint32 reg_platform = 1241; * @return This builder for chaining. */ - public Builder clearEMFDHANIAHH() { + public Builder clearRegPlatform() { - eMFDHANIAHH_ = 0; + regPlatform_ = 0; onChanged(); return this; } @@ -3850,26 +3850,26 @@ public final class GetPlayerTokenRspOuterClass { static { java.lang.String[] descriptorData = { "\n\027GetPlayerTokenRsp.proto\032\024StopServerInf" + - "o.proto\"\341\005\n\021GetPlayerTokenRsp\022\024\n\013PELBMOH" + + "o.proto\"\342\005\n\021GetPlayerTokenRsp\022\024\n\013PELBMOH" + "DKHJ\030\214\n \001(\010\022\024\n\013ILGBPPMFHIF\030\252\017 \001(\010\022\027\n\017sec" + "ret_key_seed\030\r \001(\004\022\"\n\031client_version_ran" + "dom_key\030\246\005 \001(\t\022%\n\013stop_server\030\353\006 \001(\0132\017.S" + "topServerInfo\022\023\n\nchannel_id\030\203\002 \001(\r\022\025\n\rpl" + - "atform_type\030\005 \001(\r\022\024\n\013EMFDHANIAHH\030\331\t \001(\r\022" + - "\023\n\013account_uid\030\003 \001(\t\022\013\n\003uid\030\007 \001(\r\022\014\n\003tag" + - "\030\244\014 \001(\r\022\021\n\010birthday\030\235\013 \001(\t\022\017\n\006key_id\030\214\r " + - "\001(\r\022\017\n\007retcode\030\004 \001(\005\022\020\n\010is_guest\030\002 \001(\010\022\"" + - "\n\031finish_collection_id_list\030\303\003 \003(\r\022\030\n\017se" + - "rver_rand_key\030\205\004 \001(\t\022\033\n\023security_cmd_buf" + - "fer\030\017 \001(\014\022\013\n\003msg\030\014 \001(\t\022\034\n\024is_proficient_" + - "player\030\010 \001(\010\022\r\n\005token\030\013 \001(\t\022\r\n\004sign\030\212\003 \001" + - "(\t\022\025\n\014account_type\030\261\014 \001(\r\022\026\n\016extra_bin_d" + - "ata\030\001 \001(\014\022\017\n\006psn_id\030\376\r \001(\t\022\026\n\016sub_channe" + - "l_id\030\016 \001(\r\022\022\n\nsecret_key\030\t \001(\t\022\026\n\rclient" + - "_ip_str\030\201\017 \001(\t\022\027\n\017blackUidEndTime\030\n \001(\r\022" + - "\023\n\013KCFIGJAPNIB\030\006 \001(\r\022\025\n\014country_code\030\204\013 " + - "\001(\t\022\026\n\rcloudClientIp\030\374\003 \001(\rB\033\n\031emu.grass" + - "cutter.net.protob\006proto3" + "atform_type\030\005 \001(\r\022\025\n\014reg_platform\030\331\t \001(\r" + + "\022\023\n\013account_uid\030\003 \001(\t\022\013\n\003uid\030\007 \001(\r\022\014\n\003ta" + + "g\030\244\014 \001(\r\022\021\n\010birthday\030\235\013 \001(\t\022\017\n\006key_id\030\214\r" + + " \001(\r\022\017\n\007retcode\030\004 \001(\005\022\020\n\010is_guest\030\002 \001(\010\022" + + "\"\n\031finish_collection_id_list\030\303\003 \003(\r\022\030\n\017s" + + "erver_rand_key\030\205\004 \001(\t\022\033\n\023security_cmd_bu" + + "ffer\030\017 \001(\014\022\013\n\003msg\030\014 \001(\t\022\034\n\024is_proficient" + + "_player\030\010 \001(\010\022\r\n\005token\030\013 \001(\t\022\r\n\004sign\030\212\003 " + + "\001(\t\022\025\n\014account_type\030\261\014 \001(\r\022\026\n\016extra_bin_" + + "data\030\001 \001(\014\022\017\n\006psn_id\030\376\r \001(\t\022\026\n\016sub_chann" + + "el_id\030\016 \001(\r\022\022\n\nsecret_key\030\t \001(\t\022\026\n\rclien" + + "t_ip_str\030\201\017 \001(\t\022\027\n\017blackUidEndTime\030\n \001(\r" + + "\022\023\n\013KCFIGJAPNIB\030\006 \001(\r\022\025\n\014country_code\030\204\013" + + " \001(\t\022\026\n\rcloudClientIp\030\374\003 \001(\rB\033\n\031emu.gras" + + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -3881,7 +3881,7 @@ public final class GetPlayerTokenRspOuterClass { internal_static_GetPlayerTokenRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GetPlayerTokenRsp_descriptor, - new java.lang.String[] { "PELBMOHDKHJ", "ILGBPPMFHIF", "SecretKeySeed", "ClientVersionRandomKey", "StopServer", "ChannelId", "PlatformType", "EMFDHANIAHH", "AccountUid", "Uid", "Tag", "Birthday", "KeyId", "Retcode", "IsGuest", "FinishCollectionIdList", "ServerRandKey", "SecurityCmdBuffer", "Msg", "IsProficientPlayer", "Token", "Sign", "AccountType", "ExtraBinData", "PsnId", "SubChannelId", "SecretKey", "ClientIpStr", "BlackUidEndTime", "KCFIGJAPNIB", "CountryCode", "CloudClientIp", }); + new java.lang.String[] { "PELBMOHDKHJ", "ILGBPPMFHIF", "SecretKeySeed", "ClientVersionRandomKey", "StopServer", "ChannelId", "PlatformType", "RegPlatform", "AccountUid", "Uid", "Tag", "Birthday", "KeyId", "Retcode", "IsGuest", "FinishCollectionIdList", "ServerRandKey", "SecurityCmdBuffer", "Msg", "IsProficientPlayer", "Token", "Sign", "AccountType", "ExtraBinData", "PsnId", "SubChannelId", "SecretKey", "ClientIpStr", "BlackUidEndTime", "KCFIGJAPNIB", "CountryCode", "CloudClientIp", }); emu.grasscutter.net.proto.StopServerInfoOuterClass.getDescriptor(); } 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 3eac65540..9d060ff87 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 unhide_point_list = 6; - * @return A list containing the unhidePointList. + * repeated uint32 ELDLGKEKABI = 6; + * @return A list containing the eLDLGKEKABI. */ - java.util.List getUnhidePointListList(); + java.util.List getELDLGKEKABIList(); /** - * repeated uint32 unhide_point_list = 6; - * @return The count of unhidePointList. + * repeated uint32 ELDLGKEKABI = 6; + * @return The count of eLDLGKEKABI. */ - int getUnhidePointListCount(); + int getELDLGKEKABICount(); /** - * repeated uint32 unhide_point_list = 6; + * repeated uint32 ELDLGKEKABI = 6; * @param index The index of the element to return. - * @return The unhidePointList at the given index. + * @return The eLDLGKEKABI at the given index. */ - int getUnhidePointList(int index); + int getELDLGKEKABI(int index); /** * bool FBFJPEPMAOF = 9; @@ -65,21 +65,21 @@ public final class GetScenePointRspOuterClass { int getRetcode(); /** - * repeated uint32 unlock_area_list = 12; - * @return A list containing the unlockAreaList. + * repeated uint32 GILIFDOOHFF = 12; + * @return A list containing the gILIFDOOHFF. */ - java.util.List getUnlockAreaListList(); + java.util.List getGILIFDOOHFFList(); /** - * repeated uint32 unlock_area_list = 12; - * @return The count of unlockAreaList. + * repeated uint32 GILIFDOOHFF = 12; + * @return The count of gILIFDOOHFF. */ - int getUnlockAreaListCount(); + int getGILIFDOOHFFCount(); /** - * repeated uint32 unlock_area_list = 12; + * repeated uint32 GILIFDOOHFF = 12; * @param index The index of the element to return. - * @return The unlockAreaList at the given index. + * @return The gILIFDOOHFF at the given index. */ - int getUnlockAreaList(int index); + int getGILIFDOOHFF(int index); /** * repeated uint32 PPDDIADEDIC = 8; @@ -156,21 +156,21 @@ public final class GetScenePointRspOuterClass { int getBelongUid(); /** - * repeated uint32 JCLHNODLPOH = 13; - * @return A list containing the jCLHNODLPOH. + * repeated uint32 unlockAreaList = 13; + * @return A list containing the unlockAreaList. */ - java.util.List getJCLHNODLPOHList(); + java.util.List getUnlockAreaListList(); /** - * repeated uint32 JCLHNODLPOH = 13; - * @return The count of jCLHNODLPOH. + * repeated uint32 unlockAreaList = 13; + * @return The count of unlockAreaList. */ - int getJCLHNODLPOHCount(); + int getUnlockAreaListCount(); /** - * repeated uint32 JCLHNODLPOH = 13; + * repeated uint32 unlockAreaList = 13; * @param index The index of the element to return. - * @return The jCLHNODLPOH at the given index. + * @return The unlockAreaList at the given index. */ - int getJCLHNODLPOH(int index); + int getUnlockAreaList(int index); /** * uint32 scene_id = 2; @@ -179,21 +179,21 @@ public final class GetScenePointRspOuterClass { int getSceneId(); /** - * repeated uint32 KOPAHGHMECF = 3; - * @return A list containing the kOPAHGHMECF. + * repeated uint32 unhide_point_list = 3; + * @return A list containing the unhidePointList. */ - java.util.List getKOPAHGHMECFList(); + java.util.List getUnhidePointListList(); /** - * repeated uint32 KOPAHGHMECF = 3; - * @return The count of kOPAHGHMECF. + * repeated uint32 unhide_point_list = 3; + * @return The count of unhidePointList. */ - int getKOPAHGHMECFCount(); + int getUnhidePointListCount(); /** - * repeated uint32 KOPAHGHMECF = 3; + * repeated uint32 unhide_point_list = 3; * @param index The index of the element to return. - * @return The kOPAHGHMECF at the given index. + * @return The unhidePointList at the given index. */ - int getKOPAHGHMECF(int index); + int getUnhidePointList(int index); } /** *
@@ -214,14 +214,14 @@ public final class GetScenePointRspOuterClass {
     }
     private GetScenePointRsp() {
       unlockedPointList_ = emptyIntList();
-      unhidePointList_ = emptyIntList();
-      unlockAreaList_ = emptyIntList();
+      eLDLGKEKABI_ = emptyIntList();
+      gILIFDOOHFF_ = emptyIntList();
       pPDDIADEDIC_ = emptyIntList();
       oGKCOCBLNLF_ = emptyIntList();
       eBIFELCKPEA_ = emptyIntList();
       jJOHJDFINFN_ = emptyIntList();
-      jCLHNODLPOH_ = emptyIntList();
-      kOPAHGHMECF_ = emptyIntList();
+      unlockAreaList_ = emptyIntList();
+      unhidePointList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -283,21 +283,21 @@ public final class GetScenePointRspOuterClass {
             }
             case 24: {
               if (!((mutable_bitField0_ & 0x00000100) != 0)) {
-                kOPAHGHMECF_ = newIntList();
+                unhidePointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000100;
               }
-              kOPAHGHMECF_.addInt(input.readUInt32());
+              unhidePointList_.addInt(input.readUInt32());
               break;
             }
             case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) {
-                kOPAHGHMECF_ = newIntList();
+                unhidePointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000100;
               }
               while (input.getBytesUntilLimit() > 0) {
-                kOPAHGHMECF_.addInt(input.readUInt32());
+                unhidePointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -325,21 +325,21 @@ public final class GetScenePointRspOuterClass {
             }
             case 48: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                unhidePointList_ = newIntList();
+                eLDLGKEKABI_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              unhidePointList_.addInt(input.readUInt32());
+              eLDLGKEKABI_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                unhidePointList_ = newIntList();
+                eLDLGKEKABI_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unhidePointList_.addInt(input.readUInt32());
+                eLDLGKEKABI_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -419,42 +419,42 @@ public final class GetScenePointRspOuterClass {
             }
             case 96: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                unlockAreaList_ = newIntList();
+                gILIFDOOHFF_ = newIntList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              unlockAreaList_.addInt(input.readUInt32());
+              gILIFDOOHFF_.addInt(input.readUInt32());
               break;
             }
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                unlockAreaList_ = newIntList();
+                gILIFDOOHFF_ = newIntList();
                 mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unlockAreaList_.addInt(input.readUInt32());
+                gILIFDOOHFF_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 104: {
               if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                jCLHNODLPOH_ = newIntList();
+                unlockAreaList_ = newIntList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              jCLHNODLPOH_.addInt(input.readUInt32());
+              unlockAreaList_.addInt(input.readUInt32());
               break;
             }
             case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) {
-                jCLHNODLPOH_ = newIntList();
+                unlockAreaList_ = newIntList();
                 mutable_bitField0_ |= 0x00000080;
               }
               while (input.getBytesUntilLimit() > 0) {
-                jCLHNODLPOH_.addInt(input.readUInt32());
+                unlockAreaList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -483,13 +483,13 @@ public final class GetScenePointRspOuterClass {
           unlockedPointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000100) != 0)) {
-          kOPAHGHMECF_.makeImmutable(); // C
+          unhidePointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000040) != 0)) {
           jJOHJDFINFN_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          unhidePointList_.makeImmutable(); // C
+          eLDLGKEKABI_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000020) != 0)) {
           eBIFELCKPEA_.makeImmutable(); // C
@@ -501,10 +501,10 @@ public final class GetScenePointRspOuterClass {
           oGKCOCBLNLF_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          unlockAreaList_.makeImmutable(); // C
+          gILIFDOOHFF_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000080) != 0)) {
-          jCLHNODLPOH_.makeImmutable(); // C
+          unlockAreaList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -551,33 +551,33 @@ public final class GetScenePointRspOuterClass {
     }
     private int unlockedPointListMemoizedSerializedSize = -1;
 
-    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList unhidePointList_;
+    public static final int ELDLGKEKABI_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList eLDLGKEKABI_;
     /**
-     * repeated uint32 unhide_point_list = 6;
-     * @return A list containing the unhidePointList.
+     * repeated uint32 ELDLGKEKABI = 6;
+     * @return A list containing the eLDLGKEKABI.
      */
     @java.lang.Override
     public java.util.List
-        getUnhidePointListList() {
-      return unhidePointList_;
+        getELDLGKEKABIList() {
+      return eLDLGKEKABI_;
     }
     /**
-     * repeated uint32 unhide_point_list = 6;
-     * @return The count of unhidePointList.
+     * repeated uint32 ELDLGKEKABI = 6;
+     * @return The count of eLDLGKEKABI.
      */
-    public int getUnhidePointListCount() {
-      return unhidePointList_.size();
+    public int getELDLGKEKABICount() {
+      return eLDLGKEKABI_.size();
     }
     /**
-     * repeated uint32 unhide_point_list = 6;
+     * repeated uint32 ELDLGKEKABI = 6;
      * @param index The index of the element to return.
-     * @return The unhidePointList at the given index.
+     * @return The eLDLGKEKABI at the given index.
      */
-    public int getUnhidePointList(int index) {
-      return unhidePointList_.getInt(index);
+    public int getELDLGKEKABI(int index) {
+      return eLDLGKEKABI_.getInt(index);
     }
-    private int unhidePointListMemoizedSerializedSize = -1;
+    private int eLDLGKEKABIMemoizedSerializedSize = -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 UNLOCK_AREA_LIST_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList unlockAreaList_;
+    public static final int GILIFDOOHFF_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList gILIFDOOHFF_;
     /**
-     * repeated uint32 unlock_area_list = 12;
-     * @return A list containing the unlockAreaList.
+     * repeated uint32 GILIFDOOHFF = 12;
+     * @return A list containing the gILIFDOOHFF.
      */
     @java.lang.Override
     public java.util.List
-        getUnlockAreaListList() {
-      return unlockAreaList_;
+        getGILIFDOOHFFList() {
+      return gILIFDOOHFF_;
     }
     /**
-     * repeated uint32 unlock_area_list = 12;
-     * @return The count of unlockAreaList.
+     * repeated uint32 GILIFDOOHFF = 12;
+     * @return The count of gILIFDOOHFF.
      */
-    public int getUnlockAreaListCount() {
-      return unlockAreaList_.size();
+    public int getGILIFDOOHFFCount() {
+      return gILIFDOOHFF_.size();
     }
     /**
-     * repeated uint32 unlock_area_list = 12;
+     * repeated uint32 GILIFDOOHFF = 12;
      * @param index The index of the element to return.
-     * @return The unlockAreaList at the given index.
+     * @return The gILIFDOOHFF at the given index.
      */
-    public int getUnlockAreaList(int index) {
-      return unlockAreaList_.getInt(index);
+    public int getGILIFDOOHFF(int index) {
+      return gILIFDOOHFF_.getInt(index);
     }
-    private int unlockAreaListMemoizedSerializedSize = -1;
+    private int gILIFDOOHFFMemoizedSerializedSize = -1;
 
     public static final int PPDDIADEDIC_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList pPDDIADEDIC_;
@@ -752,33 +752,33 @@ public final class GetScenePointRspOuterClass {
       return belongUid_;
     }
 
-    public static final int JCLHNODLPOH_FIELD_NUMBER = 13;
-    private com.google.protobuf.Internal.IntList jCLHNODLPOH_;
+    public static final int UNLOCKAREALIST_FIELD_NUMBER = 13;
+    private com.google.protobuf.Internal.IntList unlockAreaList_;
     /**
-     * repeated uint32 JCLHNODLPOH = 13;
-     * @return A list containing the jCLHNODLPOH.
+     * repeated uint32 unlockAreaList = 13;
+     * @return A list containing the unlockAreaList.
      */
     @java.lang.Override
     public java.util.List
-        getJCLHNODLPOHList() {
-      return jCLHNODLPOH_;
+        getUnlockAreaListList() {
+      return unlockAreaList_;
     }
     /**
-     * repeated uint32 JCLHNODLPOH = 13;
-     * @return The count of jCLHNODLPOH.
+     * repeated uint32 unlockAreaList = 13;
+     * @return The count of unlockAreaList.
      */
-    public int getJCLHNODLPOHCount() {
-      return jCLHNODLPOH_.size();
+    public int getUnlockAreaListCount() {
+      return unlockAreaList_.size();
     }
     /**
-     * repeated uint32 JCLHNODLPOH = 13;
+     * repeated uint32 unlockAreaList = 13;
      * @param index The index of the element to return.
-     * @return The jCLHNODLPOH at the given index.
+     * @return The unlockAreaList at the given index.
      */
-    public int getJCLHNODLPOH(int index) {
-      return jCLHNODLPOH_.getInt(index);
+    public int getUnlockAreaList(int index) {
+      return unlockAreaList_.getInt(index);
     }
-    private int jCLHNODLPOHMemoizedSerializedSize = -1;
+    private int unlockAreaListMemoizedSerializedSize = -1;
 
     public static final int SCENE_ID_FIELD_NUMBER = 2;
     private int sceneId_;
@@ -791,33 +791,33 @@ public final class GetScenePointRspOuterClass {
       return sceneId_;
     }
 
-    public static final int KOPAHGHMECF_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList kOPAHGHMECF_;
+    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.IntList unhidePointList_;
     /**
-     * repeated uint32 KOPAHGHMECF = 3;
-     * @return A list containing the kOPAHGHMECF.
+     * repeated uint32 unhide_point_list = 3;
+     * @return A list containing the unhidePointList.
      */
     @java.lang.Override
     public java.util.List
-        getKOPAHGHMECFList() {
-      return kOPAHGHMECF_;
+        getUnhidePointListList() {
+      return unhidePointList_;
     }
     /**
-     * repeated uint32 KOPAHGHMECF = 3;
-     * @return The count of kOPAHGHMECF.
+     * repeated uint32 unhide_point_list = 3;
+     * @return The count of unhidePointList.
      */
-    public int getKOPAHGHMECFCount() {
-      return kOPAHGHMECF_.size();
+    public int getUnhidePointListCount() {
+      return unhidePointList_.size();
     }
     /**
-     * repeated uint32 KOPAHGHMECF = 3;
+     * repeated uint32 unhide_point_list = 3;
      * @param index The index of the element to return.
-     * @return The kOPAHGHMECF at the given index.
+     * @return The unhidePointList at the given index.
      */
-    public int getKOPAHGHMECF(int index) {
-      return kOPAHGHMECF_.getInt(index);
+    public int getUnhidePointList(int index) {
+      return unhidePointList_.getInt(index);
     }
-    private int kOPAHGHMECFMemoizedSerializedSize = -1;
+    private int unhidePointListMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -844,12 +844,12 @@ public final class GetScenePointRspOuterClass {
       if (sceneId_ != 0) {
         output.writeUInt32(2, sceneId_);
       }
-      if (getKOPAHGHMECFList().size() > 0) {
+      if (getUnhidePointListList().size() > 0) {
         output.writeUInt32NoTag(26);
-        output.writeUInt32NoTag(kOPAHGHMECFMemoizedSerializedSize);
+        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
-        output.writeUInt32NoTag(kOPAHGHMECF_.getInt(i));
+      for (int i = 0; i < unhidePointList_.size(); i++) {
+        output.writeUInt32NoTag(unhidePointList_.getInt(i));
       }
       if (getJJOHJDFINFNList().size() > 0) {
         output.writeUInt32NoTag(34);
@@ -858,12 +858,12 @@ public final class GetScenePointRspOuterClass {
       for (int i = 0; i < jJOHJDFINFN_.size(); i++) {
         output.writeUInt32NoTag(jJOHJDFINFN_.getInt(i));
       }
-      if (getUnhidePointListList().size() > 0) {
+      if (getELDLGKEKABIList().size() > 0) {
         output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
+        output.writeUInt32NoTag(eLDLGKEKABIMemoizedSerializedSize);
       }
-      for (int i = 0; i < unhidePointList_.size(); i++) {
-        output.writeUInt32NoTag(unhidePointList_.getInt(i));
+      for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
+        output.writeUInt32NoTag(eLDLGKEKABI_.getInt(i));
       }
       if (getEBIFELCKPEAList().size() > 0) {
         output.writeUInt32NoTag(58);
@@ -892,20 +892,20 @@ public final class GetScenePointRspOuterClass {
       if (retcode_ != 0) {
         output.writeInt32(11, retcode_);
       }
-      if (getUnlockAreaListList().size() > 0) {
+      if (getGILIFDOOHFFList().size() > 0) {
         output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(gILIFDOOHFFMemoizedSerializedSize);
+      }
+      for (int i = 0; i < gILIFDOOHFF_.size(); i++) {
+        output.writeUInt32NoTag(gILIFDOOHFF_.getInt(i));
+      }
+      if (getUnlockAreaListList().size() > 0) {
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(unlockAreaListMemoizedSerializedSize);
       }
       for (int i = 0; i < unlockAreaList_.size(); i++) {
         output.writeUInt32NoTag(unlockAreaList_.getInt(i));
       }
-      if (getJCLHNODLPOHList().size() > 0) {
-        output.writeUInt32NoTag(106);
-        output.writeUInt32NoTag(jCLHNODLPOHMemoizedSerializedSize);
-      }
-      for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
-        output.writeUInt32NoTag(jCLHNODLPOH_.getInt(i));
-      }
       if (belongUid_ != 0) {
         output.writeUInt32(14, belongUid_);
       }
@@ -938,17 +938,17 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
+        for (int i = 0; i < unhidePointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(kOPAHGHMECF_.getInt(i));
+            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
         }
         size += dataSize;
-        if (!getKOPAHGHMECFList().isEmpty()) {
+        if (!getUnhidePointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        kOPAHGHMECFMemoizedSerializedSize = dataSize;
+        unhidePointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -966,17 +966,17 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < unhidePointList_.size(); i++) {
+        for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
+            .computeUInt32SizeNoTag(eLDLGKEKABI_.getInt(i));
         }
         size += dataSize;
-        if (!getUnhidePointListList().isEmpty()) {
+        if (!getELDLGKEKABIList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        unhidePointListMemoizedSerializedSize = dataSize;
+        eLDLGKEKABIMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -1028,6 +1028,20 @@ public final class GetScenePointRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(11, retcode_);
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < gILIFDOOHFF_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(gILIFDOOHFF_.getInt(i));
+        }
+        size += dataSize;
+        if (!getGILIFDOOHFFList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        gILIFDOOHFFMemoizedSerializedSize = dataSize;
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < unlockAreaList_.size(); i++) {
@@ -1042,20 +1056,6 @@ public final class GetScenePointRspOuterClass {
         }
         unlockAreaListMemoizedSerializedSize = dataSize;
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(jCLHNODLPOH_.getInt(i));
-        }
-        size += dataSize;
-        if (!getJCLHNODLPOHList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        jCLHNODLPOHMemoizedSerializedSize = dataSize;
-      }
       if (belongUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(14, belongUid_);
@@ -1077,14 +1077,14 @@ public final class GetScenePointRspOuterClass {
 
       if (!getUnlockedPointListList()
           .equals(other.getUnlockedPointListList())) return false;
-      if (!getUnhidePointListList()
-          .equals(other.getUnhidePointListList())) return false;
+      if (!getELDLGKEKABIList()
+          .equals(other.getELDLGKEKABIList())) return false;
       if (getFBFJPEPMAOF()
           != other.getFBFJPEPMAOF()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (!getUnlockAreaListList()
-          .equals(other.getUnlockAreaListList())) return false;
+      if (!getGILIFDOOHFFList()
+          .equals(other.getGILIFDOOHFFList())) return false;
       if (!getPPDDIADEDICList()
           .equals(other.getPPDDIADEDICList())) return false;
       if (!getOGKCOCBLNLFList()
@@ -1095,12 +1095,12 @@ public final class GetScenePointRspOuterClass {
           .equals(other.getJJOHJDFINFNList())) return false;
       if (getBelongUid()
           != other.getBelongUid()) return false;
-      if (!getJCLHNODLPOHList()
-          .equals(other.getJCLHNODLPOHList())) return false;
+      if (!getUnlockAreaListList()
+          .equals(other.getUnlockAreaListList())) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (!getKOPAHGHMECFList()
-          .equals(other.getKOPAHGHMECFList())) return false;
+      if (!getUnhidePointListList()
+          .equals(other.getUnhidePointListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1116,18 +1116,18 @@ public final class GetScenePointRspOuterClass {
         hash = (37 * hash) + UNLOCKED_POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedPointListList().hashCode();
       }
-      if (getUnhidePointListCount() > 0) {
-        hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getUnhidePointListList().hashCode();
+      if (getELDLGKEKABICount() > 0) {
+        hash = (37 * hash) + ELDLGKEKABI_FIELD_NUMBER;
+        hash = (53 * hash) + getELDLGKEKABIList().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 (getUnlockAreaListCount() > 0) {
-        hash = (37 * hash) + UNLOCK_AREA_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getUnlockAreaListList().hashCode();
+      if (getGILIFDOOHFFCount() > 0) {
+        hash = (37 * hash) + GILIFDOOHFF_FIELD_NUMBER;
+        hash = (53 * hash) + getGILIFDOOHFFList().hashCode();
       }
       if (getPPDDIADEDICCount() > 0) {
         hash = (37 * hash) + PPDDIADEDIC_FIELD_NUMBER;
@@ -1147,15 +1147,15 @@ public final class GetScenePointRspOuterClass {
       }
       hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
       hash = (53 * hash) + getBelongUid();
-      if (getJCLHNODLPOHCount() > 0) {
-        hash = (37 * hash) + JCLHNODLPOH_FIELD_NUMBER;
-        hash = (53 * hash) + getJCLHNODLPOHList().hashCode();
+      if (getUnlockAreaListCount() > 0) {
+        hash = (37 * hash) + UNLOCKAREALIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnlockAreaListList().hashCode();
       }
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
-      if (getKOPAHGHMECFCount() > 0) {
-        hash = (37 * hash) + KOPAHGHMECF_FIELD_NUMBER;
-        hash = (53 * hash) + getKOPAHGHMECFList().hashCode();
+      if (getUnhidePointListCount() > 0) {
+        hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnhidePointListList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -1297,13 +1297,13 @@ public final class GetScenePointRspOuterClass {
         super.clear();
         unlockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        unhidePointList_ = emptyIntList();
+        eLDLGKEKABI_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         fBFJPEPMAOF_ = false;
 
         retcode_ = 0;
 
-        unlockAreaList_ = emptyIntList();
+        gILIFDOOHFF_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         pPDDIADEDIC_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -1315,11 +1315,11 @@ public final class GetScenePointRspOuterClass {
         bitField0_ = (bitField0_ & ~0x00000040);
         belongUid_ = 0;
 
-        jCLHNODLPOH_ = emptyIntList();
+        unlockAreaList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000080);
         sceneId_ = 0;
 
-        kOPAHGHMECF_ = emptyIntList();
+        unhidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
@@ -1354,17 +1354,17 @@ public final class GetScenePointRspOuterClass {
         }
         result.unlockedPointList_ = unlockedPointList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          unhidePointList_.makeImmutable();
+          eLDLGKEKABI_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.unhidePointList_ = unhidePointList_;
+        result.eLDLGKEKABI_ = eLDLGKEKABI_;
         result.fBFJPEPMAOF_ = fBFJPEPMAOF_;
         result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          unlockAreaList_.makeImmutable();
+          gILIFDOOHFF_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.unlockAreaList_ = unlockAreaList_;
+        result.gILIFDOOHFF_ = gILIFDOOHFF_;
         if (((bitField0_ & 0x00000008) != 0)) {
           pPDDIADEDIC_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
@@ -1387,16 +1387,16 @@ public final class GetScenePointRspOuterClass {
         result.jJOHJDFINFN_ = jJOHJDFINFN_;
         result.belongUid_ = belongUid_;
         if (((bitField0_ & 0x00000080) != 0)) {
-          jCLHNODLPOH_.makeImmutable();
+          unlockAreaList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000080);
         }
-        result.jCLHNODLPOH_ = jCLHNODLPOH_;
+        result.unlockAreaList_ = unlockAreaList_;
         result.sceneId_ = sceneId_;
         if (((bitField0_ & 0x00000100) != 0)) {
-          kOPAHGHMECF_.makeImmutable();
+          unhidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000100);
         }
-        result.kOPAHGHMECF_ = kOPAHGHMECF_;
+        result.unhidePointList_ = unhidePointList_;
         onBuilt();
         return result;
       }
@@ -1455,13 +1455,13 @@ public final class GetScenePointRspOuterClass {
           }
           onChanged();
         }
-        if (!other.unhidePointList_.isEmpty()) {
-          if (unhidePointList_.isEmpty()) {
-            unhidePointList_ = other.unhidePointList_;
+        if (!other.eLDLGKEKABI_.isEmpty()) {
+          if (eLDLGKEKABI_.isEmpty()) {
+            eLDLGKEKABI_ = other.eLDLGKEKABI_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureUnhidePointListIsMutable();
-            unhidePointList_.addAll(other.unhidePointList_);
+            ensureELDLGKEKABIIsMutable();
+            eLDLGKEKABI_.addAll(other.eLDLGKEKABI_);
           }
           onChanged();
         }
@@ -1471,13 +1471,13 @@ public final class GetScenePointRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (!other.unlockAreaList_.isEmpty()) {
-          if (unlockAreaList_.isEmpty()) {
-            unlockAreaList_ = other.unlockAreaList_;
+        if (!other.gILIFDOOHFF_.isEmpty()) {
+          if (gILIFDOOHFF_.isEmpty()) {
+            gILIFDOOHFF_ = other.gILIFDOOHFF_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureUnlockAreaListIsMutable();
-            unlockAreaList_.addAll(other.unlockAreaList_);
+            ensureGILIFDOOHFFIsMutable();
+            gILIFDOOHFF_.addAll(other.gILIFDOOHFF_);
           }
           onChanged();
         }
@@ -1524,26 +1524,26 @@ public final class GetScenePointRspOuterClass {
         if (other.getBelongUid() != 0) {
           setBelongUid(other.getBelongUid());
         }
-        if (!other.jCLHNODLPOH_.isEmpty()) {
-          if (jCLHNODLPOH_.isEmpty()) {
-            jCLHNODLPOH_ = other.jCLHNODLPOH_;
+        if (!other.unlockAreaList_.isEmpty()) {
+          if (unlockAreaList_.isEmpty()) {
+            unlockAreaList_ = other.unlockAreaList_;
             bitField0_ = (bitField0_ & ~0x00000080);
           } else {
-            ensureJCLHNODLPOHIsMutable();
-            jCLHNODLPOH_.addAll(other.jCLHNODLPOH_);
+            ensureUnlockAreaListIsMutable();
+            unlockAreaList_.addAll(other.unlockAreaList_);
           }
           onChanged();
         }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (!other.kOPAHGHMECF_.isEmpty()) {
-          if (kOPAHGHMECF_.isEmpty()) {
-            kOPAHGHMECF_ = other.kOPAHGHMECF_;
+        if (!other.unhidePointList_.isEmpty()) {
+          if (unhidePointList_.isEmpty()) {
+            unhidePointList_ = other.unhidePointList_;
             bitField0_ = (bitField0_ & ~0x00000100);
           } else {
-            ensureKOPAHGHMECFIsMutable();
-            kOPAHGHMECF_.addAll(other.kOPAHGHMECF_);
+            ensureUnhidePointListIsMutable();
+            unhidePointList_.addAll(other.unhidePointList_);
           }
           onChanged();
         }
@@ -1656,80 +1656,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
-      private void ensureUnhidePointListIsMutable() {
+      private com.google.protobuf.Internal.IntList eLDLGKEKABI_ = emptyIntList();
+      private void ensureELDLGKEKABIIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          unhidePointList_ = mutableCopy(unhidePointList_);
+          eLDLGKEKABI_ = mutableCopy(eLDLGKEKABI_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * repeated uint32 unhide_point_list = 6;
-       * @return A list containing the unhidePointList.
+       * repeated uint32 ELDLGKEKABI = 6;
+       * @return A list containing the eLDLGKEKABI.
        */
       public java.util.List
-          getUnhidePointListList() {
+          getELDLGKEKABIList() {
         return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
+                 java.util.Collections.unmodifiableList(eLDLGKEKABI_) : eLDLGKEKABI_;
       }
       /**
-       * repeated uint32 unhide_point_list = 6;
-       * @return The count of unhidePointList.
+       * repeated uint32 ELDLGKEKABI = 6;
+       * @return The count of eLDLGKEKABI.
        */
-      public int getUnhidePointListCount() {
-        return unhidePointList_.size();
+      public int getELDLGKEKABICount() {
+        return eLDLGKEKABI_.size();
       }
       /**
-       * repeated uint32 unhide_point_list = 6;
+       * repeated uint32 ELDLGKEKABI = 6;
        * @param index The index of the element to return.
-       * @return The unhidePointList at the given index.
+       * @return The eLDLGKEKABI at the given index.
        */
-      public int getUnhidePointList(int index) {
-        return unhidePointList_.getInt(index);
+      public int getELDLGKEKABI(int index) {
+        return eLDLGKEKABI_.getInt(index);
       }
       /**
-       * repeated uint32 unhide_point_list = 6;
+       * repeated uint32 ELDLGKEKABI = 6;
        * @param index The index to set the value at.
-       * @param value The unhidePointList to set.
+       * @param value The eLDLGKEKABI to set.
        * @return This builder for chaining.
        */
-      public Builder setUnhidePointList(
+      public Builder setELDLGKEKABI(
           int index, int value) {
-        ensureUnhidePointListIsMutable();
-        unhidePointList_.setInt(index, value);
+        ensureELDLGKEKABIIsMutable();
+        eLDLGKEKABI_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unhide_point_list = 6;
-       * @param value The unhidePointList to add.
+       * repeated uint32 ELDLGKEKABI = 6;
+       * @param value The eLDLGKEKABI to add.
        * @return This builder for chaining.
        */
-      public Builder addUnhidePointList(int value) {
-        ensureUnhidePointListIsMutable();
-        unhidePointList_.addInt(value);
+      public Builder addELDLGKEKABI(int value) {
+        ensureELDLGKEKABIIsMutable();
+        eLDLGKEKABI_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unhide_point_list = 6;
-       * @param values The unhidePointList to add.
+       * repeated uint32 ELDLGKEKABI = 6;
+       * @param values The eLDLGKEKABI to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnhidePointList(
+      public Builder addAllELDLGKEKABI(
           java.lang.Iterable values) {
-        ensureUnhidePointListIsMutable();
+        ensureELDLGKEKABIIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unhidePointList_);
+            values, eLDLGKEKABI_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unhide_point_list = 6;
+       * repeated uint32 ELDLGKEKABI = 6;
        * @return This builder for chaining.
        */
-      public Builder clearUnhidePointList() {
-        unhidePointList_ = emptyIntList();
+      public Builder clearELDLGKEKABI() {
+        eLDLGKEKABI_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1797,80 +1797,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
-      private void ensureUnlockAreaListIsMutable() {
+      private com.google.protobuf.Internal.IntList gILIFDOOHFF_ = emptyIntList();
+      private void ensureGILIFDOOHFFIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          unlockAreaList_ = mutableCopy(unlockAreaList_);
+          gILIFDOOHFF_ = mutableCopy(gILIFDOOHFF_);
           bitField0_ |= 0x00000004;
          }
       }
       /**
-       * repeated uint32 unlock_area_list = 12;
-       * @return A list containing the unlockAreaList.
+       * repeated uint32 GILIFDOOHFF = 12;
+       * @return A list containing the gILIFDOOHFF.
        */
       public java.util.List
-          getUnlockAreaListList() {
+          getGILIFDOOHFFList() {
         return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
+                 java.util.Collections.unmodifiableList(gILIFDOOHFF_) : gILIFDOOHFF_;
       }
       /**
-       * repeated uint32 unlock_area_list = 12;
-       * @return The count of unlockAreaList.
+       * repeated uint32 GILIFDOOHFF = 12;
+       * @return The count of gILIFDOOHFF.
        */
-      public int getUnlockAreaListCount() {
-        return unlockAreaList_.size();
+      public int getGILIFDOOHFFCount() {
+        return gILIFDOOHFF_.size();
       }
       /**
-       * repeated uint32 unlock_area_list = 12;
+       * repeated uint32 GILIFDOOHFF = 12;
        * @param index The index of the element to return.
-       * @return The unlockAreaList at the given index.
+       * @return The gILIFDOOHFF at the given index.
        */
-      public int getUnlockAreaList(int index) {
-        return unlockAreaList_.getInt(index);
+      public int getGILIFDOOHFF(int index) {
+        return gILIFDOOHFF_.getInt(index);
       }
       /**
-       * repeated uint32 unlock_area_list = 12;
+       * repeated uint32 GILIFDOOHFF = 12;
        * @param index The index to set the value at.
-       * @param value The unlockAreaList to set.
+       * @param value The gILIFDOOHFF to set.
        * @return This builder for chaining.
        */
-      public Builder setUnlockAreaList(
+      public Builder setGILIFDOOHFF(
           int index, int value) {
-        ensureUnlockAreaListIsMutable();
-        unlockAreaList_.setInt(index, value);
+        ensureGILIFDOOHFFIsMutable();
+        gILIFDOOHFF_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unlock_area_list = 12;
-       * @param value The unlockAreaList to add.
+       * repeated uint32 GILIFDOOHFF = 12;
+       * @param value The gILIFDOOHFF to add.
        * @return This builder for chaining.
        */
-      public Builder addUnlockAreaList(int value) {
-        ensureUnlockAreaListIsMutable();
-        unlockAreaList_.addInt(value);
+      public Builder addGILIFDOOHFF(int value) {
+        ensureGILIFDOOHFFIsMutable();
+        gILIFDOOHFF_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unlock_area_list = 12;
-       * @param values The unlockAreaList to add.
+       * repeated uint32 GILIFDOOHFF = 12;
+       * @param values The gILIFDOOHFF to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnlockAreaList(
+      public Builder addAllGILIFDOOHFF(
           java.lang.Iterable values) {
-        ensureUnlockAreaListIsMutable();
+        ensureGILIFDOOHFFIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unlockAreaList_);
+            values, gILIFDOOHFF_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 unlock_area_list = 12;
+       * repeated uint32 GILIFDOOHFF = 12;
        * @return This builder for chaining.
        */
-      public Builder clearUnlockAreaList() {
-        unlockAreaList_ = emptyIntList();
+      public Builder clearGILIFDOOHFF() {
+        gILIFDOOHFF_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -2223,80 +2223,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList jCLHNODLPOH_ = emptyIntList();
-      private void ensureJCLHNODLPOHIsMutable() {
+      private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
+      private void ensureUnlockAreaListIsMutable() {
         if (!((bitField0_ & 0x00000080) != 0)) {
-          jCLHNODLPOH_ = mutableCopy(jCLHNODLPOH_);
+          unlockAreaList_ = mutableCopy(unlockAreaList_);
           bitField0_ |= 0x00000080;
          }
       }
       /**
-       * repeated uint32 JCLHNODLPOH = 13;
-       * @return A list containing the jCLHNODLPOH.
+       * repeated uint32 unlockAreaList = 13;
+       * @return A list containing the unlockAreaList.
        */
       public java.util.List
-          getJCLHNODLPOHList() {
+          getUnlockAreaListList() {
         return ((bitField0_ & 0x00000080) != 0) ?
-                 java.util.Collections.unmodifiableList(jCLHNODLPOH_) : jCLHNODLPOH_;
+                 java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
       }
       /**
-       * repeated uint32 JCLHNODLPOH = 13;
-       * @return The count of jCLHNODLPOH.
+       * repeated uint32 unlockAreaList = 13;
+       * @return The count of unlockAreaList.
        */
-      public int getJCLHNODLPOHCount() {
-        return jCLHNODLPOH_.size();
+      public int getUnlockAreaListCount() {
+        return unlockAreaList_.size();
       }
       /**
-       * repeated uint32 JCLHNODLPOH = 13;
+       * repeated uint32 unlockAreaList = 13;
        * @param index The index of the element to return.
-       * @return The jCLHNODLPOH at the given index.
+       * @return The unlockAreaList at the given index.
        */
-      public int getJCLHNODLPOH(int index) {
-        return jCLHNODLPOH_.getInt(index);
+      public int getUnlockAreaList(int index) {
+        return unlockAreaList_.getInt(index);
       }
       /**
-       * repeated uint32 JCLHNODLPOH = 13;
+       * repeated uint32 unlockAreaList = 13;
        * @param index The index to set the value at.
-       * @param value The jCLHNODLPOH to set.
+       * @param value The unlockAreaList to set.
        * @return This builder for chaining.
        */
-      public Builder setJCLHNODLPOH(
+      public Builder setUnlockAreaList(
           int index, int value) {
-        ensureJCLHNODLPOHIsMutable();
-        jCLHNODLPOH_.setInt(index, value);
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JCLHNODLPOH = 13;
-       * @param value The jCLHNODLPOH to add.
+       * repeated uint32 unlockAreaList = 13;
+       * @param value The unlockAreaList to add.
        * @return This builder for chaining.
        */
-      public Builder addJCLHNODLPOH(int value) {
-        ensureJCLHNODLPOHIsMutable();
-        jCLHNODLPOH_.addInt(value);
+      public Builder addUnlockAreaList(int value) {
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JCLHNODLPOH = 13;
-       * @param values The jCLHNODLPOH to add.
+       * repeated uint32 unlockAreaList = 13;
+       * @param values The unlockAreaList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllJCLHNODLPOH(
+      public Builder addAllUnlockAreaList(
           java.lang.Iterable values) {
-        ensureJCLHNODLPOHIsMutable();
+        ensureUnlockAreaListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, jCLHNODLPOH_);
+            values, unlockAreaList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 JCLHNODLPOH = 13;
+       * repeated uint32 unlockAreaList = 13;
        * @return This builder for chaining.
        */
-      public Builder clearJCLHNODLPOH() {
-        jCLHNODLPOH_ = emptyIntList();
+      public Builder clearUnlockAreaList() {
+        unlockAreaList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
         return this;
@@ -2333,80 +2333,80 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList kOPAHGHMECF_ = emptyIntList();
-      private void ensureKOPAHGHMECFIsMutable() {
+      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
+      private void ensureUnhidePointListIsMutable() {
         if (!((bitField0_ & 0x00000100) != 0)) {
-          kOPAHGHMECF_ = mutableCopy(kOPAHGHMECF_);
+          unhidePointList_ = mutableCopy(unhidePointList_);
           bitField0_ |= 0x00000100;
          }
       }
       /**
-       * repeated uint32 KOPAHGHMECF = 3;
-       * @return A list containing the kOPAHGHMECF.
+       * repeated uint32 unhide_point_list = 3;
+       * @return A list containing the unhidePointList.
        */
       public java.util.List
-          getKOPAHGHMECFList() {
+          getUnhidePointListList() {
         return ((bitField0_ & 0x00000100) != 0) ?
-                 java.util.Collections.unmodifiableList(kOPAHGHMECF_) : kOPAHGHMECF_;
+                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
       }
       /**
-       * repeated uint32 KOPAHGHMECF = 3;
-       * @return The count of kOPAHGHMECF.
+       * repeated uint32 unhide_point_list = 3;
+       * @return The count of unhidePointList.
        */
-      public int getKOPAHGHMECFCount() {
-        return kOPAHGHMECF_.size();
+      public int getUnhidePointListCount() {
+        return unhidePointList_.size();
       }
       /**
-       * repeated uint32 KOPAHGHMECF = 3;
+       * repeated uint32 unhide_point_list = 3;
        * @param index The index of the element to return.
-       * @return The kOPAHGHMECF at the given index.
+       * @return The unhidePointList at the given index.
        */
-      public int getKOPAHGHMECF(int index) {
-        return kOPAHGHMECF_.getInt(index);
+      public int getUnhidePointList(int index) {
+        return unhidePointList_.getInt(index);
       }
       /**
-       * repeated uint32 KOPAHGHMECF = 3;
+       * repeated uint32 unhide_point_list = 3;
        * @param index The index to set the value at.
-       * @param value The kOPAHGHMECF to set.
+       * @param value The unhidePointList to set.
        * @return This builder for chaining.
        */
-      public Builder setKOPAHGHMECF(
+      public Builder setUnhidePointList(
           int index, int value) {
-        ensureKOPAHGHMECFIsMutable();
-        kOPAHGHMECF_.setInt(index, value);
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 KOPAHGHMECF = 3;
-       * @param value The kOPAHGHMECF to add.
+       * repeated uint32 unhide_point_list = 3;
+       * @param value The unhidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addKOPAHGHMECF(int value) {
-        ensureKOPAHGHMECFIsMutable();
-        kOPAHGHMECF_.addInt(value);
+      public Builder addUnhidePointList(int value) {
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 KOPAHGHMECF = 3;
-       * @param values The kOPAHGHMECF to add.
+       * repeated uint32 unhide_point_list = 3;
+       * @param values The unhidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllKOPAHGHMECF(
+      public Builder addAllUnhidePointList(
           java.lang.Iterable values) {
-        ensureKOPAHGHMECFIsMutable();
+        ensureUnhidePointListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, kOPAHGHMECF_);
+            values, unhidePointList_);
         onChanged();
         return this;
       }
       /**
-       * repeated uint32 KOPAHGHMECF = 3;
+       * repeated uint32 unhide_point_list = 3;
        * @return This builder for chaining.
        */
-      public Builder clearKOPAHGHMECF() {
-        kOPAHGHMECF_ = emptyIntList();
+      public Builder clearUnhidePointList() {
+        unhidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
         return this;
@@ -2478,16 +2478,16 @@ public final class GetScenePointRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\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"
+      "\n\026GetScenePointRsp.proto\"\254\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\026\n\016unlockAreaList\030\r \003" +
+      "(\r\022\020\n\010scene_id\030\002 \001(\r\022\031\n\021unhide_point_lis" +
+      "t\030\003 \003(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2498,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", "UnhidePointList", "FBFJPEPMAOF", "Retcode", "UnlockAreaList", "PPDDIADEDIC", "OGKCOCBLNLF", "EBIFELCKPEA", "JJOHJDFINFN", "BelongUid", "JCLHNODLPOH", "SceneId", "KOPAHGHMECF", });
+        new java.lang.String[] { "UnlockedPointList", "ELDLGKEKABI", "FBFJPEPMAOF", "Retcode", "GILIFDOOHFF", "PPDDIADEDIC", "OGKCOCBLNLF", "EBIFELCKPEA", "JJOHJDFINFN", "BelongUid", "UnlockAreaList", "SceneId", "UnhidePointList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 4178ae31c..3d61bc31e 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 persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
     java.util.List 
-        getPersistentFurnitureListList();
+        getDeployFurniureListList();
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index);
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index);
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
-    int getPersistentFurnitureListCount();
+    int getDeployFurniureListCount();
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
     java.util.List 
-        getPersistentFurnitureListOrBuilderList();
+        getDeployFurniureListOrBuilderList();
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
         int index);
 
     /**
@@ -199,27 +199,27 @@ public final class HomeBlockArrangementInfoOuterClass {
     int getComfortValue();
 
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
     java.util.List 
-        getDeployFurniureListList();
+        getPersistentFurnitureListList();
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index);
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index);
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
-    int getDeployFurniureListCount();
+    int getPersistentFurnitureListCount();
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
     java.util.List 
-        getDeployFurniureListOrBuilderList();
+        getPersistentFurnitureListOrBuilderList();
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
         int index);
 
     /**
@@ -294,13 +294,13 @@ public final class HomeBlockArrangementInfoOuterClass {
     }
     private HomeBlockArrangementInfo() {
       dotPatternList_ = java.util.Collections.emptyList();
-      persistentFurnitureList_ = java.util.Collections.emptyList();
+      deployFurniureList_ = 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();
-      deployFurniureList_ = java.util.Collections.emptyList();
+      persistentFurnitureList_ = 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)) {
-                deployFurniureList_ = new java.util.ArrayList();
+                persistentFurnitureList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              deployFurniureList_.add(
+              persistentFurnitureList_.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)) {
-                persistentFurnitureList_ = new java.util.ArrayList();
+                deployFurniureList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              persistentFurnitureList_.add(
+              deployFurniureList_.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)) {
-          deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
+          persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
         }
         if (((mutable_bitField0_ & 0x00000040) != 0)) {
           fieldList_ = java.util.Collections.unmodifiableList(fieldList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
+          deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
         }
         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 PERSISTENT_FURNITURE_LIST_FIELD_NUMBER = 12;
-    private java.util.List persistentFurnitureList_;
+    public static final int DEPLOYFURNIURELIST_FIELD_NUMBER = 12;
+    private java.util.List deployFurniureList_;
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
     @java.lang.Override
-    public java.util.List getPersistentFurnitureListList() {
-      return persistentFurnitureList_;
+    public java.util.List getDeployFurniureListList() {
+      return deployFurniureList_;
     }
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
     @java.lang.Override
     public java.util.List 
-        getPersistentFurnitureListOrBuilderList() {
-      return persistentFurnitureList_;
+        getDeployFurniureListOrBuilderList() {
+      return deployFurniureList_;
     }
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
     @java.lang.Override
-    public int getPersistentFurnitureListCount() {
-      return persistentFurnitureList_.size();
+    public int getDeployFurniureListCount() {
+      return deployFurniureList_.size();
     }
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
-      return persistentFurnitureList_.get(index);
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
+      return deployFurniureList_.get(index);
     }
     /**
-     * repeated .HomeFurnitureData persistent_furniture_list = 12;
+     * repeated .HomeFurnitureData deployFurniureList = 12;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
         int index) {
-      return persistentFurnitureList_.get(index);
+      return deployFurniureList_.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 DEPLOY_FURNIURE_LIST_FIELD_NUMBER = 10;
-    private java.util.List deployFurniureList_;
+    public static final int PERSISTENTFURNITURELIST_FIELD_NUMBER = 10;
+    private java.util.List persistentFurnitureList_;
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
     @java.lang.Override
-    public java.util.List getDeployFurniureListList() {
-      return deployFurniureList_;
+    public java.util.List getPersistentFurnitureListList() {
+      return persistentFurnitureList_;
     }
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
     @java.lang.Override
     public java.util.List 
-        getDeployFurniureListOrBuilderList() {
-      return deployFurniureList_;
+        getPersistentFurnitureListOrBuilderList() {
+      return persistentFurnitureList_;
     }
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
     @java.lang.Override
-    public int getDeployFurniureListCount() {
-      return deployFurniureList_.size();
+    public int getPersistentFurnitureListCount() {
+      return persistentFurnitureList_.size();
     }
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
-      return deployFurniureList_.get(index);
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
+      return persistentFurnitureList_.get(index);
     }
     /**
-     * repeated .HomeFurnitureData deploy_furniure_list = 10;
+     * repeated .HomeFurnitureData persistentFurnitureList = 10;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
         int index) {
-      return deployFurniureList_.get(index);
+      return persistentFurnitureList_.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 < deployFurniureList_.size(); i++) {
-        output.writeMessage(10, deployFurniureList_.get(i));
+      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
+        output.writeMessage(10, persistentFurnitureList_.get(i));
       }
       for (int i = 0; i < fieldList_.size(); i++) {
         output.writeMessage(11, fieldList_.get(i));
       }
-      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
-        output.writeMessage(12, persistentFurnitureList_.get(i));
+      for (int i = 0; i < deployFurniureList_.size(); i++) {
+        output.writeMessage(12, deployFurniureList_.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 < deployFurniureList_.size(); i++) {
+      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, deployFurniureList_.get(i));
+          .computeMessageSize(10, persistentFurnitureList_.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 < persistentFurnitureList_.size(); i++) {
+      for (int i = 0; i < deployFurniureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, persistentFurnitureList_.get(i));
+          .computeMessageSize(12, deployFurniureList_.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 (!getPersistentFurnitureListList()
-          .equals(other.getPersistentFurnitureListList())) return false;
+      if (!getDeployFurniureListList()
+          .equals(other.getDeployFurniureListList())) 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 (!getDeployFurniureListList()
-          .equals(other.getDeployFurniureListList())) return false;
+      if (!getPersistentFurnitureListList()
+          .equals(other.getPersistentFurnitureListList())) 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 (getPersistentFurnitureListCount() > 0) {
-        hash = (37 * hash) + PERSISTENT_FURNITURE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getPersistentFurnitureListList().hashCode();
+      if (getDeployFurniureListCount() > 0) {
+        hash = (37 * hash) + DEPLOYFURNIURELIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDeployFurniureListList().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 (getDeployFurniureListCount() > 0) {
-        hash = (37 * hash) + DEPLOY_FURNIURE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDeployFurniureListList().hashCode();
+      if (getPersistentFurnitureListCount() > 0) {
+        hash = (37 * hash) + PERSISTENTFURNITURELIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPersistentFurnitureListList().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();
-          getPersistentFurnitureListFieldBuilder();
+          getDeployFurniureListFieldBuilder();
           getFurnitureSuiteListFieldBuilder();
           getFurnitureCustomSuiteListFieldBuilder();
           getFurnitureGroupListFieldBuilder();
           getDeployAnimalListFieldBuilder();
           getFieldListFieldBuilder();
-          getDeployFurniureListFieldBuilder();
+          getPersistentFurnitureListFieldBuilder();
           getDeployNpcListFieldBuilder();
           getWeekendDjinnInfoListFieldBuilder();
         }
@@ -1302,11 +1302,11 @@ public final class HomeBlockArrangementInfoOuterClass {
         } else {
           dotPatternListBuilder_.clear();
         }
-        if (persistentFurnitureListBuilder_ == null) {
-          persistentFurnitureList_ = java.util.Collections.emptyList();
+        if (deployFurniureListBuilder_ == null) {
+          deployFurniureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
-          persistentFurnitureListBuilder_.clear();
+          deployFurniureListBuilder_.clear();
         }
         if (furnitureSuiteListBuilder_ == null) {
           furnitureSuiteList_ = java.util.Collections.emptyList();
@@ -1342,11 +1342,11 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
         comfortValue_ = 0;
 
-        if (deployFurniureListBuilder_ == null) {
-          deployFurniureList_ = java.util.Collections.emptyList();
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000080);
         } else {
-          deployFurniureListBuilder_.clear();
+          persistentFurnitureListBuilder_.clear();
         }
         if (deployNpcListBuilder_ == null) {
           deployNpcList_ = java.util.Collections.emptyList();
@@ -1398,14 +1398,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         } else {
           result.dotPatternList_ = dotPatternListBuilder_.build();
         }
-        if (persistentFurnitureListBuilder_ == null) {
+        if (deployFurniureListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
-            persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
+            deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
             bitField0_ = (bitField0_ & ~0x00000002);
           }
-          result.persistentFurnitureList_ = persistentFurnitureList_;
+          result.deployFurniureList_ = deployFurniureList_;
         } else {
-          result.persistentFurnitureList_ = persistentFurnitureListBuilder_.build();
+          result.deployFurniureList_ = deployFurniureListBuilder_.build();
         }
         if (furnitureSuiteListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
@@ -1454,14 +1454,14 @@ public final class HomeBlockArrangementInfoOuterClass {
           result.fieldList_ = fieldListBuilder_.build();
         }
         result.comfortValue_ = comfortValue_;
-        if (deployFurniureListBuilder_ == null) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (((bitField0_ & 0x00000080) != 0)) {
-            deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
+            persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
             bitField0_ = (bitField0_ & ~0x00000080);
           }
-          result.deployFurniureList_ = deployFurniureList_;
+          result.persistentFurnitureList_ = persistentFurnitureList_;
         } else {
-          result.deployFurniureList_ = deployFurniureListBuilder_.build();
+          result.persistentFurnitureList_ = persistentFurnitureListBuilder_.build();
         }
         if (deployNpcListBuilder_ == null) {
           if (((bitField0_ & 0x00000100) != 0)) {
@@ -1556,29 +1556,29 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
           }
         }
-        if (persistentFurnitureListBuilder_ == null) {
-          if (!other.persistentFurnitureList_.isEmpty()) {
-            if (persistentFurnitureList_.isEmpty()) {
-              persistentFurnitureList_ = other.persistentFurnitureList_;
+        if (deployFurniureListBuilder_ == null) {
+          if (!other.deployFurniureList_.isEmpty()) {
+            if (deployFurniureList_.isEmpty()) {
+              deployFurniureList_ = other.deployFurniureList_;
               bitField0_ = (bitField0_ & ~0x00000002);
             } else {
-              ensurePersistentFurnitureListIsMutable();
-              persistentFurnitureList_.addAll(other.persistentFurnitureList_);
+              ensureDeployFurniureListIsMutable();
+              deployFurniureList_.addAll(other.deployFurniureList_);
             }
             onChanged();
           }
         } else {
-          if (!other.persistentFurnitureList_.isEmpty()) {
-            if (persistentFurnitureListBuilder_.isEmpty()) {
-              persistentFurnitureListBuilder_.dispose();
-              persistentFurnitureListBuilder_ = null;
-              persistentFurnitureList_ = other.persistentFurnitureList_;
+          if (!other.deployFurniureList_.isEmpty()) {
+            if (deployFurniureListBuilder_.isEmpty()) {
+              deployFurniureListBuilder_.dispose();
+              deployFurniureListBuilder_ = null;
+              deployFurniureList_ = other.deployFurniureList_;
               bitField0_ = (bitField0_ & ~0x00000002);
-              persistentFurnitureListBuilder_ = 
+              deployFurniureListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getPersistentFurnitureListFieldBuilder() : null;
+                   getDeployFurniureListFieldBuilder() : null;
             } else {
-              persistentFurnitureListBuilder_.addAllMessages(other.persistentFurnitureList_);
+              deployFurniureListBuilder_.addAllMessages(other.deployFurniureList_);
             }
           }
         }
@@ -1718,29 +1718,29 @@ public final class HomeBlockArrangementInfoOuterClass {
         if (other.getComfortValue() != 0) {
           setComfortValue(other.getComfortValue());
         }
-        if (deployFurniureListBuilder_ == null) {
-          if (!other.deployFurniureList_.isEmpty()) {
-            if (deployFurniureList_.isEmpty()) {
-              deployFurniureList_ = other.deployFurniureList_;
+        if (persistentFurnitureListBuilder_ == null) {
+          if (!other.persistentFurnitureList_.isEmpty()) {
+            if (persistentFurnitureList_.isEmpty()) {
+              persistentFurnitureList_ = other.persistentFurnitureList_;
               bitField0_ = (bitField0_ & ~0x00000080);
             } else {
-              ensureDeployFurniureListIsMutable();
-              deployFurniureList_.addAll(other.deployFurniureList_);
+              ensurePersistentFurnitureListIsMutable();
+              persistentFurnitureList_.addAll(other.persistentFurnitureList_);
             }
             onChanged();
           }
         } else {
-          if (!other.deployFurniureList_.isEmpty()) {
-            if (deployFurniureListBuilder_.isEmpty()) {
-              deployFurniureListBuilder_.dispose();
-              deployFurniureListBuilder_ = null;
-              deployFurniureList_ = other.deployFurniureList_;
+          if (!other.persistentFurnitureList_.isEmpty()) {
+            if (persistentFurnitureListBuilder_.isEmpty()) {
+              persistentFurnitureListBuilder_.dispose();
+              persistentFurnitureListBuilder_ = null;
+              persistentFurnitureList_ = other.persistentFurnitureList_;
               bitField0_ = (bitField0_ & ~0x00000080);
-              deployFurniureListBuilder_ = 
+              persistentFurnitureListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getDeployFurniureListFieldBuilder() : null;
+                   getPersistentFurnitureListFieldBuilder() : null;
             } else {
-              deployFurniureListBuilder_.addAllMessages(other.deployFurniureList_);
+              persistentFurnitureListBuilder_.addAllMessages(other.persistentFurnitureList_);
             }
           }
         }
@@ -2069,244 +2069,244 @@ public final class HomeBlockArrangementInfoOuterClass {
         return dotPatternListBuilder_;
       }
 
-      private java.util.List persistentFurnitureList_ =
+      private java.util.List deployFurniureList_ =
         java.util.Collections.emptyList();
-      private void ensurePersistentFurnitureListIsMutable() {
+      private void ensureDeployFurniureListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          persistentFurnitureList_ = new java.util.ArrayList(persistentFurnitureList_);
+          deployFurniureList_ = new java.util.ArrayList(deployFurniureList_);
           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> persistentFurnitureListBuilder_;
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> deployFurniureListBuilder_;
 
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public java.util.List getPersistentFurnitureListList() {
-        if (persistentFurnitureListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
+      public java.util.List getDeployFurniureListList() {
+        if (deployFurniureListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(deployFurniureList_);
         } else {
-          return persistentFurnitureListBuilder_.getMessageList();
+          return deployFurniureListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public int getPersistentFurnitureListCount() {
-        if (persistentFurnitureListBuilder_ == null) {
-          return persistentFurnitureList_.size();
+      public int getDeployFurniureListCount() {
+        if (deployFurniureListBuilder_ == null) {
+          return deployFurniureList_.size();
         } else {
-          return persistentFurnitureListBuilder_.getCount();
+          return deployFurniureListBuilder_.getCount();
         }
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
-        if (persistentFurnitureListBuilder_ == null) {
-          return persistentFurnitureList_.get(index);
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
+        if (deployFurniureListBuilder_ == null) {
+          return deployFurniureList_.get(index);
         } else {
-          return persistentFurnitureListBuilder_.getMessage(index);
+          return deployFurniureListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder setPersistentFurnitureList(
+      public Builder setDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (persistentFurnitureListBuilder_ == null) {
+        if (deployFurniureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.set(index, value);
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.set(index, value);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.setMessage(index, value);
+          deployFurniureListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder setPersistentFurnitureList(
+      public Builder setDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.set(index, builderForValue.build());
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.setMessage(index, builderForValue.build());
+          deployFurniureListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder addPersistentFurnitureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (persistentFurnitureListBuilder_ == null) {
+      public Builder addDeployFurniureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (deployFurniureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(value);
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(value);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(value);
+          deployFurniureListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder addPersistentFurnitureList(
+      public Builder addDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (persistentFurnitureListBuilder_ == null) {
+        if (deployFurniureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(index, value);
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(index, value);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(index, value);
+          deployFurniureListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder addPersistentFurnitureList(
+      public Builder addDeployFurniureList(
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(builderForValue.build());
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(builderForValue.build());
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(builderForValue.build());
+          deployFurniureListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder addPersistentFurnitureList(
+      public Builder addDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(index, builderForValue.build());
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(index, builderForValue.build());
+          deployFurniureListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder addAllPersistentFurnitureList(
+      public Builder addAllDeployFurniureList(
           java.lang.Iterable values) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, persistentFurnitureList_);
+              values, deployFurniureList_);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addAllMessages(values);
+          deployFurniureListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder clearPersistentFurnitureList() {
-        if (persistentFurnitureListBuilder_ == null) {
-          persistentFurnitureList_ = java.util.Collections.emptyList();
+      public Builder clearDeployFurniureList() {
+        if (deployFurniureListBuilder_ == null) {
+          deployFurniureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.clear();
+          deployFurniureListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public Builder removePersistentFurnitureList(int index) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.remove(index);
+      public Builder removeDeployFurniureList(int index) {
+        if (deployFurniureListBuilder_ == null) {
+          ensureDeployFurniureListIsMutable();
+          deployFurniureList_.remove(index);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.remove(index);
+          deployFurniureListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getPersistentFurnitureListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getDeployFurniureListBuilder(
           int index) {
-        return getPersistentFurnitureListFieldBuilder().getBuilder(index);
+        return getDeployFurniureListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
           int index) {
-        if (persistentFurnitureListBuilder_ == null) {
-          return persistentFurnitureList_.get(index);  } else {
-          return persistentFurnitureListBuilder_.getMessageOrBuilder(index);
+        if (deployFurniureListBuilder_ == null) {
+          return deployFurniureList_.get(index);  } else {
+          return deployFurniureListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
       public java.util.List 
-           getPersistentFurnitureListOrBuilderList() {
-        if (persistentFurnitureListBuilder_ != null) {
-          return persistentFurnitureListBuilder_.getMessageOrBuilderList();
+           getDeployFurniureListOrBuilderList() {
+        if (deployFurniureListBuilder_ != null) {
+          return deployFurniureListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
+          return java.util.Collections.unmodifiableList(deployFurniureList_);
         }
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder() {
-        return getPersistentFurnitureListFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder() {
+        return getDeployFurniureListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder(
           int index) {
-        return getPersistentFurnitureListFieldBuilder().addBuilder(
+        return getDeployFurniureListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData persistent_furniture_list = 12;
+       * repeated .HomeFurnitureData deployFurniureList = 12;
        */
       public java.util.List 
-           getPersistentFurnitureListBuilderList() {
-        return getPersistentFurnitureListFieldBuilder().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> 
-          getPersistentFurnitureListFieldBuilder() {
-        if (persistentFurnitureListBuilder_ == null) {
-          persistentFurnitureListBuilder_ = 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>(
-                  persistentFurnitureList_,
+                  deployFurniureList_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
-          persistentFurnitureList_ = null;
+          deployFurniureList_ = null;
         }
-        return persistentFurnitureListBuilder_;
+        return deployFurniureListBuilder_;
       }
 
       private java.util.List furnitureSuiteList_ =
@@ -3571,244 +3571,244 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
 
-      private java.util.List deployFurniureList_ =
+      private java.util.List persistentFurnitureList_ =
         java.util.Collections.emptyList();
-      private void ensureDeployFurniureListIsMutable() {
+      private void ensurePersistentFurnitureListIsMutable() {
         if (!((bitField0_ & 0x00000080) != 0)) {
-          deployFurniureList_ = new java.util.ArrayList(deployFurniureList_);
+          persistentFurnitureList_ = new java.util.ArrayList(persistentFurnitureList_);
           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> deployFurniureListBuilder_;
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> persistentFurnitureListBuilder_;
 
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public java.util.List getDeployFurniureListList() {
-        if (deployFurniureListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(deployFurniureList_);
+      public java.util.List getPersistentFurnitureListList() {
+        if (persistentFurnitureListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
         } else {
-          return deployFurniureListBuilder_.getMessageList();
+          return persistentFurnitureListBuilder_.getMessageList();
         }
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public int getDeployFurniureListCount() {
-        if (deployFurniureListBuilder_ == null) {
-          return deployFurniureList_.size();
+      public int getPersistentFurnitureListCount() {
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.size();
         } else {
-          return deployFurniureListBuilder_.getCount();
+          return persistentFurnitureListBuilder_.getCount();
         }
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
-        if (deployFurniureListBuilder_ == null) {
-          return deployFurniureList_.get(index);
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.get(index);
         } else {
-          return deployFurniureListBuilder_.getMessage(index);
+          return persistentFurnitureListBuilder_.getMessage(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder setDeployFurniureList(
+      public Builder setPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (deployFurniureListBuilder_ == null) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureDeployFurniureListIsMutable();
-          deployFurniureList_.set(index, value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.set(index, value);
           onChanged();
         } else {
-          deployFurniureListBuilder_.setMessage(index, value);
+          persistentFurnitureListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder setDeployFurniureList(
+      public Builder setPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (deployFurniureListBuilder_ == null) {
-          ensureDeployFurniureListIsMutable();
-          deployFurniureList_.set(index, builderForValue.build());
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          deployFurniureListBuilder_.setMessage(index, builderForValue.build());
+          persistentFurnitureListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder addDeployFurniureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (deployFurniureListBuilder_ == null) {
+      public Builder addPersistentFurnitureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureDeployFurniureListIsMutable();
-          deployFurniureList_.add(value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(value);
           onChanged();
         } else {
-          deployFurniureListBuilder_.addMessage(value);
+          persistentFurnitureListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder addDeployFurniureList(
+      public Builder addPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (deployFurniureListBuilder_ == null) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureDeployFurniureListIsMutable();
-          deployFurniureList_.add(index, value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(index, value);
           onChanged();
         } else {
-          deployFurniureListBuilder_.addMessage(index, value);
+          persistentFurnitureListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder addDeployFurniureList(
+      public Builder addPersistentFurnitureList(
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (deployFurniureListBuilder_ == null) {
-          ensureDeployFurniureListIsMutable();
-          deployFurniureList_.add(builderForValue.build());
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(builderForValue.build());
           onChanged();
         } else {
-          deployFurniureListBuilder_.addMessage(builderForValue.build());
+          persistentFurnitureListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder addDeployFurniureList(
+      public Builder addPersistentFurnitureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (deployFurniureListBuilder_ == null) {
-          ensureDeployFurniureListIsMutable();
-          deployFurniureList_.add(index, builderForValue.build());
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          deployFurniureListBuilder_.addMessage(index, builderForValue.build());
+          persistentFurnitureListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder addAllDeployFurniureList(
+      public Builder addAllPersistentFurnitureList(
           java.lang.Iterable values) {
-        if (deployFurniureListBuilder_ == null) {
-          ensureDeployFurniureListIsMutable();
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, deployFurniureList_);
+              values, persistentFurnitureList_);
           onChanged();
         } else {
-          deployFurniureListBuilder_.addAllMessages(values);
+          persistentFurnitureListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder clearDeployFurniureList() {
-        if (deployFurniureListBuilder_ == null) {
-          deployFurniureList_ = java.util.Collections.emptyList();
+      public Builder clearPersistentFurnitureList() {
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000080);
           onChanged();
         } else {
-          deployFurniureListBuilder_.clear();
+          persistentFurnitureListBuilder_.clear();
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public Builder removeDeployFurniureList(int index) {
-        if (deployFurniureListBuilder_ == null) {
-          ensureDeployFurniureListIsMutable();
-          deployFurniureList_.remove(index);
+      public Builder removePersistentFurnitureList(int index) {
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.remove(index);
           onChanged();
         } else {
-          deployFurniureListBuilder_.remove(index);
+          persistentFurnitureListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getDeployFurniureListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getPersistentFurnitureListBuilder(
           int index) {
-        return getDeployFurniureListFieldBuilder().getBuilder(index);
+        return getPersistentFurnitureListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
           int index) {
-        if (deployFurniureListBuilder_ == null) {
-          return deployFurniureList_.get(index);  } else {
-          return deployFurniureListBuilder_.getMessageOrBuilder(index);
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.get(index);  } else {
+          return persistentFurnitureListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
       public java.util.List 
-           getDeployFurniureListOrBuilderList() {
-        if (deployFurniureListBuilder_ != null) {
-          return deployFurniureListBuilder_.getMessageOrBuilderList();
+           getPersistentFurnitureListOrBuilderList() {
+        if (persistentFurnitureListBuilder_ != null) {
+          return persistentFurnitureListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(deployFurniureList_);
+          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
         }
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder() {
-        return getDeployFurniureListFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder() {
+        return getPersistentFurnitureListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder(
           int index) {
-        return getDeployFurniureListFieldBuilder().addBuilder(
+        return getPersistentFurnitureListFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * repeated .HomeFurnitureData deploy_furniure_list = 10;
+       * repeated .HomeFurnitureData persistentFurnitureList = 10;
        */
       public java.util.List 
-           getDeployFurniureListBuilderList() {
-        return getDeployFurniureListFieldBuilder().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> 
-          getDeployFurniureListFieldBuilder() {
-        if (deployFurniureListBuilder_ == null) {
-          deployFurniureListBuilder_ = 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>(
-                  deployFurniureList_,
+                  persistentFurnitureList_,
                   ((bitField0_ & 0x00000080) != 0),
                   getParentForChildren(),
                   isClean());
-          deployFurniureList_ = null;
+          persistentFurnitureList_ = null;
         }
-        return deployFurniureListBuilder_;
+        return persistentFurnitureListBuilder_;
       }
 
       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\"\324\004\n\030Home" +
+      "a.proto\032\026WeekendDjinnInfo.proto\"\320\004\n\030Home" +
       "BlockArrangementInfo\022.\n\020dot_pattern_list" +
-      "\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"
+      "\030\001 \003(\0132\024.HomeBlockDotPattern\022.\n\022deployFu" +
+      "rniureList\030\014 \003(\0132\022.HomeFurnitureData\0225\n\024" +
+      "furniture_suite_list\030\016 \003(\0132\027.HomeFurnitu" +
+      "reSuiteData\022B\n\033furniture_custom_suite_li" +
+      "st\030\002 \003(\0132\035.HomeFurnitureCustomSuiteData\022" +
+      "\020\n\010block_id\030\010 \001(\r\0225\n\024furniture_group_lis" +
+      "t\030\004 \003(\0132\027.HomeFurnitureGroupData\022+\n\022depl" +
+      "oy_animal_list\030\017 \003(\0132\017.HomeAnimalData\022\'\n" +
+      "\nfield_list\030\013 \003(\0132\023.HomeBlockFieldData\022\025" +
+      "\n\rcomfort_value\030\r \001(\r\0223\n\027persistentFurni" +
+      "tureList\030\n \003(\0132\022.HomeFurnitureData\022%\n\017de" +
+      "ploy_npc_list\030\t \003(\0132\014.HomeNpcData\022\023\n\013is_" +
+      "unlocked\030\006 \001(\010\0222\n\027weekend_djinn_info_lis" +
+      "t\030\003 \003(\0132\021.WeekendDjinnInfoB\033\n\031emu.grassc" +
+      "utter.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", "PersistentFurnitureList", "FurnitureSuiteList", "FurnitureCustomSuiteList", "BlockId", "FurnitureGroupList", "DeployAnimalList", "FieldList", "ComfortValue", "DeployFurniureList", "DeployNpcList", "IsUnlocked", "WeekendDjinnInfoList", });
+        new java.lang.String[] { "DotPatternList", "DeployFurniureList", "FurnitureSuiteList", "FurnitureCustomSuiteList", "BlockId", "FurnitureGroupList", "DeployAnimalList", "FieldList", "ComfortValue", "PersistentFurnitureList", "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 0635f01f0..0903ed7bb 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 safe_point_pos = 8;
-     * @return Whether the safePointPos field is set.
+     * .Vector teapot_spirit_pos = 8;
+     * @return Whether the teapotSpiritPos field is set.
      */
-    boolean hasSafePointPos();
+    boolean hasTeapotSpiritPos();
     /**
-     * .Vector safe_point_pos = 8;
-     * @return The safePointPos.
+     * .Vector teapot_spirit_pos = 8;
+     * @return The teapotSpiritPos.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos();
     /**
-     * .Vector safe_point_pos = 8;
+     * .Vector teapot_spirit_pos = 8;
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder();
 
     /**
      * uint32 module_id = 9;
@@ -70,19 +70,19 @@ public final class HomeMarkPointSceneDataOuterClass {
     int getSceneId();
 
     /**
-     * .Vector teapot_spirit_pos = 3;
-     * @return Whether the teapotSpiritPos field is set.
+     * .Vector safe_point_pos = 3;
+     * @return Whether the safePointPos field is set.
      */
-    boolean hasTeapotSpiritPos();
+    boolean hasSafePointPos();
     /**
-     * .Vector teapot_spirit_pos = 3;
-     * @return The teapotSpiritPos.
+     * .Vector safe_point_pos = 3;
+     * @return The safePointPos.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos();
     /**
-     * .Vector teapot_spirit_pos = 3;
+     * .Vector safe_point_pos = 3;
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder();
   }
   /**
    * 
@@ -137,13 +137,13 @@ public final class HomeMarkPointSceneDataOuterClass {
               break;
             case 26: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (teapotSpiritPos_ != null) {
-                subBuilder = teapotSpiritPos_.toBuilder();
+              if (safePointPos_ != null) {
+                subBuilder = safePointPos_.toBuilder();
               }
-              teapotSpiritPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              safePointPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(teapotSpiritPos_);
-                teapotSpiritPos_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(safePointPos_);
+                safePointPos_ = subBuilder.buildPartial();
               }
 
               break;
@@ -164,13 +164,13 @@ public final class HomeMarkPointSceneDataOuterClass {
             }
             case 66: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (safePointPos_ != null) {
-                subBuilder = safePointPos_.toBuilder();
+              if (teapotSpiritPos_ != null) {
+                subBuilder = teapotSpiritPos_.toBuilder();
               }
-              safePointPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              teapotSpiritPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(safePointPos_);
-                safePointPos_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(teapotSpiritPos_);
+                teapotSpiritPos_ = subBuilder.buildPartial();
               }
 
               break;
@@ -255,30 +255,30 @@ public final class HomeMarkPointSceneDataOuterClass {
       return furnitureList_.get(index);
     }
 
-    public static final int SAFE_POINT_POS_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
+    public static final int TEAPOT_SPIRIT_POS_FIELD_NUMBER = 8;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
     /**
-     * .Vector safe_point_pos = 8;
-     * @return Whether the safePointPos field is set.
+     * .Vector teapot_spirit_pos = 8;
+     * @return Whether the teapotSpiritPos field is set.
      */
     @java.lang.Override
-    public boolean hasSafePointPos() {
-      return safePointPos_ != null;
+    public boolean hasTeapotSpiritPos() {
+      return teapotSpiritPos_ != null;
     }
     /**
-     * .Vector safe_point_pos = 8;
-     * @return The safePointPos.
+     * .Vector teapot_spirit_pos = 8;
+     * @return The teapotSpiritPos.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
-      return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
+      return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
     }
     /**
-     * .Vector safe_point_pos = 8;
+     * .Vector teapot_spirit_pos = 8;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
-      return getSafePointPos();
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
+      return getTeapotSpiritPos();
     }
 
     public static final int MODULE_ID_FIELD_NUMBER = 9;
@@ -303,30 +303,30 @@ public final class HomeMarkPointSceneDataOuterClass {
       return sceneId_;
     }
 
-    public static final int TEAPOT_SPIRIT_POS_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
+    public static final int SAFE_POINT_POS_FIELD_NUMBER = 3;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
     /**
-     * .Vector teapot_spirit_pos = 3;
-     * @return Whether the teapotSpiritPos field is set.
+     * .Vector safe_point_pos = 3;
+     * @return Whether the safePointPos field is set.
      */
     @java.lang.Override
-    public boolean hasTeapotSpiritPos() {
-      return teapotSpiritPos_ != null;
+    public boolean hasSafePointPos() {
+      return safePointPos_ != null;
     }
     /**
-     * .Vector teapot_spirit_pos = 3;
-     * @return The teapotSpiritPos.
+     * .Vector safe_point_pos = 3;
+     * @return The safePointPos.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
-      return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+      return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
     }
     /**
-     * .Vector teapot_spirit_pos = 3;
+     * .Vector safe_point_pos = 3;
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
-      return getTeapotSpiritPos();
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+      return getSafePointPos();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -343,8 +343,8 @@ public final class HomeMarkPointSceneDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (teapotSpiritPos_ != null) {
-        output.writeMessage(3, getTeapotSpiritPos());
+      if (safePointPos_ != null) {
+        output.writeMessage(3, getSafePointPos());
       }
       if (sceneId_ != 0) {
         output.writeUInt32(5, sceneId_);
@@ -352,8 +352,8 @@ public final class HomeMarkPointSceneDataOuterClass {
       for (int i = 0; i < furnitureList_.size(); i++) {
         output.writeMessage(7, furnitureList_.get(i));
       }
-      if (safePointPos_ != null) {
-        output.writeMessage(8, getSafePointPos());
+      if (teapotSpiritPos_ != null) {
+        output.writeMessage(8, getTeapotSpiritPos());
       }
       if (moduleId_ != 0) {
         output.writeUInt32(9, moduleId_);
@@ -367,9 +367,9 @@ public final class HomeMarkPointSceneDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (teapotSpiritPos_ != null) {
+      if (safePointPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getTeapotSpiritPos());
+          .computeMessageSize(3, getSafePointPos());
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -379,9 +379,9 @@ public final class HomeMarkPointSceneDataOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, furnitureList_.get(i));
       }
-      if (safePointPos_ != null) {
+      if (teapotSpiritPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getSafePointPos());
+          .computeMessageSize(8, getTeapotSpiritPos());
       }
       if (moduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -404,19 +404,19 @@ public final class HomeMarkPointSceneDataOuterClass {
 
       if (!getFurnitureListList()
           .equals(other.getFurnitureListList())) return false;
-      if (hasSafePointPos() != other.hasSafePointPos()) return false;
-      if (hasSafePointPos()) {
-        if (!getSafePointPos()
-            .equals(other.getSafePointPos())) return false;
+      if (hasTeapotSpiritPos() != other.hasTeapotSpiritPos()) return false;
+      if (hasTeapotSpiritPos()) {
+        if (!getTeapotSpiritPos()
+            .equals(other.getTeapotSpiritPos())) return false;
       }
       if (getModuleId()
           != other.getModuleId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (hasTeapotSpiritPos() != other.hasTeapotSpiritPos()) return false;
-      if (hasTeapotSpiritPos()) {
-        if (!getTeapotSpiritPos()
-            .equals(other.getTeapotSpiritPos())) return false;
+      if (hasSafePointPos() != other.hasSafePointPos()) return false;
+      if (hasSafePointPos()) {
+        if (!getSafePointPos()
+            .equals(other.getSafePointPos())) return false;
       }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -433,17 +433,17 @@ public final class HomeMarkPointSceneDataOuterClass {
         hash = (37 * hash) + FURNITURE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFurnitureListList().hashCode();
       }
-      if (hasSafePointPos()) {
-        hash = (37 * hash) + SAFE_POINT_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getSafePointPos().hashCode();
+      if (hasTeapotSpiritPos()) {
+        hash = (37 * hash) + TEAPOT_SPIRIT_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getTeapotSpiritPos().hashCode();
       }
       hash = (37 * hash) + MODULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getModuleId();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
-      if (hasTeapotSpiritPos()) {
-        hash = (37 * hash) + TEAPOT_SPIRIT_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getTeapotSpiritPos().hashCode();
+      if (hasSafePointPos()) {
+        hash = (37 * hash) + SAFE_POINT_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getSafePointPos().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -589,22 +589,22 @@ public final class HomeMarkPointSceneDataOuterClass {
         } else {
           furnitureListBuilder_.clear();
         }
-        if (safePointPosBuilder_ == null) {
-          safePointPos_ = null;
-        } else {
-          safePointPos_ = null;
-          safePointPosBuilder_ = null;
-        }
-        moduleId_ = 0;
-
-        sceneId_ = 0;
-
         if (teapotSpiritPosBuilder_ == null) {
           teapotSpiritPos_ = null;
         } else {
           teapotSpiritPos_ = null;
           teapotSpiritPosBuilder_ = null;
         }
+        moduleId_ = 0;
+
+        sceneId_ = 0;
+
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = null;
+        } else {
+          safePointPos_ = null;
+          safePointPosBuilder_ = null;
+        }
         return this;
       }
 
@@ -641,18 +641,18 @@ public final class HomeMarkPointSceneDataOuterClass {
         } else {
           result.furnitureList_ = furnitureListBuilder_.build();
         }
-        if (safePointPosBuilder_ == null) {
-          result.safePointPos_ = safePointPos_;
-        } else {
-          result.safePointPos_ = safePointPosBuilder_.build();
-        }
-        result.moduleId_ = moduleId_;
-        result.sceneId_ = sceneId_;
         if (teapotSpiritPosBuilder_ == null) {
           result.teapotSpiritPos_ = teapotSpiritPos_;
         } else {
           result.teapotSpiritPos_ = teapotSpiritPosBuilder_.build();
         }
+        result.moduleId_ = moduleId_;
+        result.sceneId_ = sceneId_;
+        if (safePointPosBuilder_ == null) {
+          result.safePointPos_ = safePointPos_;
+        } else {
+          result.safePointPos_ = safePointPosBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -727,8 +727,8 @@ public final class HomeMarkPointSceneDataOuterClass {
             }
           }
         }
-        if (other.hasSafePointPos()) {
-          mergeSafePointPos(other.getSafePointPos());
+        if (other.hasTeapotSpiritPos()) {
+          mergeTeapotSpiritPos(other.getTeapotSpiritPos());
         }
         if (other.getModuleId() != 0) {
           setModuleId(other.getModuleId());
@@ -736,8 +736,8 @@ public final class HomeMarkPointSceneDataOuterClass {
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (other.hasTeapotSpiritPos()) {
-          mergeTeapotSpiritPos(other.getTeapotSpiritPos());
+        if (other.hasSafePointPos()) {
+          mergeSafePointPos(other.getSafePointPos());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1009,123 +1009,123 @@ public final class HomeMarkPointSceneDataOuterClass {
         return furnitureListBuilder_;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> safePointPosBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> teapotSpiritPosBuilder_;
       /**
-       * .Vector safe_point_pos = 8;
-       * @return Whether the safePointPos field is set.
+       * .Vector teapot_spirit_pos = 8;
+       * @return Whether the teapotSpiritPos field is set.
        */
-      public boolean hasSafePointPos() {
-        return safePointPosBuilder_ != null || safePointPos_ != null;
+      public boolean hasTeapotSpiritPos() {
+        return teapotSpiritPosBuilder_ != null || teapotSpiritPos_ != null;
       }
       /**
-       * .Vector safe_point_pos = 8;
-       * @return The safePointPos.
+       * .Vector teapot_spirit_pos = 8;
+       * @return The teapotSpiritPos.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
-        if (safePointPosBuilder_ == null) {
-          return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
+        if (teapotSpiritPosBuilder_ == null) {
+          return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
         } else {
-          return safePointPosBuilder_.getMessage();
+          return teapotSpiritPosBuilder_.getMessage();
         }
       }
       /**
-       * .Vector safe_point_pos = 8;
+       * .Vector teapot_spirit_pos = 8;
        */
-      public Builder setSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (safePointPosBuilder_ == null) {
+      public Builder setTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (teapotSpiritPosBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          safePointPos_ = value;
+          teapotSpiritPos_ = value;
           onChanged();
         } else {
-          safePointPosBuilder_.setMessage(value);
+          teapotSpiritPosBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * .Vector safe_point_pos = 8;
+       * .Vector teapot_spirit_pos = 8;
        */
-      public Builder setSafePointPos(
+      public Builder setTeapotSpiritPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (safePointPosBuilder_ == null) {
-          safePointPos_ = builderForValue.build();
+        if (teapotSpiritPosBuilder_ == null) {
+          teapotSpiritPos_ = builderForValue.build();
           onChanged();
         } else {
-          safePointPosBuilder_.setMessage(builderForValue.build());
+          teapotSpiritPosBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * .Vector safe_point_pos = 8;
+       * .Vector teapot_spirit_pos = 8;
        */
-      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();
+      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 {
-            safePointPos_ = value;
+            teapotSpiritPos_ = value;
           }
           onChanged();
         } else {
-          safePointPosBuilder_.mergeFrom(value);
+          teapotSpiritPosBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * .Vector safe_point_pos = 8;
+       * .Vector teapot_spirit_pos = 8;
        */
-      public Builder clearSafePointPos() {
-        if (safePointPosBuilder_ == null) {
-          safePointPos_ = null;
+      public Builder clearTeapotSpiritPos() {
+        if (teapotSpiritPosBuilder_ == null) {
+          teapotSpiritPos_ = null;
           onChanged();
         } else {
-          safePointPos_ = null;
-          safePointPosBuilder_ = null;
+          teapotSpiritPos_ = null;
+          teapotSpiritPosBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * .Vector safe_point_pos = 8;
+       * .Vector teapot_spirit_pos = 8;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSafePointPosBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTeapotSpiritPosBuilder() {
         
         onChanged();
-        return getSafePointPosFieldBuilder().getBuilder();
+        return getTeapotSpiritPosFieldBuilder().getBuilder();
       }
       /**
-       * .Vector safe_point_pos = 8;
+       * .Vector teapot_spirit_pos = 8;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
-        if (safePointPosBuilder_ != null) {
-          return safePointPosBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
+        if (teapotSpiritPosBuilder_ != null) {
+          return teapotSpiritPosBuilder_.getMessageOrBuilder();
         } else {
-          return safePointPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+          return teapotSpiritPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
         }
       }
       /**
-       * .Vector safe_point_pos = 8;
+       * .Vector teapot_spirit_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> 
-          getSafePointPosFieldBuilder() {
-        if (safePointPosBuilder_ == null) {
-          safePointPosBuilder_ = 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>(
-                  getSafePointPos(),
+                  getTeapotSpiritPos(),
                   getParentForChildren(),
                   isClean());
-          safePointPos_ = null;
+          teapotSpiritPos_ = null;
         }
-        return safePointPosBuilder_;
+        return teapotSpiritPosBuilder_;
       }
 
       private int moduleId_ ;
@@ -1190,123 +1190,123 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> teapotSpiritPosBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> safePointPosBuilder_;
       /**
-       * .Vector teapot_spirit_pos = 3;
-       * @return Whether the teapotSpiritPos field is set.
+       * .Vector safe_point_pos = 3;
+       * @return Whether the safePointPos field is set.
        */
-      public boolean hasTeapotSpiritPos() {
-        return teapotSpiritPosBuilder_ != null || teapotSpiritPos_ != null;
+      public boolean hasSafePointPos() {
+        return safePointPosBuilder_ != null || safePointPos_ != null;
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
-       * @return The teapotSpiritPos.
+       * .Vector safe_point_pos = 3;
+       * @return The safePointPos.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
-        if (teapotSpiritPosBuilder_ == null) {
-          return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+        if (safePointPosBuilder_ == null) {
+          return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
         } else {
-          return teapotSpiritPosBuilder_.getMessage();
+          return safePointPosBuilder_.getMessage();
         }
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
+       * .Vector safe_point_pos = 3;
        */
-      public Builder setTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (teapotSpiritPosBuilder_ == null) {
+      public Builder setSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (safePointPosBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          teapotSpiritPos_ = value;
+          safePointPos_ = value;
           onChanged();
         } else {
-          teapotSpiritPosBuilder_.setMessage(value);
+          safePointPosBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
+       * .Vector safe_point_pos = 3;
        */
-      public Builder setTeapotSpiritPos(
+      public Builder setSafePointPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (teapotSpiritPosBuilder_ == null) {
-          teapotSpiritPos_ = builderForValue.build();
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = builderForValue.build();
           onChanged();
         } else {
-          teapotSpiritPosBuilder_.setMessage(builderForValue.build());
+          safePointPosBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
+       * .Vector safe_point_pos = 3;
        */
-      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();
+      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 {
-            teapotSpiritPos_ = value;
+            safePointPos_ = value;
           }
           onChanged();
         } else {
-          teapotSpiritPosBuilder_.mergeFrom(value);
+          safePointPosBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
+       * .Vector safe_point_pos = 3;
        */
-      public Builder clearTeapotSpiritPos() {
-        if (teapotSpiritPosBuilder_ == null) {
-          teapotSpiritPos_ = null;
+      public Builder clearSafePointPos() {
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = null;
           onChanged();
         } else {
-          teapotSpiritPos_ = null;
-          teapotSpiritPosBuilder_ = null;
+          safePointPos_ = null;
+          safePointPosBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
+       * .Vector safe_point_pos = 3;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTeapotSpiritPosBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSafePointPosBuilder() {
         
         onChanged();
-        return getTeapotSpiritPosFieldBuilder().getBuilder();
+        return getSafePointPosFieldBuilder().getBuilder();
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
+       * .Vector safe_point_pos = 3;
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
-        if (teapotSpiritPosBuilder_ != null) {
-          return teapotSpiritPosBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+        if (safePointPosBuilder_ != null) {
+          return safePointPosBuilder_.getMessageOrBuilder();
         } else {
-          return teapotSpiritPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
+          return safePointPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
         }
       }
       /**
-       * .Vector teapot_spirit_pos = 3;
+       * .Vector safe_point_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> 
-          getTeapotSpiritPosFieldBuilder() {
-        if (teapotSpiritPosBuilder_ == null) {
-          teapotSpiritPosBuilder_ = 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>(
-                  getTeapotSpiritPos(),
+                  getSafePointPos(),
                   getParentForChildren(),
                   isClean());
-          teapotSpiritPos_ = null;
+          safePointPos_ = null;
         }
-        return teapotSpiritPosBuilder_;
+        return safePointPosBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1378,10 +1378,10 @@ public final class HomeMarkPointSceneDataOuterClass {
       "\n\034HomeMarkPointSceneData.proto\032 HomeMark" +
       "PointFurnitureData.proto\032\014Vector.proto\"\267" +
       "\001\n\026HomeMarkPointSceneData\0223\n\016furniture_l" +
-      "ist\030\007 \003(\0132\033.HomeMarkPointFurnitureData\022\037" +
-      "\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" +
+      "ist\030\007 \003(\0132\033.HomeMarkPointFurnitureData\022\"" +
+      "\n\021teapot_spirit_pos\030\010 \001(\0132\007.Vector\022\021\n\tmo" +
+      "dule_id\030\t \001(\r\022\020\n\010scene_id\030\005 \001(\r\022\037\n\016safe_" +
+      "point_pos\030\003 \001(\0132\007.VectorB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1395,7 +1395,7 @@ public final class HomeMarkPointSceneDataOuterClass {
     internal_static_HomeMarkPointSceneData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeMarkPointSceneData_descriptor,
-        new java.lang.String[] { "FurnitureList", "SafePointPos", "ModuleId", "SceneId", "TeapotSpiritPos", });
+        new java.lang.String[] { "FurnitureList", "TeapotSpiritPos", "ModuleId", "SceneId", "SafePointPos", });
     emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
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 64ab2a3b8..1783d8c50 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 store_value = 1;
-     * @return The storeValue.
+     * uint32 store_limit = 1;
+     * @return The storeLimit.
      */
-    int getStoreValue();
+    int getStoreLimit();
 
     /**
      * fixed32 next_refresh_time = 5;
@@ -31,10 +31,10 @@ public final class HomeResourceOuterClass {
     int getNextRefreshTime();
 
     /**
-     * uint32 store_limit = 3;
-     * @return The storeLimit.
+     * uint32 store_value = 3;
+     * @return The storeValue.
      */
-    int getStoreLimit();
+    int getStoreValue();
   }
   /**
    * 
@@ -87,12 +87,12 @@ public final class HomeResourceOuterClass {
               break;
             case 8: {
 
-              storeValue_ = input.readUInt32();
+              storeLimit_ = input.readUInt32();
               break;
             }
             case 24: {
 
-              storeLimit_ = input.readUInt32();
+              storeValue_ = input.readUInt32();
               break;
             }
             case 45: {
@@ -132,15 +132,15 @@ public final class HomeResourceOuterClass {
               emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.class, emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder.class);
     }
 
-    public static final int STORE_VALUE_FIELD_NUMBER = 1;
-    private int storeValue_;
+    public static final int STORE_LIMIT_FIELD_NUMBER = 1;
+    private int storeLimit_;
     /**
-     * uint32 store_value = 1;
-     * @return The storeValue.
+     * uint32 store_limit = 1;
+     * @return The storeLimit.
      */
     @java.lang.Override
-    public int getStoreValue() {
-      return storeValue_;
+    public int getStoreLimit() {
+      return storeLimit_;
     }
 
     public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 5;
@@ -154,15 +154,15 @@ public final class HomeResourceOuterClass {
       return nextRefreshTime_;
     }
 
-    public static final int STORE_LIMIT_FIELD_NUMBER = 3;
-    private int storeLimit_;
+    public static final int STORE_VALUE_FIELD_NUMBER = 3;
+    private int storeValue_;
     /**
-     * uint32 store_limit = 3;
-     * @return The storeLimit.
+     * uint32 store_value = 3;
+     * @return The storeValue.
      */
     @java.lang.Override
-    public int getStoreLimit() {
-      return storeLimit_;
+    public int getStoreValue() {
+      return storeValue_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -179,11 +179,11 @@ public final class HomeResourceOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (storeValue_ != 0) {
-        output.writeUInt32(1, storeValue_);
-      }
       if (storeLimit_ != 0) {
-        output.writeUInt32(3, storeLimit_);
+        output.writeUInt32(1, storeLimit_);
+      }
+      if (storeValue_ != 0) {
+        output.writeUInt32(3, storeValue_);
       }
       if (nextRefreshTime_ != 0) {
         output.writeFixed32(5, nextRefreshTime_);
@@ -197,13 +197,13 @@ public final class HomeResourceOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (storeValue_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, storeValue_);
-      }
       if (storeLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, storeLimit_);
+          .computeUInt32Size(1, storeLimit_);
+      }
+      if (storeValue_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, storeValue_);
       }
       if (nextRefreshTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -224,12 +224,12 @@ public final class HomeResourceOuterClass {
       }
       emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource other = (emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource) obj;
 
-      if (getStoreValue()
-          != other.getStoreValue()) return false;
-      if (getNextRefreshTime()
-          != other.getNextRefreshTime()) return false;
       if (getStoreLimit()
           != other.getStoreLimit()) return false;
+      if (getNextRefreshTime()
+          != other.getNextRefreshTime()) return false;
+      if (getStoreValue()
+          != other.getStoreValue()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,12 +241,12 @@ public final class HomeResourceOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + STORE_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getStoreValue();
-      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getNextRefreshTime();
       hash = (37 * hash) + STORE_LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getStoreLimit();
+      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + STORE_VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getStoreValue();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -384,11 +384,11 @@ public final class HomeResourceOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        storeValue_ = 0;
+        storeLimit_ = 0;
 
         nextRefreshTime_ = 0;
 
-        storeLimit_ = 0;
+        storeValue_ = 0;
 
         return this;
       }
@@ -416,9 +416,9 @@ public final class HomeResourceOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource buildPartial() {
         emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource result = new emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource(this);
-        result.storeValue_ = storeValue_;
-        result.nextRefreshTime_ = nextRefreshTime_;
         result.storeLimit_ = storeLimit_;
+        result.nextRefreshTime_ = nextRefreshTime_;
+        result.storeValue_ = storeValue_;
         onBuilt();
         return result;
       }
@@ -467,14 +467,14 @@ public final class HomeResourceOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource other) {
         if (other == emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.getDefaultInstance()) return this;
-        if (other.getStoreValue() != 0) {
-          setStoreValue(other.getStoreValue());
+        if (other.getStoreLimit() != 0) {
+          setStoreLimit(other.getStoreLimit());
         }
         if (other.getNextRefreshTime() != 0) {
           setNextRefreshTime(other.getNextRefreshTime());
         }
-        if (other.getStoreLimit() != 0) {
-          setStoreLimit(other.getStoreLimit());
+        if (other.getStoreValue() != 0) {
+          setStoreValue(other.getStoreValue());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -505,33 +505,33 @@ public final class HomeResourceOuterClass {
         return this;
       }
 
-      private int storeValue_ ;
+      private int storeLimit_ ;
       /**
-       * uint32 store_value = 1;
-       * @return The storeValue.
+       * uint32 store_limit = 1;
+       * @return The storeLimit.
        */
       @java.lang.Override
-      public int getStoreValue() {
-        return storeValue_;
+      public int getStoreLimit() {
+        return storeLimit_;
       }
       /**
-       * uint32 store_value = 1;
-       * @param value The storeValue to set.
+       * uint32 store_limit = 1;
+       * @param value The storeLimit to set.
        * @return This builder for chaining.
        */
-      public Builder setStoreValue(int value) {
+      public Builder setStoreLimit(int value) {
         
-        storeValue_ = value;
+        storeLimit_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 store_value = 1;
+       * uint32 store_limit = 1;
        * @return This builder for chaining.
        */
-      public Builder clearStoreValue() {
+      public Builder clearStoreLimit() {
         
-        storeValue_ = 0;
+        storeLimit_ = 0;
         onChanged();
         return this;
       }
@@ -567,33 +567,33 @@ public final class HomeResourceOuterClass {
         return this;
       }
 
-      private int storeLimit_ ;
+      private int storeValue_ ;
       /**
-       * uint32 store_limit = 3;
-       * @return The storeLimit.
+       * uint32 store_value = 3;
+       * @return The storeValue.
        */
       @java.lang.Override
-      public int getStoreLimit() {
-        return storeLimit_;
+      public int getStoreValue() {
+        return storeValue_;
       }
       /**
-       * uint32 store_limit = 3;
-       * @param value The storeLimit to set.
+       * uint32 store_value = 3;
+       * @param value The storeValue to set.
        * @return This builder for chaining.
        */
-      public Builder setStoreLimit(int value) {
+      public Builder setStoreValue(int value) {
         
-        storeLimit_ = value;
+        storeValue_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 store_limit = 3;
+       * uint32 store_value = 3;
        * @return This builder for chaining.
        */
-      public Builder clearStoreLimit() {
+      public Builder clearStoreValue() {
         
-        storeLimit_ = 0;
+        storeValue_ = 0;
         onChanged();
         return this;
       }
@@ -665,8 +665,8 @@ public final class HomeResourceOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022HomeResource.proto\"S\n\014HomeResource\022\023\n\013" +
-      "store_value\030\001 \001(\r\022\031\n\021next_refresh_time\030\005" +
-      " \001(\007\022\023\n\013store_limit\030\003 \001(\rB\033\n\031emu.grasscu" +
+      "store_limit\030\001 \001(\r\022\031\n\021next_refresh_time\030\005" +
+      " \001(\007\022\023\n\013store_value\030\003 \001(\rB\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +678,7 @@ public final class HomeResourceOuterClass {
     internal_static_HomeResource_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeResource_descriptor,
-        new java.lang.String[] { "StoreValue", "NextRefreshTime", "StoreLimit", });
+        new java.lang.String[] { "StoreLimit", "NextRefreshTime", "StoreValue", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java
index 4ca3d34bd..da0a8f25d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java
@@ -70,10 +70,6 @@ public final class MapLayerInfoOuterClass {
     int getUnlockedMapLayerGroupIdList(int index);
   }
   /**
-   * 
-   *obf NHFPBBLCHKH
-   * 
- * * Protobuf type {@code MapLayerInfo} */ public static final class MapLayerInfo extends @@ -537,10 +533,6 @@ public final class MapLayerInfoOuterClass { return builder; } /** - *
-     *obf NHFPBBLCHKH
-     * 
- * * Protobuf type {@code MapLayerInfo} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/NHFPBBLCHKHOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/NHFPBBLCHKHOuterClass.java new file mode 100644 index 000000000..65f0c44f5 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/NHFPBBLCHKHOuterClass.java @@ -0,0 +1,1050 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: NHFPBBLCHKH.proto + +package emu.grasscutter.net.proto; + +public final class NHFPBBLCHKHOuterClass { + private NHFPBBLCHKHOuterClass() {} + 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 NHFPBBLCHKHOrBuilder extends + // @@protoc_insertion_point(interface_extends:NHFPBBLCHKH) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated uint32 PAIGHFEEELO = 11; + * @return A list containing the pAIGHFEEELO. + */ + java.util.List getPAIGHFEEELOList(); + /** + * repeated uint32 PAIGHFEEELO = 11; + * @return The count of pAIGHFEEELO. + */ + int getPAIGHFEEELOCount(); + /** + * repeated uint32 PAIGHFEEELO = 11; + * @param index The index of the element to return. + * @return The pAIGHFEEELO at the given index. + */ + int getPAIGHFEEELO(int index); + + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @return A list containing the dIDEMJFOGLD. + */ + java.util.List getDIDEMJFOGLDList(); + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @return The count of dIDEMJFOGLD. + */ + int getDIDEMJFOGLDCount(); + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @param index The index of the element to return. + * @return The dIDEMJFOGLD at the given index. + */ + int getDIDEMJFOGLD(int index); + + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @return A list containing the jBNJGMIGFFJ. + */ + java.util.List getJBNJGMIGFFJList(); + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @return The count of jBNJGMIGFFJ. + */ + int getJBNJGMIGFFJCount(); + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @param index The index of the element to return. + * @return The jBNJGMIGFFJ at the given index. + */ + int getJBNJGMIGFFJ(int index); + } + /** + * Protobuf type {@code NHFPBBLCHKH} + */ + public static final class NHFPBBLCHKH extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:NHFPBBLCHKH) + NHFPBBLCHKHOrBuilder { + private static final long serialVersionUID = 0L; + // Use NHFPBBLCHKH.newBuilder() to construct. + private NHFPBBLCHKH(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private NHFPBBLCHKH() { + pAIGHFEEELO_ = emptyIntList(); + dIDEMJFOGLD_ = emptyIntList(); + jBNJGMIGFFJ_ = emptyIntList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new NHFPBBLCHKH(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private NHFPBBLCHKH( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 24: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + jBNJGMIGFFJ_ = newIntList(); + mutable_bitField0_ |= 0x00000004; + } + jBNJGMIGFFJ_.addInt(input.readUInt32()); + break; + } + case 26: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { + jBNJGMIGFFJ_ = newIntList(); + mutable_bitField0_ |= 0x00000004; + } + while (input.getBytesUntilLimit() > 0) { + jBNJGMIGFFJ_.addInt(input.readUInt32()); + } + input.popLimit(limit); + break; + } + case 88: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + pAIGHFEEELO_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + pAIGHFEEELO_.addInt(input.readUInt32()); + break; + } + case 90: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + pAIGHFEEELO_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + while (input.getBytesUntilLimit() > 0) { + pAIGHFEEELO_.addInt(input.readUInt32()); + } + input.popLimit(limit); + break; + } + case 120: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + dIDEMJFOGLD_ = newIntList(); + mutable_bitField0_ |= 0x00000002; + } + dIDEMJFOGLD_.addInt(input.readUInt32()); + break; + } + case 122: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + dIDEMJFOGLD_ = newIntList(); + mutable_bitField0_ |= 0x00000002; + } + while (input.getBytesUntilLimit() > 0) { + dIDEMJFOGLD_.addInt(input.readUInt32()); + } + input.popLimit(limit); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000004) != 0)) { + jBNJGMIGFFJ_.makeImmutable(); // C + } + if (((mutable_bitField0_ & 0x00000001) != 0)) { + pAIGHFEEELO_.makeImmutable(); // C + } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + dIDEMJFOGLD_.makeImmutable(); // C + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.internal_static_NHFPBBLCHKH_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.internal_static_NHFPBBLCHKH_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.class, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder.class); + } + + public static final int PAIGHFEEELO_FIELD_NUMBER = 11; + private com.google.protobuf.Internal.IntList pAIGHFEEELO_; + /** + * repeated uint32 PAIGHFEEELO = 11; + * @return A list containing the pAIGHFEEELO. + */ + @java.lang.Override + public java.util.List + getPAIGHFEEELOList() { + return pAIGHFEEELO_; + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @return The count of pAIGHFEEELO. + */ + public int getPAIGHFEEELOCount() { + return pAIGHFEEELO_.size(); + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @param index The index of the element to return. + * @return The pAIGHFEEELO at the given index. + */ + public int getPAIGHFEEELO(int index) { + return pAIGHFEEELO_.getInt(index); + } + private int pAIGHFEEELOMemoizedSerializedSize = -1; + + public static final int DIDEMJFOGLD_FIELD_NUMBER = 15; + private com.google.protobuf.Internal.IntList dIDEMJFOGLD_; + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @return A list containing the dIDEMJFOGLD. + */ + @java.lang.Override + public java.util.List + getDIDEMJFOGLDList() { + return dIDEMJFOGLD_; + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @return The count of dIDEMJFOGLD. + */ + public int getDIDEMJFOGLDCount() { + return dIDEMJFOGLD_.size(); + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @param index The index of the element to return. + * @return The dIDEMJFOGLD at the given index. + */ + public int getDIDEMJFOGLD(int index) { + return dIDEMJFOGLD_.getInt(index); + } + private int dIDEMJFOGLDMemoizedSerializedSize = -1; + + public static final int JBNJGMIGFFJ_FIELD_NUMBER = 3; + private com.google.protobuf.Internal.IntList jBNJGMIGFFJ_; + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @return A list containing the jBNJGMIGFFJ. + */ + @java.lang.Override + public java.util.List + getJBNJGMIGFFJList() { + return jBNJGMIGFFJ_; + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @return The count of jBNJGMIGFFJ. + */ + public int getJBNJGMIGFFJCount() { + return jBNJGMIGFFJ_.size(); + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @param index The index of the element to return. + * @return The jBNJGMIGFFJ at the given index. + */ + public int getJBNJGMIGFFJ(int index) { + return jBNJGMIGFFJ_.getInt(index); + } + private int jBNJGMIGFFJMemoizedSerializedSize = -1; + + 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 { + getSerializedSize(); + if (getJBNJGMIGFFJList().size() > 0) { + output.writeUInt32NoTag(26); + output.writeUInt32NoTag(jBNJGMIGFFJMemoizedSerializedSize); + } + for (int i = 0; i < jBNJGMIGFFJ_.size(); i++) { + output.writeUInt32NoTag(jBNJGMIGFFJ_.getInt(i)); + } + if (getPAIGHFEEELOList().size() > 0) { + output.writeUInt32NoTag(90); + output.writeUInt32NoTag(pAIGHFEEELOMemoizedSerializedSize); + } + for (int i = 0; i < pAIGHFEEELO_.size(); i++) { + output.writeUInt32NoTag(pAIGHFEEELO_.getInt(i)); + } + if (getDIDEMJFOGLDList().size() > 0) { + output.writeUInt32NoTag(122); + output.writeUInt32NoTag(dIDEMJFOGLDMemoizedSerializedSize); + } + for (int i = 0; i < dIDEMJFOGLD_.size(); i++) { + output.writeUInt32NoTag(dIDEMJFOGLD_.getInt(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + { + int dataSize = 0; + for (int i = 0; i < jBNJGMIGFFJ_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(jBNJGMIGFFJ_.getInt(i)); + } + size += dataSize; + if (!getJBNJGMIGFFJList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + jBNJGMIGFFJMemoizedSerializedSize = dataSize; + } + { + int dataSize = 0; + for (int i = 0; i < pAIGHFEEELO_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(pAIGHFEEELO_.getInt(i)); + } + size += dataSize; + if (!getPAIGHFEEELOList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + pAIGHFEEELOMemoizedSerializedSize = dataSize; + } + { + int dataSize = 0; + for (int i = 0; i < dIDEMJFOGLD_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(dIDEMJFOGLD_.getInt(i)); + } + size += dataSize; + if (!getDIDEMJFOGLDList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + dIDEMJFOGLDMemoizedSerializedSize = dataSize; + } + 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH other = (emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH) obj; + + if (!getPAIGHFEEELOList() + .equals(other.getPAIGHFEEELOList())) return false; + if (!getDIDEMJFOGLDList() + .equals(other.getDIDEMJFOGLDList())) return false; + if (!getJBNJGMIGFFJList() + .equals(other.getJBNJGMIGFFJList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getPAIGHFEEELOCount() > 0) { + hash = (37 * hash) + PAIGHFEEELO_FIELD_NUMBER; + hash = (53 * hash) + getPAIGHFEEELOList().hashCode(); + } + if (getDIDEMJFOGLDCount() > 0) { + hash = (37 * hash) + DIDEMJFOGLD_FIELD_NUMBER; + hash = (53 * hash) + getDIDEMJFOGLDList().hashCode(); + } + if (getJBNJGMIGFFJCount() > 0) { + hash = (37 * hash) + JBNJGMIGFFJ_FIELD_NUMBER; + hash = (53 * hash) + getJBNJGMIGFFJList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH 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 NHFPBBLCHKH} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:NHFPBBLCHKH) + emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.internal_static_NHFPBBLCHKH_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.internal_static_NHFPBBLCHKH_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.class, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.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(); + pAIGHFEEELO_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + dIDEMJFOGLD_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + jBNJGMIGFFJ_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.internal_static_NHFPBBLCHKH_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDefaultInstanceForType() { + return emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH build() { + emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH buildPartial() { + emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH result = new emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH(this); + int from_bitField0_ = bitField0_; + if (((bitField0_ & 0x00000001) != 0)) { + pAIGHFEEELO_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.pAIGHFEEELO_ = pAIGHFEEELO_; + if (((bitField0_ & 0x00000002) != 0)) { + dIDEMJFOGLD_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.dIDEMJFOGLD_ = dIDEMJFOGLD_; + if (((bitField0_ & 0x00000004) != 0)) { + jBNJGMIGFFJ_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.jBNJGMIGFFJ_ = jBNJGMIGFFJ_; + 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH) { + return mergeFrom((emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH other) { + if (other == emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance()) return this; + if (!other.pAIGHFEEELO_.isEmpty()) { + if (pAIGHFEEELO_.isEmpty()) { + pAIGHFEEELO_ = other.pAIGHFEEELO_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensurePAIGHFEEELOIsMutable(); + pAIGHFEEELO_.addAll(other.pAIGHFEEELO_); + } + onChanged(); + } + if (!other.dIDEMJFOGLD_.isEmpty()) { + if (dIDEMJFOGLD_.isEmpty()) { + dIDEMJFOGLD_ = other.dIDEMJFOGLD_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureDIDEMJFOGLDIsMutable(); + dIDEMJFOGLD_.addAll(other.dIDEMJFOGLD_); + } + onChanged(); + } + if (!other.jBNJGMIGFFJ_.isEmpty()) { + if (jBNJGMIGFFJ_.isEmpty()) { + jBNJGMIGFFJ_ = other.jBNJGMIGFFJ_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureJBNJGMIGFFJIsMutable(); + jBNJGMIGFFJ_.addAll(other.jBNJGMIGFFJ_); + } + onChanged(); + } + 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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private com.google.protobuf.Internal.IntList pAIGHFEEELO_ = emptyIntList(); + private void ensurePAIGHFEEELOIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + pAIGHFEEELO_ = mutableCopy(pAIGHFEEELO_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @return A list containing the pAIGHFEEELO. + */ + public java.util.List + getPAIGHFEEELOList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(pAIGHFEEELO_) : pAIGHFEEELO_; + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @return The count of pAIGHFEEELO. + */ + public int getPAIGHFEEELOCount() { + return pAIGHFEEELO_.size(); + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @param index The index of the element to return. + * @return The pAIGHFEEELO at the given index. + */ + public int getPAIGHFEEELO(int index) { + return pAIGHFEEELO_.getInt(index); + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @param index The index to set the value at. + * @param value The pAIGHFEEELO to set. + * @return This builder for chaining. + */ + public Builder setPAIGHFEEELO( + int index, int value) { + ensurePAIGHFEEELOIsMutable(); + pAIGHFEEELO_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @param value The pAIGHFEEELO to add. + * @return This builder for chaining. + */ + public Builder addPAIGHFEEELO(int value) { + ensurePAIGHFEEELOIsMutable(); + pAIGHFEEELO_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @param values The pAIGHFEEELO to add. + * @return This builder for chaining. + */ + public Builder addAllPAIGHFEEELO( + java.lang.Iterable values) { + ensurePAIGHFEEELOIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, pAIGHFEEELO_); + onChanged(); + return this; + } + /** + * repeated uint32 PAIGHFEEELO = 11; + * @return This builder for chaining. + */ + public Builder clearPAIGHFEEELO() { + pAIGHFEEELO_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList dIDEMJFOGLD_ = emptyIntList(); + private void ensureDIDEMJFOGLDIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + dIDEMJFOGLD_ = mutableCopy(dIDEMJFOGLD_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @return A list containing the dIDEMJFOGLD. + */ + public java.util.List + getDIDEMJFOGLDList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(dIDEMJFOGLD_) : dIDEMJFOGLD_; + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @return The count of dIDEMJFOGLD. + */ + public int getDIDEMJFOGLDCount() { + return dIDEMJFOGLD_.size(); + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @param index The index of the element to return. + * @return The dIDEMJFOGLD at the given index. + */ + public int getDIDEMJFOGLD(int index) { + return dIDEMJFOGLD_.getInt(index); + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @param index The index to set the value at. + * @param value The dIDEMJFOGLD to set. + * @return This builder for chaining. + */ + public Builder setDIDEMJFOGLD( + int index, int value) { + ensureDIDEMJFOGLDIsMutable(); + dIDEMJFOGLD_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @param value The dIDEMJFOGLD to add. + * @return This builder for chaining. + */ + public Builder addDIDEMJFOGLD(int value) { + ensureDIDEMJFOGLDIsMutable(); + dIDEMJFOGLD_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @param values The dIDEMJFOGLD to add. + * @return This builder for chaining. + */ + public Builder addAllDIDEMJFOGLD( + java.lang.Iterable values) { + ensureDIDEMJFOGLDIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, dIDEMJFOGLD_); + onChanged(); + return this; + } + /** + * repeated uint32 DIDEMJFOGLD = 15; + * @return This builder for chaining. + */ + public Builder clearDIDEMJFOGLD() { + dIDEMJFOGLD_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList jBNJGMIGFFJ_ = emptyIntList(); + private void ensureJBNJGMIGFFJIsMutable() { + if (!((bitField0_ & 0x00000004) != 0)) { + jBNJGMIGFFJ_ = mutableCopy(jBNJGMIGFFJ_); + bitField0_ |= 0x00000004; + } + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @return A list containing the jBNJGMIGFFJ. + */ + public java.util.List + getJBNJGMIGFFJList() { + return ((bitField0_ & 0x00000004) != 0) ? + java.util.Collections.unmodifiableList(jBNJGMIGFFJ_) : jBNJGMIGFFJ_; + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @return The count of jBNJGMIGFFJ. + */ + public int getJBNJGMIGFFJCount() { + return jBNJGMIGFFJ_.size(); + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @param index The index of the element to return. + * @return The jBNJGMIGFFJ at the given index. + */ + public int getJBNJGMIGFFJ(int index) { + return jBNJGMIGFFJ_.getInt(index); + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @param index The index to set the value at. + * @param value The jBNJGMIGFFJ to set. + * @return This builder for chaining. + */ + public Builder setJBNJGMIGFFJ( + int index, int value) { + ensureJBNJGMIGFFJIsMutable(); + jBNJGMIGFFJ_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @param value The jBNJGMIGFFJ to add. + * @return This builder for chaining. + */ + public Builder addJBNJGMIGFFJ(int value) { + ensureJBNJGMIGFFJIsMutable(); + jBNJGMIGFFJ_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @param values The jBNJGMIGFFJ to add. + * @return This builder for chaining. + */ + public Builder addAllJBNJGMIGFFJ( + java.lang.Iterable values) { + ensureJBNJGMIGFFJIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, jBNJGMIGFFJ_); + onChanged(); + return this; + } + /** + * repeated uint32 JBNJGMIGFFJ = 3; + * @return This builder for chaining. + */ + public Builder clearJBNJGMIGFFJ() { + jBNJGMIGFFJ_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000004); + 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:NHFPBBLCHKH) + } + + // @@protoc_insertion_point(class_scope:NHFPBBLCHKH) + private static final emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH(); + } + + public static emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public NHFPBBLCHKH parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new NHFPBBLCHKH(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.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_NHFPBBLCHKH_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_NHFPBBLCHKH_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\021NHFPBBLCHKH.proto\"L\n\013NHFPBBLCHKH\022\023\n\013PA" + + "IGHFEEELO\030\013 \003(\r\022\023\n\013DIDEMJFOGLD\030\017 \003(\r\022\023\n\013" + + "JBNJGMIGFFJ\030\003 \003(\rB\033\n\031emu.grasscutter.net" + + ".protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_NHFPBBLCHKH_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_NHFPBBLCHKH_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_NHFPBBLCHKH_descriptor, + new java.lang.String[] { "PAIGHFEEELO", "DIDEMJFOGLD", "JBNJGMIGFFJ", }); + } + + // @@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 d0488714b..b71ee1019 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 ongoing_personal_line_list = 2; - * @return A list containing the ongoingPersonalLineList. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @return A list containing the canBeUnlockedPersonalLineList. */ - java.util.List getOngoingPersonalLineListList(); + java.util.List getCanBeUnlockedPersonalLineListList(); /** - * repeated uint32 ongoing_personal_line_list = 2; - * @return The count of ongoingPersonalLineList. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @return The count of canBeUnlockedPersonalLineList. */ - int getOngoingPersonalLineListCount(); + int getCanBeUnlockedPersonalLineListCount(); /** - * repeated uint32 ongoing_personal_line_list = 2; + * repeated uint32 can_be_unlocked_personal_line_list = 2; * @param index The index of the element to return. - * @return The ongoingPersonalLineList at the given index. + * @return The canBeUnlockedPersonalLineList at the given index. */ - int getOngoingPersonalLineList(int index); + int getCanBeUnlockedPersonalLineList(int index); /** * int32 retcode = 3; @@ -54,21 +54,21 @@ public final class PersonalLineAllDataRspOuterClass { int getLegendaryKeyCount(); /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @return A list containing the canBeUnlockedPersonalLineList. + * repeated uint32 ongoing_personal_line_list = 6; + * @return A list containing the ongoingPersonalLineList. */ - java.util.List getCanBeUnlockedPersonalLineListList(); + java.util.List getOngoingPersonalLineListList(); /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @return The count of canBeUnlockedPersonalLineList. + * repeated uint32 ongoing_personal_line_list = 6; + * @return The count of ongoingPersonalLineList. */ - int getCanBeUnlockedPersonalLineListCount(); + int getOngoingPersonalLineListCount(); /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; + * repeated uint32 ongoing_personal_line_list = 6; * @param index The index of the element to return. - * @return The canBeUnlockedPersonalLineList at the given index. + * @return The ongoingPersonalLineList at the given index. */ - int getCanBeUnlockedPersonalLineList(int index); + int getOngoingPersonalLineList(int index); /** * repeated .LockedPersonallineData locked_personal_line_list = 8; @@ -112,8 +112,8 @@ public final class PersonalLineAllDataRspOuterClass { super(builder); } private PersonalLineAllDataRsp() { - ongoingPersonalLineList_ = emptyIntList(); canBeUnlockedPersonalLineList_ = emptyIntList(); + ongoingPersonalLineList_ = emptyIntList(); lockedPersonalLineList_ = java.util.Collections.emptyList(); } @@ -155,21 +155,21 @@ public final class PersonalLineAllDataRspOuterClass { } case 16: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - ongoingPersonalLineList_ = newIntList(); + canBeUnlockedPersonalLineList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - ongoingPersonalLineList_.addInt(input.readUInt32()); + canBeUnlockedPersonalLineList_.addInt(input.readUInt32()); break; } case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - ongoingPersonalLineList_ = newIntList(); + canBeUnlockedPersonalLineList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - ongoingPersonalLineList_.addInt(input.readUInt32()); + canBeUnlockedPersonalLineList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -181,21 +181,21 @@ public final class PersonalLineAllDataRspOuterClass { } case 48: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - canBeUnlockedPersonalLineList_ = newIntList(); + ongoingPersonalLineList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - canBeUnlockedPersonalLineList_.addInt(input.readUInt32()); + ongoingPersonalLineList_.addInt(input.readUInt32()); break; } case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - canBeUnlockedPersonalLineList_ = newIntList(); + ongoingPersonalLineList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - canBeUnlockedPersonalLineList_.addInt(input.readUInt32()); + ongoingPersonalLineList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -230,10 +230,10 @@ public final class PersonalLineAllDataRspOuterClass { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - ongoingPersonalLineList_.makeImmutable(); // C + canBeUnlockedPersonalLineList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - canBeUnlockedPersonalLineList_.makeImmutable(); // C + ongoingPersonalLineList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000004) != 0)) { lockedPersonalLineList_ = java.util.Collections.unmodifiableList(lockedPersonalLineList_); @@ -255,33 +255,33 @@ public final class PersonalLineAllDataRspOuterClass { emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.class, emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.Builder.class); } - public static final int ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER = 2; - private com.google.protobuf.Internal.IntList ongoingPersonalLineList_; + public static final int CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 2; + private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_; /** - * repeated uint32 ongoing_personal_line_list = 2; - * @return A list containing the ongoingPersonalLineList. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @return A list containing the canBeUnlockedPersonalLineList. */ @java.lang.Override public java.util.List - getOngoingPersonalLineListList() { - return ongoingPersonalLineList_; + getCanBeUnlockedPersonalLineListList() { + return canBeUnlockedPersonalLineList_; } /** - * repeated uint32 ongoing_personal_line_list = 2; - * @return The count of ongoingPersonalLineList. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @return The count of canBeUnlockedPersonalLineList. */ - public int getOngoingPersonalLineListCount() { - return ongoingPersonalLineList_.size(); + public int getCanBeUnlockedPersonalLineListCount() { + return canBeUnlockedPersonalLineList_.size(); } /** - * repeated uint32 ongoing_personal_line_list = 2; + * repeated uint32 can_be_unlocked_personal_line_list = 2; * @param index The index of the element to return. - * @return The ongoingPersonalLineList at the given index. + * @return The canBeUnlockedPersonalLineList at the given index. */ - public int getOngoingPersonalLineList(int index) { - return ongoingPersonalLineList_.getInt(index); + public int getCanBeUnlockedPersonalLineList(int index) { + return canBeUnlockedPersonalLineList_.getInt(index); } - private int ongoingPersonalLineListMemoizedSerializedSize = -1; + private int canBeUnlockedPersonalLineListMemoizedSerializedSize = -1; public static final int RETCODE_FIELD_NUMBER = 3; private int retcode_; @@ -316,33 +316,33 @@ public final class PersonalLineAllDataRspOuterClass { return legendaryKeyCount_; } - public static final int CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 6; - private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_; + public static final int ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER = 6; + private com.google.protobuf.Internal.IntList ongoingPersonalLineList_; /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @return A list containing the canBeUnlockedPersonalLineList. + * repeated uint32 ongoing_personal_line_list = 6; + * @return A list containing the ongoingPersonalLineList. */ @java.lang.Override public java.util.List - getCanBeUnlockedPersonalLineListList() { - return canBeUnlockedPersonalLineList_; + getOngoingPersonalLineListList() { + return ongoingPersonalLineList_; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @return The count of canBeUnlockedPersonalLineList. + * repeated uint32 ongoing_personal_line_list = 6; + * @return The count of ongoingPersonalLineList. */ - public int getCanBeUnlockedPersonalLineListCount() { - return canBeUnlockedPersonalLineList_.size(); + public int getOngoingPersonalLineListCount() { + return ongoingPersonalLineList_.size(); } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; + * repeated uint32 ongoing_personal_line_list = 6; * @param index The index of the element to return. - * @return The canBeUnlockedPersonalLineList at the given index. + * @return The ongoingPersonalLineList at the given index. */ - public int getCanBeUnlockedPersonalLineList(int index) { - return canBeUnlockedPersonalLineList_.getInt(index); + public int getOngoingPersonalLineList(int index) { + return ongoingPersonalLineList_.getInt(index); } - private int canBeUnlockedPersonalLineListMemoizedSerializedSize = -1; + private int ongoingPersonalLineListMemoizedSerializedSize = -1; public static final int LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 8; private java.util.List lockedPersonalLineList_; @@ -402,23 +402,23 @@ public final class PersonalLineAllDataRspOuterClass { if (legendaryKeyCount_ != 0) { output.writeUInt32(1, legendaryKeyCount_); } - if (getOngoingPersonalLineListList().size() > 0) { - output.writeUInt32NoTag(18); - output.writeUInt32NoTag(ongoingPersonalLineListMemoizedSerializedSize); - } - for (int i = 0; i < ongoingPersonalLineList_.size(); i++) { - output.writeUInt32NoTag(ongoingPersonalLineList_.getInt(i)); - } - if (retcode_ != 0) { - output.writeInt32(3, retcode_); - } if (getCanBeUnlockedPersonalLineListList().size() > 0) { - output.writeUInt32NoTag(50); + output.writeUInt32NoTag(18); output.writeUInt32NoTag(canBeUnlockedPersonalLineListMemoizedSerializedSize); } for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) { output.writeUInt32NoTag(canBeUnlockedPersonalLineList_.getInt(i)); } + if (retcode_ != 0) { + output.writeInt32(3, retcode_); + } + if (getOngoingPersonalLineListList().size() > 0) { + output.writeUInt32NoTag(50); + output.writeUInt32NoTag(ongoingPersonalLineListMemoizedSerializedSize); + } + for (int i = 0; i < ongoingPersonalLineList_.size(); i++) { + output.writeUInt32NoTag(ongoingPersonalLineList_.getInt(i)); + } for (int i = 0; i < lockedPersonalLineList_.size(); i++) { output.writeMessage(8, lockedPersonalLineList_.get(i)); } @@ -438,24 +438,6 @@ public final class PersonalLineAllDataRspOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(1, legendaryKeyCount_); } - { - int dataSize = 0; - for (int i = 0; i < ongoingPersonalLineList_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(ongoingPersonalLineList_.getInt(i)); - } - size += dataSize; - if (!getOngoingPersonalLineListList().isEmpty()) { - size += 1; - size += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(dataSize); - } - ongoingPersonalLineListMemoizedSerializedSize = dataSize; - } - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, retcode_); - } { int dataSize = 0; for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) { @@ -470,6 +452,24 @@ public final class PersonalLineAllDataRspOuterClass { } canBeUnlockedPersonalLineListMemoizedSerializedSize = dataSize; } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, retcode_); + } + { + int dataSize = 0; + for (int i = 0; i < ongoingPersonalLineList_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(ongoingPersonalLineList_.getInt(i)); + } + size += dataSize; + if (!getOngoingPersonalLineListList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + ongoingPersonalLineListMemoizedSerializedSize = dataSize; + } for (int i = 0; i < lockedPersonalLineList_.size(); i++) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(8, lockedPersonalLineList_.get(i)); @@ -493,16 +493,16 @@ public final class PersonalLineAllDataRspOuterClass { } emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp other = (emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp) obj; - if (!getOngoingPersonalLineListList() - .equals(other.getOngoingPersonalLineListList())) return false; + if (!getCanBeUnlockedPersonalLineListList() + .equals(other.getCanBeUnlockedPersonalLineListList())) return false; if (getRetcode() != other.getRetcode()) return false; if (getCurFinishedDailyTaskCount() != other.getCurFinishedDailyTaskCount()) return false; if (getLegendaryKeyCount() != other.getLegendaryKeyCount()) return false; - if (!getCanBeUnlockedPersonalLineListList() - .equals(other.getCanBeUnlockedPersonalLineListList())) return false; + if (!getOngoingPersonalLineListList() + .equals(other.getOngoingPersonalLineListList())) return false; if (!getLockedPersonalLineListList() .equals(other.getLockedPersonalLineListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -516,9 +516,9 @@ public final class PersonalLineAllDataRspOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getOngoingPersonalLineListCount() > 0) { - hash = (37 * hash) + ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER; - hash = (53 * hash) + getOngoingPersonalLineListList().hashCode(); + if (getCanBeUnlockedPersonalLineListCount() > 0) { + hash = (37 * hash) + CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER; + hash = (53 * hash) + getCanBeUnlockedPersonalLineListList().hashCode(); } hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); @@ -526,9 +526,9 @@ public final class PersonalLineAllDataRspOuterClass { hash = (53 * hash) + getCurFinishedDailyTaskCount(); hash = (37 * hash) + LEGENDARY_KEY_COUNT_FIELD_NUMBER; hash = (53 * hash) + getLegendaryKeyCount(); - if (getCanBeUnlockedPersonalLineListCount() > 0) { - hash = (37 * hash) + CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER; - hash = (53 * hash) + getCanBeUnlockedPersonalLineListList().hashCode(); + if (getOngoingPersonalLineListCount() > 0) { + hash = (37 * hash) + ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER; + hash = (53 * hash) + getOngoingPersonalLineListList().hashCode(); } if (getLockedPersonalLineListCount() > 0) { hash = (37 * hash) + LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER; @@ -673,7 +673,7 @@ public final class PersonalLineAllDataRspOuterClass { @java.lang.Override public Builder clear() { super.clear(); - ongoingPersonalLineList_ = emptyIntList(); + canBeUnlockedPersonalLineList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); retcode_ = 0; @@ -681,7 +681,7 @@ public final class PersonalLineAllDataRspOuterClass { legendaryKeyCount_ = 0; - canBeUnlockedPersonalLineList_ = emptyIntList(); + ongoingPersonalLineList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); if (lockedPersonalLineListBuilder_ == null) { lockedPersonalLineList_ = java.util.Collections.emptyList(); @@ -717,18 +717,18 @@ public final class PersonalLineAllDataRspOuterClass { emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp result = new emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - ongoingPersonalLineList_.makeImmutable(); + canBeUnlockedPersonalLineList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.ongoingPersonalLineList_ = ongoingPersonalLineList_; + result.canBeUnlockedPersonalLineList_ = canBeUnlockedPersonalLineList_; result.retcode_ = retcode_; result.curFinishedDailyTaskCount_ = curFinishedDailyTaskCount_; result.legendaryKeyCount_ = legendaryKeyCount_; if (((bitField0_ & 0x00000002) != 0)) { - canBeUnlockedPersonalLineList_.makeImmutable(); + ongoingPersonalLineList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.canBeUnlockedPersonalLineList_ = canBeUnlockedPersonalLineList_; + result.ongoingPersonalLineList_ = ongoingPersonalLineList_; if (lockedPersonalLineListBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { lockedPersonalLineList_ = java.util.Collections.unmodifiableList(lockedPersonalLineList_); @@ -786,13 +786,13 @@ public final class PersonalLineAllDataRspOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp other) { if (other == emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.getDefaultInstance()) return this; - if (!other.ongoingPersonalLineList_.isEmpty()) { - if (ongoingPersonalLineList_.isEmpty()) { - ongoingPersonalLineList_ = other.ongoingPersonalLineList_; + if (!other.canBeUnlockedPersonalLineList_.isEmpty()) { + if (canBeUnlockedPersonalLineList_.isEmpty()) { + canBeUnlockedPersonalLineList_ = other.canBeUnlockedPersonalLineList_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureOngoingPersonalLineListIsMutable(); - ongoingPersonalLineList_.addAll(other.ongoingPersonalLineList_); + ensureCanBeUnlockedPersonalLineListIsMutable(); + canBeUnlockedPersonalLineList_.addAll(other.canBeUnlockedPersonalLineList_); } onChanged(); } @@ -805,13 +805,13 @@ public final class PersonalLineAllDataRspOuterClass { if (other.getLegendaryKeyCount() != 0) { setLegendaryKeyCount(other.getLegendaryKeyCount()); } - if (!other.canBeUnlockedPersonalLineList_.isEmpty()) { - if (canBeUnlockedPersonalLineList_.isEmpty()) { - canBeUnlockedPersonalLineList_ = other.canBeUnlockedPersonalLineList_; + if (!other.ongoingPersonalLineList_.isEmpty()) { + if (ongoingPersonalLineList_.isEmpty()) { + ongoingPersonalLineList_ = other.ongoingPersonalLineList_; bitField0_ = (bitField0_ & ~0x00000002); } else { - ensureCanBeUnlockedPersonalLineListIsMutable(); - canBeUnlockedPersonalLineList_.addAll(other.canBeUnlockedPersonalLineList_); + ensureOngoingPersonalLineListIsMutable(); + ongoingPersonalLineList_.addAll(other.ongoingPersonalLineList_); } onChanged(); } @@ -871,80 +871,80 @@ public final class PersonalLineAllDataRspOuterClass { } private int bitField0_; - private com.google.protobuf.Internal.IntList ongoingPersonalLineList_ = emptyIntList(); - private void ensureOngoingPersonalLineListIsMutable() { + private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_ = emptyIntList(); + private void ensureCanBeUnlockedPersonalLineListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - ongoingPersonalLineList_ = mutableCopy(ongoingPersonalLineList_); + canBeUnlockedPersonalLineList_ = mutableCopy(canBeUnlockedPersonalLineList_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 ongoing_personal_line_list = 2; - * @return A list containing the ongoingPersonalLineList. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @return A list containing the canBeUnlockedPersonalLineList. */ public java.util.List - getOngoingPersonalLineListList() { + getCanBeUnlockedPersonalLineListList() { return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(ongoingPersonalLineList_) : ongoingPersonalLineList_; + java.util.Collections.unmodifiableList(canBeUnlockedPersonalLineList_) : canBeUnlockedPersonalLineList_; } /** - * repeated uint32 ongoing_personal_line_list = 2; - * @return The count of ongoingPersonalLineList. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @return The count of canBeUnlockedPersonalLineList. */ - public int getOngoingPersonalLineListCount() { - return ongoingPersonalLineList_.size(); + public int getCanBeUnlockedPersonalLineListCount() { + return canBeUnlockedPersonalLineList_.size(); } /** - * repeated uint32 ongoing_personal_line_list = 2; + * repeated uint32 can_be_unlocked_personal_line_list = 2; * @param index The index of the element to return. - * @return The ongoingPersonalLineList at the given index. + * @return The canBeUnlockedPersonalLineList at the given index. */ - public int getOngoingPersonalLineList(int index) { - return ongoingPersonalLineList_.getInt(index); + public int getCanBeUnlockedPersonalLineList(int index) { + return canBeUnlockedPersonalLineList_.getInt(index); } /** - * repeated uint32 ongoing_personal_line_list = 2; + * repeated uint32 can_be_unlocked_personal_line_list = 2; * @param index The index to set the value at. - * @param value The ongoingPersonalLineList to set. + * @param value The canBeUnlockedPersonalLineList to set. * @return This builder for chaining. */ - public Builder setOngoingPersonalLineList( + public Builder setCanBeUnlockedPersonalLineList( int index, int value) { - ensureOngoingPersonalLineListIsMutable(); - ongoingPersonalLineList_.setInt(index, value); + ensureCanBeUnlockedPersonalLineListIsMutable(); + canBeUnlockedPersonalLineList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 ongoing_personal_line_list = 2; - * @param value The ongoingPersonalLineList to add. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @param value The canBeUnlockedPersonalLineList to add. * @return This builder for chaining. */ - public Builder addOngoingPersonalLineList(int value) { - ensureOngoingPersonalLineListIsMutable(); - ongoingPersonalLineList_.addInt(value); + public Builder addCanBeUnlockedPersonalLineList(int value) { + ensureCanBeUnlockedPersonalLineListIsMutable(); + canBeUnlockedPersonalLineList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 ongoing_personal_line_list = 2; - * @param values The ongoingPersonalLineList to add. + * repeated uint32 can_be_unlocked_personal_line_list = 2; + * @param values The canBeUnlockedPersonalLineList to add. * @return This builder for chaining. */ - public Builder addAllOngoingPersonalLineList( + public Builder addAllCanBeUnlockedPersonalLineList( java.lang.Iterable values) { - ensureOngoingPersonalLineListIsMutable(); + ensureCanBeUnlockedPersonalLineListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, ongoingPersonalLineList_); + values, canBeUnlockedPersonalLineList_); onChanged(); return this; } /** - * repeated uint32 ongoing_personal_line_list = 2; + * repeated uint32 can_be_unlocked_personal_line_list = 2; * @return This builder for chaining. */ - public Builder clearOngoingPersonalLineList() { - ongoingPersonalLineList_ = emptyIntList(); + public Builder clearCanBeUnlockedPersonalLineList() { + canBeUnlockedPersonalLineList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; @@ -1043,80 +1043,80 @@ public final class PersonalLineAllDataRspOuterClass { return this; } - private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_ = emptyIntList(); - private void ensureCanBeUnlockedPersonalLineListIsMutable() { + private com.google.protobuf.Internal.IntList ongoingPersonalLineList_ = emptyIntList(); + private void ensureOngoingPersonalLineListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - canBeUnlockedPersonalLineList_ = mutableCopy(canBeUnlockedPersonalLineList_); + ongoingPersonalLineList_ = mutableCopy(ongoingPersonalLineList_); bitField0_ |= 0x00000002; } } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @return A list containing the canBeUnlockedPersonalLineList. + * repeated uint32 ongoing_personal_line_list = 6; + * @return A list containing the ongoingPersonalLineList. */ public java.util.List - getCanBeUnlockedPersonalLineListList() { + getOngoingPersonalLineListList() { return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(canBeUnlockedPersonalLineList_) : canBeUnlockedPersonalLineList_; + java.util.Collections.unmodifiableList(ongoingPersonalLineList_) : ongoingPersonalLineList_; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @return The count of canBeUnlockedPersonalLineList. + * repeated uint32 ongoing_personal_line_list = 6; + * @return The count of ongoingPersonalLineList. */ - public int getCanBeUnlockedPersonalLineListCount() { - return canBeUnlockedPersonalLineList_.size(); + public int getOngoingPersonalLineListCount() { + return ongoingPersonalLineList_.size(); } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; + * repeated uint32 ongoing_personal_line_list = 6; * @param index The index of the element to return. - * @return The canBeUnlockedPersonalLineList at the given index. + * @return The ongoingPersonalLineList at the given index. */ - public int getCanBeUnlockedPersonalLineList(int index) { - return canBeUnlockedPersonalLineList_.getInt(index); + public int getOngoingPersonalLineList(int index) { + return ongoingPersonalLineList_.getInt(index); } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; + * repeated uint32 ongoing_personal_line_list = 6; * @param index The index to set the value at. - * @param value The canBeUnlockedPersonalLineList to set. + * @param value The ongoingPersonalLineList to set. * @return This builder for chaining. */ - public Builder setCanBeUnlockedPersonalLineList( + public Builder setOngoingPersonalLineList( int index, int value) { - ensureCanBeUnlockedPersonalLineListIsMutable(); - canBeUnlockedPersonalLineList_.setInt(index, value); + ensureOngoingPersonalLineListIsMutable(); + ongoingPersonalLineList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @param value The canBeUnlockedPersonalLineList to add. + * repeated uint32 ongoing_personal_line_list = 6; + * @param value The ongoingPersonalLineList to add. * @return This builder for chaining. */ - public Builder addCanBeUnlockedPersonalLineList(int value) { - ensureCanBeUnlockedPersonalLineListIsMutable(); - canBeUnlockedPersonalLineList_.addInt(value); + public Builder addOngoingPersonalLineList(int value) { + ensureOngoingPersonalLineListIsMutable(); + ongoingPersonalLineList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; - * @param values The canBeUnlockedPersonalLineList to add. + * repeated uint32 ongoing_personal_line_list = 6; + * @param values The ongoingPersonalLineList to add. * @return This builder for chaining. */ - public Builder addAllCanBeUnlockedPersonalLineList( + public Builder addAllOngoingPersonalLineList( java.lang.Iterable values) { - ensureCanBeUnlockedPersonalLineListIsMutable(); + ensureOngoingPersonalLineListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, canBeUnlockedPersonalLineList_); + values, ongoingPersonalLineList_); onChanged(); return this; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 6; + * repeated uint32 ongoing_personal_line_list = 6; * @return This builder for chaining. */ - public Builder clearCanBeUnlockedPersonalLineList() { - canBeUnlockedPersonalLineList_ = emptyIntList(); + public Builder clearOngoingPersonalLineList() { + ongoingPersonalLineList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; @@ -1430,10 +1430,10 @@ public final class PersonalLineAllDataRspOuterClass { java.lang.String[] descriptorData = { "\n\034PersonalLineAllDataRsp.proto\032\034LockedPe" + "rsonallineData.proto\"\371\001\n\026PersonalLineAll" + - "DataRsp\022\"\n\032ongoing_personal_line_list\030\002 " + - "\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" + + "DataRsp\022*\n\"can_be_unlocked_personal_line" + + "_list\030\002 \003(\r\022\017\n\007retcode\030\003 \001(\005\022%\n\035cur_fini" + + "shed_daily_task_count\030\013 \001(\r\022\033\n\023legendary" + + "_key_count\030\001 \001(\r\022\"\n\032ongoing_personal_lin" + "e_list\030\006 \003(\r\022:\n\031locked_personal_line_lis" + "t\030\010 \003(\0132\027.LockedPersonallineDataB\033\n\031emu." + "grasscutter.net.protob\006proto3" @@ -1448,7 +1448,7 @@ public final class PersonalLineAllDataRspOuterClass { internal_static_PersonalLineAllDataRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PersonalLineAllDataRsp_descriptor, - new java.lang.String[] { "OngoingPersonalLineList", "Retcode", "CurFinishedDailyTaskCount", "LegendaryKeyCount", "CanBeUnlockedPersonalLineList", "LockedPersonalLineList", }); + new java.lang.String[] { "CanBeUnlockedPersonalLineList", "Retcode", "CurFinishedDailyTaskCount", "LegendaryKeyCount", "OngoingPersonalLineList", "LockedPersonalLineList", }); emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterChildMapLayerNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterChildMapLayerNotifyOuterClass.java new file mode 100644 index 000000000..c0d91e1f8 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterChildMapLayerNotifyOuterClass.java @@ -0,0 +1,545 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: PlayerEnterChildMapLayerNotify.proto + +package emu.grasscutter.net.proto; + +public final class PlayerEnterChildMapLayerNotifyOuterClass { + private PlayerEnterChildMapLayerNotifyOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface PlayerEnterChildMapLayerNotifyOrBuilder extends + // @@protoc_insertion_point(interface_extends:PlayerEnterChildMapLayerNotify) + com.google.protobuf.MessageOrBuilder { + + /** + * uint32 layer_id = 10; + * @return The layerId. + */ + int getLayerId(); + } + /** + *
+   * CmdId: 2225
+   * 
+ * + * Protobuf type {@code PlayerEnterChildMapLayerNotify} + */ + public static final class PlayerEnterChildMapLayerNotify extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:PlayerEnterChildMapLayerNotify) + PlayerEnterChildMapLayerNotifyOrBuilder { + private static final long serialVersionUID = 0L; + // Use PlayerEnterChildMapLayerNotify.newBuilder() to construct. + private PlayerEnterChildMapLayerNotify(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PlayerEnterChildMapLayerNotify() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PlayerEnterChildMapLayerNotify(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PlayerEnterChildMapLayerNotify( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 80: { + + layerId_ = input.readUInt32(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.Builder.class); + } + + public static final int LAYER_ID_FIELD_NUMBER = 10; + private int layerId_; + /** + * uint32 layer_id = 10; + * @return The layerId. + */ + @java.lang.Override + public int getLayerId() { + return layerId_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (layerId_ != 0) { + output.writeUInt32(10, layerId_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (layerId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(10, layerId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify other = (emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify) obj; + + if (getLayerId() + != other.getLayerId()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + LAYER_ID_FIELD_NUMBER; + hash = (53 * hash) + getLayerId(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * CmdId: 2225
+     * 
+ * + * Protobuf type {@code PlayerEnterChildMapLayerNotify} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:PlayerEnterChildMapLayerNotify) + emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotifyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + layerId_ = 0; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.internal_static_PlayerEnterChildMapLayerNotify_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify getDefaultInstanceForType() { + return emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify build() { + emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify buildPartial() { + emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify result = new emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify(this); + result.layerId_ = layerId_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify) { + return mergeFrom((emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify other) { + if (other == emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify.getDefaultInstance()) return this; + if (other.getLayerId() != 0) { + setLayerId(other.getLayerId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int layerId_ ; + /** + * uint32 layer_id = 10; + * @return The layerId. + */ + @java.lang.Override + public int getLayerId() { + return layerId_; + } + /** + * uint32 layer_id = 10; + * @param value The layerId to set. + * @return This builder for chaining. + */ + public Builder setLayerId(int value) { + + layerId_ = value; + onChanged(); + return this; + } + /** + * uint32 layer_id = 10; + * @return This builder for chaining. + */ + public Builder clearLayerId() { + + layerId_ = 0; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:PlayerEnterChildMapLayerNotify) + } + + // @@protoc_insertion_point(class_scope:PlayerEnterChildMapLayerNotify) + private static final emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify(); + } + + public static emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PlayerEnterChildMapLayerNotify parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PlayerEnterChildMapLayerNotify(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterChildMapLayerNotifyOuterClass.PlayerEnterChildMapLayerNotify getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_PlayerEnterChildMapLayerNotify_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n$PlayerEnterChildMapLayerNotify.proto\"2" + + "\n\036PlayerEnterChildMapLayerNotify\022\020\n\010laye" + + "r_id\030\n \001(\rB\033\n\031emu.grasscutter.net.protob" + + "\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_PlayerEnterChildMapLayerNotify_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_PlayerEnterChildMapLayerNotify_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_PlayerEnterChildMapLayerNotify_descriptor, + new java.lang.String[] { "LayerId", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterMapLayerNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterMapLayerNotifyOuterClass.java new file mode 100644 index 000000000..3e1f4a22b --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterMapLayerNotifyOuterClass.java @@ -0,0 +1,544 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: PlayerEnterMapLayerNotify.proto + +package emu.grasscutter.net.proto; + +public final class PlayerEnterMapLayerNotifyOuterClass { + private PlayerEnterMapLayerNotifyOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface PlayerEnterMapLayerNotifyOrBuilder extends + // @@protoc_insertion_point(interface_extends:PlayerEnterMapLayerNotify) + com.google.protobuf.MessageOrBuilder { + + /** + * uint32 layer_id = 13; + * @return The layerId. + */ + int getLayerId(); + } + /** + *
+   * CmdId: 26672
+   * 
+ * + * Protobuf type {@code PlayerEnterMapLayerNotify} + */ + public static final class PlayerEnterMapLayerNotify extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:PlayerEnterMapLayerNotify) + PlayerEnterMapLayerNotifyOrBuilder { + private static final long serialVersionUID = 0L; + // Use PlayerEnterMapLayerNotify.newBuilder() to construct. + private PlayerEnterMapLayerNotify(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PlayerEnterMapLayerNotify() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PlayerEnterMapLayerNotify(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PlayerEnterMapLayerNotify( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 104: { + + layerId_ = input.readUInt32(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.Builder.class); + } + + public static final int LAYER_ID_FIELD_NUMBER = 13; + private int layerId_; + /** + * uint32 layer_id = 13; + * @return The layerId. + */ + @java.lang.Override + public int getLayerId() { + return layerId_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (layerId_ != 0) { + output.writeUInt32(13, layerId_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (layerId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(13, layerId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify other = (emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify) obj; + + if (getLayerId() + != other.getLayerId()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + LAYER_ID_FIELD_NUMBER; + hash = (53 * hash) + getLayerId(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * CmdId: 26672
+     * 
+ * + * Protobuf type {@code PlayerEnterMapLayerNotify} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:PlayerEnterMapLayerNotify) + emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotifyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.class, emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + layerId_ = 0; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.internal_static_PlayerEnterMapLayerNotify_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify getDefaultInstanceForType() { + return emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify build() { + emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify buildPartial() { + emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify result = new emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify(this); + result.layerId_ = layerId_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify) { + return mergeFrom((emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify other) { + if (other == emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify.getDefaultInstance()) return this; + if (other.getLayerId() != 0) { + setLayerId(other.getLayerId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int layerId_ ; + /** + * uint32 layer_id = 13; + * @return The layerId. + */ + @java.lang.Override + public int getLayerId() { + return layerId_; + } + /** + * uint32 layer_id = 13; + * @param value The layerId to set. + * @return This builder for chaining. + */ + public Builder setLayerId(int value) { + + layerId_ = value; + onChanged(); + return this; + } + /** + * uint32 layer_id = 13; + * @return This builder for chaining. + */ + public Builder clearLayerId() { + + layerId_ = 0; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:PlayerEnterMapLayerNotify) + } + + // @@protoc_insertion_point(class_scope:PlayerEnterMapLayerNotify) + private static final emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify(); + } + + public static emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PlayerEnterMapLayerNotify parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PlayerEnterMapLayerNotify(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.PlayerEnterMapLayerNotifyOuterClass.PlayerEnterMapLayerNotify getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_PlayerEnterMapLayerNotify_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\037PlayerEnterMapLayerNotify.proto\"-\n\031Pla" + + "yerEnterMapLayerNotify\022\020\n\010layer_id\030\r \001(\r" + + "B\033\n\031emu.grasscutter.net.protob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_PlayerEnterMapLayerNotify_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_PlayerEnterMapLayerNotify_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_PlayerEnterMapLayerNotify_descriptor, + new java.lang.String[] { "LayerId", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java index 6ee9ae9ab..6f2b06d45 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java @@ -31,19 +31,19 @@ public final class PlayerEnterSceneNotifyOuterClass { getSceneTransactionBytes(); /** - * .NHFPBBLCHKH DCGPONECHMM = 897; - * @return Whether the dCGPONECHMM field is set. + * .MapLayerInfo map_layer_info = 897; + * @return Whether the mapLayerInfo field is set. */ - boolean hasDCGPONECHMM(); + boolean hasMapLayerInfo(); /** - * .NHFPBBLCHKH DCGPONECHMM = 897; - * @return The dCGPONECHMM. + * .MapLayerInfo map_layer_info = 897; + * @return The mapLayerInfo. */ - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM(); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo(); /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder(); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder(); /** * bool is_skip_ui = 3; @@ -339,14 +339,14 @@ public final class PlayerEnterSceneNotifyOuterClass { break; } case 7178: { - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder subBuilder = null; - if (dCGPONECHMM_ != null) { - subBuilder = dCGPONECHMM_.toBuilder(); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null; + if (mapLayerInfo_ != null) { + subBuilder = mapLayerInfo_.toBuilder(); } - dCGPONECHMM_ = input.readMessage(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.parser(), extensionRegistry); + mapLayerInfo_ = input.readMessage(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(dCGPONECHMM_); - dCGPONECHMM_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(mapLayerInfo_); + mapLayerInfo_ = subBuilder.buildPartial(); } break; @@ -445,30 +445,30 @@ public final class PlayerEnterSceneNotifyOuterClass { } } - public static final int DCGPONECHMM_FIELD_NUMBER = 897; - private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_; + public static final int MAP_LAYER_INFO_FIELD_NUMBER = 897; + private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_; /** - * .NHFPBBLCHKH DCGPONECHMM = 897; - * @return Whether the dCGPONECHMM field is set. + * .MapLayerInfo map_layer_info = 897; + * @return Whether the mapLayerInfo field is set. */ @java.lang.Override - public boolean hasDCGPONECHMM() { - return dCGPONECHMM_ != null; + public boolean hasMapLayerInfo() { + return mapLayerInfo_ != null; } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; - * @return The dCGPONECHMM. + * .MapLayerInfo map_layer_info = 897; + * @return The mapLayerInfo. */ @java.lang.Override - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() { - return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_; + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() { + return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_; } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ @java.lang.Override - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() { - return getDCGPONECHMM(); + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() { + return getMapLayerInfo(); } public static final int IS_SKIP_UI_FIELD_NUMBER = 3; @@ -774,8 +774,8 @@ public final class PlayerEnterSceneNotifyOuterClass { if (enterReason_ != 0) { output.writeUInt32(670, enterReason_); } - if (dCGPONECHMM_ != null) { - output.writeMessage(897, getDCGPONECHMM()); + if (mapLayerInfo_ != null) { + output.writeMessage(897, getMapLayerInfo()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1319, sceneTransaction_); @@ -864,9 +864,9 @@ public final class PlayerEnterSceneNotifyOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(670, enterReason_); } - if (dCGPONECHMM_ != null) { + if (mapLayerInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(897, getDCGPONECHMM()); + .computeMessageSize(897, getMapLayerInfo()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1319, sceneTransaction_); @@ -900,10 +900,10 @@ public final class PlayerEnterSceneNotifyOuterClass { if (!getSceneTransaction() .equals(other.getSceneTransaction())) return false; - if (hasDCGPONECHMM() != other.hasDCGPONECHMM()) return false; - if (hasDCGPONECHMM()) { - if (!getDCGPONECHMM() - .equals(other.getDCGPONECHMM())) return false; + if (hasMapLayerInfo() != other.hasMapLayerInfo()) return false; + if (hasMapLayerInfo()) { + if (!getMapLayerInfo() + .equals(other.getMapLayerInfo())) return false; } if (getIsSkipUi() != other.getIsSkipUi()) return false; @@ -957,9 +957,9 @@ public final class PlayerEnterSceneNotifyOuterClass { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + SCENE_TRANSACTION_FIELD_NUMBER; hash = (53 * hash) + getSceneTransaction().hashCode(); - if (hasDCGPONECHMM()) { - hash = (37 * hash) + DCGPONECHMM_FIELD_NUMBER; - hash = (53 * hash) + getDCGPONECHMM().hashCode(); + if (hasMapLayerInfo()) { + hash = (37 * hash) + MAP_LAYER_INFO_FIELD_NUMBER; + hash = (53 * hash) + getMapLayerInfo().hashCode(); } hash = (37 * hash) + IS_SKIP_UI_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( @@ -1144,11 +1144,11 @@ public final class PlayerEnterSceneNotifyOuterClass { super.clear(); sceneTransaction_ = ""; - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMM_ = null; + if (mapLayerInfoBuilder_ == null) { + mapLayerInfo_ = null; } else { - dCGPONECHMM_ = null; - dCGPONECHMMBuilder_ = null; + mapLayerInfo_ = null; + mapLayerInfoBuilder_ = null; } isSkipUi_ = false; @@ -1220,10 +1220,10 @@ public final class PlayerEnterSceneNotifyOuterClass { emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify result = new emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify(this); int from_bitField0_ = bitField0_; result.sceneTransaction_ = sceneTransaction_; - if (dCGPONECHMMBuilder_ == null) { - result.dCGPONECHMM_ = dCGPONECHMM_; + if (mapLayerInfoBuilder_ == null) { + result.mapLayerInfo_ = mapLayerInfo_; } else { - result.dCGPONECHMM_ = dCGPONECHMMBuilder_.build(); + result.mapLayerInfo_ = mapLayerInfoBuilder_.build(); } result.isSkipUi_ = isSkipUi_; result.prevSceneId_ = prevSceneId_; @@ -1306,8 +1306,8 @@ public final class PlayerEnterSceneNotifyOuterClass { sceneTransaction_ = other.sceneTransaction_; onChanged(); } - if (other.hasDCGPONECHMM()) { - mergeDCGPONECHMM(other.getDCGPONECHMM()); + if (other.hasMapLayerInfo()) { + mergeMapLayerInfo(other.getMapLayerInfo()); } if (other.getIsSkipUi() != false) { setIsSkipUi(other.getIsSkipUi()); @@ -1473,123 +1473,123 @@ public final class PlayerEnterSceneNotifyOuterClass { return this; } - private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_; + private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> dCGPONECHMMBuilder_; + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> mapLayerInfoBuilder_; /** - * .NHFPBBLCHKH DCGPONECHMM = 897; - * @return Whether the dCGPONECHMM field is set. + * .MapLayerInfo map_layer_info = 897; + * @return Whether the mapLayerInfo field is set. */ - public boolean hasDCGPONECHMM() { - return dCGPONECHMMBuilder_ != null || dCGPONECHMM_ != null; + public boolean hasMapLayerInfo() { + return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null; } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; - * @return The dCGPONECHMM. + * .MapLayerInfo map_layer_info = 897; + * @return The mapLayerInfo. */ - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() { - if (dCGPONECHMMBuilder_ == null) { - return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_; + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() { + if (mapLayerInfoBuilder_ == null) { + return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_; } else { - return dCGPONECHMMBuilder_.getMessage(); + return mapLayerInfoBuilder_.getMessage(); } } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ - public Builder setDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) { - if (dCGPONECHMMBuilder_ == null) { + public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) { + if (mapLayerInfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - dCGPONECHMM_ = value; + mapLayerInfo_ = value; onChanged(); } else { - dCGPONECHMMBuilder_.setMessage(value); + mapLayerInfoBuilder_.setMessage(value); } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ - public Builder setDCGPONECHMM( - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder builderForValue) { - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMM_ = builderForValue.build(); + public Builder setMapLayerInfo( + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder builderForValue) { + if (mapLayerInfoBuilder_ == null) { + mapLayerInfo_ = builderForValue.build(); onChanged(); } else { - dCGPONECHMMBuilder_.setMessage(builderForValue.build()); + mapLayerInfoBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ - public Builder mergeDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) { - if (dCGPONECHMMBuilder_ == null) { - if (dCGPONECHMM_ != null) { - dCGPONECHMM_ = - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.newBuilder(dCGPONECHMM_).mergeFrom(value).buildPartial(); + public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) { + if (mapLayerInfoBuilder_ == null) { + if (mapLayerInfo_ != null) { + mapLayerInfo_ = + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.newBuilder(mapLayerInfo_).mergeFrom(value).buildPartial(); } else { - dCGPONECHMM_ = value; + mapLayerInfo_ = value; } onChanged(); } else { - dCGPONECHMMBuilder_.mergeFrom(value); + mapLayerInfoBuilder_.mergeFrom(value); } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ - public Builder clearDCGPONECHMM() { - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMM_ = null; + public Builder clearMapLayerInfo() { + if (mapLayerInfoBuilder_ == null) { + mapLayerInfo_ = null; onChanged(); } else { - dCGPONECHMM_ = null; - dCGPONECHMMBuilder_ = null; + mapLayerInfo_ = null; + mapLayerInfoBuilder_ = null; } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder getDCGPONECHMMBuilder() { + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() { onChanged(); - return getDCGPONECHMMFieldBuilder().getBuilder(); + return getMapLayerInfoFieldBuilder().getBuilder(); } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() { - if (dCGPONECHMMBuilder_ != null) { - return dCGPONECHMMBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() { + if (mapLayerInfoBuilder_ != null) { + return mapLayerInfoBuilder_.getMessageOrBuilder(); } else { - return dCGPONECHMM_ == null ? - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_; + return mapLayerInfo_ == null ? + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_; } } /** - * .NHFPBBLCHKH DCGPONECHMM = 897; + * .MapLayerInfo map_layer_info = 897; */ private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> - getDCGPONECHMMFieldBuilder() { - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMMBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder>( - getDCGPONECHMM(), + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> + getMapLayerInfoFieldBuilder() { + if (mapLayerInfoBuilder_ == null) { + mapLayerInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder>( + getMapLayerInfo(), getParentForChildren(), isClean()); - dCGPONECHMM_ = null; + mapLayerInfo_ = null; } - return dCGPONECHMMBuilder_; + return mapLayerInfoBuilder_; } private boolean isSkipUi_ ; @@ -2432,27 +2432,27 @@ public final class PlayerEnterSceneNotifyOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\034PlayerEnterSceneNotify.proto\032\021NHFPBBLC" + - "HKH.proto\032\014Vector.proto\032\017EnterType.proto" + - "\"\360\003\n\026PlayerEnterSceneNotify\022\032\n\021scene_tra" + - "nsaction\030\247\n \001(\t\022\"\n\013DCGPONECHMM\030\201\007 \001(\0132\014." + - "NHFPBBLCHKH\022\022\n\nis_skip_ui\030\003 \001(\010\022\025\n\rprev_" + - "scene_id\030\t \001(\r\022#\n\032is_first_login_enter_s" + - "cene\030\244\001 \001(\010\022\022\n\ntarget_uid\030\001 \001(\r\022\031\n\021scene" + - "_tag_id_list\030\r \003(\r\022\031\n\010prev_pos\030\014 \001(\0132\007.V" + - "ector\022\031\n\021enter_scene_token\030\007 \001(\r\022\023\n\nworl" + - "d_type\030\257\n \001(\r\022\030\n\004type\030\006 \001(\0162\n.EnterType\022" + - "\025\n\014enter_reason\030\236\005 \001(\r\022\024\n\003pos\030\016 \001(\0132\007.Ve" + - "ctor\022\030\n\020scene_begin_time\030\005 \001(\004\022\024\n\013LAJGLC" + - "IFKCP\030\234\016 \001(\r\022\023\n\013world_level\030\004 \001(\r\022\022\n\ndun" + - "geon_id\030\013 \001(\r\022\020\n\010scene_id\030\n \001(\r\022\032\n\021creat" + - "e_player_uid\030\324\r \001(\rB\033\n\031emu.grasscutter.n" + - "et.protob\006proto3" + "\n\034PlayerEnterSceneNotify.proto\032\022MapLayer" + + "Info.proto\032\014Vector.proto\032\017EnterType.prot" + + "o\"\364\003\n\026PlayerEnterSceneNotify\022\032\n\021scene_tr" + + "ansaction\030\247\n \001(\t\022&\n\016map_layer_info\030\201\007 \001(" + + "\0132\r.MapLayerInfo\022\022\n\nis_skip_ui\030\003 \001(\010\022\025\n\r" + + "prev_scene_id\030\t \001(\r\022#\n\032is_first_login_en" + + "ter_scene\030\244\001 \001(\010\022\022\n\ntarget_uid\030\001 \001(\r\022\031\n\021" + + "scene_tag_id_list\030\r \003(\r\022\031\n\010prev_pos\030\014 \001(" + + "\0132\007.Vector\022\031\n\021enter_scene_token\030\007 \001(\r\022\023\n" + + "\nworld_type\030\257\n \001(\r\022\030\n\004type\030\006 \001(\0162\n.Enter" + + "Type\022\025\n\014enter_reason\030\236\005 \001(\r\022\024\n\003pos\030\016 \001(\013" + + "2\007.Vector\022\030\n\020scene_begin_time\030\005 \001(\004\022\024\n\013L" + + "AJGLCIFKCP\030\234\016 \001(\r\022\023\n\013world_level\030\004 \001(\r\022\022" + + "\n\ndungeon_id\030\013 \001(\r\022\020\n\010scene_id\030\n \001(\r\022\032\n\021" + + "create_player_uid\030\324\r \001(\rB\033\n\031emu.grasscut" + + "ter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor(), + emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor(), emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(), emu.grasscutter.net.proto.EnterTypeOuterClass.getDescriptor(), }); @@ -2461,8 +2461,8 @@ public final class PlayerEnterSceneNotifyOuterClass { internal_static_PlayerEnterSceneNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerEnterSceneNotify_descriptor, - new java.lang.String[] { "SceneTransaction", "DCGPONECHMM", "IsSkipUi", "PrevSceneId", "IsFirstLoginEnterScene", "TargetUid", "SceneTagIdList", "PrevPos", "EnterSceneToken", "WorldType", "Type", "EnterReason", "Pos", "SceneBeginTime", "LAJGLCIFKCP", "WorldLevel", "DungeonId", "SceneId", "CreatePlayerUid", }); - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor(); + new java.lang.String[] { "SceneTransaction", "MapLayerInfo", "IsSkipUi", "PrevSceneId", "IsFirstLoginEnterScene", "TargetUid", "SceneTagIdList", "PrevPos", "EnterSceneToken", "WorldType", "Type", "EnterReason", "Pos", "SceneBeginTime", "LAJGLCIFKCP", "WorldLevel", "DungeonId", "SceneId", "CreatePlayerUid", }); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor(); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); emu.grasscutter.net.proto.EnterTypeOuterClass.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 0cb83da39..0d58d4e72 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java @@ -19,39 +19,39 @@ public final class PlayerHomeCompInfoOuterClass { com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @return A list containing the levelupRewardGotLevelList. - */ - java.util.List getLevelupRewardGotLevelListList(); - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @return The count of levelupRewardGotLevelList. - */ - int getLevelupRewardGotLevelListCount(); - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @param index The index of the element to return. - * @return The levelupRewardGotLevelList at the given index. - */ - int getLevelupRewardGotLevelList(int index); - - /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @return A list containing the unlockedModuleIdList. */ java.util.List getUnlockedModuleIdListList(); /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @return The count of unlockedModuleIdList. */ int getUnlockedModuleIdListCount(); /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @param index The index of the element to return. * @return The unlockedModuleIdList at the given index. */ int getUnlockedModuleIdList(int index); + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @return A list containing the levelupRewardGotLevelList. + */ + java.util.List getLevelupRewardGotLevelListList(); + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @return The count of levelupRewardGotLevelList. + */ + int getLevelupRewardGotLevelListCount(); + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @param index The index of the element to return. + * @return The levelupRewardGotLevelList at the given index. + */ + int getLevelupRewardGotLevelList(int index); + /** * repeated uint32 seen_module_id_list = 8; * @return A list containing the seenModuleIdList. @@ -97,8 +97,8 @@ public final class PlayerHomeCompInfoOuterClass { super(builder); } private PlayerHomeCompInfo() { - levelupRewardGotLevelList_ = emptyIntList(); unlockedModuleIdList_ = emptyIntList(); + levelupRewardGotLevelList_ = emptyIntList(); seenModuleIdList_ = emptyIntList(); friendEnterHomeOption_ = 0; } @@ -136,21 +136,21 @@ public final class PlayerHomeCompInfoOuterClass { break; case 24: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - levelupRewardGotLevelList_ = newIntList(); + unlockedModuleIdList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - levelupRewardGotLevelList_.addInt(input.readUInt32()); + unlockedModuleIdList_.addInt(input.readUInt32()); break; } case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - levelupRewardGotLevelList_ = newIntList(); + unlockedModuleIdList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - levelupRewardGotLevelList_.addInt(input.readUInt32()); + unlockedModuleIdList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -178,21 +178,21 @@ public final class PlayerHomeCompInfoOuterClass { } case 80: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - unlockedModuleIdList_ = newIntList(); + levelupRewardGotLevelList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - unlockedModuleIdList_.addInt(input.readUInt32()); + levelupRewardGotLevelList_.addInt(input.readUInt32()); break; } case 82: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - unlockedModuleIdList_ = newIntList(); + levelupRewardGotLevelList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - unlockedModuleIdList_.addInt(input.readUInt32()); + levelupRewardGotLevelList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -219,13 +219,13 @@ public final class PlayerHomeCompInfoOuterClass { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - levelupRewardGotLevelList_.makeImmutable(); // C + unlockedModuleIdList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000004) != 0)) { seenModuleIdList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - unlockedModuleIdList_.makeImmutable(); // C + levelupRewardGotLevelList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -244,38 +244,10 @@ public final class PlayerHomeCompInfoOuterClass { emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.class, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder.class); } - public static final int LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER = 3; - private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_; - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @return A list containing the levelupRewardGotLevelList. - */ - @java.lang.Override - public java.util.List - getLevelupRewardGotLevelListList() { - return levelupRewardGotLevelList_; - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @return The count of levelupRewardGotLevelList. - */ - public int getLevelupRewardGotLevelListCount() { - return levelupRewardGotLevelList_.size(); - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @param index The index of the element to return. - * @return The levelupRewardGotLevelList at the given index. - */ - public int getLevelupRewardGotLevelList(int index) { - return levelupRewardGotLevelList_.getInt(index); - } - private int levelupRewardGotLevelListMemoizedSerializedSize = -1; - - public static final int UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER = 10; + public static final int UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER = 3; private com.google.protobuf.Internal.IntList unlockedModuleIdList_; /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @return A list containing the unlockedModuleIdList. */ @java.lang.Override @@ -284,14 +256,14 @@ public final class PlayerHomeCompInfoOuterClass { return unlockedModuleIdList_; } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @return The count of unlockedModuleIdList. */ public int getUnlockedModuleIdListCount() { return unlockedModuleIdList_.size(); } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @param index The index of the element to return. * @return The unlockedModuleIdList at the given index. */ @@ -300,6 +272,34 @@ public final class PlayerHomeCompInfoOuterClass { } private int unlockedModuleIdListMemoizedSerializedSize = -1; + public static final int LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER = 10; + private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_; + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @return A list containing the levelupRewardGotLevelList. + */ + @java.lang.Override + public java.util.List + getLevelupRewardGotLevelListList() { + return levelupRewardGotLevelList_; + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @return The count of levelupRewardGotLevelList. + */ + public int getLevelupRewardGotLevelListCount() { + return levelupRewardGotLevelList_.size(); + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @param index The index of the element to return. + * @return The levelupRewardGotLevelList at the given index. + */ + public int getLevelupRewardGotLevelList(int index) { + return levelupRewardGotLevelList_.getInt(index); + } + private int levelupRewardGotLevelListMemoizedSerializedSize = -1; + public static final int SEEN_MODULE_ID_LIST_FIELD_NUMBER = 8; private com.google.protobuf.Internal.IntList seenModuleIdList_; /** @@ -362,12 +362,12 @@ public final class PlayerHomeCompInfoOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getLevelupRewardGotLevelListList().size() > 0) { + if (getUnlockedModuleIdListList().size() > 0) { output.writeUInt32NoTag(26); - output.writeUInt32NoTag(levelupRewardGotLevelListMemoizedSerializedSize); + output.writeUInt32NoTag(unlockedModuleIdListMemoizedSerializedSize); } - for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) { - output.writeUInt32NoTag(levelupRewardGotLevelList_.getInt(i)); + for (int i = 0; i < unlockedModuleIdList_.size(); i++) { + output.writeUInt32NoTag(unlockedModuleIdList_.getInt(i)); } if (getSeenModuleIdListList().size() > 0) { output.writeUInt32NoTag(66); @@ -376,12 +376,12 @@ public final class PlayerHomeCompInfoOuterClass { for (int i = 0; i < seenModuleIdList_.size(); i++) { output.writeUInt32NoTag(seenModuleIdList_.getInt(i)); } - if (getUnlockedModuleIdListList().size() > 0) { + if (getLevelupRewardGotLevelListList().size() > 0) { output.writeUInt32NoTag(82); - output.writeUInt32NoTag(unlockedModuleIdListMemoizedSerializedSize); + output.writeUInt32NoTag(levelupRewardGotLevelListMemoizedSerializedSize); } - for (int i = 0; i < unlockedModuleIdList_.size(); i++) { - output.writeUInt32NoTag(unlockedModuleIdList_.getInt(i)); + for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) { + output.writeUInt32NoTag(levelupRewardGotLevelList_.getInt(i)); } if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) { output.writeEnum(15, friendEnterHomeOption_); @@ -397,17 +397,17 @@ public final class PlayerHomeCompInfoOuterClass { size = 0; { int dataSize = 0; - for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) { + for (int i = 0; i < unlockedModuleIdList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(levelupRewardGotLevelList_.getInt(i)); + .computeUInt32SizeNoTag(unlockedModuleIdList_.getInt(i)); } size += dataSize; - if (!getLevelupRewardGotLevelListList().isEmpty()) { + if (!getUnlockedModuleIdListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - levelupRewardGotLevelListMemoizedSerializedSize = dataSize; + unlockedModuleIdListMemoizedSerializedSize = dataSize; } { int dataSize = 0; @@ -425,17 +425,17 @@ public final class PlayerHomeCompInfoOuterClass { } { int dataSize = 0; - for (int i = 0; i < unlockedModuleIdList_.size(); i++) { + for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(unlockedModuleIdList_.getInt(i)); + .computeUInt32SizeNoTag(levelupRewardGotLevelList_.getInt(i)); } size += dataSize; - if (!getUnlockedModuleIdListList().isEmpty()) { + if (!getLevelupRewardGotLevelListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - unlockedModuleIdListMemoizedSerializedSize = dataSize; + levelupRewardGotLevelListMemoizedSerializedSize = dataSize; } if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) { size += com.google.protobuf.CodedOutputStream @@ -456,10 +456,10 @@ public final class PlayerHomeCompInfoOuterClass { } emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo other = (emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo) obj; - if (!getLevelupRewardGotLevelListList() - .equals(other.getLevelupRewardGotLevelListList())) return false; if (!getUnlockedModuleIdListList() .equals(other.getUnlockedModuleIdListList())) return false; + if (!getLevelupRewardGotLevelListList() + .equals(other.getLevelupRewardGotLevelListList())) return false; if (!getSeenModuleIdListList() .equals(other.getSeenModuleIdListList())) return false; if (friendEnterHomeOption_ != other.friendEnterHomeOption_) return false; @@ -474,14 +474,14 @@ public final class PlayerHomeCompInfoOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getLevelupRewardGotLevelListCount() > 0) { - hash = (37 * hash) + LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER; - hash = (53 * hash) + getLevelupRewardGotLevelListList().hashCode(); - } if (getUnlockedModuleIdListCount() > 0) { hash = (37 * hash) + UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getUnlockedModuleIdListList().hashCode(); } + if (getLevelupRewardGotLevelListCount() > 0) { + hash = (37 * hash) + LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER; + hash = (53 * hash) + getLevelupRewardGotLevelListList().hashCode(); + } if (getSeenModuleIdListCount() > 0) { hash = (37 * hash) + SEEN_MODULE_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getSeenModuleIdListList().hashCode(); @@ -625,9 +625,9 @@ public final class PlayerHomeCompInfoOuterClass { @java.lang.Override public Builder clear() { super.clear(); - levelupRewardGotLevelList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); unlockedModuleIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + levelupRewardGotLevelList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); seenModuleIdList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); @@ -661,15 +661,15 @@ public final class PlayerHomeCompInfoOuterClass { emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo result = new emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - levelupRewardGotLevelList_.makeImmutable(); + unlockedModuleIdList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.levelupRewardGotLevelList_ = levelupRewardGotLevelList_; + result.unlockedModuleIdList_ = unlockedModuleIdList_; if (((bitField0_ & 0x00000002) != 0)) { - unlockedModuleIdList_.makeImmutable(); + levelupRewardGotLevelList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.unlockedModuleIdList_ = unlockedModuleIdList_; + result.levelupRewardGotLevelList_ = levelupRewardGotLevelList_; if (((bitField0_ & 0x00000004) != 0)) { seenModuleIdList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000004); @@ -724,26 +724,26 @@ public final class PlayerHomeCompInfoOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo other) { if (other == emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.getDefaultInstance()) return this; - if (!other.levelupRewardGotLevelList_.isEmpty()) { - if (levelupRewardGotLevelList_.isEmpty()) { - levelupRewardGotLevelList_ = other.levelupRewardGotLevelList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureLevelupRewardGotLevelListIsMutable(); - levelupRewardGotLevelList_.addAll(other.levelupRewardGotLevelList_); - } - onChanged(); - } if (!other.unlockedModuleIdList_.isEmpty()) { if (unlockedModuleIdList_.isEmpty()) { unlockedModuleIdList_ = other.unlockedModuleIdList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureUnlockedModuleIdListIsMutable(); unlockedModuleIdList_.addAll(other.unlockedModuleIdList_); } onChanged(); } + if (!other.levelupRewardGotLevelList_.isEmpty()) { + if (levelupRewardGotLevelList_.isEmpty()) { + levelupRewardGotLevelList_ = other.levelupRewardGotLevelList_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureLevelupRewardGotLevelListIsMutable(); + levelupRewardGotLevelList_.addAll(other.levelupRewardGotLevelList_); + } + onChanged(); + } if (!other.seenModuleIdList_.isEmpty()) { if (seenModuleIdList_.isEmpty()) { seenModuleIdList_ = other.seenModuleIdList_; @@ -787,110 +787,31 @@ public final class PlayerHomeCompInfoOuterClass { } private int bitField0_; - private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_ = emptyIntList(); - private void ensureLevelupRewardGotLevelListIsMutable() { + private com.google.protobuf.Internal.IntList unlockedModuleIdList_ = emptyIntList(); + private void ensureUnlockedModuleIdListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - levelupRewardGotLevelList_ = mutableCopy(levelupRewardGotLevelList_); + unlockedModuleIdList_ = mutableCopy(unlockedModuleIdList_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @return A list containing the levelupRewardGotLevelList. - */ - public java.util.List - getLevelupRewardGotLevelListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(levelupRewardGotLevelList_) : levelupRewardGotLevelList_; - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @return The count of levelupRewardGotLevelList. - */ - public int getLevelupRewardGotLevelListCount() { - return levelupRewardGotLevelList_.size(); - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @param index The index of the element to return. - * @return The levelupRewardGotLevelList at the given index. - */ - public int getLevelupRewardGotLevelList(int index) { - return levelupRewardGotLevelList_.getInt(index); - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @param index The index to set the value at. - * @param value The levelupRewardGotLevelList to set. - * @return This builder for chaining. - */ - public Builder setLevelupRewardGotLevelList( - int index, int value) { - ensureLevelupRewardGotLevelListIsMutable(); - levelupRewardGotLevelList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @param value The levelupRewardGotLevelList to add. - * @return This builder for chaining. - */ - public Builder addLevelupRewardGotLevelList(int value) { - ensureLevelupRewardGotLevelListIsMutable(); - levelupRewardGotLevelList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @param values The levelupRewardGotLevelList to add. - * @return This builder for chaining. - */ - public Builder addAllLevelupRewardGotLevelList( - java.lang.Iterable values) { - ensureLevelupRewardGotLevelListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, levelupRewardGotLevelList_); - onChanged(); - return this; - } - /** - * repeated uint32 levelup_reward_got_level_list = 3; - * @return This builder for chaining. - */ - public Builder clearLevelupRewardGotLevelList() { - levelupRewardGotLevelList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - - private com.google.protobuf.Internal.IntList unlockedModuleIdList_ = emptyIntList(); - private void ensureUnlockedModuleIdListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - unlockedModuleIdList_ = mutableCopy(unlockedModuleIdList_); - bitField0_ |= 0x00000002; - } - } - /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @return A list containing the unlockedModuleIdList. */ public java.util.List getUnlockedModuleIdListList() { - return ((bitField0_ & 0x00000002) != 0) ? + return ((bitField0_ & 0x00000001) != 0) ? java.util.Collections.unmodifiableList(unlockedModuleIdList_) : unlockedModuleIdList_; } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @return The count of unlockedModuleIdList. */ public int getUnlockedModuleIdListCount() { return unlockedModuleIdList_.size(); } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @param index The index of the element to return. * @return The unlockedModuleIdList at the given index. */ @@ -898,7 +819,7 @@ public final class PlayerHomeCompInfoOuterClass { return unlockedModuleIdList_.getInt(index); } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @param index The index to set the value at. * @param value The unlockedModuleIdList to set. * @return This builder for chaining. @@ -911,7 +832,7 @@ public final class PlayerHomeCompInfoOuterClass { return this; } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @param value The unlockedModuleIdList to add. * @return This builder for chaining. */ @@ -922,7 +843,7 @@ public final class PlayerHomeCompInfoOuterClass { return this; } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @param values The unlockedModuleIdList to add. * @return This builder for chaining. */ @@ -935,11 +856,90 @@ public final class PlayerHomeCompInfoOuterClass { return this; } /** - * repeated uint32 unlocked_module_id_list = 10; + * repeated uint32 unlocked_module_id_list = 3; * @return This builder for chaining. */ public Builder clearUnlockedModuleIdList() { unlockedModuleIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_ = emptyIntList(); + private void ensureLevelupRewardGotLevelListIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + levelupRewardGotLevelList_ = mutableCopy(levelupRewardGotLevelList_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @return A list containing the levelupRewardGotLevelList. + */ + public java.util.List + getLevelupRewardGotLevelListList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(levelupRewardGotLevelList_) : levelupRewardGotLevelList_; + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @return The count of levelupRewardGotLevelList. + */ + public int getLevelupRewardGotLevelListCount() { + return levelupRewardGotLevelList_.size(); + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @param index The index of the element to return. + * @return The levelupRewardGotLevelList at the given index. + */ + public int getLevelupRewardGotLevelList(int index) { + return levelupRewardGotLevelList_.getInt(index); + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @param index The index to set the value at. + * @param value The levelupRewardGotLevelList to set. + * @return This builder for chaining. + */ + public Builder setLevelupRewardGotLevelList( + int index, int value) { + ensureLevelupRewardGotLevelListIsMutable(); + levelupRewardGotLevelList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @param value The levelupRewardGotLevelList to add. + * @return This builder for chaining. + */ + public Builder addLevelupRewardGotLevelList(int value) { + ensureLevelupRewardGotLevelListIsMutable(); + levelupRewardGotLevelList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @param values The levelupRewardGotLevelList to add. + * @return This builder for chaining. + */ + public Builder addAllLevelupRewardGotLevelList( + java.lang.Iterable values) { + ensureLevelupRewardGotLevelListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, levelupRewardGotLevelList_); + onChanged(); + return this; + } + /** + * repeated uint32 levelup_reward_got_level_list = 10; + * @return This builder for chaining. + */ + public Builder clearLevelupRewardGotLevelList() { + levelupRewardGotLevelList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; @@ -1145,9 +1145,9 @@ public final class PlayerHomeCompInfoOuterClass { static { java.lang.String[] descriptorData = { "\n\030PlayerHomeCompInfo.proto\032\033FriendEnterH" + - "omeOption.proto\"\263\001\n\022PlayerHomeCompInfo\022%" + - "\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" + + "omeOption.proto\"\263\001\n\022PlayerHomeCompInfo\022\037" + + "\n\027unlocked_module_id_list\030\003 \003(\r\022%\n\035level" + + "up_reward_got_level_list\030\n \003(\r\022\033\n\023seen_m" + "odule_id_list\030\010 \003(\r\0228\n\030friend_enter_home" + "_option\030\017 \001(\0162\026.FriendEnterHomeOptionB\033\n" + "\031emu.grasscutter.net.protob\006proto3" @@ -1162,7 +1162,7 @@ public final class PlayerHomeCompInfoOuterClass { internal_static_PlayerHomeCompInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerHomeCompInfo_descriptor, - new java.lang.String[] { "LevelupRewardGotLevelList", "UnlockedModuleIdList", "SeenModuleIdList", "FriendEnterHomeOption", }); + new java.lang.String[] { "UnlockedModuleIdList", "LevelupRewardGotLevelList", "SeenModuleIdList", "FriendEnterHomeOption", }); emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.getDescriptor(); } 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 02bba4a2a..dd3bb8ffd 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java @@ -131,10 +131,10 @@ public final class PlayerLoginRspOuterClass { boolean getFBFJPEPMAOF(); /** - * bool DHMNOPIMOOE = 14; - * @return The dHMNOPIMOOE. + * bool is_use_ability_hash = 14; + * @return The isUseAbilityHash. */ - boolean getDHMNOPIMOOE(); + boolean getIsUseAbilityHash(); /** * bool is_audit = 335; @@ -203,10 +203,10 @@ public final class PlayerLoginRspOuterClass { int getClientSilenceDataVersion(); /** - * bool is_use_ability_hash = 2; - * @return The isUseAbilityHash. + * bool PKKKINOCFMJ = 2; + * @return The pKKKINOCFMJ. */ - boolean getIsUseAbilityHash(); + boolean getPKKKINOCFMJ(); /** * int32 retcode = 8; @@ -486,7 +486,7 @@ public final class PlayerLoginRspOuterClass { break; case 16: { - isUseAbilityHash_ = input.readBool(); + pKKKINOCFMJ_ = input.readBool(); break; } case 24: { @@ -550,7 +550,7 @@ public final class PlayerLoginRspOuterClass { } case 112: { - dHMNOPIMOOE_ = input.readBool(); + isUseAbilityHash_ = input.readBool(); break; } case 120: { @@ -1031,15 +1031,15 @@ public final class PlayerLoginRspOuterClass { return fBFJPEPMAOF_; } - public static final int DHMNOPIMOOE_FIELD_NUMBER = 14; - private boolean dHMNOPIMOOE_; + public static final int IS_USE_ABILITY_HASH_FIELD_NUMBER = 14; + private boolean isUseAbilityHash_; /** - * bool DHMNOPIMOOE = 14; - * @return The dHMNOPIMOOE. + * bool is_use_ability_hash = 14; + * @return The isUseAbilityHash. */ @java.lang.Override - public boolean getDHMNOPIMOOE() { - return dHMNOPIMOOE_; + public boolean getIsUseAbilityHash() { + return isUseAbilityHash_; } public static final int IS_AUDIT_FIELD_NUMBER = 335; @@ -1191,15 +1191,15 @@ public final class PlayerLoginRspOuterClass { return clientSilenceDataVersion_; } - public static final int IS_USE_ABILITY_HASH_FIELD_NUMBER = 2; - private boolean isUseAbilityHash_; + public static final int PKKKINOCFMJ_FIELD_NUMBER = 2; + private boolean pKKKINOCFMJ_; /** - * bool is_use_ability_hash = 2; - * @return The isUseAbilityHash. + * bool PKKKINOCFMJ = 2; + * @return The pKKKINOCFMJ. */ @java.lang.Override - public boolean getIsUseAbilityHash() { - return isUseAbilityHash_; + public boolean getPKKKINOCFMJ() { + return pKKKINOCFMJ_; } public static final int RETCODE_FIELD_NUMBER = 8; @@ -1713,8 +1713,8 @@ public final class PlayerLoginRspOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (isUseAbilityHash_ != false) { - output.writeBool(2, isUseAbilityHash_); + if (pKKKINOCFMJ_ != false) { + output.writeBool(2, pKKKINOCFMJ_); } if (loginRand_ != 0L) { output.writeUInt64(3, loginRand_); @@ -1749,8 +1749,8 @@ public final class PlayerLoginRspOuterClass { if (!playerData_.isEmpty()) { output.writeBytes(13, playerData_); } - if (dHMNOPIMOOE_ != false) { - output.writeBool(14, dHMNOPIMOOE_); + if (isUseAbilityHash_ != false) { + output.writeBool(14, isUseAbilityHash_); } if (fBFJPEPMAOF_ != false) { output.writeBool(15, fBFJPEPMAOF_); @@ -1839,9 +1839,9 @@ public final class PlayerLoginRspOuterClass { if (size != -1) return size; size = 0; - if (isUseAbilityHash_ != false) { + if (pKKKINOCFMJ_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, isUseAbilityHash_); + .computeBoolSize(2, pKKKINOCFMJ_); } if (loginRand_ != 0L) { size += com.google.protobuf.CodedOutputStream @@ -1888,9 +1888,9 @@ public final class PlayerLoginRspOuterClass { size += com.google.protobuf.CodedOutputStream .computeBytesSize(13, playerData_); } - if (dHMNOPIMOOE_ != false) { + if (isUseAbilityHash_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(14, dHMNOPIMOOE_); + .computeBoolSize(14, isUseAbilityHash_); } if (fBFJPEPMAOF_ != false) { size += com.google.protobuf.CodedOutputStream @@ -2022,8 +2022,8 @@ public final class PlayerLoginRspOuterClass { .equals(other.getShortAbilityHashMapList())) return false; if (getFBFJPEPMAOF() != other.getFBFJPEPMAOF()) return false; - if (getDHMNOPIMOOE() - != other.getDHMNOPIMOOE()) return false; + if (getIsUseAbilityHash() + != other.getIsUseAbilityHash()) return false; if (getIsAudit() != other.getIsAudit()) return false; if (!getClientSilenceMd5() @@ -2036,8 +2036,8 @@ public final class PlayerLoginRspOuterClass { != other.getDNHHIMENOLD()) return false; if (getClientSilenceDataVersion() != other.getClientSilenceDataVersion()) return false; - if (getIsUseAbilityHash() - != other.getIsUseAbilityHash()) return false; + if (getPKKKINOCFMJ() + != other.getPKKKINOCFMJ()) return false; if (getRetcode() != other.getRetcode()) return false; if (getClientDataVersion() @@ -2124,9 +2124,9 @@ public final class PlayerLoginRspOuterClass { hash = (37 * hash) + FBFJPEPMAOF_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getFBFJPEPMAOF()); - hash = (37 * hash) + DHMNOPIMOOE_FIELD_NUMBER; + hash = (37 * hash) + IS_USE_ABILITY_HASH_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getDHMNOPIMOOE()); + getIsUseAbilityHash()); hash = (37 * hash) + IS_AUDIT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsAudit()); @@ -2143,9 +2143,9 @@ public final class PlayerLoginRspOuterClass { getDNHHIMENOLD()); hash = (37 * hash) + CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER; hash = (53 * hash) + getClientSilenceDataVersion(); - hash = (37 * hash) + IS_USE_ABILITY_HASH_FIELD_NUMBER; + hash = (37 * hash) + PKKKINOCFMJ_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsUseAbilityHash()); + getPKKKINOCFMJ()); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER; @@ -2385,7 +2385,7 @@ public final class PlayerLoginRspOuterClass { } fBFJPEPMAOF_ = false; - dHMNOPIMOOE_ = false; + isUseAbilityHash_ = false; isAudit_ = false; @@ -2403,7 +2403,7 @@ public final class PlayerLoginRspOuterClass { clientSilenceDataVersion_ = 0; - isUseAbilityHash_ = false; + pKKKINOCFMJ_ = false; retcode_ = 0; @@ -2501,7 +2501,7 @@ public final class PlayerLoginRspOuterClass { result.shortAbilityHashMap_ = shortAbilityHashMapBuilder_.build(); } result.fBFJPEPMAOF_ = fBFJPEPMAOF_; - result.dHMNOPIMOOE_ = dHMNOPIMOOE_; + result.isUseAbilityHash_ = isUseAbilityHash_; result.isAudit_ = isAudit_; result.clientSilenceMd5_ = clientSilenceMd5_; result.msg_ = msg_; @@ -2516,7 +2516,7 @@ public final class PlayerLoginRspOuterClass { } result.dNHHIMENOLD_ = dNHHIMENOLD_; result.clientSilenceDataVersion_ = clientSilenceDataVersion_; - result.isUseAbilityHash_ = isUseAbilityHash_; + result.pKKKINOCFMJ_ = pKKKINOCFMJ_; result.retcode_ = retcode_; result.clientDataVersion_ = clientDataVersion_; result.birthday_ = birthday_; @@ -2649,8 +2649,8 @@ public final class PlayerLoginRspOuterClass { if (other.getFBFJPEPMAOF() != false) { setFBFJPEPMAOF(other.getFBFJPEPMAOF()); } - if (other.getDHMNOPIMOOE() != false) { - setDHMNOPIMOOE(other.getDHMNOPIMOOE()); + if (other.getIsUseAbilityHash() != false) { + setIsUseAbilityHash(other.getIsUseAbilityHash()); } if (other.getIsAudit() != false) { setIsAudit(other.getIsAudit()); @@ -2695,8 +2695,8 @@ public final class PlayerLoginRspOuterClass { if (other.getClientSilenceDataVersion() != 0) { setClientSilenceDataVersion(other.getClientSilenceDataVersion()); } - if (other.getIsUseAbilityHash() != false) { - setIsUseAbilityHash(other.getIsUseAbilityHash()); + if (other.getPKKKINOCFMJ() != false) { + setPKKKINOCFMJ(other.getPKKKINOCFMJ()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); @@ -3468,33 +3468,33 @@ public final class PlayerLoginRspOuterClass { return this; } - private boolean dHMNOPIMOOE_ ; + private boolean isUseAbilityHash_ ; /** - * bool DHMNOPIMOOE = 14; - * @return The dHMNOPIMOOE. + * bool is_use_ability_hash = 14; + * @return The isUseAbilityHash. */ @java.lang.Override - public boolean getDHMNOPIMOOE() { - return dHMNOPIMOOE_; + public boolean getIsUseAbilityHash() { + return isUseAbilityHash_; } /** - * bool DHMNOPIMOOE = 14; - * @param value The dHMNOPIMOOE to set. + * bool is_use_ability_hash = 14; + * @param value The isUseAbilityHash to set. * @return This builder for chaining. */ - public Builder setDHMNOPIMOOE(boolean value) { + public Builder setIsUseAbilityHash(boolean value) { - dHMNOPIMOOE_ = value; + isUseAbilityHash_ = value; onChanged(); return this; } /** - * bool DHMNOPIMOOE = 14; + * bool is_use_ability_hash = 14; * @return This builder for chaining. */ - public Builder clearDHMNOPIMOOE() { + public Builder clearIsUseAbilityHash() { - dHMNOPIMOOE_ = false; + isUseAbilityHash_ = false; onChanged(); return this; } @@ -3984,33 +3984,33 @@ public final class PlayerLoginRspOuterClass { return this; } - private boolean isUseAbilityHash_ ; + private boolean pKKKINOCFMJ_ ; /** - * bool is_use_ability_hash = 2; - * @return The isUseAbilityHash. + * bool PKKKINOCFMJ = 2; + * @return The pKKKINOCFMJ. */ @java.lang.Override - public boolean getIsUseAbilityHash() { - return isUseAbilityHash_; + public boolean getPKKKINOCFMJ() { + return pKKKINOCFMJ_; } /** - * bool is_use_ability_hash = 2; - * @param value The isUseAbilityHash to set. + * bool PKKKINOCFMJ = 2; + * @param value The pKKKINOCFMJ to set. * @return This builder for chaining. */ - public Builder setIsUseAbilityHash(boolean value) { + public Builder setPKKKINOCFMJ(boolean value) { - isUseAbilityHash_ = value; + pKKKINOCFMJ_ = value; onChanged(); return this; } /** - * bool is_use_ability_hash = 2; + * bool PKKKINOCFMJ = 2; * @return This builder for chaining. */ - public Builder clearIsUseAbilityHash() { + public Builder clearPKKKINOCFMJ() { - isUseAbilityHash_ = false; + pKKKINOCFMJ_ = false; onChanged(); return this; } @@ -5359,12 +5359,12 @@ public final class PlayerLoginRspOuterClass { "d_relogin\030\311\017 \001(\010\022\020\n\010game_biz\030\004 \001(\t\022\031\n\021ab" + "ility_hash_code\030\005 \001(\005\0226\n\026short_ability_h" + "ash_map\030\335\n \003(\0132\025.ShortAbilityHashPair\022\023\n" + - "\013FBFJPEPMAOF\030\017 \001(\010\022\023\n\013DHMNOPIMOOE\030\016 \001(\010\022" + - "\021\n\010is_audit\030\317\002 \001(\010\022\033\n\022client_silence_md5" + - "\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\033\n\023is_use_ability_hash\030\002 \001(" + + "\013FBFJPEPMAOF\030\017 \001(\010\022\033\n\023is_use_ability_has" + + "h\030\016 \001(\010\022\021\n\010is_audit\030\317\002 \001(\010\022\033\n\022client_sil" + + "ence_md5\030\220\006 \001(\t\022\013\n\003msg\030+ \001(\t\0223\n\027feature_" + + "block_info_list\030\333\014 \003(\0132\021.FeatureBlockInf" + + "o\022\024\n\013DNHHIMENOLD\030\333\n \001(\010\022#\n\033client_silenc" + + "e_data_version\030\006 \001(\r\022\023\n\013PKKKINOCFMJ\030\002 \001(" + "\010\022\017\n\007retcode\030\010 \001(\005\022\033\n\023client_data_versio" + "n\030\014 \001(\r\022\021\n\010birthday\030\230\r \001(\t\022\024\n\013BOKKNHEOKP" + "D\030\354\004 \001(\010\022\022\n\ntarget_uid\030\t \001(\r\022:\n\016block_in" + @@ -5399,7 +5399,7 @@ public final class PlayerLoginRspOuterClass { internal_static_PlayerLoginRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerLoginRsp_descriptor, - new java.lang.String[] { "ClientVersionSuffix", "AbilityHashMap", "IsTransfer", "TargetHomeOwnerUid", "IsDataNeedRelogin", "GameBiz", "AbilityHashCode", "ShortAbilityHashMap", "FBFJPEPMAOF", "DHMNOPIMOOE", "IsAudit", "ClientSilenceMd5", "Msg", "FeatureBlockInfoList", "DNHHIMENOLD", "ClientSilenceDataVersion", "IsUseAbilityHash", "Retcode", "ClientDataVersion", "Birthday", "BOKKNHEOKPD", "TargetUid", "BlockInfoMap", "GOFGOCDJDND", "NextResourceUrl", "ResVersionConfig", "TotalTickTime", "PlayerData", "ScInfo", "LoginRand", "ENNOCBNIHIK", "CountryCode", "PlayerDataVersion", "ClientSilenceVersionSuffix", "ECKNMCACJKG", "ClientMd5", "NextResVersionConfig", }); + new java.lang.String[] { "ClientVersionSuffix", "AbilityHashMap", "IsTransfer", "TargetHomeOwnerUid", "IsDataNeedRelogin", "GameBiz", "AbilityHashCode", "ShortAbilityHashMap", "FBFJPEPMAOF", "IsUseAbilityHash", "IsAudit", "ClientSilenceMd5", "Msg", "FeatureBlockInfoList", "DNHHIMENOLD", "ClientSilenceDataVersion", "PKKKINOCFMJ", "Retcode", "ClientDataVersion", "Birthday", "BOKKNHEOKPD", "TargetUid", "BlockInfoMap", "GOFGOCDJDND", "NextResourceUrl", "ResVersionConfig", "TotalTickTime", "PlayerData", "ScInfo", "LoginRand", "ENNOCBNIHIK", "CountryCode", "PlayerDataVersion", "ClientSilenceVersionSuffix", "ECKNMCACJKG", "ClientMd5", "NextResVersionConfig", }); internal_static_PlayerLoginRsp_AbilityHashMapEntry_descriptor = internal_static_PlayerLoginRsp_descriptor.getNestedTypes().get(0); internal_static_PlayerLoginRsp_AbilityHashMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java index 1d9bc26ca..5ac6c07a2 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java @@ -19,19 +19,19 @@ public final class PlayerWorldSceneInfoOuterClass { com.google.protobuf.MessageOrBuilder { /** - * .NHFPBBLCHKH DCGPONECHMM = 1; - * @return Whether the dCGPONECHMM field is set. + * .MapLayerInfo map_layer_info = 1; + * @return Whether the mapLayerInfo field is set. */ - boolean hasDCGPONECHMM(); + boolean hasMapLayerInfo(); /** - * .NHFPBBLCHKH DCGPONECHMM = 1; - * @return The dCGPONECHMM. + * .MapLayerInfo map_layer_info = 1; + * @return The mapLayerInfo. */ - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM(); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo(); /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder(); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder(); /** * uint32 scene_id = 12; @@ -114,14 +114,14 @@ public final class PlayerWorldSceneInfoOuterClass { done = true; break; case 10: { - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder subBuilder = null; - if (dCGPONECHMM_ != null) { - subBuilder = dCGPONECHMM_.toBuilder(); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null; + if (mapLayerInfo_ != null) { + subBuilder = mapLayerInfo_.toBuilder(); } - dCGPONECHMM_ = input.readMessage(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.parser(), extensionRegistry); + mapLayerInfo_ = input.readMessage(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(dCGPONECHMM_); - dCGPONECHMM_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(mapLayerInfo_); + mapLayerInfo_ = subBuilder.buildPartial(); } break; @@ -192,30 +192,30 @@ public final class PlayerWorldSceneInfoOuterClass { emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.class, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder.class); } - public static final int DCGPONECHMM_FIELD_NUMBER = 1; - private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_; + public static final int MAP_LAYER_INFO_FIELD_NUMBER = 1; + private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_; /** - * .NHFPBBLCHKH DCGPONECHMM = 1; - * @return Whether the dCGPONECHMM field is set. + * .MapLayerInfo map_layer_info = 1; + * @return Whether the mapLayerInfo field is set. */ @java.lang.Override - public boolean hasDCGPONECHMM() { - return dCGPONECHMM_ != null; + public boolean hasMapLayerInfo() { + return mapLayerInfo_ != null; } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; - * @return The dCGPONECHMM. + * .MapLayerInfo map_layer_info = 1; + * @return The mapLayerInfo. */ @java.lang.Override - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() { - return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_; + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() { + return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_; } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() { - return getDCGPONECHMM(); + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() { + return getMapLayerInfo(); } public static final int SCENE_ID_FIELD_NUMBER = 12; @@ -283,8 +283,8 @@ public final class PlayerWorldSceneInfoOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (dCGPONECHMM_ != null) { - output.writeMessage(1, getDCGPONECHMM()); + if (mapLayerInfo_ != null) { + output.writeMessage(1, getMapLayerInfo()); } if (isLocked_ != false) { output.writeBool(2, isLocked_); @@ -308,9 +308,9 @@ public final class PlayerWorldSceneInfoOuterClass { if (size != -1) return size; size = 0; - if (dCGPONECHMM_ != null) { + if (mapLayerInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getDCGPONECHMM()); + .computeMessageSize(1, getMapLayerInfo()); } if (isLocked_ != false) { size += com.google.protobuf.CodedOutputStream @@ -349,10 +349,10 @@ public final class PlayerWorldSceneInfoOuterClass { } emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo other = (emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo) obj; - if (hasDCGPONECHMM() != other.hasDCGPONECHMM()) return false; - if (hasDCGPONECHMM()) { - if (!getDCGPONECHMM() - .equals(other.getDCGPONECHMM())) return false; + if (hasMapLayerInfo() != other.hasMapLayerInfo()) return false; + if (hasMapLayerInfo()) { + if (!getMapLayerInfo() + .equals(other.getMapLayerInfo())) return false; } if (getSceneId() != other.getSceneId()) return false; @@ -371,9 +371,9 @@ public final class PlayerWorldSceneInfoOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasDCGPONECHMM()) { - hash = (37 * hash) + DCGPONECHMM_FIELD_NUMBER; - hash = (53 * hash) + getDCGPONECHMM().hashCode(); + if (hasMapLayerInfo()) { + hash = (37 * hash) + MAP_LAYER_INFO_FIELD_NUMBER; + hash = (53 * hash) + getMapLayerInfo().hashCode(); } hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); @@ -521,11 +521,11 @@ public final class PlayerWorldSceneInfoOuterClass { @java.lang.Override public Builder clear() { super.clear(); - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMM_ = null; + if (mapLayerInfoBuilder_ == null) { + mapLayerInfo_ = null; } else { - dCGPONECHMM_ = null; - dCGPONECHMMBuilder_ = null; + mapLayerInfo_ = null; + mapLayerInfoBuilder_ = null; } sceneId_ = 0; @@ -560,10 +560,10 @@ public final class PlayerWorldSceneInfoOuterClass { public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo buildPartial() { emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo result = new emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo(this); int from_bitField0_ = bitField0_; - if (dCGPONECHMMBuilder_ == null) { - result.dCGPONECHMM_ = dCGPONECHMM_; + if (mapLayerInfoBuilder_ == null) { + result.mapLayerInfo_ = mapLayerInfo_; } else { - result.dCGPONECHMM_ = dCGPONECHMMBuilder_.build(); + result.mapLayerInfo_ = mapLayerInfoBuilder_.build(); } result.sceneId_ = sceneId_; result.isLocked_ = isLocked_; @@ -620,8 +620,8 @@ public final class PlayerWorldSceneInfoOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo other) { if (other == emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.getDefaultInstance()) return this; - if (other.hasDCGPONECHMM()) { - mergeDCGPONECHMM(other.getDCGPONECHMM()); + if (other.hasMapLayerInfo()) { + mergeMapLayerInfo(other.getMapLayerInfo()); } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); @@ -669,123 +669,123 @@ public final class PlayerWorldSceneInfoOuterClass { } private int bitField0_; - private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_; + private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> dCGPONECHMMBuilder_; + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> mapLayerInfoBuilder_; /** - * .NHFPBBLCHKH DCGPONECHMM = 1; - * @return Whether the dCGPONECHMM field is set. + * .MapLayerInfo map_layer_info = 1; + * @return Whether the mapLayerInfo field is set. */ - public boolean hasDCGPONECHMM() { - return dCGPONECHMMBuilder_ != null || dCGPONECHMM_ != null; + public boolean hasMapLayerInfo() { + return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null; } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; - * @return The dCGPONECHMM. + * .MapLayerInfo map_layer_info = 1; + * @return The mapLayerInfo. */ - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() { - if (dCGPONECHMMBuilder_ == null) { - return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_; + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() { + if (mapLayerInfoBuilder_ == null) { + return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_; } else { - return dCGPONECHMMBuilder_.getMessage(); + return mapLayerInfoBuilder_.getMessage(); } } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ - public Builder setDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) { - if (dCGPONECHMMBuilder_ == null) { + public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) { + if (mapLayerInfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - dCGPONECHMM_ = value; + mapLayerInfo_ = value; onChanged(); } else { - dCGPONECHMMBuilder_.setMessage(value); + mapLayerInfoBuilder_.setMessage(value); } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ - public Builder setDCGPONECHMM( - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder builderForValue) { - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMM_ = builderForValue.build(); + public Builder setMapLayerInfo( + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder builderForValue) { + if (mapLayerInfoBuilder_ == null) { + mapLayerInfo_ = builderForValue.build(); onChanged(); } else { - dCGPONECHMMBuilder_.setMessage(builderForValue.build()); + mapLayerInfoBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ - public Builder mergeDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) { - if (dCGPONECHMMBuilder_ == null) { - if (dCGPONECHMM_ != null) { - dCGPONECHMM_ = - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.newBuilder(dCGPONECHMM_).mergeFrom(value).buildPartial(); + public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) { + if (mapLayerInfoBuilder_ == null) { + if (mapLayerInfo_ != null) { + mapLayerInfo_ = + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.newBuilder(mapLayerInfo_).mergeFrom(value).buildPartial(); } else { - dCGPONECHMM_ = value; + mapLayerInfo_ = value; } onChanged(); } else { - dCGPONECHMMBuilder_.mergeFrom(value); + mapLayerInfoBuilder_.mergeFrom(value); } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ - public Builder clearDCGPONECHMM() { - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMM_ = null; + public Builder clearMapLayerInfo() { + if (mapLayerInfoBuilder_ == null) { + mapLayerInfo_ = null; onChanged(); } else { - dCGPONECHMM_ = null; - dCGPONECHMMBuilder_ = null; + mapLayerInfo_ = null; + mapLayerInfoBuilder_ = null; } return this; } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder getDCGPONECHMMBuilder() { + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() { onChanged(); - return getDCGPONECHMMFieldBuilder().getBuilder(); + return getMapLayerInfoFieldBuilder().getBuilder(); } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ - public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() { - if (dCGPONECHMMBuilder_ != null) { - return dCGPONECHMMBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() { + if (mapLayerInfoBuilder_ != null) { + return mapLayerInfoBuilder_.getMessageOrBuilder(); } else { - return dCGPONECHMM_ == null ? - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_; + return mapLayerInfo_ == null ? + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_; } } /** - * .NHFPBBLCHKH DCGPONECHMM = 1; + * .MapLayerInfo map_layer_info = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> - getDCGPONECHMMFieldBuilder() { - if (dCGPONECHMMBuilder_ == null) { - dCGPONECHMMBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder>( - getDCGPONECHMM(), + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> + getMapLayerInfoFieldBuilder() { + if (mapLayerInfoBuilder_ == null) { + mapLayerInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder>( + getMapLayerInfo(), getParentForChildren(), isClean()); - dCGPONECHMM_ = null; + mapLayerInfo_ = null; } - return dCGPONECHMMBuilder_; + return mapLayerInfoBuilder_; } private int sceneId_ ; @@ -995,25 +995,25 @@ public final class PlayerWorldSceneInfoOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\032PlayerWorldSceneInfo.proto\032\021NHFPBBLCHK" + - "H.proto\"y\n\024PlayerWorldSceneInfo\022!\n\013DCGPO" + - "NECHMM\030\001 \001(\0132\014.NHFPBBLCHKH\022\020\n\010scene_id\030\014" + - " \001(\r\022\021\n\tis_locked\030\002 \001(\010\022\031\n\021scene_tag_id_" + - "list\030\007 \003(\rB\033\n\031emu.grasscutter.net.protob" + - "\006proto3" + "\n\032PlayerWorldSceneInfo.proto\032\022MapLayerIn" + + "fo.proto\"}\n\024PlayerWorldSceneInfo\022%\n\016map_" + + "layer_info\030\001 \001(\0132\r.MapLayerInfo\022\020\n\010scene" + + "_id\030\014 \001(\r\022\021\n\tis_locked\030\002 \001(\010\022\031\n\021scene_ta" + + "g_id_list\030\007 \003(\rB\033\n\031emu.grasscutter.net.p" + + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor(), + emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor(), }); internal_static_PlayerWorldSceneInfo_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_PlayerWorldSceneInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerWorldSceneInfo_descriptor, - new java.lang.String[] { "DCGPONECHMM", "SceneId", "IsLocked", "SceneTagIdList", }); - emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor(); + new java.lang.String[] { "MapLayerInfo", "SceneId", "IsLocked", "SceneTagIdList", }); + emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) 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 f3b29cf52..18ce73e26 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QueryCodexMonsterBeKilledNumRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryCodexMonsterBeKilledNumRspOuterClass.java @@ -19,39 +19,39 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 be_captured_num_list = 12; - * @return A list containing the beCapturedNumList. - */ - java.util.List getBeCapturedNumListList(); - /** - * repeated uint32 be_captured_num_list = 12; - * @return The count of beCapturedNumList. - */ - int getBeCapturedNumListCount(); - /** - * repeated uint32 be_captured_num_list = 12; - * @param index The index of the element to return. - * @return The beCapturedNumList at the given index. - */ - int getBeCapturedNumList(int index); - - /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @return A list containing the beKilledNumList. */ java.util.List getBeKilledNumListList(); /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @return The count of beKilledNumList. */ int getBeKilledNumListCount(); /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @param index The index of the element to return. * @return The beKilledNumList at the given index. */ int getBeKilledNumList(int index); + /** + * repeated uint32 be_captured_num_list = 8; + * @return A list containing the beCapturedNumList. + */ + java.util.List getBeCapturedNumListList(); + /** + * repeated uint32 be_captured_num_list = 8; + * @return The count of beCapturedNumList. + */ + int getBeCapturedNumListCount(); + /** + * repeated uint32 be_captured_num_list = 8; + * @param index The index of the element to return. + * @return The beCapturedNumList at the given index. + */ + int getBeCapturedNumList(int index); + /** * int32 retcode = 15; * @return The retcode. @@ -93,8 +93,8 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { super(builder); } private QueryCodexMonsterBeKilledNumRsp() { - beCapturedNumList_ = emptyIntList(); beKilledNumList_ = emptyIntList(); + beCapturedNumList_ = emptyIntList(); codexIdList_ = emptyIntList(); } @@ -152,42 +152,42 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { } case 64: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - beKilledNumList_ = newIntList(); + beCapturedNumList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - beKilledNumList_.addInt(input.readUInt32()); + beCapturedNumList_.addInt(input.readUInt32()); break; } case 66: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - beKilledNumList_ = newIntList(); + beCapturedNumList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - beKilledNumList_.addInt(input.readUInt32()); + beCapturedNumList_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 96: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - beCapturedNumList_ = newIntList(); + beKilledNumList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - beCapturedNumList_.addInt(input.readUInt32()); + beKilledNumList_.addInt(input.readUInt32()); break; } case 98: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - beCapturedNumList_ = newIntList(); + beKilledNumList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - beCapturedNumList_.addInt(input.readUInt32()); + beKilledNumList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -216,10 +216,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { codexIdList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - beKilledNumList_.makeImmutable(); // C + beCapturedNumList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000001) != 0)) { - beCapturedNumList_.makeImmutable(); // C + beKilledNumList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -238,38 +238,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.class, emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.Builder.class); } - public static final int BE_CAPTURED_NUM_LIST_FIELD_NUMBER = 12; - private com.google.protobuf.Internal.IntList beCapturedNumList_; - /** - * repeated uint32 be_captured_num_list = 12; - * @return A list containing the beCapturedNumList. - */ - @java.lang.Override - public java.util.List - getBeCapturedNumListList() { - return beCapturedNumList_; - } - /** - * repeated uint32 be_captured_num_list = 12; - * @return The count of beCapturedNumList. - */ - public int getBeCapturedNumListCount() { - return beCapturedNumList_.size(); - } - /** - * repeated uint32 be_captured_num_list = 12; - * @param index The index of the element to return. - * @return The beCapturedNumList at the given index. - */ - public int getBeCapturedNumList(int index) { - return beCapturedNumList_.getInt(index); - } - private int beCapturedNumListMemoizedSerializedSize = -1; - - public static final int BE_KILLED_NUM_LIST_FIELD_NUMBER = 8; + public static final int BE_KILLED_NUM_LIST_FIELD_NUMBER = 12; private com.google.protobuf.Internal.IntList beKilledNumList_; /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @return A list containing the beKilledNumList. */ @java.lang.Override @@ -278,14 +250,14 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { return beKilledNumList_; } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @return The count of beKilledNumList. */ public int getBeKilledNumListCount() { return beKilledNumList_.size(); } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @param index The index of the element to return. * @return The beKilledNumList at the given index. */ @@ -294,6 +266,34 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { } private int beKilledNumListMemoizedSerializedSize = -1; + public static final int BE_CAPTURED_NUM_LIST_FIELD_NUMBER = 8; + private com.google.protobuf.Internal.IntList beCapturedNumList_; + /** + * repeated uint32 be_captured_num_list = 8; + * @return A list containing the beCapturedNumList. + */ + @java.lang.Override + public java.util.List + getBeCapturedNumListList() { + return beCapturedNumList_; + } + /** + * repeated uint32 be_captured_num_list = 8; + * @return The count of beCapturedNumList. + */ + public int getBeCapturedNumListCount() { + return beCapturedNumList_.size(); + } + /** + * repeated uint32 be_captured_num_list = 8; + * @param index The index of the element to return. + * @return The beCapturedNumList at the given index. + */ + public int getBeCapturedNumList(int index) { + return beCapturedNumList_.getInt(index); + } + private int beCapturedNumListMemoizedSerializedSize = -1; + public static final int RETCODE_FIELD_NUMBER = 15; private int retcode_; /** @@ -355,20 +355,20 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { for (int i = 0; i < codexIdList_.size(); i++) { output.writeUInt32NoTag(codexIdList_.getInt(i)); } - if (getBeKilledNumListList().size() > 0) { - output.writeUInt32NoTag(66); - output.writeUInt32NoTag(beKilledNumListMemoizedSerializedSize); - } - for (int i = 0; i < beKilledNumList_.size(); i++) { - output.writeUInt32NoTag(beKilledNumList_.getInt(i)); - } if (getBeCapturedNumListList().size() > 0) { - output.writeUInt32NoTag(98); + output.writeUInt32NoTag(66); output.writeUInt32NoTag(beCapturedNumListMemoizedSerializedSize); } for (int i = 0; i < beCapturedNumList_.size(); i++) { output.writeUInt32NoTag(beCapturedNumList_.getInt(i)); } + if (getBeKilledNumListList().size() > 0) { + output.writeUInt32NoTag(98); + output.writeUInt32NoTag(beKilledNumListMemoizedSerializedSize); + } + for (int i = 0; i < beKilledNumList_.size(); i++) { + output.writeUInt32NoTag(beKilledNumList_.getInt(i)); + } if (retcode_ != 0) { output.writeInt32(15, retcode_); } @@ -395,20 +395,6 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { } codexIdListMemoizedSerializedSize = dataSize; } - { - int dataSize = 0; - for (int i = 0; i < beKilledNumList_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(beKilledNumList_.getInt(i)); - } - size += dataSize; - if (!getBeKilledNumListList().isEmpty()) { - size += 1; - size += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(dataSize); - } - beKilledNumListMemoizedSerializedSize = dataSize; - } { int dataSize = 0; for (int i = 0; i < beCapturedNumList_.size(); i++) { @@ -423,6 +409,20 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { } beCapturedNumListMemoizedSerializedSize = dataSize; } + { + int dataSize = 0; + for (int i = 0; i < beKilledNumList_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(beKilledNumList_.getInt(i)); + } + size += dataSize; + if (!getBeKilledNumListList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + beKilledNumListMemoizedSerializedSize = dataSize; + } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(15, retcode_); @@ -442,10 +442,10 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { } emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp other = (emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp) obj; - if (!getBeCapturedNumListList() - .equals(other.getBeCapturedNumListList())) return false; if (!getBeKilledNumListList() .equals(other.getBeKilledNumListList())) return false; + if (!getBeCapturedNumListList() + .equals(other.getBeCapturedNumListList())) return false; if (getRetcode() != other.getRetcode()) return false; if (!getCodexIdListList() @@ -461,14 +461,14 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getBeCapturedNumListCount() > 0) { - hash = (37 * hash) + BE_CAPTURED_NUM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getBeCapturedNumListList().hashCode(); - } if (getBeKilledNumListCount() > 0) { hash = (37 * hash) + BE_KILLED_NUM_LIST_FIELD_NUMBER; hash = (53 * hash) + getBeKilledNumListList().hashCode(); } + if (getBeCapturedNumListCount() > 0) { + hash = (37 * hash) + BE_CAPTURED_NUM_LIST_FIELD_NUMBER; + hash = (53 * hash) + getBeCapturedNumListList().hashCode(); + } hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); if (getCodexIdListCount() > 0) { @@ -613,9 +613,9 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { @java.lang.Override public Builder clear() { super.clear(); - beCapturedNumList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); beKilledNumList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + beCapturedNumList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); retcode_ = 0; @@ -649,15 +649,15 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp result = new emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - beCapturedNumList_.makeImmutable(); + beKilledNumList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.beCapturedNumList_ = beCapturedNumList_; + result.beKilledNumList_ = beKilledNumList_; if (((bitField0_ & 0x00000002) != 0)) { - beKilledNumList_.makeImmutable(); + beCapturedNumList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.beKilledNumList_ = beKilledNumList_; + result.beCapturedNumList_ = beCapturedNumList_; result.retcode_ = retcode_; if (((bitField0_ & 0x00000004) != 0)) { codexIdList_.makeImmutable(); @@ -712,26 +712,26 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp other) { if (other == emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumRspOuterClass.QueryCodexMonsterBeKilledNumRsp.getDefaultInstance()) return this; - if (!other.beCapturedNumList_.isEmpty()) { - if (beCapturedNumList_.isEmpty()) { - beCapturedNumList_ = other.beCapturedNumList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureBeCapturedNumListIsMutable(); - beCapturedNumList_.addAll(other.beCapturedNumList_); - } - onChanged(); - } if (!other.beKilledNumList_.isEmpty()) { if (beKilledNumList_.isEmpty()) { beKilledNumList_ = other.beKilledNumList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureBeKilledNumListIsMutable(); beKilledNumList_.addAll(other.beKilledNumList_); } onChanged(); } + if (!other.beCapturedNumList_.isEmpty()) { + if (beCapturedNumList_.isEmpty()) { + beCapturedNumList_ = other.beCapturedNumList_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureBeCapturedNumListIsMutable(); + beCapturedNumList_.addAll(other.beCapturedNumList_); + } + onChanged(); + } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } @@ -775,110 +775,31 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { } private int bitField0_; - private com.google.protobuf.Internal.IntList beCapturedNumList_ = emptyIntList(); - private void ensureBeCapturedNumListIsMutable() { + private com.google.protobuf.Internal.IntList beKilledNumList_ = emptyIntList(); + private void ensureBeKilledNumListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - beCapturedNumList_ = mutableCopy(beCapturedNumList_); + beKilledNumList_ = mutableCopy(beKilledNumList_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 be_captured_num_list = 12; - * @return A list containing the beCapturedNumList. - */ - public java.util.List - getBeCapturedNumListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(beCapturedNumList_) : beCapturedNumList_; - } - /** - * repeated uint32 be_captured_num_list = 12; - * @return The count of beCapturedNumList. - */ - public int getBeCapturedNumListCount() { - return beCapturedNumList_.size(); - } - /** - * repeated uint32 be_captured_num_list = 12; - * @param index The index of the element to return. - * @return The beCapturedNumList at the given index. - */ - public int getBeCapturedNumList(int index) { - return beCapturedNumList_.getInt(index); - } - /** - * repeated uint32 be_captured_num_list = 12; - * @param index The index to set the value at. - * @param value The beCapturedNumList to set. - * @return This builder for chaining. - */ - public Builder setBeCapturedNumList( - int index, int value) { - ensureBeCapturedNumListIsMutable(); - beCapturedNumList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 be_captured_num_list = 12; - * @param value The beCapturedNumList to add. - * @return This builder for chaining. - */ - public Builder addBeCapturedNumList(int value) { - ensureBeCapturedNumListIsMutable(); - beCapturedNumList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 be_captured_num_list = 12; - * @param values The beCapturedNumList to add. - * @return This builder for chaining. - */ - public Builder addAllBeCapturedNumList( - java.lang.Iterable values) { - ensureBeCapturedNumListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, beCapturedNumList_); - onChanged(); - return this; - } - /** - * repeated uint32 be_captured_num_list = 12; - * @return This builder for chaining. - */ - public Builder clearBeCapturedNumList() { - beCapturedNumList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - - private com.google.protobuf.Internal.IntList beKilledNumList_ = emptyIntList(); - private void ensureBeKilledNumListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - beKilledNumList_ = mutableCopy(beKilledNumList_); - bitField0_ |= 0x00000002; - } - } - /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @return A list containing the beKilledNumList. */ public java.util.List getBeKilledNumListList() { - return ((bitField0_ & 0x00000002) != 0) ? + return ((bitField0_ & 0x00000001) != 0) ? java.util.Collections.unmodifiableList(beKilledNumList_) : beKilledNumList_; } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @return The count of beKilledNumList. */ public int getBeKilledNumListCount() { return beKilledNumList_.size(); } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @param index The index of the element to return. * @return The beKilledNumList at the given index. */ @@ -886,7 +807,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { return beKilledNumList_.getInt(index); } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @param index The index to set the value at. * @param value The beKilledNumList to set. * @return This builder for chaining. @@ -899,7 +820,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { return this; } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @param value The beKilledNumList to add. * @return This builder for chaining. */ @@ -910,7 +831,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { return this; } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @param values The beKilledNumList to add. * @return This builder for chaining. */ @@ -923,11 +844,90 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { return this; } /** - * repeated uint32 be_killed_num_list = 8; + * repeated uint32 be_killed_num_list = 12; * @return This builder for chaining. */ public Builder clearBeKilledNumList() { beKilledNumList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList beCapturedNumList_ = emptyIntList(); + private void ensureBeCapturedNumListIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + beCapturedNumList_ = mutableCopy(beCapturedNumList_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated uint32 be_captured_num_list = 8; + * @return A list containing the beCapturedNumList. + */ + public java.util.List + getBeCapturedNumListList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(beCapturedNumList_) : beCapturedNumList_; + } + /** + * repeated uint32 be_captured_num_list = 8; + * @return The count of beCapturedNumList. + */ + public int getBeCapturedNumListCount() { + return beCapturedNumList_.size(); + } + /** + * repeated uint32 be_captured_num_list = 8; + * @param index The index of the element to return. + * @return The beCapturedNumList at the given index. + */ + public int getBeCapturedNumList(int index) { + return beCapturedNumList_.getInt(index); + } + /** + * repeated uint32 be_captured_num_list = 8; + * @param index The index to set the value at. + * @param value The beCapturedNumList to set. + * @return This builder for chaining. + */ + public Builder setBeCapturedNumList( + int index, int value) { + ensureBeCapturedNumListIsMutable(); + beCapturedNumList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 be_captured_num_list = 8; + * @param value The beCapturedNumList to add. + * @return This builder for chaining. + */ + public Builder addBeCapturedNumList(int value) { + ensureBeCapturedNumListIsMutable(); + beCapturedNumList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 be_captured_num_list = 8; + * @param values The beCapturedNumList to add. + * @return This builder for chaining. + */ + public Builder addAllBeCapturedNumList( + java.lang.Iterable values) { + ensureBeCapturedNumListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, beCapturedNumList_); + onChanged(); + return this; + } + /** + * repeated uint32 be_captured_num_list = 8; + * @return This builder for chaining. + */ + public Builder clearBeCapturedNumList() { + beCapturedNumList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; @@ -1110,8 +1110,8 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { static { java.lang.String[] descriptorData = { "\n%QueryCodexMonsterBeKilledNumRsp.proto\"" + - "\203\001\n\037QueryCodexMonsterBeKilledNumRsp\022\034\n\024b" + - "e_captured_num_list\030\014 \003(\r\022\032\n\022be_killed_n" + + "\203\001\n\037QueryCodexMonsterBeKilledNumRsp\022\032\n\022b" + + "e_killed_num_list\030\014 \003(\r\022\034\n\024be_captured_n" + "um_list\030\010 \003(\r\022\017\n\007retcode\030\017 \001(\005\022\025\n\rcodex_" + "id_list\030\005 \003(\rB\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" @@ -1125,7 +1125,7 @@ public final class QueryCodexMonsterBeKilledNumRspOuterClass { internal_static_QueryCodexMonsterBeKilledNumRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QueryCodexMonsterBeKilledNumRsp_descriptor, - new java.lang.String[] { "BeCapturedNumList", "BeKilledNumList", "Retcode", "CodexIdList", }); + new java.lang.String[] { "BeKilledNumList", "BeCapturedNumList", "Retcode", "CodexIdList", }); } // @@protoc_insertion_point(outer_class_scope) 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 d22ee5989..8d0c101ca 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java @@ -19,10 +19,6 @@ public final class QueryPathRspOuterClass { com.google.protobuf.MessageOrBuilder { /** - *
-     * Obf: LFJGAFPHNNE
-     * 
- * * int32 query_id = 6; * @return The queryId. */ @@ -59,11 +55,19 @@ public final class QueryPathRspOuterClass { int getRetcode(); /** + *
+     * Obf: LFJGAFPHNNE
+     * 
+ * * .PathStatusType query_status = 15; * @return The enum numeric value on the wire for queryStatus. */ int getQueryStatusValue(); /** + *
+     * Obf: LFJGAFPHNNE
+     * 
+ * * .PathStatusType query_status = 15; * @return The queryStatus. */ @@ -185,10 +189,6 @@ public final class QueryPathRspOuterClass { public static final int QUERY_ID_FIELD_NUMBER = 6; private int queryId_; /** - *
-     * Obf: LFJGAFPHNNE
-     * 
- * * int32 query_id = 6; * @return The queryId. */ @@ -251,6 +251,10 @@ public final class QueryPathRspOuterClass { public static final int QUERY_STATUS_FIELD_NUMBER = 15; private int queryStatus_; /** + *
+     * Obf: LFJGAFPHNNE
+     * 
+ * * .PathStatusType query_status = 15; * @return The enum numeric value on the wire for queryStatus. */ @@ -258,6 +262,10 @@ public final class QueryPathRspOuterClass { return queryStatus_; } /** + *
+     * Obf: LFJGAFPHNNE
+     * 
+ * * .PathStatusType query_status = 15; * @return The queryStatus. */ @@ -666,10 +674,6 @@ public final class QueryPathRspOuterClass { private int queryId_ ; /** - *
-       * Obf: LFJGAFPHNNE
-       * 
- * * int32 query_id = 6; * @return The queryId. */ @@ -678,10 +682,6 @@ public final class QueryPathRspOuterClass { return queryId_; } /** - *
-       * Obf: LFJGAFPHNNE
-       * 
- * * int32 query_id = 6; * @param value The queryId to set. * @return This builder for chaining. @@ -693,10 +693,6 @@ public final class QueryPathRspOuterClass { return this; } /** - *
-       * Obf: LFJGAFPHNNE
-       * 
- * * int32 query_id = 6; * @return This builder for chaining. */ @@ -980,6 +976,10 @@ public final class QueryPathRspOuterClass { private int queryStatus_ = 0; /** + *
+       * Obf: LFJGAFPHNNE
+       * 
+ * * .PathStatusType query_status = 15; * @return The enum numeric value on the wire for queryStatus. */ @@ -987,6 +987,10 @@ public final class QueryPathRspOuterClass { return queryStatus_; } /** + *
+       * Obf: LFJGAFPHNNE
+       * 
+ * * .PathStatusType query_status = 15; * @param value The enum numeric value on the wire for queryStatus to set. * @return This builder for chaining. @@ -998,6 +1002,10 @@ public final class QueryPathRspOuterClass { return this; } /** + *
+       * Obf: LFJGAFPHNNE
+       * 
+ * * .PathStatusType query_status = 15; * @return The queryStatus. */ @@ -1008,6 +1016,10 @@ public final class QueryPathRspOuterClass { return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result; } /** + *
+       * Obf: LFJGAFPHNNE
+       * 
+ * * .PathStatusType query_status = 15; * @param value The queryStatus to set. * @return This builder for chaining. @@ -1022,6 +1034,10 @@ public final class QueryPathRspOuterClass { return this; } /** + *
+       * Obf: LFJGAFPHNNE
+       * 
+ * * .PathStatusType query_status = 15; * @return This builder for chaining. */ @@ -1098,8 +1114,8 @@ public final class QueryPathRspOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\022QueryPathRsp.proto\032\014Vector.proto\032\024Path" + - "StatusType.proto\"r\n\014QueryPathRsp\022\020\n\010quer" + + "\n\022QueryPathRsp.proto\032\024PathStatusType.pro" + + "to\032\014Vector.proto\"r\n\014QueryPathRsp\022\020\n\010quer" + "y_id\030\006 \001(\005\022\030\n\007corners\030\001 \003(\0132\007.Vector\022\017\n\007" + "retcode\030\010 \001(\005\022%\n\014query_status\030\017 \001(\0162\017.Pa" + "thStatusTypeB\033\n\031emu.grasscutter.net.prot" + @@ -1108,8 +1124,8 @@ public final class QueryPathRspOuterClass { descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(), emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor(), + emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(), }); internal_static_QueryPathRsp_descriptor = getDescriptor().getMessageTypes().get(0); @@ -1117,8 +1133,8 @@ public final class QueryPathRspOuterClass { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QueryPathRsp_descriptor, new java.lang.String[] { "QueryId", "Corners", "Retcode", "QueryStatus", }); - emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor(); + emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) 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 073757d26..bf8d712ad 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 cur_append_prop_list = 14; - * @return A list containing the curAppendPropList. + * repeated uint32 old_append_prop_list = 14; + * @return A list containing the oldAppendPropList. */ - java.util.List getCurAppendPropListList(); + java.util.List getOldAppendPropListList(); /** - * repeated uint32 cur_append_prop_list = 14; - * @return The count of curAppendPropList. + * repeated uint32 old_append_prop_list = 14; + * @return The count of oldAppendPropList. */ - int getCurAppendPropListCount(); + int getOldAppendPropListCount(); /** - * repeated uint32 cur_append_prop_list = 14; + * repeated uint32 old_append_prop_list = 14; * @param index The index of the element to return. - * @return The curAppendPropList at the given index. + * @return The oldAppendPropList at the given index. */ - int getCurAppendPropList(int index); + int getOldAppendPropList(int index); /** * uint32 old_level = 8; @@ -54,21 +54,21 @@ public final class ReliquaryUpgradeRspOuterClass { int getOldLevel(); /** - * repeated uint32 old_append_prop_list = 15; - * @return A list containing the oldAppendPropList. + * repeated uint32 cur_append_prop_list = 15; + * @return A list containing the curAppendPropList. */ - java.util.List getOldAppendPropListList(); + java.util.List getCurAppendPropListList(); /** - * repeated uint32 old_append_prop_list = 15; - * @return The count of oldAppendPropList. + * repeated uint32 cur_append_prop_list = 15; + * @return The count of curAppendPropList. */ - int getOldAppendPropListCount(); + int getCurAppendPropListCount(); /** - * repeated uint32 old_append_prop_list = 15; + * repeated uint32 cur_append_prop_list = 15; * @param index The index of the element to return. - * @return The oldAppendPropList at the given index. + * @return The curAppendPropList at the given index. */ - int getOldAppendPropList(int index); + int getCurAppendPropList(int index); /** * uint64 target_reliquary_guid = 5; @@ -100,8 +100,8 @@ public final class ReliquaryUpgradeRspOuterClass { super(builder); } private ReliquaryUpgradeRsp() { - curAppendPropList_ = emptyIntList(); oldAppendPropList_ = emptyIntList(); + curAppendPropList_ = emptyIntList(); } @java.lang.Override @@ -162,42 +162,42 @@ public final class ReliquaryUpgradeRspOuterClass { } case 112: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - curAppendPropList_ = newIntList(); + oldAppendPropList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - curAppendPropList_.addInt(input.readUInt32()); + oldAppendPropList_.addInt(input.readUInt32()); break; } case 114: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - curAppendPropList_ = newIntList(); + oldAppendPropList_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - curAppendPropList_.addInt(input.readUInt32()); + oldAppendPropList_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 120: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - oldAppendPropList_ = newIntList(); + curAppendPropList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - oldAppendPropList_.addInt(input.readUInt32()); + curAppendPropList_.addInt(input.readUInt32()); break; } case 122: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - oldAppendPropList_ = newIntList(); + curAppendPropList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - oldAppendPropList_.addInt(input.readUInt32()); + curAppendPropList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -218,10 +218,10 @@ public final class ReliquaryUpgradeRspOuterClass { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - curAppendPropList_.makeImmutable(); // C + oldAppendPropList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - oldAppendPropList_.makeImmutable(); // C + curAppendPropList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -262,33 +262,33 @@ public final class ReliquaryUpgradeRspOuterClass { return powerUpRate_; } - public static final int CUR_APPEND_PROP_LIST_FIELD_NUMBER = 14; - private com.google.protobuf.Internal.IntList curAppendPropList_; + public static final int OLD_APPEND_PROP_LIST_FIELD_NUMBER = 14; + private com.google.protobuf.Internal.IntList oldAppendPropList_; /** - * repeated uint32 cur_append_prop_list = 14; - * @return A list containing the curAppendPropList. + * repeated uint32 old_append_prop_list = 14; + * @return A list containing the oldAppendPropList. */ @java.lang.Override public java.util.List - getCurAppendPropListList() { - return curAppendPropList_; + getOldAppendPropListList() { + return oldAppendPropList_; } /** - * repeated uint32 cur_append_prop_list = 14; - * @return The count of curAppendPropList. + * repeated uint32 old_append_prop_list = 14; + * @return The count of oldAppendPropList. */ - public int getCurAppendPropListCount() { - return curAppendPropList_.size(); + public int getOldAppendPropListCount() { + return oldAppendPropList_.size(); } /** - * repeated uint32 cur_append_prop_list = 14; + * repeated uint32 old_append_prop_list = 14; * @param index The index of the element to return. - * @return The curAppendPropList at the given index. + * @return The oldAppendPropList at the given index. */ - public int getCurAppendPropList(int index) { - return curAppendPropList_.getInt(index); + public int getOldAppendPropList(int index) { + return oldAppendPropList_.getInt(index); } - private int curAppendPropListMemoizedSerializedSize = -1; + private int oldAppendPropListMemoizedSerializedSize = -1; public static final int OLD_LEVEL_FIELD_NUMBER = 8; private int oldLevel_; @@ -301,33 +301,33 @@ public final class ReliquaryUpgradeRspOuterClass { return oldLevel_; } - public static final int OLD_APPEND_PROP_LIST_FIELD_NUMBER = 15; - private com.google.protobuf.Internal.IntList oldAppendPropList_; + public static final int CUR_APPEND_PROP_LIST_FIELD_NUMBER = 15; + private com.google.protobuf.Internal.IntList curAppendPropList_; /** - * repeated uint32 old_append_prop_list = 15; - * @return A list containing the oldAppendPropList. + * repeated uint32 cur_append_prop_list = 15; + * @return A list containing the curAppendPropList. */ @java.lang.Override public java.util.List - getOldAppendPropListList() { - return oldAppendPropList_; + getCurAppendPropListList() { + return curAppendPropList_; } /** - * repeated uint32 old_append_prop_list = 15; - * @return The count of oldAppendPropList. + * repeated uint32 cur_append_prop_list = 15; + * @return The count of curAppendPropList. */ - public int getOldAppendPropListCount() { - return oldAppendPropList_.size(); + public int getCurAppendPropListCount() { + return curAppendPropList_.size(); } /** - * repeated uint32 old_append_prop_list = 15; + * repeated uint32 cur_append_prop_list = 15; * @param index The index of the element to return. - * @return The oldAppendPropList at the given index. + * @return The curAppendPropList at the given index. */ - public int getOldAppendPropList(int index) { - return oldAppendPropList_.getInt(index); + public int getCurAppendPropList(int index) { + return curAppendPropList_.getInt(index); } - private int oldAppendPropListMemoizedSerializedSize = -1; + private int curAppendPropListMemoizedSerializedSize = -1; public static final int TARGET_RELIQUARY_GUID_FIELD_NUMBER = 5; private long targetReliquaryGuid_; @@ -381,20 +381,20 @@ public final class ReliquaryUpgradeRspOuterClass { if (curLevel_ != 0) { output.writeUInt32(13, curLevel_); } - if (getCurAppendPropListList().size() > 0) { - output.writeUInt32NoTag(114); - output.writeUInt32NoTag(curAppendPropListMemoizedSerializedSize); - } - for (int i = 0; i < curAppendPropList_.size(); i++) { - output.writeUInt32NoTag(curAppendPropList_.getInt(i)); - } if (getOldAppendPropListList().size() > 0) { - output.writeUInt32NoTag(122); + output.writeUInt32NoTag(114); output.writeUInt32NoTag(oldAppendPropListMemoizedSerializedSize); } for (int i = 0; i < oldAppendPropList_.size(); i++) { output.writeUInt32NoTag(oldAppendPropList_.getInt(i)); } + if (getCurAppendPropListList().size() > 0) { + output.writeUInt32NoTag(122); + output.writeUInt32NoTag(curAppendPropListMemoizedSerializedSize); + } + for (int i = 0; i < curAppendPropList_.size(); i++) { + output.writeUInt32NoTag(curAppendPropList_.getInt(i)); + } unknownFields.writeTo(output); } @@ -424,20 +424,6 @@ public final class ReliquaryUpgradeRspOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(13, curLevel_); } - { - int dataSize = 0; - for (int i = 0; i < curAppendPropList_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(curAppendPropList_.getInt(i)); - } - size += dataSize; - if (!getCurAppendPropListList().isEmpty()) { - size += 1; - size += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(dataSize); - } - curAppendPropListMemoizedSerializedSize = dataSize; - } { int dataSize = 0; for (int i = 0; i < oldAppendPropList_.size(); i++) { @@ -452,6 +438,20 @@ public final class ReliquaryUpgradeRspOuterClass { } oldAppendPropListMemoizedSerializedSize = dataSize; } + { + int dataSize = 0; + for (int i = 0; i < curAppendPropList_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(curAppendPropList_.getInt(i)); + } + size += dataSize; + if (!getCurAppendPropListList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + curAppendPropListMemoizedSerializedSize = dataSize; + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -471,12 +471,12 @@ public final class ReliquaryUpgradeRspOuterClass { != other.getCurLevel()) return false; if (getPowerUpRate() != other.getPowerUpRate()) return false; - if (!getCurAppendPropListList() - .equals(other.getCurAppendPropListList())) return false; - if (getOldLevel() - != other.getOldLevel()) return false; if (!getOldAppendPropListList() .equals(other.getOldAppendPropListList())) return false; + if (getOldLevel() + != other.getOldLevel()) return false; + if (!getCurAppendPropListList() + .equals(other.getCurAppendPropListList())) return false; if (getTargetReliquaryGuid() != other.getTargetReliquaryGuid()) return false; if (getRetcode() @@ -496,16 +496,16 @@ public final class ReliquaryUpgradeRspOuterClass { hash = (53 * hash) + getCurLevel(); hash = (37 * hash) + POWER_UP_RATE_FIELD_NUMBER; hash = (53 * hash) + getPowerUpRate(); - if (getCurAppendPropListCount() > 0) { - hash = (37 * hash) + CUR_APPEND_PROP_LIST_FIELD_NUMBER; - hash = (53 * hash) + getCurAppendPropListList().hashCode(); - } - hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getOldLevel(); if (getOldAppendPropListCount() > 0) { hash = (37 * hash) + OLD_APPEND_PROP_LIST_FIELD_NUMBER; hash = (53 * hash) + getOldAppendPropListList().hashCode(); } + hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getOldLevel(); + if (getCurAppendPropListCount() > 0) { + hash = (37 * hash) + CUR_APPEND_PROP_LIST_FIELD_NUMBER; + hash = (53 * hash) + getCurAppendPropListList().hashCode(); + } hash = (37 * hash) + TARGET_RELIQUARY_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getTargetReliquaryGuid()); @@ -653,11 +653,11 @@ public final class ReliquaryUpgradeRspOuterClass { powerUpRate_ = 0; - curAppendPropList_ = emptyIntList(); + oldAppendPropList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); oldLevel_ = 0; - oldAppendPropList_ = emptyIntList(); + curAppendPropList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); targetReliquaryGuid_ = 0L; @@ -693,16 +693,16 @@ public final class ReliquaryUpgradeRspOuterClass { result.curLevel_ = curLevel_; result.powerUpRate_ = powerUpRate_; if (((bitField0_ & 0x00000001) != 0)) { - curAppendPropList_.makeImmutable(); + oldAppendPropList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.curAppendPropList_ = curAppendPropList_; + result.oldAppendPropList_ = oldAppendPropList_; result.oldLevel_ = oldLevel_; if (((bitField0_ & 0x00000002) != 0)) { - oldAppendPropList_.makeImmutable(); + curAppendPropList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.oldAppendPropList_ = oldAppendPropList_; + result.curAppendPropList_ = curAppendPropList_; result.targetReliquaryGuid_ = targetReliquaryGuid_; result.retcode_ = retcode_; onBuilt(); @@ -759,26 +759,26 @@ public final class ReliquaryUpgradeRspOuterClass { if (other.getPowerUpRate() != 0) { setPowerUpRate(other.getPowerUpRate()); } - if (!other.curAppendPropList_.isEmpty()) { - if (curAppendPropList_.isEmpty()) { - curAppendPropList_ = other.curAppendPropList_; + if (!other.oldAppendPropList_.isEmpty()) { + if (oldAppendPropList_.isEmpty()) { + oldAppendPropList_ = other.oldAppendPropList_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureCurAppendPropListIsMutable(); - curAppendPropList_.addAll(other.curAppendPropList_); + ensureOldAppendPropListIsMutable(); + oldAppendPropList_.addAll(other.oldAppendPropList_); } onChanged(); } if (other.getOldLevel() != 0) { setOldLevel(other.getOldLevel()); } - if (!other.oldAppendPropList_.isEmpty()) { - if (oldAppendPropList_.isEmpty()) { - oldAppendPropList_ = other.oldAppendPropList_; + if (!other.curAppendPropList_.isEmpty()) { + if (curAppendPropList_.isEmpty()) { + curAppendPropList_ = other.curAppendPropList_; bitField0_ = (bitField0_ & ~0x00000002); } else { - ensureOldAppendPropListIsMutable(); - oldAppendPropList_.addAll(other.oldAppendPropList_); + ensureCurAppendPropListIsMutable(); + curAppendPropList_.addAll(other.curAppendPropList_); } onChanged(); } @@ -880,80 +880,80 @@ public final class ReliquaryUpgradeRspOuterClass { return this; } - private com.google.protobuf.Internal.IntList curAppendPropList_ = emptyIntList(); - private void ensureCurAppendPropListIsMutable() { + private com.google.protobuf.Internal.IntList oldAppendPropList_ = emptyIntList(); + private void ensureOldAppendPropListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - curAppendPropList_ = mutableCopy(curAppendPropList_); + oldAppendPropList_ = mutableCopy(oldAppendPropList_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 cur_append_prop_list = 14; - * @return A list containing the curAppendPropList. + * repeated uint32 old_append_prop_list = 14; + * @return A list containing the oldAppendPropList. */ public java.util.List - getCurAppendPropListList() { + getOldAppendPropListList() { return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(curAppendPropList_) : curAppendPropList_; + java.util.Collections.unmodifiableList(oldAppendPropList_) : oldAppendPropList_; } /** - * repeated uint32 cur_append_prop_list = 14; - * @return The count of curAppendPropList. + * repeated uint32 old_append_prop_list = 14; + * @return The count of oldAppendPropList. */ - public int getCurAppendPropListCount() { - return curAppendPropList_.size(); + public int getOldAppendPropListCount() { + return oldAppendPropList_.size(); } /** - * repeated uint32 cur_append_prop_list = 14; + * repeated uint32 old_append_prop_list = 14; * @param index The index of the element to return. - * @return The curAppendPropList at the given index. + * @return The oldAppendPropList at the given index. */ - public int getCurAppendPropList(int index) { - return curAppendPropList_.getInt(index); + public int getOldAppendPropList(int index) { + return oldAppendPropList_.getInt(index); } /** - * repeated uint32 cur_append_prop_list = 14; + * repeated uint32 old_append_prop_list = 14; * @param index The index to set the value at. - * @param value The curAppendPropList to set. + * @param value The oldAppendPropList to set. * @return This builder for chaining. */ - public Builder setCurAppendPropList( + public Builder setOldAppendPropList( int index, int value) { - ensureCurAppendPropListIsMutable(); - curAppendPropList_.setInt(index, value); + ensureOldAppendPropListIsMutable(); + oldAppendPropList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 cur_append_prop_list = 14; - * @param value The curAppendPropList to add. + * repeated uint32 old_append_prop_list = 14; + * @param value The oldAppendPropList to add. * @return This builder for chaining. */ - public Builder addCurAppendPropList(int value) { - ensureCurAppendPropListIsMutable(); - curAppendPropList_.addInt(value); + public Builder addOldAppendPropList(int value) { + ensureOldAppendPropListIsMutable(); + oldAppendPropList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 cur_append_prop_list = 14; - * @param values The curAppendPropList to add. + * repeated uint32 old_append_prop_list = 14; + * @param values The oldAppendPropList to add. * @return This builder for chaining. */ - public Builder addAllCurAppendPropList( + public Builder addAllOldAppendPropList( java.lang.Iterable values) { - ensureCurAppendPropListIsMutable(); + ensureOldAppendPropListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, curAppendPropList_); + values, oldAppendPropList_); onChanged(); return this; } /** - * repeated uint32 cur_append_prop_list = 14; + * repeated uint32 old_append_prop_list = 14; * @return This builder for chaining. */ - public Builder clearCurAppendPropList() { - curAppendPropList_ = emptyIntList(); + public Builder clearOldAppendPropList() { + oldAppendPropList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; @@ -990,80 +990,80 @@ public final class ReliquaryUpgradeRspOuterClass { return this; } - private com.google.protobuf.Internal.IntList oldAppendPropList_ = emptyIntList(); - private void ensureOldAppendPropListIsMutable() { + private com.google.protobuf.Internal.IntList curAppendPropList_ = emptyIntList(); + private void ensureCurAppendPropListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - oldAppendPropList_ = mutableCopy(oldAppendPropList_); + curAppendPropList_ = mutableCopy(curAppendPropList_); bitField0_ |= 0x00000002; } } /** - * repeated uint32 old_append_prop_list = 15; - * @return A list containing the oldAppendPropList. + * repeated uint32 cur_append_prop_list = 15; + * @return A list containing the curAppendPropList. */ public java.util.List - getOldAppendPropListList() { + getCurAppendPropListList() { return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(oldAppendPropList_) : oldAppendPropList_; + java.util.Collections.unmodifiableList(curAppendPropList_) : curAppendPropList_; } /** - * repeated uint32 old_append_prop_list = 15; - * @return The count of oldAppendPropList. + * repeated uint32 cur_append_prop_list = 15; + * @return The count of curAppendPropList. */ - public int getOldAppendPropListCount() { - return oldAppendPropList_.size(); + public int getCurAppendPropListCount() { + return curAppendPropList_.size(); } /** - * repeated uint32 old_append_prop_list = 15; + * repeated uint32 cur_append_prop_list = 15; * @param index The index of the element to return. - * @return The oldAppendPropList at the given index. + * @return The curAppendPropList at the given index. */ - public int getOldAppendPropList(int index) { - return oldAppendPropList_.getInt(index); + public int getCurAppendPropList(int index) { + return curAppendPropList_.getInt(index); } /** - * repeated uint32 old_append_prop_list = 15; + * repeated uint32 cur_append_prop_list = 15; * @param index The index to set the value at. - * @param value The oldAppendPropList to set. + * @param value The curAppendPropList to set. * @return This builder for chaining. */ - public Builder setOldAppendPropList( + public Builder setCurAppendPropList( int index, int value) { - ensureOldAppendPropListIsMutable(); - oldAppendPropList_.setInt(index, value); + ensureCurAppendPropListIsMutable(); + curAppendPropList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 old_append_prop_list = 15; - * @param value The oldAppendPropList to add. + * repeated uint32 cur_append_prop_list = 15; + * @param value The curAppendPropList to add. * @return This builder for chaining. */ - public Builder addOldAppendPropList(int value) { - ensureOldAppendPropListIsMutable(); - oldAppendPropList_.addInt(value); + public Builder addCurAppendPropList(int value) { + ensureCurAppendPropListIsMutable(); + curAppendPropList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 old_append_prop_list = 15; - * @param values The oldAppendPropList to add. + * repeated uint32 cur_append_prop_list = 15; + * @param values The curAppendPropList to add. * @return This builder for chaining. */ - public Builder addAllOldAppendPropList( + public Builder addAllCurAppendPropList( java.lang.Iterable values) { - ensureOldAppendPropListIsMutable(); + ensureCurAppendPropListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, oldAppendPropList_); + values, curAppendPropList_); onChanged(); return this; } /** - * repeated uint32 old_append_prop_list = 15; + * repeated uint32 cur_append_prop_list = 15; * @return This builder for chaining. */ - public Builder clearOldAppendPropList() { - oldAppendPropList_ = emptyIntList(); + public Builder clearCurAppendPropList() { + curAppendPropList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; @@ -1199,8 +1199,8 @@ public final class ReliquaryUpgradeRspOuterClass { java.lang.String[] descriptorData = { "\n\031ReliquaryUpgradeRsp.proto\"\276\001\n\023Reliquar" + "yUpgradeRsp\022\021\n\tcur_level\030\r \001(\r\022\025\n\rpower_" + - "up_rate\030\013 \001(\r\022\034\n\024cur_append_prop_list\030\016 " + - "\003(\r\022\021\n\told_level\030\010 \001(\r\022\034\n\024old_append_pro" + + "up_rate\030\013 \001(\r\022\034\n\024old_append_prop_list\030\016 " + + "\003(\r\022\021\n\told_level\030\010 \001(\r\022\034\n\024cur_append_pro" + "p_list\030\017 \003(\r\022\035\n\025target_reliquary_guid\030\005 " + "\001(\004\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter." + "net.protob\006proto3" @@ -1214,7 +1214,7 @@ public final class ReliquaryUpgradeRspOuterClass { internal_static_ReliquaryUpgradeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ReliquaryUpgradeRsp_descriptor, - new java.lang.String[] { "CurLevel", "PowerUpRate", "CurAppendPropList", "OldLevel", "OldAppendPropList", "TargetReliquaryGuid", "Retcode", }); + new java.lang.String[] { "CurLevel", "PowerUpRate", "OldAppendPropList", "OldLevel", "CurAppendPropList", "TargetReliquaryGuid", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneGadgetInfoOuterClass.java index c6d2cecc4..1f9d3f56c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SceneGadgetInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneGadgetInfoOuterClass.java @@ -405,16 +405,28 @@ public final class SceneGadgetInfoOuterClass { emu.grasscutter.net.proto.CoinCollectOperatorInfoOuterClass.CoinCollectOperatorInfoOrBuilder getCoinCollectOperatorInfoOrBuilder(); /** + *
+     *Item trifle_item = 67;
+     * 
+ * * .TrifleGadget trifle_gadget = 67; * @return Whether the trifleGadget field is set. */ boolean hasTrifleGadget(); /** + *
+     *Item trifle_item = 67;
+     * 
+ * * .TrifleGadget trifle_gadget = 67; * @return The trifleGadget. */ emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget getTrifleGadget(); /** + *
+     *Item trifle_item = 67;
+     * 
+ * * .TrifleGadget trifle_gadget = 67; */ emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadgetOrBuilder getTrifleGadgetOrBuilder(); @@ -1985,6 +1997,10 @@ public final class SceneGadgetInfoOuterClass { public static final int TRIFLE_GADGET_FIELD_NUMBER = 67; /** + *
+     *Item trifle_item = 67;
+     * 
+ * * .TrifleGadget trifle_gadget = 67; * @return Whether the trifleGadget field is set. */ @@ -1993,6 +2009,10 @@ public final class SceneGadgetInfoOuterClass { return contentCase_ == 67; } /** + *
+     *Item trifle_item = 67;
+     * 
+ * * .TrifleGadget trifle_gadget = 67; * @return The trifleGadget. */ @@ -2004,6 +2024,10 @@ public final class SceneGadgetInfoOuterClass { return emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.getDefaultInstance(); } /** + *
+     *Item trifle_item = 67;
+     * 
+ * * .TrifleGadget trifle_gadget = 67; */ @java.lang.Override @@ -6946,6 +6970,10 @@ public final class SceneGadgetInfoOuterClass { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget, emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.Builder, emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadgetOrBuilder> trifleGadgetBuilder_; /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; * @return Whether the trifleGadget field is set. */ @@ -6954,6 +6982,10 @@ public final class SceneGadgetInfoOuterClass { return contentCase_ == 67; } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; * @return The trifleGadget. */ @@ -6972,6 +7004,10 @@ public final class SceneGadgetInfoOuterClass { } } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; */ public Builder setTrifleGadget(emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget value) { @@ -6988,6 +7024,10 @@ public final class SceneGadgetInfoOuterClass { return this; } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; */ public Builder setTrifleGadget( @@ -7002,6 +7042,10 @@ public final class SceneGadgetInfoOuterClass { return this; } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; */ public Builder mergeTrifleGadget(emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget value) { @@ -7024,6 +7068,10 @@ public final class SceneGadgetInfoOuterClass { return this; } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; */ public Builder clearTrifleGadget() { @@ -7043,12 +7091,20 @@ public final class SceneGadgetInfoOuterClass { return this; } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; */ public emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.Builder getTrifleGadgetBuilder() { return getTrifleGadgetFieldBuilder().getBuilder(); } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; */ @java.lang.Override @@ -7063,6 +7119,10 @@ public final class SceneGadgetInfoOuterClass { } } /** + *
+       *Item trifle_item = 67;
+       * 
+ * * .TrifleGadget trifle_gadget = 67; */ private com.google.protobuf.SingleFieldBuilderV3< @@ -8068,69 +8128,70 @@ public final class SceneGadgetInfoOuterClass { static { java.lang.String[] descriptorData = { "\n\025SceneGadgetInfo.proto\032\024GadgetBornType." + - "proto\032\026GatherGadgetInfo.proto\032\021WorktopIn" + - "fo.proto\032\026ClientGadgetInfo.proto\032\021Weathe" + - "rInfo.proto\032\027AbilityGadgetInfo.proto\032\026St" + - "atueGadgetInfo.proto\032\023BossChestInfo.prot" + - "o\032\026BlossomChestInfo.proto\032\026MpPlayRewardI" + - "nfo.proto\032\035GadgetGeneralRewardInfo.proto" + - "\032\022OfferingInfo.proto\032\024FoundationInfo.pro" + - "to\032\021VehicleInfo.proto\032\023EchoShellInfo.pro" + - "to\032\020ScreenInfo.proto\032\022FishPoolInfo.proto" + - "\032\032CustomGadgetTreeInfo.proto\032\031RoguelikeG" + - "adgetInfo.proto\032\031NightCrowGadgetInfo.pro" + - "to\032\036DeshretObeliskGadgetInfo.proto\032\035Coin" + - "CollectOperatorInfo.proto\032\022TrifleGadget." + - "proto\032\022PlatformInfo.proto\032\021JMFPBNKNHED.p" + - "roto\032\024GadgetPlayInfo.proto\032\021GDGKKLFMJKH." + - "proto\032\021OMBIJJLAHFB.proto\032\021BDOCPDNCIEF.pr" + - "oto\"\315\014\n\017SceneGadgetInfo\022\021\n\tgadget_id\030\001 \001" + - "(\r\022\020\n\010group_id\030\002 \001(\r\022\021\n\tconfig_id\030\003 \001(\r\022" + - "\027\n\017owner_entity_id\030\004 \001(\r\022\"\n\tborn_type\030\005 " + - "\001(\0162\017.GadgetBornType\022\024\n\014gadget_state\030\006 \001" + - "(\r\022\023\n\013KPKNNJLPMFP\030\007 \001(\r\022\030\n\020is_show_cutsc" + - "ene\030\010 \001(\010\022\031\n\021authority_peer_id\030\t \001(\r\022\032\n\022" + - "is_enable_interact\030\n \001(\010\022\023\n\013CLICILNBKDD\030" + - "\013 \001(\r\022*\n\rgather_gadget\030\r \001(\0132\021.GatherGad" + - "getInfoH\000\022\037\n\007worktop\030\016 \001(\0132\014.WorktopInfo" + - "H\000\022*\n\rclient_gadget\030\017 \001(\0132\021.ClientGadget" + - "InfoH\000\022\037\n\007weather\030\021 \001(\0132\014.WeatherInfoH\000\022" + - ",\n\016ability_gadget\030\022 \001(\0132\022.AbilityGadgetI" + - "nfoH\000\022*\n\rstatue_gadget\030\023 \001(\0132\021.StatueGad" + - "getInfoH\000\022$\n\nboss_chest\030\024 \001(\0132\016.BossChes" + - "tInfoH\000\022*\n\rblossom_chest\030) \001(\0132\021.Blossom" + - "ChestInfoH\000\022+\n\016mp_play_reward\030* \001(\0132\021.Mp" + - "PlayRewardInfoH\000\0222\n\016general_reward\030+ \001(\013" + - "2\030.GadgetGeneralRewardInfoH\000\022&\n\roffering" + - "_info\030, \001(\0132\r.OfferingInfoH\000\022*\n\017foundati" + - "on_info\030- \001(\0132\017.FoundationInfoH\000\022$\n\014vehi" + - "cle_info\030. \001(\0132\014.VehicleInfoH\000\022$\n\nshell_" + - "info\030/ \001(\0132\016.EchoShellInfoH\000\022\"\n\013screen_i" + - "nfo\0300 \001(\0132\013.ScreenInfoH\000\022\'\n\016fish_pool_in" + - "fo\030; \001(\0132\r.FishPoolInfoH\000\0228\n\027custom_gadg" + - "et_tree_info\030< \001(\0132\025.CustomGadgetTreeInf" + - "oH\000\0225\n\025roguelike_gadget_info\030= \001(\0132\024.Rog" + - "uelikeGadgetInfoH\000\0226\n\026night_crow_gadget_" + - "info\030> \001(\0132\024.NightCrowGadgetInfoH\000\022@\n\033de" + - "shret_obelisk_gadget_info\030? \001(\0132\031.Deshre" + - "tObeliskGadgetInfoH\000\022>\n\032coin_collect_ope" + - "rator_info\030@ \001(\0132\030.CoinCollectOperatorIn" + - "foH\000\022&\n\rtrifle_gadget\030C \001(\0132\r.TrifleGadg" + - "etH\000\022\021\n\tmark_flag\030\025 \001(\r\022\034\n\024prop_owner_en" + - "tity_id\030\026 \001(\r\022\037\n\010platform\030\027 \001(\0132\r.Platfo" + - "rmInfo\022\031\n\021interact_uid_list\030\030 \003(\r\022\020\n\010dra" + - "ft_id\030\031 \001(\r\022\023\n\013KHICBPFFAII\030\032 \001(\r\022!\n\013GPOH" + - "BBPBBEC\030\033 \001(\0132\014.JMFPBNKNHED\022\"\n\tplay_info" + - "\030d \001(\0132\017.GadgetPlayInfo\022!\n\013DPJFGJDHGGJ\030e" + - " \001(\0132\014.GDGKKLFMJKH\022!\n\013PBBAFKFGHIB\030f \001(\0132" + - "\014.OMBIJJLAHFB\022!\n\013FDKBHOCNBPH\030g \001(\0132\014.BDO" + - "CPDNCIEFB\t\n\007contentB\033\n\031emu.grasscutter.n" + - "et.protob\006proto3" + "proto\032\nItem.proto\032\026GatherGadgetInfo.prot" + + "o\032\021WorktopInfo.proto\032\026ClientGadgetInfo.p" + + "roto\032\021WeatherInfo.proto\032\027AbilityGadgetIn" + + "fo.proto\032\026StatueGadgetInfo.proto\032\023BossCh" + + "estInfo.proto\032\026BlossomChestInfo.proto\032\026M" + + "pPlayRewardInfo.proto\032\035GadgetGeneralRewa" + + "rdInfo.proto\032\022OfferingInfo.proto\032\024Founda" + + "tionInfo.proto\032\021VehicleInfo.proto\032\023EchoS" + + "hellInfo.proto\032\020ScreenInfo.proto\032\022FishPo" + + "olInfo.proto\032\032CustomGadgetTreeInfo.proto" + + "\032\031RoguelikeGadgetInfo.proto\032\031NightCrowGa" + + "dgetInfo.proto\032\036DeshretObeliskGadgetInfo" + + ".proto\032\035CoinCollectOperatorInfo.proto\032\022T" + + "rifleGadget.proto\032\022PlatformInfo.proto\032\021J" + + "MFPBNKNHED.proto\032\024GadgetPlayInfo.proto\032\021" + + "GDGKKLFMJKH.proto\032\021OMBIJJLAHFB.proto\032\021BD" + + "OCPDNCIEF.proto\"\315\014\n\017SceneGadgetInfo\022\021\n\tg" + + "adget_id\030\001 \001(\r\022\020\n\010group_id\030\002 \001(\r\022\021\n\tconf" + + "ig_id\030\003 \001(\r\022\027\n\017owner_entity_id\030\004 \001(\r\022\"\n\t" + + "born_type\030\005 \001(\0162\017.GadgetBornType\022\024\n\014gadg" + + "et_state\030\006 \001(\r\022\023\n\013KPKNNJLPMFP\030\007 \001(\r\022\030\n\020i" + + "s_show_cutscene\030\010 \001(\010\022\031\n\021authority_peer_" + + "id\030\t \001(\r\022\032\n\022is_enable_interact\030\n \001(\010\022\023\n\013" + + "CLICILNBKDD\030\013 \001(\r\022*\n\rgather_gadget\030\r \001(\013" + + "2\021.GatherGadgetInfoH\000\022\037\n\007worktop\030\016 \001(\0132\014" + + ".WorktopInfoH\000\022*\n\rclient_gadget\030\017 \001(\0132\021." + + "ClientGadgetInfoH\000\022\037\n\007weather\030\021 \001(\0132\014.We" + + "atherInfoH\000\022,\n\016ability_gadget\030\022 \001(\0132\022.Ab" + + "ilityGadgetInfoH\000\022*\n\rstatue_gadget\030\023 \001(\013" + + "2\021.StatueGadgetInfoH\000\022$\n\nboss_chest\030\024 \001(" + + "\0132\016.BossChestInfoH\000\022*\n\rblossom_chest\030) \001" + + "(\0132\021.BlossomChestInfoH\000\022+\n\016mp_play_rewar" + + "d\030* \001(\0132\021.MpPlayRewardInfoH\000\0222\n\016general_" + + "reward\030+ \001(\0132\030.GadgetGeneralRewardInfoH\000" + + "\022&\n\roffering_info\030, \001(\0132\r.OfferingInfoH\000" + + "\022*\n\017foundation_info\030- \001(\0132\017.FoundationIn" + + "foH\000\022$\n\014vehicle_info\030. \001(\0132\014.VehicleInfo" + + "H\000\022$\n\nshell_info\030/ \001(\0132\016.EchoShellInfoH\000" + + "\022\"\n\013screen_info\0300 \001(\0132\013.ScreenInfoH\000\022\'\n\016" + + "fish_pool_info\030; \001(\0132\r.FishPoolInfoH\000\0228\n" + + "\027custom_gadget_tree_info\030< \001(\0132\025.CustomG" + + "adgetTreeInfoH\000\0225\n\025roguelike_gadget_info" + + "\030= \001(\0132\024.RoguelikeGadgetInfoH\000\0226\n\026night_" + + "crow_gadget_info\030> \001(\0132\024.NightCrowGadget" + + "InfoH\000\022@\n\033deshret_obelisk_gadget_info\030? " + + "\001(\0132\031.DeshretObeliskGadgetInfoH\000\022>\n\032coin" + + "_collect_operator_info\030@ \001(\0132\030.CoinColle" + + "ctOperatorInfoH\000\022&\n\rtrifle_gadget\030C \001(\0132" + + "\r.TrifleGadgetH\000\022\021\n\tmark_flag\030\025 \001(\r\022\034\n\024p" + + "rop_owner_entity_id\030\026 \001(\r\022\037\n\010platform\030\027 " + + "\001(\0132\r.PlatformInfo\022\031\n\021interact_uid_list\030" + + "\030 \003(\r\022\020\n\010draft_id\030\031 \001(\r\022\023\n\013KHICBPFFAII\030\032" + + " \001(\r\022!\n\013GPOHBBPBBEC\030\033 \001(\0132\014.JMFPBNKNHED\022" + + "\"\n\tplay_info\030d \001(\0132\017.GadgetPlayInfo\022!\n\013D" + + "PJFGJDHGGJ\030e \001(\0132\014.GDGKKLFMJKH\022!\n\013PBBAFK" + + "FGHIB\030f \001(\0132\014.OMBIJJLAHFB\022!\n\013FDKBHOCNBPH" + + "\030g \001(\0132\014.BDOCPDNCIEFB\t\n\007contentB\033\n\031emu.g" + + "rasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor(), + emu.grasscutter.net.proto.ItemOuterClass.getDescriptor(), emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.getDescriptor(), emu.grasscutter.net.proto.WorktopInfoOuterClass.getDescriptor(), emu.grasscutter.net.proto.ClientGadgetInfoOuterClass.getDescriptor(), @@ -8167,6 +8228,7 @@ public final class SceneGadgetInfoOuterClass { internal_static_SceneGadgetInfo_descriptor, new java.lang.String[] { "GadgetId", "GroupId", "ConfigId", "OwnerEntityId", "BornType", "GadgetState", "KPKNNJLPMFP", "IsShowCutscene", "AuthorityPeerId", "IsEnableInteract", "CLICILNBKDD", "GatherGadget", "Worktop", "ClientGadget", "Weather", "AbilityGadget", "StatueGadget", "BossChest", "BlossomChest", "MpPlayReward", "GeneralReward", "OfferingInfo", "FoundationInfo", "VehicleInfo", "ShellInfo", "ScreenInfo", "FishPoolInfo", "CustomGadgetTreeInfo", "RoguelikeGadgetInfo", "NightCrowGadgetInfo", "DeshretObeliskGadgetInfo", "CoinCollectOperatorInfo", "TrifleGadget", "MarkFlag", "PropOwnerEntityId", "Platform", "InteractUidList", "DraftId", "KHICBPFFAII", "GPOHBBPBBEC", "PlayInfo", "DPJFGJDHGGJ", "PBBAFKFGHIB", "FDKBHOCNBPH", "Content", }); emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor(); + emu.grasscutter.net.proto.ItemOuterClass.getDescriptor(); emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.getDescriptor(); emu.grasscutter.net.proto.WorktopInfoOuterClass.getDescriptor(); emu.grasscutter.net.proto.ClientGadgetInfoOuterClass.getDescriptor(); 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 f42f4dfe6..2a0574e95 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 is_on_scene = 15; - * @return The isOnScene. + * bool is_reconnect = 15; + * @return The isReconnect. */ - boolean getIsOnScene(); + boolean getIsReconnect(); /** * .AbilitySyncStateInfo weapon_ability_info = 11; @@ -181,10 +181,10 @@ public final class SceneTeamAvatarOuterClass { boolean getIsPlayerCurAvatar(); /** - * bool is_reconnect = 13; - * @return The isReconnect. + * bool is_on_scene = 13; + * @return The isOnScene. */ - boolean getIsReconnect(); + boolean getIsOnScene(); } /** *
@@ -343,7 +343,7 @@ public final class SceneTeamAvatarOuterClass {
             }
             case 104: {
 
-              isReconnect_ = input.readBool();
+              isOnScene_ = input.readBool();
               break;
             }
             case 114: {
@@ -361,7 +361,7 @@ public final class SceneTeamAvatarOuterClass {
             }
             case 120: {
 
-              isOnScene_ = input.readBool();
+              isReconnect_ = input.readBool();
               break;
             }
             case 14120: {
@@ -452,15 +452,15 @@ public final class SceneTeamAvatarOuterClass {
       return playerUid_;
     }
 
-    public static final int IS_ON_SCENE_FIELD_NUMBER = 15;
-    private boolean isOnScene_;
+    public static final int IS_RECONNECT_FIELD_NUMBER = 15;
+    private boolean isReconnect_;
     /**
-     * bool is_on_scene = 15;
-     * @return The isOnScene.
+     * bool is_reconnect = 15;
+     * @return The isReconnect.
      */
     @java.lang.Override
-    public boolean getIsOnScene() {
-      return isOnScene_;
+    public boolean getIsReconnect() {
+      return isReconnect_;
     }
 
     public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 11;
@@ -688,15 +688,15 @@ public final class SceneTeamAvatarOuterClass {
       return isPlayerCurAvatar_;
     }
 
-    public static final int IS_RECONNECT_FIELD_NUMBER = 13;
-    private boolean isReconnect_;
+    public static final int IS_ON_SCENE_FIELD_NUMBER = 13;
+    private boolean isOnScene_;
     /**
-     * bool is_reconnect = 13;
-     * @return The isReconnect.
+     * bool is_on_scene = 13;
+     * @return The isOnScene.
      */
     @java.lang.Override
-    public boolean getIsReconnect() {
-      return isReconnect_;
+    public boolean getIsOnScene() {
+      return isOnScene_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -749,14 +749,14 @@ public final class SceneTeamAvatarOuterClass {
       if (avatarGuid_ != 0L) {
         output.writeUInt64(12, avatarGuid_);
       }
-      if (isReconnect_ != false) {
-        output.writeBool(13, isReconnect_);
+      if (isOnScene_ != false) {
+        output.writeBool(13, isOnScene_);
       }
       if (sceneAvatarInfo_ != null) {
         output.writeMessage(14, getSceneAvatarInfo());
       }
-      if (isOnScene_ != false) {
-        output.writeBool(15, isOnScene_);
+      if (isReconnect_ != false) {
+        output.writeBool(15, isReconnect_);
       }
       if (isPlayerCurAvatar_ != false) {
         output.writeBool(1765, isPlayerCurAvatar_);
@@ -818,17 +818,17 @@ public final class SceneTeamAvatarOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(12, avatarGuid_);
       }
-      if (isReconnect_ != false) {
+      if (isOnScene_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isReconnect_);
+          .computeBoolSize(13, isOnScene_);
       }
       if (sceneAvatarInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(14, getSceneAvatarInfo());
       }
-      if (isOnScene_ != false) {
+      if (isReconnect_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isOnScene_);
+          .computeBoolSize(15, isReconnect_);
       }
       if (isPlayerCurAvatar_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -858,8 +858,8 @@ public final class SceneTeamAvatarOuterClass {
           != other.getWeaponEntityId()) return false;
       if (getPlayerUid()
           != other.getPlayerUid()) return false;
-      if (getIsOnScene()
-          != other.getIsOnScene()) return false;
+      if (getIsReconnect()
+          != other.getIsReconnect()) return false;
       if (hasWeaponAbilityInfo() != other.hasWeaponAbilityInfo()) return false;
       if (hasWeaponAbilityInfo()) {
         if (!getWeaponAbilityInfo()
@@ -897,8 +897,8 @@ public final class SceneTeamAvatarOuterClass {
       }
       if (getIsPlayerCurAvatar()
           != other.getIsPlayerCurAvatar()) return false;
-      if (getIsReconnect()
-          != other.getIsReconnect()) return false;
+      if (getIsOnScene()
+          != other.getIsOnScene()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -918,9 +918,9 @@ public final class SceneTeamAvatarOuterClass {
       hash = (53 * hash) + getWeaponEntityId();
       hash = (37 * hash) + PLAYER_UID_FIELD_NUMBER;
       hash = (53 * hash) + getPlayerUid();
-      hash = (37 * hash) + IS_ON_SCENE_FIELD_NUMBER;
+      hash = (37 * hash) + IS_RECONNECT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsOnScene());
+          getIsReconnect());
       if (hasWeaponAbilityInfo()) {
         hash = (37 * hash) + WEAPON_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getWeaponAbilityInfo().hashCode();
@@ -958,9 +958,9 @@ public final class SceneTeamAvatarOuterClass {
       hash = (37 * hash) + IS_PLAYER_CUR_AVATAR_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsPlayerCurAvatar());
-      hash = (37 * hash) + IS_RECONNECT_FIELD_NUMBER;
+      hash = (37 * hash) + IS_ON_SCENE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsReconnect());
+          getIsOnScene());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1109,7 +1109,7 @@ public final class SceneTeamAvatarOuterClass {
 
         playerUid_ = 0;
 
-        isOnScene_ = false;
+        isReconnect_ = false;
 
         if (weaponAbilityInfoBuilder_ == null) {
           weaponAbilityInfo_ = null;
@@ -1157,7 +1157,7 @@ public final class SceneTeamAvatarOuterClass {
         }
         isPlayerCurAvatar_ = false;
 
-        isReconnect_ = false;
+        isOnScene_ = false;
 
         return this;
       }
@@ -1193,7 +1193,7 @@ public final class SceneTeamAvatarOuterClass {
         }
         result.weaponEntityId_ = weaponEntityId_;
         result.playerUid_ = playerUid_;
-        result.isOnScene_ = isOnScene_;
+        result.isReconnect_ = isReconnect_;
         if (weaponAbilityInfoBuilder_ == null) {
           result.weaponAbilityInfo_ = weaponAbilityInfo_;
         } else {
@@ -1233,7 +1233,7 @@ public final class SceneTeamAvatarOuterClass {
           result.sceneAvatarInfo_ = sceneAvatarInfoBuilder_.build();
         }
         result.isPlayerCurAvatar_ = isPlayerCurAvatar_;
-        result.isReconnect_ = isReconnect_;
+        result.isOnScene_ = isOnScene_;
         onBuilt();
         return result;
       }
@@ -1291,8 +1291,8 @@ public final class SceneTeamAvatarOuterClass {
         if (other.getPlayerUid() != 0) {
           setPlayerUid(other.getPlayerUid());
         }
-        if (other.getIsOnScene() != false) {
-          setIsOnScene(other.getIsOnScene());
+        if (other.getIsReconnect() != false) {
+          setIsReconnect(other.getIsReconnect());
         }
         if (other.hasWeaponAbilityInfo()) {
           mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
@@ -1350,8 +1350,8 @@ public final class SceneTeamAvatarOuterClass {
         if (other.getIsPlayerCurAvatar() != false) {
           setIsPlayerCurAvatar(other.getIsPlayerCurAvatar());
         }
-        if (other.getIsReconnect() != false) {
-          setIsReconnect(other.getIsReconnect());
+        if (other.getIsOnScene() != false) {
+          setIsOnScene(other.getIsOnScene());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1564,33 +1564,33 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
-      private boolean isOnScene_ ;
+      private boolean isReconnect_ ;
       /**
-       * bool is_on_scene = 15;
-       * @return The isOnScene.
+       * bool is_reconnect = 15;
+       * @return The isReconnect.
        */
       @java.lang.Override
-      public boolean getIsOnScene() {
-        return isOnScene_;
+      public boolean getIsReconnect() {
+        return isReconnect_;
       }
       /**
-       * bool is_on_scene = 15;
-       * @param value The isOnScene to set.
+       * bool is_reconnect = 15;
+       * @param value The isReconnect to set.
        * @return This builder for chaining.
        */
-      public Builder setIsOnScene(boolean value) {
+      public Builder setIsReconnect(boolean value) {
         
-        isOnScene_ = value;
+        isReconnect_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool is_on_scene = 15;
+       * bool is_reconnect = 15;
        * @return This builder for chaining.
        */
-      public Builder clearIsOnScene() {
+      public Builder clearIsReconnect() {
         
-        isOnScene_ = false;
+        isReconnect_ = false;
         onChanged();
         return this;
       }
@@ -2585,33 +2585,33 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
-      private boolean isReconnect_ ;
+      private boolean isOnScene_ ;
       /**
-       * bool is_reconnect = 13;
-       * @return The isReconnect.
+       * bool is_on_scene = 13;
+       * @return The isOnScene.
        */
       @java.lang.Override
-      public boolean getIsReconnect() {
-        return isReconnect_;
+      public boolean getIsOnScene() {
+        return isOnScene_;
       }
       /**
-       * bool is_reconnect = 13;
-       * @param value The isReconnect to set.
+       * bool is_on_scene = 13;
+       * @param value The isOnScene to set.
        * @return This builder for chaining.
        */
-      public Builder setIsReconnect(boolean value) {
+      public Builder setIsOnScene(boolean value) {
         
-        isReconnect_ = value;
+        isOnScene_ = value;
         onChanged();
         return this;
       }
       /**
-       * bool is_reconnect = 13;
+       * bool is_on_scene = 13;
        * @return This builder for chaining.
        */
-      public Builder clearIsReconnect() {
+      public Builder clearIsOnScene() {
         
-        isReconnect_ = false;
+        isOnScene_ = false;
         onChanged();
         return this;
       }
@@ -2688,18 +2688,18 @@ public final class SceneTeamAvatarOuterClass {
       "ontrolBlock.proto\032\025SceneAvatarInfo.proto" +
       "\"\230\004\n\017SceneTeamAvatar\022+\n\021scene_entity_inf" +
       "o\030\004 \001(\0132\020.SceneEntityInfo\022\030\n\020weapon_enti" +
-      "ty_id\030\010 \001(\r\022\022\n\nplayer_uid\030\003 \001(\r\022\023\n\013is_on" +
-      "_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" +
-      "eapon_guid\030\005 \001(\004\022 \n\013avatar_info\030\006 \001(\0132\013." +
-      "AvatarInfo\022\021\n\tentity_id\030\t \001(\r\022\023\n\013avatar_" +
-      "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\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" +
+      "ty_id\030\010 \001(\r\022\022\n\nplayer_uid\030\003 \001(\r\022\024\n\014is_re" +
+      "connect\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_abili" +
+      "ty_info\030\007 \001(\0132\025.AbilitySyncStateInfo\022\023\n\013" +
+      "weapon_guid\030\005 \001(\004\022 \n\013avatar_info\030\006 \001(\0132\013" +
+      ".AvatarInfo\022\021\n\tentity_id\030\t \001(\r\022\023\n\013avatar" +
+      "_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.SceneAva" +
+      "tarInfo\022\035\n\024is_player_cur_avatar\030\345\r \001(\010\022\023" +
+      "\n\013is_on_scene\030\r \001(\010B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -2717,7 +2717,7 @@ public final class SceneTeamAvatarOuterClass {
     internal_static_SceneTeamAvatar_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTeamAvatar_descriptor,
-        new java.lang.String[] { "SceneEntityInfo", "WeaponEntityId", "PlayerUid", "IsOnScene", "WeaponAbilityInfo", "ServerBuffList", "AvatarAbilityInfo", "WeaponGuid", "AvatarInfo", "EntityId", "AvatarGuid", "AbilityControlBlock", "SceneId", "SceneAvatarInfo", "IsPlayerCurAvatar", "IsReconnect", });
+        new java.lang.String[] { "SceneEntityInfo", "WeaponEntityId", "PlayerUid", "IsReconnect", "WeaponAbilityInfo", "ServerBuffList", "AvatarAbilityInfo", "WeaponGuid", "AvatarInfo", "EntityId", "AvatarGuid", "AbilityControlBlock", "SceneId", "SceneAvatarInfo", "IsPlayerCurAvatar", "IsOnScene", });
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
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 93f166cd4..1959628b5 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 add_quest_id_list = 6;
-     * @return A list containing the addQuestIdList.
-     */
-    java.util.List getAddQuestIdListList();
-    /**
-     * repeated uint32 add_quest_id_list = 6;
-     * @return The count of addQuestIdList.
-     */
-    int getAddQuestIdListCount();
-    /**
-     * repeated uint32 add_quest_id_list = 6;
-     * @param index The index of the element to return.
-     * @return The addQuestIdList at the given index.
-     */
-    int getAddQuestIdList(int index);
-
-    /**
-     * repeated uint32 del_quest_id_list = 9;
+     * repeated uint32 del_quest_id_list = 6;
      * @return A list containing the delQuestIdList.
      */
     java.util.List getDelQuestIdListList();
     /**
-     * repeated uint32 del_quest_id_list = 9;
+     * repeated uint32 del_quest_id_list = 6;
      * @return The count of delQuestIdList.
      */
     int getDelQuestIdListCount();
     /**
-     * repeated uint32 del_quest_id_list = 9;
+     * repeated uint32 del_quest_id_list = 6;
      * @param index The index of the element to return.
      * @return The delQuestIdList at the given index.
      */
     int getDelQuestIdList(int index);
+
+    /**
+     * repeated uint32 add_quest_id_list = 9;
+     * @return A list containing the addQuestIdList.
+     */
+    java.util.List getAddQuestIdListList();
+    /**
+     * repeated uint32 add_quest_id_list = 9;
+     * @return The count of addQuestIdList.
+     */
+    int getAddQuestIdListCount();
+    /**
+     * repeated uint32 add_quest_id_list = 9;
+     * @param index The index of the element to return.
+     * @return The addQuestIdList at the given index.
+     */
+    int getAddQuestIdList(int index);
   }
   /**
    * 
@@ -70,8 +70,8 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       super(builder);
     }
     private ServerCondMeetQuestListUpdateNotify() {
-      addQuestIdList_ = emptyIntList();
       delQuestIdList_ = emptyIntList();
+      addQuestIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -107,42 +107,42 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
               break;
             case 48: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                addQuestIdList_ = newIntList();
+                delQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              addQuestIdList_.addInt(input.readUInt32());
+              delQuestIdList_.addInt(input.readUInt32());
               break;
             }
             case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                addQuestIdList_ = newIntList();
+                delQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                addQuestIdList_.addInt(input.readUInt32());
+                delQuestIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 72: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                delQuestIdList_ = newIntList();
+                addQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              delQuestIdList_.addInt(input.readUInt32());
+              addQuestIdList_.addInt(input.readUInt32());
               break;
             }
             case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                delQuestIdList_ = newIntList();
+                addQuestIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                delQuestIdList_.addInt(input.readUInt32());
+                addQuestIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -163,10 +163,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          addQuestIdList_.makeImmutable(); // C
+          delQuestIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          delQuestIdList_.makeImmutable(); // C
+          addQuestIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -185,38 +185,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.class, emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.Builder.class);
     }
 
-    public static final int ADD_QUEST_ID_LIST_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList addQuestIdList_;
-    /**
-     * repeated uint32 add_quest_id_list = 6;
-     * @return A list containing the addQuestIdList.
-     */
-    @java.lang.Override
-    public java.util.List
-        getAddQuestIdListList() {
-      return addQuestIdList_;
-    }
-    /**
-     * repeated uint32 add_quest_id_list = 6;
-     * @return The count of addQuestIdList.
-     */
-    public int getAddQuestIdListCount() {
-      return addQuestIdList_.size();
-    }
-    /**
-     * repeated uint32 add_quest_id_list = 6;
-     * @param index The index of the element to return.
-     * @return The addQuestIdList at the given index.
-     */
-    public int getAddQuestIdList(int index) {
-      return addQuestIdList_.getInt(index);
-    }
-    private int addQuestIdListMemoizedSerializedSize = -1;
-
-    public static final int DEL_QUEST_ID_LIST_FIELD_NUMBER = 9;
+    public static final int DEL_QUEST_ID_LIST_FIELD_NUMBER = 6;
     private com.google.protobuf.Internal.IntList delQuestIdList_;
     /**
-     * repeated uint32 del_quest_id_list = 9;
+     * repeated uint32 del_quest_id_list = 6;
      * @return A list containing the delQuestIdList.
      */
     @java.lang.Override
@@ -225,14 +197,14 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       return delQuestIdList_;
     }
     /**
-     * repeated uint32 del_quest_id_list = 9;
+     * repeated uint32 del_quest_id_list = 6;
      * @return The count of delQuestIdList.
      */
     public int getDelQuestIdListCount() {
       return delQuestIdList_.size();
     }
     /**
-     * repeated uint32 del_quest_id_list = 9;
+     * repeated uint32 del_quest_id_list = 6;
      * @param index The index of the element to return.
      * @return The delQuestIdList at the given index.
      */
@@ -241,6 +213,34 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     }
     private int delQuestIdListMemoizedSerializedSize = -1;
 
+    public static final int ADD_QUEST_ID_LIST_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.IntList addQuestIdList_;
+    /**
+     * repeated uint32 add_quest_id_list = 9;
+     * @return A list containing the addQuestIdList.
+     */
+    @java.lang.Override
+    public java.util.List
+        getAddQuestIdListList() {
+      return addQuestIdList_;
+    }
+    /**
+     * repeated uint32 add_quest_id_list = 9;
+     * @return The count of addQuestIdList.
+     */
+    public int getAddQuestIdListCount() {
+      return addQuestIdList_.size();
+    }
+    /**
+     * repeated uint32 add_quest_id_list = 9;
+     * @param index The index of the element to return.
+     * @return The addQuestIdList at the given index.
+     */
+    public int getAddQuestIdList(int index) {
+      return addQuestIdList_.getInt(index);
+    }
+    private int addQuestIdListMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -256,20 +256,20 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getAddQuestIdListList().size() > 0) {
-        output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(addQuestIdListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < addQuestIdList_.size(); i++) {
-        output.writeUInt32NoTag(addQuestIdList_.getInt(i));
-      }
       if (getDelQuestIdListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(50);
         output.writeUInt32NoTag(delQuestIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < delQuestIdList_.size(); i++) {
         output.writeUInt32NoTag(delQuestIdList_.getInt(i));
       }
+      if (getAddQuestIdListList().size() > 0) {
+        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(addQuestIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < addQuestIdList_.size(); i++) {
+        output.writeUInt32NoTag(addQuestIdList_.getInt(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -279,20 +279,6 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      {
-        int dataSize = 0;
-        for (int i = 0; i < addQuestIdList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(addQuestIdList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getAddQuestIdListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        addQuestIdListMemoizedSerializedSize = dataSize;
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < delQuestIdList_.size(); i++) {
@@ -307,6 +293,20 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         }
         delQuestIdListMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < addQuestIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(addQuestIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getAddQuestIdListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        addQuestIdListMemoizedSerializedSize = dataSize;
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -322,10 +322,10 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify other = (emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify) obj;
 
-      if (!getAddQuestIdListList()
-          .equals(other.getAddQuestIdListList())) return false;
       if (!getDelQuestIdListList()
           .equals(other.getDelQuestIdListList())) return false;
+      if (!getAddQuestIdListList()
+          .equals(other.getAddQuestIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -337,14 +337,14 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getAddQuestIdListCount() > 0) {
-        hash = (37 * hash) + ADD_QUEST_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getAddQuestIdListList().hashCode();
-      }
       if (getDelQuestIdListCount() > 0) {
         hash = (37 * hash) + DEL_QUEST_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getDelQuestIdListList().hashCode();
       }
+      if (getAddQuestIdListCount() > 0) {
+        hash = (37 * hash) + ADD_QUEST_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAddQuestIdListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -483,9 +483,9 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        addQuestIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         delQuestIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        addQuestIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -515,15 +515,15 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify result = new emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          addQuestIdList_.makeImmutable();
+          delQuestIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.addQuestIdList_ = addQuestIdList_;
+        result.delQuestIdList_ = delQuestIdList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          delQuestIdList_.makeImmutable();
+          addQuestIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.delQuestIdList_ = delQuestIdList_;
+        result.addQuestIdList_ = addQuestIdList_;
         onBuilt();
         return result;
       }
@@ -572,26 +572,26 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify.getDefaultInstance()) return this;
-        if (!other.addQuestIdList_.isEmpty()) {
-          if (addQuestIdList_.isEmpty()) {
-            addQuestIdList_ = other.addQuestIdList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureAddQuestIdListIsMutable();
-            addQuestIdList_.addAll(other.addQuestIdList_);
-          }
-          onChanged();
-        }
         if (!other.delQuestIdList_.isEmpty()) {
           if (delQuestIdList_.isEmpty()) {
             delQuestIdList_ = other.delQuestIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureDelQuestIdListIsMutable();
             delQuestIdList_.addAll(other.delQuestIdList_);
           }
           onChanged();
         }
+        if (!other.addQuestIdList_.isEmpty()) {
+          if (addQuestIdList_.isEmpty()) {
+            addQuestIdList_ = other.addQuestIdList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureAddQuestIdListIsMutable();
+            addQuestIdList_.addAll(other.addQuestIdList_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -622,110 +622,31 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList addQuestIdList_ = emptyIntList();
-      private void ensureAddQuestIdListIsMutable() {
+      private com.google.protobuf.Internal.IntList delQuestIdList_ = emptyIntList();
+      private void ensureDelQuestIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          addQuestIdList_ = mutableCopy(addQuestIdList_);
+          delQuestIdList_ = mutableCopy(delQuestIdList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * repeated uint32 add_quest_id_list = 6;
-       * @return A list containing the addQuestIdList.
-       */
-      public java.util.List
-          getAddQuestIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(addQuestIdList_) : addQuestIdList_;
-      }
-      /**
-       * repeated uint32 add_quest_id_list = 6;
-       * @return The count of addQuestIdList.
-       */
-      public int getAddQuestIdListCount() {
-        return addQuestIdList_.size();
-      }
-      /**
-       * repeated uint32 add_quest_id_list = 6;
-       * @param index The index of the element to return.
-       * @return The addQuestIdList at the given index.
-       */
-      public int getAddQuestIdList(int index) {
-        return addQuestIdList_.getInt(index);
-      }
-      /**
-       * repeated uint32 add_quest_id_list = 6;
-       * @param index The index to set the value at.
-       * @param value The addQuestIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAddQuestIdList(
-          int index, int value) {
-        ensureAddQuestIdListIsMutable();
-        addQuestIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated uint32 add_quest_id_list = 6;
-       * @param value The addQuestIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAddQuestIdList(int value) {
-        ensureAddQuestIdListIsMutable();
-        addQuestIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated uint32 add_quest_id_list = 6;
-       * @param values The addQuestIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllAddQuestIdList(
-          java.lang.Iterable values) {
-        ensureAddQuestIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, addQuestIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated uint32 add_quest_id_list = 6;
-       * @return This builder for chaining.
-       */
-      public Builder clearAddQuestIdList() {
-        addQuestIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList delQuestIdList_ = emptyIntList();
-      private void ensureDelQuestIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          delQuestIdList_ = mutableCopy(delQuestIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * repeated uint32 del_quest_id_list = 9;
+       * repeated uint32 del_quest_id_list = 6;
        * @return A list containing the delQuestIdList.
        */
       public java.util.List
           getDelQuestIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(delQuestIdList_) : delQuestIdList_;
       }
       /**
-       * repeated uint32 del_quest_id_list = 9;
+       * repeated uint32 del_quest_id_list = 6;
        * @return The count of delQuestIdList.
        */
       public int getDelQuestIdListCount() {
         return delQuestIdList_.size();
       }
       /**
-       * repeated uint32 del_quest_id_list = 9;
+       * repeated uint32 del_quest_id_list = 6;
        * @param index The index of the element to return.
        * @return The delQuestIdList at the given index.
        */
@@ -733,7 +654,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return delQuestIdList_.getInt(index);
       }
       /**
-       * repeated uint32 del_quest_id_list = 9;
+       * repeated uint32 del_quest_id_list = 6;
        * @param index The index to set the value at.
        * @param value The delQuestIdList to set.
        * @return This builder for chaining.
@@ -746,7 +667,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * repeated uint32 del_quest_id_list = 9;
+       * repeated uint32 del_quest_id_list = 6;
        * @param value The delQuestIdList to add.
        * @return This builder for chaining.
        */
@@ -757,7 +678,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * repeated uint32 del_quest_id_list = 9;
+       * repeated uint32 del_quest_id_list = 6;
        * @param values The delQuestIdList to add.
        * @return This builder for chaining.
        */
@@ -770,11 +691,90 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * repeated uint32 del_quest_id_list = 9;
+       * repeated uint32 del_quest_id_list = 6;
        * @return This builder for chaining.
        */
       public Builder clearDelQuestIdList() {
         delQuestIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList addQuestIdList_ = emptyIntList();
+      private void ensureAddQuestIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          addQuestIdList_ = mutableCopy(addQuestIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * repeated uint32 add_quest_id_list = 9;
+       * @return A list containing the addQuestIdList.
+       */
+      public java.util.List
+          getAddQuestIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(addQuestIdList_) : addQuestIdList_;
+      }
+      /**
+       * repeated uint32 add_quest_id_list = 9;
+       * @return The count of addQuestIdList.
+       */
+      public int getAddQuestIdListCount() {
+        return addQuestIdList_.size();
+      }
+      /**
+       * repeated uint32 add_quest_id_list = 9;
+       * @param index The index of the element to return.
+       * @return The addQuestIdList at the given index.
+       */
+      public int getAddQuestIdList(int index) {
+        return addQuestIdList_.getInt(index);
+      }
+      /**
+       * repeated uint32 add_quest_id_list = 9;
+       * @param index The index to set the value at.
+       * @param value The addQuestIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAddQuestIdList(
+          int index, int value) {
+        ensureAddQuestIdListIsMutable();
+        addQuestIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * repeated uint32 add_quest_id_list = 9;
+       * @param value The addQuestIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAddQuestIdList(int value) {
+        ensureAddQuestIdListIsMutable();
+        addQuestIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * repeated uint32 add_quest_id_list = 9;
+       * @param values The addQuestIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllAddQuestIdList(
+          java.lang.Iterable values) {
+        ensureAddQuestIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, addQuestIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * repeated uint32 add_quest_id_list = 9;
+       * @return This builder for chaining.
+       */
+      public Builder clearAddQuestIdList() {
+        addQuestIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -848,7 +848,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n)ServerCondMeetQuestListUpdateNotify.pr" +
       "oto\"[\n#ServerCondMeetQuestListUpdateNoti" +
-      "fy\022\031\n\021add_quest_id_list\030\006 \003(\r\022\031\n\021del_que" +
+      "fy\022\031\n\021del_quest_id_list\030\006 \003(\r\022\031\n\021add_que" +
       "st_id_list\030\t \003(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
@@ -861,7 +861,7 @@ public final class ServerCondMeetQuestListUpdateNotifyOuterClass {
     internal_static_ServerCondMeetQuestListUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ServerCondMeetQuestListUpdateNotify_descriptor,
-        new java.lang.String[] { "AddQuestIdList", "DelQuestIdList", });
+        new java.lang.String[] { "DelQuestIdList", "AddQuestIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 51747200a..a7a514a7f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
@@ -19,22 +19,34 @@ public final class ShopGoodsOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * uint32 NPBGGAMEDJG = 4;
-     * @return The nPBGGAMEDJG.
+     * 
+     *Stardust // paimon
+     * 
+ * + * uint32 scoin = 4; + * @return The scoin. */ - int getNPBGGAMEDJG(); + int getScoin(); /** - * uint32 FEMEEIEHBBL = 11; - * @return The fEMEEIEHBBL. + *
+     * FEMEEIEHBBL
+     * 
+ * + * uint32 mcoin = 11; + * @return The mcoin. */ - int getFEMEEIEHBBL(); + int getMcoin(); /** - * uint32 JOMBNPMFHGG = 8; - * @return The jOMBNPMFHGG. + *
+     * benar
+     * 
+ * + * uint32 goods_id = 8; + * @return The goodsId. */ - int getJOMBNPMFHGG(); + int getGoodsId(); /** * repeated .ItemParam cost_item_list = 3; @@ -61,10 +73,10 @@ public final class ShopGoodsOuterClass { int index); /** - * uint32 scoin = 1690; - * @return The scoin. + * uint32 min_level = 1690; + * @return The minLevel. */ - int getScoin(); + int getMinLevel(); /** * uint32 bought_num = 14; @@ -108,10 +120,10 @@ public final class ShopGoodsOuterClass { int getPreGoodsIdList(int index); /** - * uint32 mcoin = 10; - * @return The mcoin. + * uint32 buy_limit = 10; + * @return The buyLimit. */ - int getMcoin(); + int getBuyLimit(); /** * .ItemParam goods_item = 1; @@ -129,35 +141,35 @@ public final class ShopGoodsOuterClass { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder(); /** - * uint32 NODBIKCALJI = 12; - * @return The nODBIKCALJI. + * uint32 hcoin = 12; + * @return The hcoin. */ - int getNODBIKCALJI(); + int getHcoin(); /** - * uint32 buy_limit = 2; - * @return The buyLimit. + * uint32 EKGBDJFIDJO = 2; + * @return The eKGBDJFIDJO. */ - int getBuyLimit(); + int getEKGBDJFIDJO(); /** - * uint32 min_level = 898; - * @return The minLevel. + * uint32 KKKOCADJCHM = 898; + * @return The kKKOCADJCHM. */ - int getMinLevel(); + int getKKKOCADJCHM(); /** - * uint32 max_level = 1946; + * uint32 OENMLOAFHMJ = 1946; + * @return The oENMLOAFHMJ. + */ + int getOENMLOAFHMJ(); + + /** + * uint32 max_level = 7; * @return The maxLevel. */ int getMaxLevel(); - /** - * uint32 goods_id = 7; - * @return The goodsId. - */ - int getGoodsId(); - /** * uint32 end_time = 6; * @return The endTime. @@ -165,12 +177,18 @@ public final class ShopGoodsOuterClass { int getEndTime(); /** - * uint32 hcoin = 15; - * @return The hcoin. + * uint32 uk15 = 15; + * @return The uk15. */ - int getHcoin(); + int getUk15(); /** + *
+     * mcoin = Crystals
+     * scoin = Stardust
+     * hcoin = Starglitter
+     * 
+ * * uint32 next_refresh_time = 9; * @return The nextRefreshTime. */ @@ -243,7 +261,7 @@ public final class ShopGoodsOuterClass { } case 16: { - buyLimit_ = input.readUInt32(); + eKGBDJFIDJO_ = input.readUInt32(); break; } case 26: { @@ -257,7 +275,7 @@ public final class ShopGoodsOuterClass { } case 32: { - nPBGGAMEDJG_ = input.readUInt32(); + scoin_ = input.readUInt32(); break; } case 40: { @@ -288,12 +306,12 @@ public final class ShopGoodsOuterClass { } case 56: { - goodsId_ = input.readUInt32(); + maxLevel_ = input.readUInt32(); break; } case 64: { - jOMBNPMFHGG_ = input.readUInt32(); + goodsId_ = input.readUInt32(); break; } case 72: { @@ -303,17 +321,17 @@ public final class ShopGoodsOuterClass { } case 80: { - mcoin_ = input.readUInt32(); + buyLimit_ = input.readUInt32(); break; } case 88: { - fEMEEIEHBBL_ = input.readUInt32(); + mcoin_ = input.readUInt32(); break; } case 96: { - nODBIKCALJI_ = input.readUInt32(); + hcoin_ = input.readUInt32(); break; } case 104: { @@ -328,12 +346,12 @@ public final class ShopGoodsOuterClass { } case 120: { - hcoin_ = input.readUInt32(); + uk15_ = input.readUInt32(); break; } case 7184: { - minLevel_ = input.readUInt32(); + kKKOCADJCHM_ = input.readUInt32(); break; } case 7384: { @@ -343,12 +361,12 @@ public final class ShopGoodsOuterClass { } case 13520: { - scoin_ = input.readUInt32(); + minLevel_ = input.readUInt32(); break; } case 15568: { - maxLevel_ = input.readUInt32(); + oENMLOAFHMJ_ = input.readUInt32(); break; } case 15600: { @@ -394,37 +412,49 @@ public final class ShopGoodsOuterClass { emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.class, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder.class); } - public static final int NPBGGAMEDJG_FIELD_NUMBER = 4; - private int nPBGGAMEDJG_; + public static final int SCOIN_FIELD_NUMBER = 4; + private int scoin_; /** - * uint32 NPBGGAMEDJG = 4; - * @return The nPBGGAMEDJG. + *
+     *Stardust // paimon
+     * 
+ * + * uint32 scoin = 4; + * @return The scoin. */ @java.lang.Override - public int getNPBGGAMEDJG() { - return nPBGGAMEDJG_; + public int getScoin() { + return scoin_; } - public static final int FEMEEIEHBBL_FIELD_NUMBER = 11; - private int fEMEEIEHBBL_; + public static final int MCOIN_FIELD_NUMBER = 11; + private int mcoin_; /** - * uint32 FEMEEIEHBBL = 11; - * @return The fEMEEIEHBBL. + *
+     * FEMEEIEHBBL
+     * 
+ * + * uint32 mcoin = 11; + * @return The mcoin. */ @java.lang.Override - public int getFEMEEIEHBBL() { - return fEMEEIEHBBL_; + public int getMcoin() { + return mcoin_; } - public static final int JOMBNPMFHGG_FIELD_NUMBER = 8; - private int jOMBNPMFHGG_; + public static final int GOODS_ID_FIELD_NUMBER = 8; + private int goodsId_; /** - * uint32 JOMBNPMFHGG = 8; - * @return The jOMBNPMFHGG. + *
+     * benar
+     * 
+ * + * uint32 goods_id = 8; + * @return The goodsId. */ @java.lang.Override - public int getJOMBNPMFHGG() { - return jOMBNPMFHGG_; + public int getGoodsId() { + return goodsId_; } public static final int COST_ITEM_LIST_FIELD_NUMBER = 3; @@ -467,15 +497,15 @@ public final class ShopGoodsOuterClass { return costItemList_.get(index); } - public static final int SCOIN_FIELD_NUMBER = 1690; - private int scoin_; + public static final int MIN_LEVEL_FIELD_NUMBER = 1690; + private int minLevel_; /** - * uint32 scoin = 1690; - * @return The scoin. + * uint32 min_level = 1690; + * @return The minLevel. */ @java.lang.Override - public int getScoin() { - return scoin_; + public int getMinLevel() { + return minLevel_; } public static final int BOUGHT_NUM_FIELD_NUMBER = 14; @@ -550,15 +580,15 @@ public final class ShopGoodsOuterClass { } private int preGoodsIdListMemoizedSerializedSize = -1; - public static final int MCOIN_FIELD_NUMBER = 10; - private int mcoin_; + public static final int BUY_LIMIT_FIELD_NUMBER = 10; + private int buyLimit_; /** - * uint32 mcoin = 10; - * @return The mcoin. + * uint32 buy_limit = 10; + * @return The buyLimit. */ @java.lang.Override - public int getMcoin() { - return mcoin_; + public int getBuyLimit() { + return buyLimit_; } public static final int GOODS_ITEM_FIELD_NUMBER = 1; @@ -587,43 +617,54 @@ public final class ShopGoodsOuterClass { return getGoodsItem(); } - public static final int NODBIKCALJI_FIELD_NUMBER = 12; - private int nODBIKCALJI_; + public static final int HCOIN_FIELD_NUMBER = 12; + private int hcoin_; /** - * uint32 NODBIKCALJI = 12; - * @return The nODBIKCALJI. + * uint32 hcoin = 12; + * @return The hcoin. */ @java.lang.Override - public int getNODBIKCALJI() { - return nODBIKCALJI_; + public int getHcoin() { + return hcoin_; } - public static final int BUY_LIMIT_FIELD_NUMBER = 2; - private int buyLimit_; + public static final int EKGBDJFIDJO_FIELD_NUMBER = 2; + private int eKGBDJFIDJO_; /** - * uint32 buy_limit = 2; - * @return The buyLimit. + * uint32 EKGBDJFIDJO = 2; + * @return The eKGBDJFIDJO. */ @java.lang.Override - public int getBuyLimit() { - return buyLimit_; + public int getEKGBDJFIDJO() { + return eKGBDJFIDJO_; } - public static final int MIN_LEVEL_FIELD_NUMBER = 898; - private int minLevel_; + public static final int KKKOCADJCHM_FIELD_NUMBER = 898; + private int kKKOCADJCHM_; /** - * uint32 min_level = 898; - * @return The minLevel. + * uint32 KKKOCADJCHM = 898; + * @return The kKKOCADJCHM. */ @java.lang.Override - public int getMinLevel() { - return minLevel_; + public int getKKKOCADJCHM() { + return kKKOCADJCHM_; } - public static final int MAX_LEVEL_FIELD_NUMBER = 1946; + public static final int OENMLOAFHMJ_FIELD_NUMBER = 1946; + private int oENMLOAFHMJ_; + /** + * uint32 OENMLOAFHMJ = 1946; + * @return The oENMLOAFHMJ. + */ + @java.lang.Override + public int getOENMLOAFHMJ() { + return oENMLOAFHMJ_; + } + + public static final int MAX_LEVEL_FIELD_NUMBER = 7; private int maxLevel_; /** - * uint32 max_level = 1946; + * uint32 max_level = 7; * @return The maxLevel. */ @java.lang.Override @@ -631,17 +672,6 @@ public final class ShopGoodsOuterClass { return maxLevel_; } - public static final int GOODS_ID_FIELD_NUMBER = 7; - private int goodsId_; - /** - * uint32 goods_id = 7; - * @return The goodsId. - */ - @java.lang.Override - public int getGoodsId() { - return goodsId_; - } - public static final int END_TIME_FIELD_NUMBER = 6; private int endTime_; /** @@ -653,20 +683,26 @@ public final class ShopGoodsOuterClass { return endTime_; } - public static final int HCOIN_FIELD_NUMBER = 15; - private int hcoin_; + public static final int UK15_FIELD_NUMBER = 15; + private int uk15_; /** - * uint32 hcoin = 15; - * @return The hcoin. + * uint32 uk15 = 15; + * @return The uk15. */ @java.lang.Override - public int getHcoin() { - return hcoin_; + public int getUk15() { + return uk15_; } public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 9; private int nextRefreshTime_; /** + *
+     * mcoin = Crystals
+     * scoin = Stardust
+     * hcoin = Starglitter
+     * 
+ * * uint32 next_refresh_time = 9; * @return The nextRefreshTime. */ @@ -693,14 +729,14 @@ public final class ShopGoodsOuterClass { if (goodsItem_ != null) { output.writeMessage(1, getGoodsItem()); } - if (buyLimit_ != 0) { - output.writeUInt32(2, buyLimit_); + if (eKGBDJFIDJO_ != 0) { + output.writeUInt32(2, eKGBDJFIDJO_); } for (int i = 0; i < costItemList_.size(); i++) { output.writeMessage(3, costItemList_.get(i)); } - if (nPBGGAMEDJG_ != 0) { - output.writeUInt32(4, nPBGGAMEDJG_); + if (scoin_ != 0) { + output.writeUInt32(4, scoin_); } if (getPreGoodsIdListList().size() > 0) { output.writeUInt32NoTag(42); @@ -712,23 +748,23 @@ public final class ShopGoodsOuterClass { if (endTime_ != 0) { output.writeUInt32(6, endTime_); } - if (goodsId_ != 0) { - output.writeUInt32(7, goodsId_); + if (maxLevel_ != 0) { + output.writeUInt32(7, maxLevel_); } - if (jOMBNPMFHGG_ != 0) { - output.writeUInt32(8, jOMBNPMFHGG_); + if (goodsId_ != 0) { + output.writeUInt32(8, goodsId_); } if (nextRefreshTime_ != 0) { output.writeUInt32(9, nextRefreshTime_); } + if (buyLimit_ != 0) { + output.writeUInt32(10, buyLimit_); + } if (mcoin_ != 0) { - output.writeUInt32(10, mcoin_); + output.writeUInt32(11, mcoin_); } - if (fEMEEIEHBBL_ != 0) { - output.writeUInt32(11, fEMEEIEHBBL_); - } - if (nODBIKCALJI_ != 0) { - output.writeUInt32(12, nODBIKCALJI_); + if (hcoin_ != 0) { + output.writeUInt32(12, hcoin_); } if (beginTime_ != 0) { output.writeUInt32(13, beginTime_); @@ -736,20 +772,20 @@ public final class ShopGoodsOuterClass { if (boughtNum_ != 0) { output.writeUInt32(14, boughtNum_); } - if (hcoin_ != 0) { - output.writeUInt32(15, hcoin_); + if (uk15_ != 0) { + output.writeUInt32(15, uk15_); } - if (minLevel_ != 0) { - output.writeUInt32(898, minLevel_); + if (kKKOCADJCHM_ != 0) { + output.writeUInt32(898, kKKOCADJCHM_); } if (dIHOGOJNKHB_ != 0) { output.writeUInt32(923, dIHOGOJNKHB_); } - if (scoin_ != 0) { - output.writeUInt32(1690, scoin_); + if (minLevel_ != 0) { + output.writeUInt32(1690, minLevel_); } - if (maxLevel_ != 0) { - output.writeUInt32(1946, maxLevel_); + if (oENMLOAFHMJ_ != 0) { + output.writeUInt32(1946, oENMLOAFHMJ_); } if (bNEKKILPEKF_ != 0) { output.writeUInt32(1950, bNEKKILPEKF_); @@ -767,17 +803,17 @@ public final class ShopGoodsOuterClass { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getGoodsItem()); } - if (buyLimit_ != 0) { + if (eKGBDJFIDJO_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, buyLimit_); + .computeUInt32Size(2, eKGBDJFIDJO_); } for (int i = 0; i < costItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, costItemList_.get(i)); } - if (nPBGGAMEDJG_ != 0) { + if (scoin_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, nPBGGAMEDJG_); + .computeUInt32Size(4, scoin_); } { int dataSize = 0; @@ -797,29 +833,29 @@ public final class ShopGoodsOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(6, endTime_); } + if (maxLevel_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(7, maxLevel_); + } if (goodsId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, goodsId_); - } - if (jOMBNPMFHGG_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, jOMBNPMFHGG_); + .computeUInt32Size(8, goodsId_); } if (nextRefreshTime_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(9, nextRefreshTime_); } + if (buyLimit_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(10, buyLimit_); + } if (mcoin_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, mcoin_); + .computeUInt32Size(11, mcoin_); } - if (fEMEEIEHBBL_ != 0) { + if (hcoin_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, fEMEEIEHBBL_); - } - if (nODBIKCALJI_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, nODBIKCALJI_); + .computeUInt32Size(12, hcoin_); } if (beginTime_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -829,25 +865,25 @@ public final class ShopGoodsOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(14, boughtNum_); } - if (hcoin_ != 0) { + if (uk15_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, hcoin_); + .computeUInt32Size(15, uk15_); } - if (minLevel_ != 0) { + if (kKKOCADJCHM_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(898, minLevel_); + .computeUInt32Size(898, kKKOCADJCHM_); } if (dIHOGOJNKHB_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(923, dIHOGOJNKHB_); } - if (scoin_ != 0) { + if (minLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1690, scoin_); + .computeUInt32Size(1690, minLevel_); } - if (maxLevel_ != 0) { + if (oENMLOAFHMJ_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1946, maxLevel_); + .computeUInt32Size(1946, oENMLOAFHMJ_); } if (bNEKKILPEKF_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -868,16 +904,16 @@ public final class ShopGoodsOuterClass { } emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods other = (emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods) obj; - if (getNPBGGAMEDJG() - != other.getNPBGGAMEDJG()) return false; - if (getFEMEEIEHBBL() - != other.getFEMEEIEHBBL()) return false; - if (getJOMBNPMFHGG() - != other.getJOMBNPMFHGG()) return false; - if (!getCostItemListList() - .equals(other.getCostItemListList())) return false; if (getScoin() != other.getScoin()) return false; + if (getMcoin() + != other.getMcoin()) return false; + if (getGoodsId() + != other.getGoodsId()) return false; + if (!getCostItemListList() + .equals(other.getCostItemListList())) return false; + if (getMinLevel() + != other.getMinLevel()) return false; if (getBoughtNum() != other.getBoughtNum()) return false; if (getDIHOGOJNKHB() @@ -888,27 +924,27 @@ public final class ShopGoodsOuterClass { != other.getBNEKKILPEKF()) return false; if (!getPreGoodsIdListList() .equals(other.getPreGoodsIdListList())) return false; - if (getMcoin() - != other.getMcoin()) return false; + if (getBuyLimit() + != other.getBuyLimit()) return false; if (hasGoodsItem() != other.hasGoodsItem()) return false; if (hasGoodsItem()) { if (!getGoodsItem() .equals(other.getGoodsItem())) return false; } - if (getNODBIKCALJI() - != other.getNODBIKCALJI()) 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() != other.getHcoin()) return false; + if (getEKGBDJFIDJO() + != other.getEKGBDJFIDJO()) return false; + if (getKKKOCADJCHM() + != other.getKKKOCADJCHM()) return false; + if (getOENMLOAFHMJ() + != other.getOENMLOAFHMJ()) return false; + if (getMaxLevel() + != other.getMaxLevel()) return false; + if (getEndTime() + != other.getEndTime()) return false; + if (getUk15() + != other.getUk15()) return false; if (getNextRefreshTime() != other.getNextRefreshTime()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -922,18 +958,18 @@ public final class ShopGoodsOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + NPBGGAMEDJG_FIELD_NUMBER; - hash = (53 * hash) + getNPBGGAMEDJG(); - hash = (37 * hash) + FEMEEIEHBBL_FIELD_NUMBER; - hash = (53 * hash) + getFEMEEIEHBBL(); - hash = (37 * hash) + JOMBNPMFHGG_FIELD_NUMBER; - hash = (53 * hash) + getJOMBNPMFHGG(); + hash = (37 * hash) + SCOIN_FIELD_NUMBER; + hash = (53 * hash) + getScoin(); + hash = (37 * hash) + MCOIN_FIELD_NUMBER; + hash = (53 * hash) + getMcoin(); + hash = (37 * hash) + GOODS_ID_FIELD_NUMBER; + hash = (53 * hash) + getGoodsId(); if (getCostItemListCount() > 0) { hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getCostItemListList().hashCode(); } - hash = (37 * hash) + SCOIN_FIELD_NUMBER; - hash = (53 * hash) + getScoin(); + hash = (37 * hash) + MIN_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getMinLevel(); hash = (37 * hash) + BOUGHT_NUM_FIELD_NUMBER; hash = (53 * hash) + getBoughtNum(); hash = (37 * hash) + DIHOGOJNKHB_FIELD_NUMBER; @@ -946,26 +982,26 @@ public final class ShopGoodsOuterClass { hash = (37 * hash) + PREGOODSIDLIST_FIELD_NUMBER; hash = (53 * hash) + getPreGoodsIdListList().hashCode(); } - hash = (37 * hash) + MCOIN_FIELD_NUMBER; - hash = (53 * hash) + getMcoin(); + hash = (37 * hash) + BUY_LIMIT_FIELD_NUMBER; + hash = (53 * hash) + getBuyLimit(); 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) + 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; hash = (53 * hash) + getHcoin(); + 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) + MAX_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getMaxLevel(); + hash = (37 * hash) + END_TIME_FIELD_NUMBER; + hash = (53 * hash) + getEndTime(); + hash = (37 * hash) + UK15_FIELD_NUMBER; + hash = (53 * hash) + getUk15(); hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER; hash = (53 * hash) + getNextRefreshTime(); hash = (29 * hash) + unknownFields.hashCode(); @@ -1106,11 +1142,11 @@ public final class ShopGoodsOuterClass { @java.lang.Override public Builder clear() { super.clear(); - nPBGGAMEDJG_ = 0; + scoin_ = 0; - fEMEEIEHBBL_ = 0; + mcoin_ = 0; - jOMBNPMFHGG_ = 0; + goodsId_ = 0; if (costItemListBuilder_ == null) { costItemList_ = java.util.Collections.emptyList(); @@ -1118,7 +1154,7 @@ public final class ShopGoodsOuterClass { } else { costItemListBuilder_.clear(); } - scoin_ = 0; + minLevel_ = 0; boughtNum_ = 0; @@ -1130,7 +1166,7 @@ public final class ShopGoodsOuterClass { preGoodsIdList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); - mcoin_ = 0; + buyLimit_ = 0; if (goodsItemBuilder_ == null) { goodsItem_ = null; @@ -1138,19 +1174,19 @@ public final class ShopGoodsOuterClass { goodsItem_ = null; goodsItemBuilder_ = null; } - nODBIKCALJI_ = 0; + hcoin_ = 0; - buyLimit_ = 0; + eKGBDJFIDJO_ = 0; - minLevel_ = 0; + kKKOCADJCHM_ = 0; + + oENMLOAFHMJ_ = 0; maxLevel_ = 0; - goodsId_ = 0; - endTime_ = 0; - hcoin_ = 0; + uk15_ = 0; nextRefreshTime_ = 0; @@ -1181,9 +1217,9 @@ public final class ShopGoodsOuterClass { public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods buildPartial() { emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods result = new emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods(this); int from_bitField0_ = bitField0_; - result.nPBGGAMEDJG_ = nPBGGAMEDJG_; - result.fEMEEIEHBBL_ = fEMEEIEHBBL_; - result.jOMBNPMFHGG_ = jOMBNPMFHGG_; + result.scoin_ = scoin_; + result.mcoin_ = mcoin_; + result.goodsId_ = goodsId_; if (costItemListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { costItemList_ = java.util.Collections.unmodifiableList(costItemList_); @@ -1193,7 +1229,7 @@ public final class ShopGoodsOuterClass { } else { result.costItemList_ = costItemListBuilder_.build(); } - result.scoin_ = scoin_; + result.minLevel_ = minLevel_; result.boughtNum_ = boughtNum_; result.dIHOGOJNKHB_ = dIHOGOJNKHB_; result.beginTime_ = beginTime_; @@ -1203,19 +1239,19 @@ public final class ShopGoodsOuterClass { bitField0_ = (bitField0_ & ~0x00000002); } result.preGoodsIdList_ = preGoodsIdList_; - result.mcoin_ = mcoin_; + result.buyLimit_ = buyLimit_; if (goodsItemBuilder_ == null) { result.goodsItem_ = goodsItem_; } else { result.goodsItem_ = goodsItemBuilder_.build(); } - result.nODBIKCALJI_ = nODBIKCALJI_; - result.buyLimit_ = buyLimit_; - result.minLevel_ = minLevel_; - result.maxLevel_ = maxLevel_; - result.goodsId_ = goodsId_; - result.endTime_ = endTime_; result.hcoin_ = hcoin_; + result.eKGBDJFIDJO_ = eKGBDJFIDJO_; + result.kKKOCADJCHM_ = kKKOCADJCHM_; + result.oENMLOAFHMJ_ = oENMLOAFHMJ_; + result.maxLevel_ = maxLevel_; + result.endTime_ = endTime_; + result.uk15_ = uk15_; result.nextRefreshTime_ = nextRefreshTime_; onBuilt(); return result; @@ -1265,14 +1301,14 @@ public final class ShopGoodsOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods other) { if (other == emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance()) return this; - if (other.getNPBGGAMEDJG() != 0) { - setNPBGGAMEDJG(other.getNPBGGAMEDJG()); + if (other.getScoin() != 0) { + setScoin(other.getScoin()); } - if (other.getFEMEEIEHBBL() != 0) { - setFEMEEIEHBBL(other.getFEMEEIEHBBL()); + if (other.getMcoin() != 0) { + setMcoin(other.getMcoin()); } - if (other.getJOMBNPMFHGG() != 0) { - setJOMBNPMFHGG(other.getJOMBNPMFHGG()); + if (other.getGoodsId() != 0) { + setGoodsId(other.getGoodsId()); } if (costItemListBuilder_ == null) { if (!other.costItemList_.isEmpty()) { @@ -1300,8 +1336,8 @@ public final class ShopGoodsOuterClass { } } } - if (other.getScoin() != 0) { - setScoin(other.getScoin()); + if (other.getMinLevel() != 0) { + setMinLevel(other.getMinLevel()); } if (other.getBoughtNum() != 0) { setBoughtNum(other.getBoughtNum()); @@ -1325,32 +1361,32 @@ public final class ShopGoodsOuterClass { } onChanged(); } - if (other.getMcoin() != 0) { - setMcoin(other.getMcoin()); + if (other.getBuyLimit() != 0) { + setBuyLimit(other.getBuyLimit()); } if (other.hasGoodsItem()) { mergeGoodsItem(other.getGoodsItem()); } - if (other.getNODBIKCALJI() != 0) { - setNODBIKCALJI(other.getNODBIKCALJI()); + if (other.getHcoin() != 0) { + setHcoin(other.getHcoin()); } - if (other.getBuyLimit() != 0) { - setBuyLimit(other.getBuyLimit()); + if (other.getEKGBDJFIDJO() != 0) { + setEKGBDJFIDJO(other.getEKGBDJFIDJO()); } - if (other.getMinLevel() != 0) { - setMinLevel(other.getMinLevel()); + if (other.getKKKOCADJCHM() != 0) { + setKKKOCADJCHM(other.getKKKOCADJCHM()); + } + if (other.getOENMLOAFHMJ() != 0) { + setOENMLOAFHMJ(other.getOENMLOAFHMJ()); } if (other.getMaxLevel() != 0) { setMaxLevel(other.getMaxLevel()); } - if (other.getGoodsId() != 0) { - setGoodsId(other.getGoodsId()); - } if (other.getEndTime() != 0) { setEndTime(other.getEndTime()); } - if (other.getHcoin() != 0) { - setHcoin(other.getHcoin()); + if (other.getUk15() != 0) { + setUk15(other.getUk15()); } if (other.getNextRefreshTime() != 0) { setNextRefreshTime(other.getNextRefreshTime()); @@ -1385,95 +1421,131 @@ public final class ShopGoodsOuterClass { } private int bitField0_; - private int nPBGGAMEDJG_ ; + private int scoin_ ; /** - * uint32 NPBGGAMEDJG = 4; - * @return The nPBGGAMEDJG. + *
+       *Stardust // paimon
+       * 
+ * + * uint32 scoin = 4; + * @return The scoin. */ @java.lang.Override - public int getNPBGGAMEDJG() { - return nPBGGAMEDJG_; + public int getScoin() { + return scoin_; } /** - * uint32 NPBGGAMEDJG = 4; - * @param value The nPBGGAMEDJG to set. + *
+       *Stardust // paimon
+       * 
+ * + * uint32 scoin = 4; + * @param value The scoin to set. * @return This builder for chaining. */ - public Builder setNPBGGAMEDJG(int value) { + public Builder setScoin(int value) { - nPBGGAMEDJG_ = value; + scoin_ = value; onChanged(); return this; } /** - * uint32 NPBGGAMEDJG = 4; + *
+       *Stardust // paimon
+       * 
+ * + * uint32 scoin = 4; * @return This builder for chaining. */ - public Builder clearNPBGGAMEDJG() { + public Builder clearScoin() { - nPBGGAMEDJG_ = 0; + scoin_ = 0; onChanged(); return this; } - private int fEMEEIEHBBL_ ; + private int mcoin_ ; /** - * uint32 FEMEEIEHBBL = 11; - * @return The fEMEEIEHBBL. + *
+       * FEMEEIEHBBL
+       * 
+ * + * uint32 mcoin = 11; + * @return The mcoin. */ @java.lang.Override - public int getFEMEEIEHBBL() { - return fEMEEIEHBBL_; + public int getMcoin() { + return mcoin_; } /** - * uint32 FEMEEIEHBBL = 11; - * @param value The fEMEEIEHBBL to set. + *
+       * FEMEEIEHBBL
+       * 
+ * + * uint32 mcoin = 11; + * @param value The mcoin to set. * @return This builder for chaining. */ - public Builder setFEMEEIEHBBL(int value) { + public Builder setMcoin(int value) { - fEMEEIEHBBL_ = value; + mcoin_ = value; onChanged(); return this; } /** - * uint32 FEMEEIEHBBL = 11; + *
+       * FEMEEIEHBBL
+       * 
+ * + * uint32 mcoin = 11; * @return This builder for chaining. */ - public Builder clearFEMEEIEHBBL() { + public Builder clearMcoin() { - fEMEEIEHBBL_ = 0; + mcoin_ = 0; onChanged(); return this; } - private int jOMBNPMFHGG_ ; + private int goodsId_ ; /** - * uint32 JOMBNPMFHGG = 8; - * @return The jOMBNPMFHGG. + *
+       * benar
+       * 
+ * + * uint32 goods_id = 8; + * @return The goodsId. */ @java.lang.Override - public int getJOMBNPMFHGG() { - return jOMBNPMFHGG_; + public int getGoodsId() { + return goodsId_; } /** - * uint32 JOMBNPMFHGG = 8; - * @param value The jOMBNPMFHGG to set. + *
+       * benar
+       * 
+ * + * uint32 goods_id = 8; + * @param value The goodsId to set. * @return This builder for chaining. */ - public Builder setJOMBNPMFHGG(int value) { + public Builder setGoodsId(int value) { - jOMBNPMFHGG_ = value; + goodsId_ = value; onChanged(); return this; } /** - * uint32 JOMBNPMFHGG = 8; + *
+       * benar
+       * 
+ * + * uint32 goods_id = 8; * @return This builder for chaining. */ - public Builder clearJOMBNPMFHGG() { + public Builder clearGoodsId() { - jOMBNPMFHGG_ = 0; + goodsId_ = 0; onChanged(); return this; } @@ -1718,33 +1790,33 @@ public final class ShopGoodsOuterClass { return costItemListBuilder_; } - private int scoin_ ; + private int minLevel_ ; /** - * uint32 scoin = 1690; - * @return The scoin. + * uint32 min_level = 1690; + * @return The minLevel. */ @java.lang.Override - public int getScoin() { - return scoin_; + public int getMinLevel() { + return minLevel_; } /** - * uint32 scoin = 1690; - * @param value The scoin to set. + * uint32 min_level = 1690; + * @param value The minLevel to set. * @return This builder for chaining. */ - public Builder setScoin(int value) { + public Builder setMinLevel(int value) { - scoin_ = value; + minLevel_ = value; onChanged(); return this; } /** - * uint32 scoin = 1690; + * uint32 min_level = 1690; * @return This builder for chaining. */ - public Builder clearScoin() { + public Builder clearMinLevel() { - scoin_ = 0; + minLevel_ = 0; onChanged(); return this; } @@ -1952,33 +2024,33 @@ public final class ShopGoodsOuterClass { return this; } - private int mcoin_ ; + private int buyLimit_ ; /** - * uint32 mcoin = 10; - * @return The mcoin. + * uint32 buy_limit = 10; + * @return The buyLimit. */ @java.lang.Override - public int getMcoin() { - return mcoin_; + public int getBuyLimit() { + return buyLimit_; } /** - * uint32 mcoin = 10; - * @param value The mcoin to set. + * uint32 buy_limit = 10; + * @param value The buyLimit to set. * @return This builder for chaining. */ - public Builder setMcoin(int value) { + public Builder setBuyLimit(int value) { - mcoin_ = value; + buyLimit_ = value; onChanged(); return this; } /** - * uint32 mcoin = 10; + * uint32 buy_limit = 10; * @return This builder for chaining. */ - public Builder clearMcoin() { + public Builder clearBuyLimit() { - mcoin_ = 0; + buyLimit_ = 0; onChanged(); return this; } @@ -2102,102 +2174,133 @@ public final class ShopGoodsOuterClass { return goodsItemBuilder_; } - private int nODBIKCALJI_ ; + private int hcoin_ ; /** - * uint32 NODBIKCALJI = 12; - * @return The nODBIKCALJI. + * uint32 hcoin = 12; + * @return The hcoin. */ @java.lang.Override - public int getNODBIKCALJI() { - return nODBIKCALJI_; + public int getHcoin() { + return hcoin_; } /** - * uint32 NODBIKCALJI = 12; - * @param value The nODBIKCALJI to set. + * uint32 hcoin = 12; + * @param value The hcoin to set. * @return This builder for chaining. */ - public Builder setNODBIKCALJI(int value) { + public Builder setHcoin(int value) { - nODBIKCALJI_ = value; + hcoin_ = value; onChanged(); return this; } /** - * uint32 NODBIKCALJI = 12; + * uint32 hcoin = 12; * @return This builder for chaining. */ - public Builder clearNODBIKCALJI() { + public Builder clearHcoin() { - nODBIKCALJI_ = 0; + hcoin_ = 0; onChanged(); return this; } - private int buyLimit_ ; + private int eKGBDJFIDJO_ ; /** - * uint32 buy_limit = 2; - * @return The buyLimit. + * uint32 EKGBDJFIDJO = 2; + * @return The eKGBDJFIDJO. */ @java.lang.Override - public int getBuyLimit() { - return buyLimit_; + public int getEKGBDJFIDJO() { + return eKGBDJFIDJO_; } /** - * uint32 buy_limit = 2; - * @param value The buyLimit to set. + * uint32 EKGBDJFIDJO = 2; + * @param value The eKGBDJFIDJO to set. * @return This builder for chaining. */ - public Builder setBuyLimit(int value) { + public Builder setEKGBDJFIDJO(int value) { - buyLimit_ = value; + eKGBDJFIDJO_ = value; onChanged(); return this; } /** - * uint32 buy_limit = 2; + * uint32 EKGBDJFIDJO = 2; * @return This builder for chaining. */ - public Builder clearBuyLimit() { + public Builder clearEKGBDJFIDJO() { - buyLimit_ = 0; + eKGBDJFIDJO_ = 0; onChanged(); return this; } - private int minLevel_ ; + private int kKKOCADJCHM_ ; /** - * uint32 min_level = 898; - * @return The minLevel. + * uint32 KKKOCADJCHM = 898; + * @return The kKKOCADJCHM. */ @java.lang.Override - public int getMinLevel() { - return minLevel_; + public int getKKKOCADJCHM() { + return kKKOCADJCHM_; } /** - * uint32 min_level = 898; - * @param value The minLevel to set. + * uint32 KKKOCADJCHM = 898; + * @param value The kKKOCADJCHM to set. * @return This builder for chaining. */ - public Builder setMinLevel(int value) { + public Builder setKKKOCADJCHM(int value) { - minLevel_ = value; + kKKOCADJCHM_ = value; onChanged(); return this; } /** - * uint32 min_level = 898; + * uint32 KKKOCADJCHM = 898; * @return This builder for chaining. */ - public Builder clearMinLevel() { + public Builder clearKKKOCADJCHM() { - minLevel_ = 0; + kKKOCADJCHM_ = 0; + onChanged(); + return this; + } + + private int oENMLOAFHMJ_ ; + /** + * uint32 OENMLOAFHMJ = 1946; + * @return The oENMLOAFHMJ. + */ + @java.lang.Override + public int getOENMLOAFHMJ() { + return oENMLOAFHMJ_; + } + /** + * uint32 OENMLOAFHMJ = 1946; + * @param value The oENMLOAFHMJ to set. + * @return This builder for chaining. + */ + public Builder setOENMLOAFHMJ(int value) { + + oENMLOAFHMJ_ = value; + onChanged(); + return this; + } + /** + * uint32 OENMLOAFHMJ = 1946; + * @return This builder for chaining. + */ + public Builder clearOENMLOAFHMJ() { + + oENMLOAFHMJ_ = 0; onChanged(); return this; } private int maxLevel_ ; /** - * uint32 max_level = 1946; + * uint32 max_level = 7; * @return The maxLevel. */ @java.lang.Override @@ -2205,7 +2308,7 @@ public final class ShopGoodsOuterClass { return maxLevel_; } /** - * uint32 max_level = 1946; + * uint32 max_level = 7; * @param value The maxLevel to set. * @return This builder for chaining. */ @@ -2216,7 +2319,7 @@ public final class ShopGoodsOuterClass { return this; } /** - * uint32 max_level = 1946; + * uint32 max_level = 7; * @return This builder for chaining. */ public Builder clearMaxLevel() { @@ -2226,37 +2329,6 @@ public final class ShopGoodsOuterClass { return this; } - private int goodsId_ ; - /** - * uint32 goods_id = 7; - * @return The goodsId. - */ - @java.lang.Override - public int getGoodsId() { - return goodsId_; - } - /** - * uint32 goods_id = 7; - * @param value The goodsId to set. - * @return This builder for chaining. - */ - public Builder setGoodsId(int value) { - - goodsId_ = value; - onChanged(); - return this; - } - /** - * uint32 goods_id = 7; - * @return This builder for chaining. - */ - public Builder clearGoodsId() { - - goodsId_ = 0; - onChanged(); - return this; - } - private int endTime_ ; /** * uint32 end_time = 6; @@ -2288,39 +2360,45 @@ public final class ShopGoodsOuterClass { return this; } - private int hcoin_ ; + private int uk15_ ; /** - * uint32 hcoin = 15; - * @return The hcoin. + * uint32 uk15 = 15; + * @return The uk15. */ @java.lang.Override - public int getHcoin() { - return hcoin_; + public int getUk15() { + return uk15_; } /** - * uint32 hcoin = 15; - * @param value The hcoin to set. + * uint32 uk15 = 15; + * @param value The uk15 to set. * @return This builder for chaining. */ - public Builder setHcoin(int value) { + public Builder setUk15(int value) { - hcoin_ = value; + uk15_ = value; onChanged(); return this; } /** - * uint32 hcoin = 15; + * uint32 uk15 = 15; * @return This builder for chaining. */ - public Builder clearHcoin() { + public Builder clearUk15() { - hcoin_ = 0; + uk15_ = 0; onChanged(); return this; } private int nextRefreshTime_ ; /** + *
+       * mcoin = Crystals
+       * scoin = Stardust
+       * hcoin = Starglitter
+       * 
+ * * uint32 next_refresh_time = 9; * @return The nextRefreshTime. */ @@ -2329,6 +2407,12 @@ public final class ShopGoodsOuterClass { return nextRefreshTime_; } /** + *
+       * mcoin = Crystals
+       * scoin = Stardust
+       * hcoin = Starglitter
+       * 
+ * * uint32 next_refresh_time = 9; * @param value The nextRefreshTime to set. * @return This builder for chaining. @@ -2340,6 +2424,12 @@ public final class ShopGoodsOuterClass { return this; } /** + *
+       * mcoin = Crystals
+       * scoin = Stardust
+       * hcoin = Starglitter
+       * 
+ * * uint32 next_refresh_time = 9; * @return This builder for chaining. */ @@ -2416,19 +2506,19 @@ public final class ShopGoodsOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\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\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" + "\n\017ShopGoods.proto\032\017ItemParam.proto\"\260\003\n\tS" + + "hopGoods\022\r\n\005scoin\030\004 \001(\r\022\r\n\005mcoin\030\013 \001(\r\022\020" + + "\n\010goods_id\030\010 \001(\r\022\"\n\016cost_item_list\030\003 \003(\013" + + "2\n.ItemParam\022\022\n\tmin_level\030\232\r \001(\r\022\022\n\nboug" + + "ht_num\030\016 \001(\r\022\024\n\013DIHOGOJNKHB\030\233\007 \001(\r\022\022\n\nbe" + + "gin_time\030\r \001(\r\022\024\n\013BNEKKILPEKF\030\236\017 \001(\r\022\026\n\016" + + "preGoodsIdList\030\005 \003(\r\022\021\n\tbuy_limit\030\n \001(\r\022" + + "\036\n\ngoods_item\030\001 \001(\0132\n.ItemParam\022\r\n\005hcoin" + + "\030\014 \001(\r\022\023\n\013EKGBDJFIDJO\030\002 \001(\r\022\024\n\013KKKOCADJC" + + "HM\030\202\007 \001(\r\022\024\n\013OENMLOAFHMJ\030\232\017 \001(\r\022\021\n\tmax_l" + + "evel\030\007 \001(\r\022\020\n\010end_time\030\006 \001(\r\022\014\n\004uk15\030\017 \001" + + "(\r\022\031\n\021next_refresh_time\030\t \001(\rB\033\n\031emu.gra" + + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -2440,7 +2530,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", "Scoin", "BoughtNum", "DIHOGOJNKHB", "BeginTime", "BNEKKILPEKF", "PreGoodsIdList", "Mcoin", "GoodsItem", "NODBIKCALJI", "BuyLimit", "MinLevel", "MaxLevel", "GoodsId", "EndTime", "Hcoin", "NextRefreshTime", }); + new java.lang.String[] { "Scoin", "Mcoin", "GoodsId", "CostItemList", "MinLevel", "BoughtNum", "DIHOGOJNKHB", "BeginTime", "BNEKKILPEKF", "PreGoodsIdList", "BuyLimit", "GoodsItem", "Hcoin", "EKGBDJFIDJO", "KKKOCADJCHM", "OENMLOAFHMJ", "MaxLevel", "EndTime", "Uk15", "NextRefreshTime", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } 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 b6094efbc..57abadb5c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java @@ -182,6 +182,14 @@ public final class TrialAvatarGrantRecordOuterClass { * GRANT_REASON_BY_CHAR_AMUSEMENT = 13; */ GRANT_REASON_BY_CHAR_AMUSEMENT(13), + /** + * FJBKKFJNBHD_HMLDNDBKNFL = 14; + */ + FJBKKFJNBHD_HMLDNDBKNFL(14), + /** + * FJBKKFJNBHD_PJDEJIHFCPP = 15; + */ + FJBKKFJNBHD_PJDEJIHFCPP(15), UNRECOGNIZED(-1), ; @@ -241,6 +249,14 @@ public final class TrialAvatarGrantRecordOuterClass { * GRANT_REASON_BY_CHAR_AMUSEMENT = 13; */ public static final int GRANT_REASON_BY_CHAR_AMUSEMENT_VALUE = 13; + /** + * FJBKKFJNBHD_HMLDNDBKNFL = 14; + */ + public static final int FJBKKFJNBHD_HMLDNDBKNFL_VALUE = 14; + /** + * FJBKKFJNBHD_PJDEJIHFCPP = 15; + */ + public static final int FJBKKFJNBHD_PJDEJIHFCPP_VALUE = 15; public final int getNumber() { @@ -281,6 +297,8 @@ public final class TrialAvatarGrantRecordOuterClass { case 11: return GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY; case 12: return GRANT_REASON_BY_VINTAGE_HUNTING; case 13: return GRANT_REASON_BY_CHAR_AMUSEMENT; + case 14: return FJBKKFJNBHD_HMLDNDBKNFL; + case 15: return FJBKKFJNBHD_PJDEJIHFCPP; default: return null; } } @@ -810,9 +828,9 @@ public final class TrialAvatarGrantRecordOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\034TrialAvatarGrantRecord.proto\"\346\004\n\026Trial" + + "\n\034TrialAvatarGrantRecord.proto\"\240\005\n\026Trial" + "AvatarGrantRecord\022\024\n\014grant_reason\030\001 \001(\r\022" + - "\034\n\024from_parent_quest_id\030\002 \001(\r\"\227\004\n\013GrantR" + + "\034\n\024from_parent_quest_id\030\002 \001(\r\"\321\004\n\013GrantR" + "eason\022\030\n\024GRANT_REASON_INVALID\020\000\022\031\n\025GRANT" + "_REASON_BY_QUEST\020\001\022)\n%GRANT_REASON_BY_TR" + "IAL_AVATAR_ACTIVITY\020\002\022-\n)GRANT_REASON_BY" + @@ -826,8 +844,9 @@ public final class TrialAvatarGrantRecordOuterClass { "CTIVITY\020\n\022+\n\'GRANT_REASON_BY_MUQADAS_POT" + "ION_ACTIVITY\020\013\022#\n\037GRANT_REASON_BY_VINTAG" + "E_HUNTING\020\014\022\"\n\036GRANT_REASON_BY_CHAR_AMUS" + - "EMENT\020\rB\033\n\031emu.grasscutter.net.protob\006pr" + - "oto3" + "EMENT\020\r\022\033\n\027FJBKKFJNBHD_HMLDNDBKNFL\020\016\022\033\n\027" + + "FJBKKFJNBHD_PJDEJIHFCPP\020\017B\033\n\031emu.grasscu" + + "tter.net.protob\006proto3" }; 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 9a4f97624..cbffa3642 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java @@ -19,17 +19,17 @@ public final class WeaponPromoteRspOuterClass { com.google.protobuf.MessageOrBuilder { /** - * uint32 old_promote_level = 4; - * @return The oldPromoteLevel. - */ - int getOldPromoteLevel(); - - /** - * uint32 cur_promote_level = 14; + * uint32 cur_promote_level = 4; * @return The curPromoteLevel. */ int getCurPromoteLevel(); + /** + * uint32 old_promote_level = 14; + * @return The oldPromoteLevel. + */ + int getOldPromoteLevel(); + /** * int32 retcode = 6; * @return The retcode. @@ -99,7 +99,7 @@ public final class WeaponPromoteRspOuterClass { } case 32: { - oldPromoteLevel_ = input.readUInt32(); + curPromoteLevel_ = input.readUInt32(); break; } case 48: { @@ -109,7 +109,7 @@ public final class WeaponPromoteRspOuterClass { } case 112: { - curPromoteLevel_ = input.readUInt32(); + oldPromoteLevel_ = input.readUInt32(); break; } default: { @@ -144,21 +144,10 @@ public final class WeaponPromoteRspOuterClass { emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.class, emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.Builder.class); } - public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 4; - private int oldPromoteLevel_; - /** - * uint32 old_promote_level = 4; - * @return The oldPromoteLevel. - */ - @java.lang.Override - public int getOldPromoteLevel() { - return oldPromoteLevel_; - } - - public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 14; + public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 4; private int curPromoteLevel_; /** - * uint32 cur_promote_level = 14; + * uint32 cur_promote_level = 4; * @return The curPromoteLevel. */ @java.lang.Override @@ -166,6 +155,17 @@ public final class WeaponPromoteRspOuterClass { return curPromoteLevel_; } + public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 14; + private int oldPromoteLevel_; + /** + * uint32 old_promote_level = 14; + * @return The oldPromoteLevel. + */ + @java.lang.Override + public int getOldPromoteLevel() { + return oldPromoteLevel_; + } + public static final int RETCODE_FIELD_NUMBER = 6; private int retcode_; /** @@ -205,14 +205,14 @@ public final class WeaponPromoteRspOuterClass { if (targetWeaponGuid_ != 0L) { output.writeUInt64(3, targetWeaponGuid_); } - if (oldPromoteLevel_ != 0) { - output.writeUInt32(4, oldPromoteLevel_); + if (curPromoteLevel_ != 0) { + output.writeUInt32(4, curPromoteLevel_); } if (retcode_ != 0) { output.writeInt32(6, retcode_); } - if (curPromoteLevel_ != 0) { - output.writeUInt32(14, curPromoteLevel_); + if (oldPromoteLevel_ != 0) { + output.writeUInt32(14, oldPromoteLevel_); } unknownFields.writeTo(output); } @@ -227,17 +227,17 @@ public final class WeaponPromoteRspOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(3, targetWeaponGuid_); } - if (oldPromoteLevel_ != 0) { + if (curPromoteLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, oldPromoteLevel_); + .computeUInt32Size(4, curPromoteLevel_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(6, retcode_); } - if (curPromoteLevel_ != 0) { + if (oldPromoteLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, curPromoteLevel_); + .computeUInt32Size(14, oldPromoteLevel_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -254,10 +254,10 @@ public final class WeaponPromoteRspOuterClass { } emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other = (emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp) obj; - if (getOldPromoteLevel() - != other.getOldPromoteLevel()) return false; if (getCurPromoteLevel() != other.getCurPromoteLevel()) return false; + if (getOldPromoteLevel() + != other.getOldPromoteLevel()) return false; if (getRetcode() != other.getRetcode()) return false; if (getTargetWeaponGuid() @@ -273,10 +273,10 @@ public final class WeaponPromoteRspOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getOldPromoteLevel(); hash = (37 * hash) + CUR_PROMOTE_LEVEL_FIELD_NUMBER; hash = (53 * hash) + getCurPromoteLevel(); + hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getOldPromoteLevel(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; @@ -420,10 +420,10 @@ public final class WeaponPromoteRspOuterClass { @java.lang.Override public Builder clear() { super.clear(); - oldPromoteLevel_ = 0; - curPromoteLevel_ = 0; + oldPromoteLevel_ = 0; + retcode_ = 0; targetWeaponGuid_ = 0L; @@ -454,8 +454,8 @@ public final class WeaponPromoteRspOuterClass { @java.lang.Override public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp buildPartial() { emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp result = new emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp(this); - result.oldPromoteLevel_ = oldPromoteLevel_; result.curPromoteLevel_ = curPromoteLevel_; + result.oldPromoteLevel_ = oldPromoteLevel_; result.retcode_ = retcode_; result.targetWeaponGuid_ = targetWeaponGuid_; onBuilt(); @@ -506,12 +506,12 @@ public final class WeaponPromoteRspOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other) { if (other == emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.getDefaultInstance()) return this; - if (other.getOldPromoteLevel() != 0) { - setOldPromoteLevel(other.getOldPromoteLevel()); - } if (other.getCurPromoteLevel() != 0) { setCurPromoteLevel(other.getCurPromoteLevel()); } + if (other.getOldPromoteLevel() != 0) { + setOldPromoteLevel(other.getOldPromoteLevel()); + } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } @@ -547,40 +547,9 @@ public final class WeaponPromoteRspOuterClass { return this; } - private int oldPromoteLevel_ ; - /** - * uint32 old_promote_level = 4; - * @return The oldPromoteLevel. - */ - @java.lang.Override - public int getOldPromoteLevel() { - return oldPromoteLevel_; - } - /** - * uint32 old_promote_level = 4; - * @param value The oldPromoteLevel to set. - * @return This builder for chaining. - */ - public Builder setOldPromoteLevel(int value) { - - oldPromoteLevel_ = value; - onChanged(); - return this; - } - /** - * uint32 old_promote_level = 4; - * @return This builder for chaining. - */ - public Builder clearOldPromoteLevel() { - - oldPromoteLevel_ = 0; - onChanged(); - return this; - } - private int curPromoteLevel_ ; /** - * uint32 cur_promote_level = 14; + * uint32 cur_promote_level = 4; * @return The curPromoteLevel. */ @java.lang.Override @@ -588,7 +557,7 @@ public final class WeaponPromoteRspOuterClass { return curPromoteLevel_; } /** - * uint32 cur_promote_level = 14; + * uint32 cur_promote_level = 4; * @param value The curPromoteLevel to set. * @return This builder for chaining. */ @@ -599,7 +568,7 @@ public final class WeaponPromoteRspOuterClass { return this; } /** - * uint32 cur_promote_level = 14; + * uint32 cur_promote_level = 4; * @return This builder for chaining. */ public Builder clearCurPromoteLevel() { @@ -609,6 +578,37 @@ public final class WeaponPromoteRspOuterClass { return this; } + private int oldPromoteLevel_ ; + /** + * uint32 old_promote_level = 14; + * @return The oldPromoteLevel. + */ + @java.lang.Override + public int getOldPromoteLevel() { + return oldPromoteLevel_; + } + /** + * uint32 old_promote_level = 14; + * @param value The oldPromoteLevel to set. + * @return This builder for chaining. + */ + public Builder setOldPromoteLevel(int value) { + + oldPromoteLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 old_promote_level = 14; + * @return This builder for chaining. + */ + public Builder clearOldPromoteLevel() { + + oldPromoteLevel_ = 0; + onChanged(); + return this; + } + private int retcode_ ; /** * int32 retcode = 6; @@ -738,7 +738,7 @@ public final class WeaponPromoteRspOuterClass { static { java.lang.String[] descriptorData = { "\n\026WeaponPromoteRsp.proto\"u\n\020WeaponPromot" + - "eRsp\022\031\n\021old_promote_level\030\004 \001(\r\022\031\n\021cur_p" + + "eRsp\022\031\n\021cur_promote_level\030\004 \001(\r\022\031\n\021old_p" + "romote_level\030\016 \001(\r\022\017\n\007retcode\030\006 \001(\005\022\032\n\022t" + "arget_weapon_guid\030\003 \001(\004B\033\n\031emu.grasscutt" + "er.net.protob\006proto3" @@ -752,7 +752,7 @@ public final class WeaponPromoteRspOuterClass { internal_static_WeaponPromoteRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WeaponPromoteRsp_descriptor, - new java.lang.String[] { "OldPromoteLevel", "CurPromoteLevel", "Retcode", "TargetWeaponGuid", }); + new java.lang.String[] { "CurPromoteLevel", "OldPromoteLevel", "Retcode", "TargetWeaponGuid", }); } // @@protoc_insertion_point(outer_class_scope) 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 b35532882..4a3b419da 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java @@ -19,52 +19,52 @@ public final class WidgetCoolDownNotifyOuterClass { com.google.protobuf.MessageOrBuilder { /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 7; - */ - java.util.List - getNormalCoolDownDataListList(); - /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 7; - */ - emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index); - /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 7; - */ - int getNormalCoolDownDataListCount(); - /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 7; - */ - java.util.List - getNormalCoolDownDataListOrBuilderList(); - /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 7; - */ - emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( - int index); - - /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 10; + * repeated .WidgetCoolDownData group_cool_down_data_list = 7; */ java.util.List getGroupCoolDownDataListList(); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 10; + * repeated .WidgetCoolDownData group_cool_down_data_list = 7; */ emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 10; + * repeated .WidgetCoolDownData group_cool_down_data_list = 7; */ int getGroupCoolDownDataListCount(); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 10; + * repeated .WidgetCoolDownData group_cool_down_data_list = 7; */ java.util.List getGroupCoolDownDataListOrBuilderList(); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 10; + * repeated .WidgetCoolDownData group_cool_down_data_list = 7; */ emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder( int index); + + /** + * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + */ + java.util.List + getNormalCoolDownDataListList(); + /** + * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + */ + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index); + /** + * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + */ + int getNormalCoolDownDataListCount(); + /** + * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + */ + java.util.List + getNormalCoolDownDataListOrBuilderList(); + /** + * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + */ + emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( + int index); } /** *
@@ -84,8 +84,8 @@ public final class WidgetCoolDownNotifyOuterClass {
       super(builder);
     }
     private WidgetCoolDownNotify() {
-      normalCoolDownDataList_ = java.util.Collections.emptyList();
       groupCoolDownDataList_ = java.util.Collections.emptyList();
+      normalCoolDownDataList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -121,19 +121,19 @@ public final class WidgetCoolDownNotifyOuterClass {
               break;
             case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                normalCoolDownDataList_ = new java.util.ArrayList();
+                groupCoolDownDataList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              normalCoolDownDataList_.add(
+              groupCoolDownDataList_.add(
                   input.readMessage(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.parser(), extensionRegistry));
               break;
             }
             case 82: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                groupCoolDownDataList_ = new java.util.ArrayList();
+                normalCoolDownDataList_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              groupCoolDownDataList_.add(
+              normalCoolDownDataList_.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)) {
-          normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
+          groupCoolDownDataList_ = java.util.Collections.unmodifiableList(groupCoolDownDataList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          groupCoolDownDataList_ = java.util.Collections.unmodifiableList(groupCoolDownDataList_);
+          normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -175,57 +175,17 @@ public final class WidgetCoolDownNotifyOuterClass {
               emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.class, emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.Builder.class);
     }
 
-    public static final int NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 7;
-    private java.util.List normalCoolDownDataList_;
-    /**
-     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-     */
-    @java.lang.Override
-    public java.util.List getNormalCoolDownDataListList() {
-      return normalCoolDownDataList_;
-    }
-    /**
-     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-     */
-    @java.lang.Override
-    public java.util.List 
-        getNormalCoolDownDataListOrBuilderList() {
-      return normalCoolDownDataList_;
-    }
-    /**
-     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-     */
-    @java.lang.Override
-    public int getNormalCoolDownDataListCount() {
-      return normalCoolDownDataList_.size();
-    }
-    /**
-     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
-      return normalCoolDownDataList_.get(index);
-    }
-    /**
-     * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
-        int index) {
-      return normalCoolDownDataList_.get(index);
-    }
-
-    public static final int GROUP_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 10;
+    public static final int GROUP_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 7;
     private java.util.List groupCoolDownDataList_;
     /**
-     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
      */
     @java.lang.Override
     public java.util.List getGroupCoolDownDataListList() {
       return groupCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
      */
     @java.lang.Override
     public java.util.List 
@@ -233,21 +193,21 @@ public final class WidgetCoolDownNotifyOuterClass {
       return groupCoolDownDataList_;
     }
     /**
-     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
      */
     @java.lang.Override
     public int getGroupCoolDownDataListCount() {
       return groupCoolDownDataList_.size();
     }
     /**
-     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index) {
       return groupCoolDownDataList_.get(index);
     }
     /**
-     * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+     * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder(
@@ -255,6 +215,46 @@ public final class WidgetCoolDownNotifyOuterClass {
       return groupCoolDownDataList_.get(index);
     }
 
+    public static final int NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 10;
+    private java.util.List normalCoolDownDataList_;
+    /**
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+     */
+    @java.lang.Override
+    public java.util.List getNormalCoolDownDataListList() {
+      return normalCoolDownDataList_;
+    }
+    /**
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+     */
+    @java.lang.Override
+    public java.util.List 
+        getNormalCoolDownDataListOrBuilderList() {
+      return normalCoolDownDataList_;
+    }
+    /**
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+     */
+    @java.lang.Override
+    public int getNormalCoolDownDataListCount() {
+      return normalCoolDownDataList_.size();
+    }
+    /**
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
+      return normalCoolDownDataList_.get(index);
+    }
+    /**
+     * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
+        int index) {
+      return normalCoolDownDataList_.get(index);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -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 < normalCoolDownDataList_.size(); i++) {
-        output.writeMessage(7, normalCoolDownDataList_.get(i));
-      }
       for (int i = 0; i < groupCoolDownDataList_.size(); i++) {
-        output.writeMessage(10, groupCoolDownDataList_.get(i));
+        output.writeMessage(7, groupCoolDownDataList_.get(i));
+      }
+      for (int i = 0; i < normalCoolDownDataList_.size(); i++) {
+        output.writeMessage(10, normalCoolDownDataList_.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 < normalCoolDownDataList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, normalCoolDownDataList_.get(i));
-      }
       for (int i = 0; i < groupCoolDownDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, groupCoolDownDataList_.get(i));
+          .computeMessageSize(7, groupCoolDownDataList_.get(i));
+      }
+      for (int i = 0; i < normalCoolDownDataList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, normalCoolDownDataList_.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 (!getNormalCoolDownDataListList()
-          .equals(other.getNormalCoolDownDataListList())) return false;
       if (!getGroupCoolDownDataListList()
           .equals(other.getGroupCoolDownDataListList())) return false;
+      if (!getNormalCoolDownDataListList()
+          .equals(other.getNormalCoolDownDataListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -322,14 +322,14 @@ public final class WidgetCoolDownNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getNormalCoolDownDataListCount() > 0) {
-        hash = (37 * hash) + NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getNormalCoolDownDataListList().hashCode();
-      }
       if (getGroupCoolDownDataListCount() > 0) {
         hash = (37 * hash) + GROUP_COOL_DOWN_DATA_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getGroupCoolDownDataListList().hashCode();
       }
+      if (getNormalCoolDownDataListCount() > 0) {
+        hash = (37 * hash) + NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getNormalCoolDownDataListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -463,25 +463,25 @@ public final class WidgetCoolDownNotifyOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getNormalCoolDownDataListFieldBuilder();
           getGroupCoolDownDataListFieldBuilder();
+          getNormalCoolDownDataListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (normalCoolDownDataListBuilder_ == null) {
-          normalCoolDownDataList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          normalCoolDownDataListBuilder_.clear();
-        }
         if (groupCoolDownDataListBuilder_ == null) {
           groupCoolDownDataList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           groupCoolDownDataListBuilder_.clear();
         }
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          normalCoolDownDataListBuilder_.clear();
+        }
         return this;
       }
 
@@ -509,24 +509,24 @@ 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 (normalCoolDownDataListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.normalCoolDownDataList_ = normalCoolDownDataList_;
-        } else {
-          result.normalCoolDownDataList_ = normalCoolDownDataListBuilder_.build();
-        }
         if (groupCoolDownDataListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             groupCoolDownDataList_ = java.util.Collections.unmodifiableList(groupCoolDownDataList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.groupCoolDownDataList_ = groupCoolDownDataList_;
         } else {
           result.groupCoolDownDataList_ = groupCoolDownDataListBuilder_.build();
         }
+        if (normalCoolDownDataListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            normalCoolDownDataList_ = java.util.Collections.unmodifiableList(normalCoolDownDataList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.normalCoolDownDataList_ = normalCoolDownDataList_;
+        } else {
+          result.normalCoolDownDataList_ = normalCoolDownDataListBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -575,37 +575,11 @@ 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 (normalCoolDownDataListBuilder_ == null) {
-          if (!other.normalCoolDownDataList_.isEmpty()) {
-            if (normalCoolDownDataList_.isEmpty()) {
-              normalCoolDownDataList_ = other.normalCoolDownDataList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureNormalCoolDownDataListIsMutable();
-              normalCoolDownDataList_.addAll(other.normalCoolDownDataList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.normalCoolDownDataList_.isEmpty()) {
-            if (normalCoolDownDataListBuilder_.isEmpty()) {
-              normalCoolDownDataListBuilder_.dispose();
-              normalCoolDownDataListBuilder_ = null;
-              normalCoolDownDataList_ = other.normalCoolDownDataList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              normalCoolDownDataListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getNormalCoolDownDataListFieldBuilder() : null;
-            } else {
-              normalCoolDownDataListBuilder_.addAllMessages(other.normalCoolDownDataList_);
-            }
-          }
-        }
         if (groupCoolDownDataListBuilder_ == null) {
           if (!other.groupCoolDownDataList_.isEmpty()) {
             if (groupCoolDownDataList_.isEmpty()) {
               groupCoolDownDataList_ = other.groupCoolDownDataList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureGroupCoolDownDataListIsMutable();
               groupCoolDownDataList_.addAll(other.groupCoolDownDataList_);
@@ -618,7 +592,7 @@ public final class WidgetCoolDownNotifyOuterClass {
               groupCoolDownDataListBuilder_.dispose();
               groupCoolDownDataListBuilder_ = null;
               groupCoolDownDataList_ = other.groupCoolDownDataList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               groupCoolDownDataListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getGroupCoolDownDataListFieldBuilder() : null;
@@ -627,6 +601,32 @@ public final class WidgetCoolDownNotifyOuterClass {
             }
           }
         }
+        if (normalCoolDownDataListBuilder_ == null) {
+          if (!other.normalCoolDownDataList_.isEmpty()) {
+            if (normalCoolDownDataList_.isEmpty()) {
+              normalCoolDownDataList_ = other.normalCoolDownDataList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureNormalCoolDownDataListIsMutable();
+              normalCoolDownDataList_.addAll(other.normalCoolDownDataList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.normalCoolDownDataList_.isEmpty()) {
+            if (normalCoolDownDataListBuilder_.isEmpty()) {
+              normalCoolDownDataListBuilder_.dispose();
+              normalCoolDownDataListBuilder_ = null;
+              normalCoolDownDataList_ = other.normalCoolDownDataList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              normalCoolDownDataListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getNormalCoolDownDataListFieldBuilder() : null;
+            } else {
+              normalCoolDownDataListBuilder_.addAllMessages(other.normalCoolDownDataList_);
+            }
+          }
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -657,252 +657,12 @@ public final class WidgetCoolDownNotifyOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List normalCoolDownDataList_ =
-        java.util.Collections.emptyList();
-      private void ensureNormalCoolDownDataListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          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> normalCoolDownDataListBuilder_;
-
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public java.util.List getNormalCoolDownDataListList() {
-        if (normalCoolDownDataListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
-        } else {
-          return normalCoolDownDataListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public int getNormalCoolDownDataListCount() {
-        if (normalCoolDownDataListBuilder_ == null) {
-          return normalCoolDownDataList_.size();
-        } else {
-          return normalCoolDownDataListBuilder_.getCount();
-        }
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          return normalCoolDownDataList_.get(index);
-        } else {
-          return normalCoolDownDataListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder setNormalCoolDownDataList(
-          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureNormalCoolDownDataListIsMutable();
-          normalCoolDownDataList_.set(index, value);
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder setNormalCoolDownDataList(
-          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          ensureNormalCoolDownDataListIsMutable();
-          normalCoolDownDataList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureNormalCoolDownDataListIsMutable();
-          normalCoolDownDataList_.add(value);
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder addNormalCoolDownDataList(
-          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureNormalCoolDownDataListIsMutable();
-          normalCoolDownDataList_.add(index, value);
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder addNormalCoolDownDataList(
-          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          ensureNormalCoolDownDataListIsMutable();
-          normalCoolDownDataList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder addNormalCoolDownDataList(
-          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          ensureNormalCoolDownDataListIsMutable();
-          normalCoolDownDataList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder addAllNormalCoolDownDataList(
-          java.lang.Iterable values) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          ensureNormalCoolDownDataListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, normalCoolDownDataList_);
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder clearNormalCoolDownDataList() {
-        if (normalCoolDownDataListBuilder_ == null) {
-          normalCoolDownDataList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public Builder removeNormalCoolDownDataList(int index) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          ensureNormalCoolDownDataListIsMutable();
-          normalCoolDownDataList_.remove(index);
-          onChanged();
-        } else {
-          normalCoolDownDataListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getNormalCoolDownDataListBuilder(
-          int index) {
-        return getNormalCoolDownDataListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
-          int index) {
-        if (normalCoolDownDataListBuilder_ == null) {
-          return normalCoolDownDataList_.get(index);  } else {
-          return normalCoolDownDataListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public java.util.List 
-           getNormalCoolDownDataListOrBuilderList() {
-        if (normalCoolDownDataListBuilder_ != null) {
-          return normalCoolDownDataListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
-        }
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder() {
-        return getNormalCoolDownDataListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder(
-          int index) {
-        return getNormalCoolDownDataListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
-      }
-      /**
-       * repeated .WidgetCoolDownData normal_cool_down_data_list = 7;
-       */
-      public java.util.List 
-           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> 
-          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>(
-                  normalCoolDownDataList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          normalCoolDownDataList_ = null;
-        }
-        return normalCoolDownDataListBuilder_;
-      }
-
       private java.util.List groupCoolDownDataList_ =
         java.util.Collections.emptyList();
       private void ensureGroupCoolDownDataListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           groupCoolDownDataList_ = new java.util.ArrayList(groupCoolDownDataList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -910,7 +670,7 @@ public final class WidgetCoolDownNotifyOuterClass {
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> groupCoolDownDataListBuilder_;
 
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public java.util.List getGroupCoolDownDataListList() {
         if (groupCoolDownDataListBuilder_ == null) {
@@ -920,7 +680,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         }
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public int getGroupCoolDownDataListCount() {
         if (groupCoolDownDataListBuilder_ == null) {
@@ -930,7 +690,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         }
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index) {
         if (groupCoolDownDataListBuilder_ == null) {
@@ -940,7 +700,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         }
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder setGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
@@ -957,7 +717,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder setGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
@@ -971,7 +731,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder addGroupCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
         if (groupCoolDownDataListBuilder_ == null) {
@@ -987,7 +747,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder addGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
@@ -1004,7 +764,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder addGroupCoolDownDataList(
           emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
@@ -1018,7 +778,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder addGroupCoolDownDataList(
           int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
@@ -1032,7 +792,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder addAllGroupCoolDownDataList(
           java.lang.Iterable values) {
@@ -1047,12 +807,12 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder clearGroupCoolDownDataList() {
         if (groupCoolDownDataListBuilder_ == null) {
           groupCoolDownDataList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           groupCoolDownDataListBuilder_.clear();
@@ -1060,7 +820,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public Builder removeGroupCoolDownDataList(int index) {
         if (groupCoolDownDataListBuilder_ == null) {
@@ -1073,14 +833,14 @@ public final class WidgetCoolDownNotifyOuterClass {
         return this;
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getGroupCoolDownDataListBuilder(
           int index) {
         return getGroupCoolDownDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder(
           int index) {
@@ -1090,7 +850,7 @@ public final class WidgetCoolDownNotifyOuterClass {
         }
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public java.util.List 
            getGroupCoolDownDataListOrBuilderList() {
@@ -1101,14 +861,14 @@ public final class WidgetCoolDownNotifyOuterClass {
         }
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addGroupCoolDownDataListBuilder() {
         return getGroupCoolDownDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addGroupCoolDownDataListBuilder(
           int index) {
@@ -1116,7 +876,7 @@ public final class WidgetCoolDownNotifyOuterClass {
             index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
       }
       /**
-       * repeated .WidgetCoolDownData group_cool_down_data_list = 10;
+       * repeated .WidgetCoolDownData group_cool_down_data_list = 7;
        */
       public java.util.List 
            getGroupCoolDownDataListBuilderList() {
@@ -1129,13 +889,253 @@ public final class WidgetCoolDownNotifyOuterClass {
           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>(
                   groupCoolDownDataList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           groupCoolDownDataList_ = null;
         }
         return groupCoolDownDataListBuilder_;
       }
+
+      private java.util.List normalCoolDownDataList_ =
+        java.util.Collections.emptyList();
+      private void ensureNormalCoolDownDataListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          normalCoolDownDataList_ = new java.util.ArrayList(normalCoolDownDataList_);
+          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> normalCoolDownDataListBuilder_;
+
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public java.util.List getNormalCoolDownDataListList() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
+        } else {
+          return normalCoolDownDataListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public int getNormalCoolDownDataListCount() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.size();
+        } else {
+          return normalCoolDownDataListBuilder_.getCount();
+        }
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.get(index);
+        } else {
+          return normalCoolDownDataListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder setNormalCoolDownDataList(
+          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.set(index, value);
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder setNormalCoolDownDataList(
+          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(value);
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder addNormalCoolDownDataList(
+          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(index, value);
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder addNormalCoolDownDataList(
+          emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder addNormalCoolDownDataList(
+          int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder addAllNormalCoolDownDataList(
+          java.lang.Iterable values) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, normalCoolDownDataList_);
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder clearNormalCoolDownDataList() {
+        if (normalCoolDownDataListBuilder_ == null) {
+          normalCoolDownDataList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public Builder removeNormalCoolDownDataList(int index) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          ensureNormalCoolDownDataListIsMutable();
+          normalCoolDownDataList_.remove(index);
+          onChanged();
+        } else {
+          normalCoolDownDataListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getNormalCoolDownDataListBuilder(
+          int index) {
+        return getNormalCoolDownDataListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder(
+          int index) {
+        if (normalCoolDownDataListBuilder_ == null) {
+          return normalCoolDownDataList_.get(index);  } else {
+          return normalCoolDownDataListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public java.util.List 
+           getNormalCoolDownDataListOrBuilderList() {
+        if (normalCoolDownDataListBuilder_ != null) {
+          return normalCoolDownDataListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(normalCoolDownDataList_);
+        }
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder() {
+        return getNormalCoolDownDataListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder(
+          int index) {
+        return getNormalCoolDownDataListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance());
+      }
+      /**
+       * repeated .WidgetCoolDownData normal_cool_down_data_list = 10;
+       */
+      public java.util.List 
+           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> 
+          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>(
+                  normalCoolDownDataList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          normalCoolDownDataList_ = null;
+        }
+        return normalCoolDownDataListBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1205,8 +1205,8 @@ public final class WidgetCoolDownNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032WidgetCoolDownNotify.proto\032\030WidgetCool" +
       "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" +
+      "6\n\031group_cool_down_data_list\030\007 \003(\0132\023.Wid" +
+      "getCoolDownData\0227\n\032normal_cool_down_data" +
       "_list\030\n \003(\0132\023.WidgetCoolDownDataB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
@@ -1220,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[] { "NormalCoolDownDataList", "GroupCoolDownDataList", });
+        new java.lang.String[] { "GroupCoolDownDataList", "NormalCoolDownDataList", });
     emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldOwnerDailyTaskNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldOwnerDailyTaskNotifyOuterClass.java
index a136cf3a5..e11e6a96a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldOwnerDailyTaskNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldOwnerDailyTaskNotifyOuterClass.java
@@ -19,16 +19,16 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * uint32 PFDDEKLPFJL = 3;
-     * @return The pFDDEKLPFJL.
+     * uint32 filter_city_id = 3;
+     * @return The filterCityId.
      */
-    int getPFDDEKLPFJL();
+    int getFilterCityId();
 
     /**
-     * uint32 PIOIDLPAJIN = 4;
-     * @return The pIOIDLPAJIN.
+     * uint32 finished_daily_task_num = 4;
+     * @return The finishedDailyTaskNum.
      */
-    int getPIOIDLPAJIN();
+    int getFinishedDailyTaskNum();
 
     /**
      * repeated .DailyTaskInfo task_list = 8;
@@ -108,12 +108,12 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
               break;
             case 24: {
 
-              pFDDEKLPFJL_ = input.readUInt32();
+              filterCityId_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              pIOIDLPAJIN_ = input.readUInt32();
+              finishedDailyTaskNum_ = input.readUInt32();
               break;
             }
             case 66: {
@@ -160,26 +160,26 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
               emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify.class, emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify.Builder.class);
     }
 
-    public static final int PFDDEKLPFJL_FIELD_NUMBER = 3;
-    private int pFDDEKLPFJL_;
+    public static final int FILTER_CITY_ID_FIELD_NUMBER = 3;
+    private int filterCityId_;
     /**
-     * uint32 PFDDEKLPFJL = 3;
-     * @return The pFDDEKLPFJL.
+     * uint32 filter_city_id = 3;
+     * @return The filterCityId.
      */
     @java.lang.Override
-    public int getPFDDEKLPFJL() {
-      return pFDDEKLPFJL_;
+    public int getFilterCityId() {
+      return filterCityId_;
     }
 
-    public static final int PIOIDLPAJIN_FIELD_NUMBER = 4;
-    private int pIOIDLPAJIN_;
+    public static final int FINISHED_DAILY_TASK_NUM_FIELD_NUMBER = 4;
+    private int finishedDailyTaskNum_;
     /**
-     * uint32 PIOIDLPAJIN = 4;
-     * @return The pIOIDLPAJIN.
+     * uint32 finished_daily_task_num = 4;
+     * @return The finishedDailyTaskNum.
      */
     @java.lang.Override
-    public int getPIOIDLPAJIN() {
-      return pIOIDLPAJIN_;
+    public int getFinishedDailyTaskNum() {
+      return finishedDailyTaskNum_;
     }
 
     public static final int TASK_LIST_FIELD_NUMBER = 8;
@@ -236,11 +236,11 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pFDDEKLPFJL_ != 0) {
-        output.writeUInt32(3, pFDDEKLPFJL_);
+      if (filterCityId_ != 0) {
+        output.writeUInt32(3, filterCityId_);
       }
-      if (pIOIDLPAJIN_ != 0) {
-        output.writeUInt32(4, pIOIDLPAJIN_);
+      if (finishedDailyTaskNum_ != 0) {
+        output.writeUInt32(4, finishedDailyTaskNum_);
       }
       for (int i = 0; i < taskList_.size(); i++) {
         output.writeMessage(8, taskList_.get(i));
@@ -254,13 +254,13 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pFDDEKLPFJL_ != 0) {
+      if (filterCityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, pFDDEKLPFJL_);
+          .computeUInt32Size(3, filterCityId_);
       }
-      if (pIOIDLPAJIN_ != 0) {
+      if (finishedDailyTaskNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, pIOIDLPAJIN_);
+          .computeUInt32Size(4, finishedDailyTaskNum_);
       }
       for (int i = 0; i < taskList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -281,10 +281,10 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify other = (emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify) obj;
 
-      if (getPFDDEKLPFJL()
-          != other.getPFDDEKLPFJL()) return false;
-      if (getPIOIDLPAJIN()
-          != other.getPIOIDLPAJIN()) return false;
+      if (getFilterCityId()
+          != other.getFilterCityId()) return false;
+      if (getFinishedDailyTaskNum()
+          != other.getFinishedDailyTaskNum()) return false;
       if (!getTaskListList()
           .equals(other.getTaskListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -298,10 +298,10 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PFDDEKLPFJL_FIELD_NUMBER;
-      hash = (53 * hash) + getPFDDEKLPFJL();
-      hash = (37 * hash) + PIOIDLPAJIN_FIELD_NUMBER;
-      hash = (53 * hash) + getPIOIDLPAJIN();
+      hash = (37 * hash) + FILTER_CITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getFilterCityId();
+      hash = (37 * hash) + FINISHED_DAILY_TASK_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getFinishedDailyTaskNum();
       if (getTaskListCount() > 0) {
         hash = (37 * hash) + TASK_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getTaskListList().hashCode();
@@ -445,9 +445,9 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pFDDEKLPFJL_ = 0;
+        filterCityId_ = 0;
 
-        pIOIDLPAJIN_ = 0;
+        finishedDailyTaskNum_ = 0;
 
         if (taskListBuilder_ == null) {
           taskList_ = java.util.Collections.emptyList();
@@ -482,8 +482,8 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       public emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify buildPartial() {
         emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify result = new emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify(this);
         int from_bitField0_ = bitField0_;
-        result.pFDDEKLPFJL_ = pFDDEKLPFJL_;
-        result.pIOIDLPAJIN_ = pIOIDLPAJIN_;
+        result.filterCityId_ = filterCityId_;
+        result.finishedDailyTaskNum_ = finishedDailyTaskNum_;
         if (taskListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             taskList_ = java.util.Collections.unmodifiableList(taskList_);
@@ -541,11 +541,11 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify other) {
         if (other == emu.grasscutter.net.proto.WorldOwnerDailyTaskNotifyOuterClass.WorldOwnerDailyTaskNotify.getDefaultInstance()) return this;
-        if (other.getPFDDEKLPFJL() != 0) {
-          setPFDDEKLPFJL(other.getPFDDEKLPFJL());
+        if (other.getFilterCityId() != 0) {
+          setFilterCityId(other.getFilterCityId());
         }
-        if (other.getPIOIDLPAJIN() != 0) {
-          setPIOIDLPAJIN(other.getPIOIDLPAJIN());
+        if (other.getFinishedDailyTaskNum() != 0) {
+          setFinishedDailyTaskNum(other.getFinishedDailyTaskNum());
         }
         if (taskListBuilder_ == null) {
           if (!other.taskList_.isEmpty()) {
@@ -603,64 +603,64 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int pFDDEKLPFJL_ ;
+      private int filterCityId_ ;
       /**
-       * uint32 PFDDEKLPFJL = 3;
-       * @return The pFDDEKLPFJL.
+       * uint32 filter_city_id = 3;
+       * @return The filterCityId.
        */
       @java.lang.Override
-      public int getPFDDEKLPFJL() {
-        return pFDDEKLPFJL_;
+      public int getFilterCityId() {
+        return filterCityId_;
       }
       /**
-       * uint32 PFDDEKLPFJL = 3;
-       * @param value The pFDDEKLPFJL to set.
+       * uint32 filter_city_id = 3;
+       * @param value The filterCityId to set.
        * @return This builder for chaining.
        */
-      public Builder setPFDDEKLPFJL(int value) {
+      public Builder setFilterCityId(int value) {
         
-        pFDDEKLPFJL_ = value;
+        filterCityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 PFDDEKLPFJL = 3;
+       * uint32 filter_city_id = 3;
        * @return This builder for chaining.
        */
-      public Builder clearPFDDEKLPFJL() {
+      public Builder clearFilterCityId() {
         
-        pFDDEKLPFJL_ = 0;
+        filterCityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int pIOIDLPAJIN_ ;
+      private int finishedDailyTaskNum_ ;
       /**
-       * uint32 PIOIDLPAJIN = 4;
-       * @return The pIOIDLPAJIN.
+       * uint32 finished_daily_task_num = 4;
+       * @return The finishedDailyTaskNum.
        */
       @java.lang.Override
-      public int getPIOIDLPAJIN() {
-        return pIOIDLPAJIN_;
+      public int getFinishedDailyTaskNum() {
+        return finishedDailyTaskNum_;
       }
       /**
-       * uint32 PIOIDLPAJIN = 4;
-       * @param value The pIOIDLPAJIN to set.
+       * uint32 finished_daily_task_num = 4;
+       * @param value The finishedDailyTaskNum to set.
        * @return This builder for chaining.
        */
-      public Builder setPIOIDLPAJIN(int value) {
+      public Builder setFinishedDailyTaskNum(int value) {
         
-        pIOIDLPAJIN_ = value;
+        finishedDailyTaskNum_ = value;
         onChanged();
         return this;
       }
       /**
-       * uint32 PIOIDLPAJIN = 4;
+       * uint32 finished_daily_task_num = 4;
        * @return This builder for chaining.
        */
-      public Builder clearPIOIDLPAJIN() {
+      public Builder clearFinishedDailyTaskNum() {
         
-        pIOIDLPAJIN_ = 0;
+        finishedDailyTaskNum_ = 0;
         onChanged();
         return this;
       }
@@ -972,10 +972,11 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037WorldOwnerDailyTaskNotify.proto\032\023Daily" +
-      "TaskInfo.proto\"h\n\031WorldOwnerDailyTaskNot" +
-      "ify\022\023\n\013PFDDEKLPFJL\030\003 \001(\r\022\023\n\013PIOIDLPAJIN\030" +
-      "\004 \001(\r\022!\n\ttask_list\030\010 \003(\0132\016.DailyTaskInfo" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "TaskInfo.proto\"w\n\031WorldOwnerDailyTaskNot" +
+      "ify\022\026\n\016filter_city_id\030\003 \001(\r\022\037\n\027finished_" +
+      "daily_task_num\030\004 \001(\r\022!\n\ttask_list\030\010 \003(\0132" +
+      "\016.DailyTaskInfoB\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -987,7 +988,7 @@ public final class WorldOwnerDailyTaskNotifyOuterClass {
     internal_static_WorldOwnerDailyTaskNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldOwnerDailyTaskNotify_descriptor,
-        new java.lang.String[] { "PFDDEKLPFJL", "PIOIDLPAJIN", "TaskList", });
+        new java.lang.String[] { "FilterCityId", "FinishedDailyTaskNum", "TaskList", });
     emu.grasscutter.net.proto.DailyTaskInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/main/java/emu/grasscutter/data/GameData.java b/src/main/java/emu/grasscutter/data/GameData.java
index e1d692362..10c622904 100644
--- a/src/main/java/emu/grasscutter/data/GameData.java
+++ b/src/main/java/emu/grasscutter/data/GameData.java
@@ -27,11 +27,10 @@ import emu.grasscutter.game.quest.enums.QuestCond;
 import emu.grasscutter.game.world.GroupReplacementData;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
-import javax.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.util.*;
+import javax.annotation.Nullable;
+import lombok.*;
 
 @SuppressWarnings({"unused", "MismatchedQueryAndUpdateOfCollection"})
 public final class GameData {
@@ -142,8 +141,7 @@ public final class GameData {
             new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap bargainDataMap
-        = new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap bargainDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap battlePassMissionDataMap =
@@ -250,7 +248,8 @@ public final class GameData {
     private static final Int2ObjectMap givingDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap givingGroupDataMap = new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap givingGroupDataMap =
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     @Deprecated // This is to prevent people from using this map. This is for the resource loader
@@ -270,17 +269,18 @@ public final class GameData {
     private static final Int2ObjectMap investigationMonsterDataMap =
             new Int2ObjectOpenHashMap<>();
 
-    @Getter
-    private static final Int2ObjectMap itemDataMap = new Int2ObjectOpenHashMap<>();
+    @Getter private static final Int2ObjectMap itemDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap mapLayerDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap mapLayerFloorDataMap = new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap mapLayerFloorDataMap =
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
-    private static final Int2ObjectMap mapLayerGroupDataMap = new Int2ObjectOpenHashMap<>();
+    private static final Int2ObjectMap mapLayerGroupDataMap =
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap monsterCurveDataMap =
@@ -347,16 +347,18 @@ public final class GameData {
 
     @Getter
     private static final Int2ObjectMap sceneDataMap = new Int2ObjectLinkedOpenHashMap<>();
+
     @Getter
-    private static final Int2ObjectMap sceneTagDataMap = new Int2ObjectLinkedOpenHashMap<>();
+    private static final Int2ObjectMap sceneTagDataMap =
+            new Int2ObjectLinkedOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap talkConfigDataMap =
-        new Int2ObjectOpenHashMap<>();
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap towerFloorDataMap =
-        new Int2ObjectOpenHashMap<>();
+            new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap towerLevelDataMap =
diff --git a/src/main/java/emu/grasscutter/data/excels/BargainData.java b/src/main/java/emu/grasscutter/data/excels/BargainData.java
index b51912951..8bc3d050a 100644
--- a/src/main/java/emu/grasscutter/data/excels/BargainData.java
+++ b/src/main/java/emu/grasscutter/data/excels/BargainData.java
@@ -1,9 +1,8 @@
 package emu.grasscutter.data.excels;
 
 import emu.grasscutter.data.*;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @Getter
 @ResourceType(name = "BargainExcelConfigData.json")
@@ -14,11 +13,11 @@ public final class BargainData extends GameResource {
     private List dialogId;
 
     /**
-     * This is a list of 2 integers.
-     * The first integer is the minimum value of the bargain.
-     * The second integer is the maximum value of the bargain.
+     * This is a list of 2 integers. The first integer is the minimum value of the bargain. The second
+     * integer is the maximum value of the bargain.
      */
     private List expectedValue;
+
     private int space;
 
     private List successTalkId;
@@ -26,11 +25,11 @@ public final class BargainData extends GameResource {
     private int moodNpcId;
 
     /**
-     * This is a list of 2 integers.
-     * The first integer is the minimum value of the mood.
-     * The second integer is the maximum value of the mood.
+     * This is a list of 2 integers. The first integer is the minimum value of the mood. The second
+     * integer is the maximum value of the mood.
      */
     private List randomMood;
+
     private int moodAlertLimit;
     private int moodLowLimit;
     private int singleFailMoodDeduction;
diff --git a/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java b/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java
index 560be60e6..bd22eefcc 100644
--- a/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java
+++ b/src/main/java/emu/grasscutter/data/excels/giving/GivingData.java
@@ -4,9 +4,8 @@ import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.inventory.BagTab;
-import lombok.*;
-
 import java.util.List;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -14,6 +13,7 @@ import java.util.List;
 public final class GivingData extends GameResource {
     @SerializedName(value = "id", alternate = "Id")
     private int id;
+
     private int talkId;
     private int mistakeTalkId;
 
@@ -40,7 +40,9 @@ public final class GivingData extends GameResource {
     }
 
     public enum GiveType {
-        @SerializedName("GIVING_TYPE_QUEST") QUEST,
-        @SerializedName("GIVING_TYPE_GROUP") GROUP
+        @SerializedName("GIVING_TYPE_QUEST")
+        QUEST,
+        @SerializedName("GIVING_TYPE_GROUP")
+        GROUP
     }
 }
diff --git a/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java b/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java
index 4c5bb7d1a..c73101ca8 100644
--- a/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java
+++ b/src/main/java/emu/grasscutter/data/excels/giving/GivingGroupData.java
@@ -2,9 +2,8 @@ package emu.grasscutter.data.excels.giving;
 
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
-import lombok.*;
-
 import java.util.List;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java
index 60901d547..1596860c8 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java
@@ -13,7 +13,7 @@ public final class MapLayerData extends GameResource {
 
     @SerializedName("NLPFIGAEBFP")
     private int idk1;
-    @SerializedName("GCBPOOPNLLD")
-    private float level;    //how deep thoronium is in me
 
+    @SerializedName("GCBPOOPNLLD")
+    private float level; // how deep thoronium is in me
 }
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java
index 9941c7298..44ecc3fbb 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerFloorData.java
@@ -3,22 +3,26 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.experimental.FieldDefaults;
 
-import java.util.List;
-
 @ResourceType(name = "MapLayerFloorExcelConfigData.json")
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public final class MapLayerFloorData extends GameResource {
     @Getter(onMethod_ = @Override)
     int id;
+
     int PJDGAAAGOPO;
     int LCGNJBLMDHA;
-    @SerializedName(value = "floorNameTextMapHash", alternate = {"NDAGFKELEAP"})
+
+    @SerializedName(
+            value = "floorNameTextMapHash",
+            alternate = {"NDAGFKELEAP"})
     long floorNameTextMapHash;
+
     CKNDNKLCAHC CKNDNKLCAHC;
     long BHEMLJCFHPI;
 
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java
index e44dc02b9..7ddd2cc16 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java
@@ -3,9 +3,8 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @ResourceType(name = "MapLayerGroupExcelConfigData.json")
 @Getter
@@ -15,7 +14,7 @@ public final class MapLayerGroupData extends GameResource {
 
     @SerializedName("FIIAHPKBCDE")
     private List areaIds;
-    @SerializedName("ODEFCAMHKNK")
-    private float mapFloorId;    //MapLayerFloorExcel (first level of the maplayer)
 
+    @SerializedName("ODEFCAMHKNK")
+    private float mapFloorId; // MapLayerFloorExcel (first level of the maplayer)
 }
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java b/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java
index e70086754..07c6e25c2 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/SceneData.java
@@ -3,9 +3,8 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.SceneType;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @ResourceType(name = "SceneExcelConfigData.json")
 @Getter
diff --git a/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java b/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java
index 47bf9fa49..0c7c5754a 100644
--- a/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java
+++ b/src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java
@@ -3,9 +3,8 @@ package emu.grasscutter.data.excels.scene;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @ResourceType(name = "SceneTagConfigData.json")
 @Getter
@@ -15,6 +14,7 @@ public final class SceneTagData extends GameResource {
 
     @SerializedName("DJCOAOBDIHP")
     private boolean idk1;
+
     @SerializedName("LOLNNMPKHIB")
     private boolean idk2;
 
diff --git a/src/main/java/emu/grasscutter/database/DatabaseHelper.java b/src/main/java/emu/grasscutter/database/DatabaseHelper.java
index 49caf7265..fffc6ab73 100644
--- a/src/main/java/emu/grasscutter/database/DatabaseHelper.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseHelper.java
@@ -21,10 +21,10 @@ import emu.grasscutter.game.quest.GameMainQuest;
 import emu.grasscutter.game.world.SceneGroupInstance;
 import emu.grasscutter.utils.objects.Returnable;
 import io.netty.util.concurrent.FastThreadLocalThread;
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import lombok.Getter;
 
 public final class DatabaseHelper {
@@ -542,18 +542,16 @@ public final class DatabaseHelper {
         DatabaseHelper.saveGameAsync(musicGameBeatmap);
     }
 
-    @Nullable
-    public static Achievements getAchievementData(int uid) {
+    @Nullable public static Achievements getAchievementData(int uid) {
         try {
             return DatabaseManager.getGameDatastore()
-                .find(Achievements.class)
-                .filter(Filters.and(Filters.eq("uid", uid)))
-                .first();
+                    .find(Achievements.class)
+                    .filter(Filters.and(Filters.eq("uid", uid)))
+                    .first();
         } catch (IllegalArgumentException e) {
-            Grasscutter.getLogger().debug("Error occurred while getting uid " + uid + "'s achievement data", e);
-            DatabaseManager.getGameDatabase()
-                .getCollection("achievements")
-                .deleteMany(eq("uid", uid));
+            Grasscutter.getLogger()
+                    .debug("Error occurred while getting uid " + uid + "'s achievement data", e);
+            DatabaseManager.getGameDatabase().getCollection("achievements").deleteMany(eq("uid", uid));
             return null;
         }
     }
diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java
index 5125285a2..0ba1d7339 100644
--- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java
+++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java
@@ -19,11 +19,10 @@ import emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType;
 import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
 import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
 import io.netty.util.concurrent.FastThreadLocalThread;
-import lombok.Getter;
-import org.reflections.Reflections;
-
 import java.util.HashMap;
 import java.util.concurrent.*;
+import lombok.Getter;
+import org.reflections.Reflections;
 
 public final class AbilityManager extends BasePlayerManager {
     private static final HashMap actionHandlers =
@@ -93,7 +92,7 @@ public final class AbilityManager extends BasePlayerManager {
         if (handler == null || ability == null) {
             if (DebugConstants.LOG_ABILITIES) {
                 Grasscutter.getLogger()
-                    .debug("Could not execute ability action {} at {}", action.type, ability);
+                        .debug("Could not execute ability action {} at {}", action.type, ability);
             }
 
             return;
diff --git a/src/main/java/emu/grasscutter/game/achievement/Achievement.java b/src/main/java/emu/grasscutter/game/achievement/Achievement.java
index c52513051..5e554d24c 100644
--- a/src/main/java/emu/grasscutter/game/achievement/Achievement.java
+++ b/src/main/java/emu/grasscutter/game/achievement/Achievement.java
@@ -1,22 +1,21 @@
 package emu.grasscutter.game.achievement;
 
 import dev.morphia.annotations.Entity;
-import emu.grasscutter.net.proto.AchievementOuterClass;
-import emu.grasscutter.net.proto.StatusOuterClass;
-import lombok.Getter;
-import lombok.Setter;
+import emu.grasscutter.net.proto.*;
+import emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status;
+import lombok.*;
 
 @Entity
 @Getter
 public class Achievement {
-    @Setter private StatusOuterClass.Status status;
+    @Setter private Status status;
     private int id;
     private int totalProgress;
     @Setter private int curProgress;
     @Setter private int finishTimestampSec;
 
     public Achievement(
-            StatusOuterClass.Status status,
+            Status status,
             int id,
             int totalProgress,
             int curProgress,
diff --git a/src/main/java/emu/grasscutter/game/achievement/Achievements.java b/src/main/java/emu/grasscutter/game/achievement/Achievements.java
index 551681ebc..c81da5ec4 100644
--- a/src/main/java/emu/grasscutter/game/achievement/Achievements.java
+++ b/src/main/java/emu/grasscutter/game/achievement/Achievements.java
@@ -1,9 +1,7 @@
 package emu.grasscutter.game.achievement;
 
 import com.github.davidmoten.guavamini.Lists;
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Transient;
+import dev.morphia.annotations.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.achievement.AchievementData;
@@ -11,22 +9,15 @@ import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.proto.StatusOuterClass;
-import emu.grasscutter.server.packet.send.PacketAchievementAllDataNotify;
-import emu.grasscutter.server.packet.send.PacketAchievementUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketTakeAchievementGoalRewardRsp;
-import emu.grasscutter.server.packet.send.PacketTakeAchievementRewardRsp;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status;
+import emu.grasscutter.server.packet.send.*;
+import lombok.*;
+import org.bson.types.ObjectId;
+
+import javax.annotation.Nullable;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.IntSupplier;
-import javax.annotation.Nullable;
-import lombok.Builder;
-import lombok.Data;
-import lombok.Getter;
-import org.bson.types.ObjectId;
 
 @Entity("achievements")
 @Data
@@ -35,7 +26,7 @@ public class Achievements {
     private static final IntSupplier currentTimeSecs =
             () -> (int) (System.currentTimeMillis() / 1000L);
     private static final Achievement INVALID =
-            new Achievement(StatusOuterClass.Status.STATUS_INVALID, -1, 0, 0, 0);
+            new Achievement(Status.STATUS_INVALID, -1, 0, 0, 0);
     @Id private ObjectId id;
     private int uid;
     @Transient private Player player;
@@ -75,7 +66,7 @@ public class Achievements {
                             map.put(
                                     a.getId(),
                                     new Achievement(
-                                            StatusOuterClass.Status.STATUS_UNFINISHED, a.getId(), a.getProgress(), 0, 0));
+                                            Status.STATUS_UNFINISHED, a.getId(), a.getProgress(), 0, 0));
                         });
         return map;
     }
@@ -135,13 +126,13 @@ public class Achievements {
     }
 
     private boolean update(Achievement a) {
-        if (a.getStatus() == StatusOuterClass.Status.STATUS_UNFINISHED
+        if (a.getStatus() == Status.STATUS_UNFINISHED
                 && a.getCurProgress() >= a.getTotalProgress()) {
-            a.setStatus(StatusOuterClass.Status.STATUS_FINISHED);
+            a.setStatus(Status.STATUS_FINISHED);
             a.setFinishTimestampSec(currentTimeSecs.getAsInt());
             return true;
         } else if (this.isFinished(a.getId()) && a.getCurProgress() < a.getTotalProgress()) {
-            a.setStatus(StatusOuterClass.Status.STATUS_UNFINISHED);
+            a.setStatus(Status.STATUS_UNFINISHED);
             a.setFinishTimestampSec(0);
             return true;
         }
@@ -187,7 +178,7 @@ public class Achievements {
                         achievementId,
                         id -> {
                             return new Achievement(
-                                    StatusOuterClass.Status.STATUS_UNFINISHED,
+                                    Status.STATUS_UNFINISHED,
                                     id,
                                     GameData.getAchievementDataMap().get(id.intValue()).getProgress(),
                                     0,
@@ -200,14 +191,14 @@ public class Achievements {
         return data == null || data.isDisuse();
     }
 
-    public StatusOuterClass.Status getStatus(int achievementId) {
+    public Status getStatus(int achievementId) {
         return this.getAchievementList().getOrDefault(achievementId, INVALID).getStatus();
     }
 
     public boolean isFinished(int achievementId) {
         var status = this.getStatus(achievementId);
-        return status == StatusOuterClass.Status.STATUS_FINISHED
-                || status == StatusOuterClass.Status.STATUS_REWARD_TAKEN;
+        return status == Status.STATUS_FINISHED
+                || status == Status.STATUS_REWARD_TAKEN;
     }
 
     public void takeReward(List ids) {
@@ -244,7 +235,7 @@ public class Achievements {
                             });
 
             var a = this.getAchievement(i);
-            a.setStatus(StatusOuterClass.Status.STATUS_REWARD_TAKEN);
+            a.setStatus(Status.STATUS_REWARD_TAKEN);
             this.save();
             this.sendUpdatePacket(a);
         }
@@ -298,11 +289,11 @@ public class Achievements {
     }
 
     public boolean isRewardTaken(int achievementId) {
-        return this.getStatus(achievementId) == StatusOuterClass.Status.STATUS_REWARD_TAKEN;
+        return this.getStatus(achievementId) == Status.STATUS_REWARD_TAKEN;
     }
 
     public boolean isRewardLeft(int achievementId) {
-        return this.getStatus(achievementId) == StatusOuterClass.Status.STATUS_FINISHED;
+        return this.getStatus(achievementId) == Status.STATUS_FINISHED;
     }
 
     private boolean isPacketSendable() {
@@ -324,12 +315,15 @@ public class Achievements {
 
     private void registerNewAchievementsIfExist() {
         GameData.getAchievementDataMap().values().stream()
-            .filter(AchievementData::isUsed)
-            .filter(a -> !this.achievementList.containsKey(a.getId()))
-            .forEach(a -> {
-                Grasscutter.getLogger().info("Registering a new achievement (id: {})", a.getId());
-                this.achievementList.put(a.getId(), new Achievement(AchievementStatus.UNFINISHED, a.getId(), a.getProgress(), 0, 0));
-            });
+                .filter(AchievementData::isUsed)
+                .filter(a -> !this.achievementList.containsKey(a.getId()))
+                .forEach(
+                        a -> {
+                            Grasscutter.getLogger().trace("Registering a new achievement (id: {})", a.getId());
+                            this.achievementList.put(
+                                    a.getId(),
+                                    new Achievement(Status.STATUS_UNFINISHED, a.getId(), a.getProgress(), 0, 0));
+                        });
         this.save();
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/avatar/Avatar.java b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
index aede1b72a..fc272ed95 100644
--- a/src/main/java/emu/grasscutter/game/avatar/Avatar.java
+++ b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
@@ -828,11 +828,11 @@ public class Avatar {
                 switch (entry.getExtraTalentIndex()) {
                     case 9 -> this.skillDepot.getEnergySkill(); // Ult skill
                     case 2 -> (this.skillDepot.getSkills().size() >= 2)
-                        ? this.skillDepot.getSkills().get(1)
-                        : 0; // E skill
+                            ? this.skillDepot.getSkills().get(1)
+                            : 0; // E skill
                     case 1 -> (this.skillDepot.getSkills().size() >= 1)
-                        ? this.skillDepot.getSkills().get(0)
-                        : 0; // Normal Attack (Liney)
+                            ? this.skillDepot.getSkills().get(0)
+                            : 0; // Normal Attack (Liney)
                     default -> 0;
                 };
         // Sanity check
diff --git a/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java b/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java
index 4bbb9a1a7..bb3ddf993 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java
@@ -3,20 +3,16 @@ package emu.grasscutter.game.dungeons.challenge;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.dungeons.challenge.trigger.ChallengeTrigger;
 import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.props.WatcherTriggerType;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.SceneGroup;
-import emu.grasscutter.scripts.data.SceneTrigger;
-import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.server.packet.send.PacketDungeonChallengeBeginNotify;
-import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
+import emu.grasscutter.scripts.data.*;
+import emu.grasscutter.server.packet.send.*;
+import lombok.*;
+
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 @Setter
@@ -81,7 +77,7 @@ public class WorldChallenge {
 
     public void start() {
         if (inProgress()) {
-            Grasscutter.getLogger().info("Could not start a in progress challenge.");
+            Grasscutter.getLogger().debug("Could not start a in progress challenge.");
             return;
         }
         this.progress = true;
diff --git a/src/main/java/emu/grasscutter/game/inventory/BagTab.java b/src/main/java/emu/grasscutter/game/inventory/BagTab.java
index a089912f7..697374b75 100644
--- a/src/main/java/emu/grasscutter/game/inventory/BagTab.java
+++ b/src/main/java/emu/grasscutter/game/inventory/BagTab.java
@@ -1,10 +1,9 @@
 package emu.grasscutter.game.inventory;
 
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
 import java.util.*;
 import java.util.stream.Stream;
+import lombok.*;
 
 @RequiredArgsConstructor
 public enum BagTab {
@@ -24,11 +23,11 @@ public enum BagTab {
 
     static {
         Stream.of(BagTab.values())
-            .forEach(
-                entry -> {
-                    map.put(entry.getValue(), entry);
-                    stringMap.put(entry.name(), entry);
-                });
+                .forEach(
+                        entry -> {
+                            map.put(entry.getValue(), entry);
+                            stringMap.put(entry.name(), entry);
+                        });
     }
 
     @Getter private final int value;
diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
index 0da00025e..74bd301b8 100644
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@@ -1,5 +1,7 @@
 package emu.grasscutter.game.inventory;
 
+import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
@@ -15,13 +17,10 @@ import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.longs.*;
-
 import java.util.*;
 import javax.annotation.Nullable;
 import lombok.val;
 
-import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
-
 public class Inventory extends BasePlayerManager implements Iterable {
     private final Long2ObjectMap store;
     private final Int2ObjectMap inventoryTypes;
@@ -185,8 +184,8 @@ public class Inventory extends BasePlayerManager implements Iterable {
     }
 
     /**
-     * Checks to see if the player has the item in their inventory.
-     * This will succeed if the player has at least the minimum count of the item.
+     * Checks to see if the player has the item in their inventory. This will succeed if the player
+     * has at least the minimum count of the item.
      *
      * @param itemId The item id to check for.
      * @param minCount The minimum count of the item to check for.
@@ -201,30 +200,26 @@ public class Inventory extends BasePlayerManager implements Iterable {
      *
      * @param itemId The item id to check for.
      * @param count The count of the item to check for.
-     * @param enforce If true, the player must have the exact amount.
-     *                If false, the player must have at least the amount.
+     * @param enforce If true, the player must have the exact amount. If false, the player must have
+     *     at least the amount.
      * @return True if the player has the item, false otherwise.
      */
     public boolean hasItem(int itemId, int count, boolean enforce) {
         var item = this.getFirstItem(itemId);
         if (item == null) return false;
 
-        return enforce ?
-            item.getCount() == count :
-            item.getCount() >= count;
+        return enforce ? item.getCount() == count : item.getCount() >= count;
     }
 
     /**
-     * Checks to see if the player has the item in their inventory.
-     * This is exact.
+     * Checks to see if the player has the item in their inventory. This is exact.
      *
      * @param items A map of item game IDs to their count.
      * @return True if the player has the items, false otherwise.
      */
     public boolean hasAllItems(Collection items) {
         for (var item : items) {
-            if (!this.hasItem(item.getItemId(), item.getCount(), true))
-                return false;
+            if (!this.hasItem(item.getItemId(), item.getCount(), true)) return false;
         }
 
         return true;
@@ -530,22 +525,18 @@ public class Inventory extends BasePlayerManager implements Iterable {
     }
 
     /**
-     * Removes an item from the player's inventory.
-     * This uses the item ID to find the first stack of the item's type.
+     * Removes an item from the player's inventory. This uses the item ID to find the first stack of
+     * the item's type.
      *
      * @param itemId The ID of the item to remove.
      * @param count The amount of items to remove.
      * @return True if the item was removed, false otherwise.
      */
     public synchronized boolean removeItem(int itemId, int count) {
-        var item = this.getItems().values().stream()
-            .filter(i -> i.getItemId() == itemId)
-            .findFirst();
+        var item = this.getItems().values().stream().filter(i -> i.getItemId() == itemId).findFirst();
 
         // Check if the item is in the player's inventory.
-        return item
-            .filter(gameItem -> this.removeItem(gameItem, count))
-            .isPresent();
+        return item.filter(gameItem -> this.removeItem(gameItem, count)).isPresent();
     }
 
     public synchronized boolean removeItem(long guid, int count) {
@@ -566,14 +557,10 @@ public class Inventory extends BasePlayerManager implements Iterable {
      * @return True if the item was removed, false otherwise.
      */
     public synchronized boolean removeItemById(int itemId, int count) {
-        var item = this.getItems().values().stream()
-            .filter(i -> i.getItemId() == itemId)
-            .findFirst();
+        var item = this.getItems().values().stream().filter(i -> i.getItemId() == itemId).findFirst();
 
         // Check if the item is in the player's inventory.
-        return item
-            .filter(gameItem -> this.removeItem(gameItem, count))
-            .isPresent();
+        return item.filter(gameItem -> this.removeItem(gameItem, count)).isPresent();
     }
 
     public synchronized boolean removeItem(GameItem item) {
diff --git a/src/main/java/emu/grasscutter/game/player/PlayerProgress.java b/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
index 638d8c5da..f66b957ef 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
@@ -5,10 +5,9 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import lombok.*;
 
 /** Tracks progress the player made in the world, like obtained items, seen characters and more */
 @Getter
diff --git a/src/main/java/emu/grasscutter/game/props/ClimateType.java b/src/main/java/emu/grasscutter/game/props/ClimateType.java
index eb97aa5ab..92e8aba07 100644
--- a/src/main/java/emu/grasscutter/game/props/ClimateType.java
+++ b/src/main/java/emu/grasscutter/game/props/ClimateType.java
@@ -2,7 +2,6 @@ package emu.grasscutter.game.props;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -22,10 +21,10 @@ public enum ClimateType {
 
     static {
         Stream.of(values())
-            .forEach(
-                e -> {
-                    map.put(e.getValue(), e);
-                    stringMap.put(e.name(), e);
+                .forEach(
+                        e -> {
+                            map.put(e.getValue(), e);
+                            stringMap.put(e.name(), e);
                         });
     }
 
diff --git a/src/main/java/emu/grasscutter/game/quest/BargainRecord.java b/src/main/java/emu/grasscutter/game/quest/BargainRecord.java
index 0bd5d4978..1b41a86b4 100644
--- a/src/main/java/emu/grasscutter/game/quest/BargainRecord.java
+++ b/src/main/java/emu/grasscutter/game/quest/BargainRecord.java
@@ -13,20 +13,17 @@ import lombok.*;
 @Builder
 public final class BargainRecord {
     /**
-     * Provides an instance of a bargain record.
-     * Uses information from game resources.
+     * Provides an instance of a bargain record. Uses information from game resources.
      *
      * @param bargainId The ID of the bargain.
      * @return An instance of a bargain record.
      */
     public static BargainRecord resolve(int bargainId) {
         var bargainData = GameData.getBargainDataMap().get(bargainId);
-        if (bargainData == null) throw new RuntimeException("No bargain data found for " + bargainId + ".");
+        if (bargainData == null)
+            throw new RuntimeException("No bargain data found for " + bargainId + ".");
 
-        return BargainRecord.builder()
-            .bargainId(bargainId)
-            .build()
-            .determineBase(bargainData);
+        return BargainRecord.builder().bargainId(bargainId).build().determineBase(bargainData);
     }
 
     private int bargainId;
@@ -38,21 +35,17 @@ public final class BargainRecord {
     private boolean finished;
     private BargainResultType result;
 
-    /**
-     * Determines the price of the bargain.
-     */
+    /** Determines the price of the bargain. */
     public BargainRecord determineBase(BargainData data) {
         // Set the expected price.
         var price = data.getExpectedValue();
-        this.setExpectedPrice(Utils.randomRange(
-            price.get(0), price.get(1)));
+        this.setExpectedPrice(Utils.randomRange(price.get(0), price.get(1)));
         // Set the lowest price.
         this.setLowestPrice(price.get(0));
 
         // Set the base mood.
         var mood = data.getRandomMood();
-        this.setCurrentMood(Utils.randomRange(
-            mood.get(0), mood.get(1)));
+        this.setCurrentMood(Utils.randomRange(mood.get(0), mood.get(1)));
 
         return this;
     }
@@ -100,10 +93,10 @@ public final class BargainRecord {
      */
     public BargainSnapshot toSnapshot() {
         return BargainSnapshot.newBuilder()
-            .setBargainId(this.getBargainId())
-            .setCurMood(this.getCurrentMood())
-            .setBALOPACHCDB(this.getExpectedPrice())
-            .setIOCNPJJNHLD(this.getLowestPrice())
-            .build();
+                .setBargainId(this.getBargainId())
+                .setCurMood(this.getCurrentMood())
+                .setBALOPACHCDB(this.getExpectedPrice())
+                .setIOCNPJJNHLD(this.getLowestPrice())
+                .build();
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/GameQuest.java b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
index 4241d05a1..6a052e85d 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
@@ -15,10 +15,9 @@ import emu.grasscutter.scripts.data.SceneGroup;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.IntIntImmutablePair;
-import lombok.*;
-
-import javax.script.Bindings;
 import java.util.*;
+import javax.script.Bindings;
+import lombok.*;
 
 @Entity
 public class GameQuest {
diff --git a/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java b/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java
index 1000eac82..4e1770030 100644
--- a/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java
+++ b/src/main/java/emu/grasscutter/game/quest/ItemGiveRecord.java
@@ -4,49 +4,45 @@ import dev.morphia.annotations.Entity;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.giving.GivingData.GiveMethod;
 import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
-import lombok.*;
-
 import java.util.*;
+import lombok.*;
 
 @Data
 @Entity
 @Builder
 public final class ItemGiveRecord {
     /**
-     * Provides a builder for an item give record.
-     * Uses information from game resources.
+     * Provides a builder for an item give record. Uses information from game resources.
      *
      * @param givingId The ID of the giving action.
      * @return A builder for an item give record.
      */
     public static ItemGiveRecord resolve(int givingId) {
         var givingData = GameData.getGivingDataMap().get(givingId);
-        if (givingData == null) throw new RuntimeException("No giving data found for " + givingId + ".");
+        if (givingData == null)
+            throw new RuntimeException("No giving data found for " + givingId + ".");
 
-        var builder = ItemGiveRecord.builder()
-            .givingId(givingId)
-            .finished(false);
+        var builder = ItemGiveRecord.builder().givingId(givingId).finished(false);
 
         // Create a map.
         var givenItems = new HashMap();
         if (givingData.getGivingMethod() == GiveMethod.GIVING_METHOD_EXACT) {
-            givingData.getExactItems().forEach(item ->
-                givenItems.put(item.getItemId(), 0));
+            givingData.getExactItems().forEach(item -> givenItems.put(item.getItemId(), 0));
         } else {
-            givingData.getGivingGroupIds().forEach(groupId -> {
-                var groupData = GameData.getGivingGroupDataMap().get((int) groupId);
-                if (groupData == null) return;
+            givingData
+                    .getGivingGroupIds()
+                    .forEach(
+                            groupId -> {
+                                var groupData = GameData.getGivingGroupDataMap().get((int) groupId);
+                                if (groupData == null) return;
 
-                // Add all items in the group.
-                groupData.getItemIds().forEach(itemId ->
-                    givenItems.put(itemId, 0));
-                builder.groupId(groupId);
-            });
+                                // Add all items in the group.
+                                groupData.getItemIds().forEach(itemId -> givenItems.put(itemId, 0));
+                                builder.groupId(groupId);
+                            });
         }
 
-        return builder
-            .givenItems(givenItems)
-            .build();
+        return builder.givenItems(givenItems).build();
     }
 
     private int givingId;
@@ -63,13 +59,13 @@ public final class ItemGiveRecord {
      */
     public GivingRecord toProto() {
         return GivingRecord.newBuilder()
-            .setGivingId(this.getGivingId())
-            .setConfigId(this.getConfigId())
-            .setGroupId(this.getGroupId())
-            .setLastGroupId(this.getLastGroupId())
-            .setIsFinished(this.isFinished())
-            .setIsGadgetGiving(false)
-            .putAllMaterialCntMap(this.getGivenItems())
-            .build();
+                .setGivingId(this.getGivingId())
+                .setConfigId(this.getConfigId())
+                .setGroupId(this.getGroupId())
+                .setLastGroupId(this.getLastGroupId())
+                .setIsFinished(this.isFinished())
+                .setIsGadgetGiving(false)
+                .putAllMaterialCntMap(this.getGivenItems())
+                .build();
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestManager.java b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
index ab1ee3f30..9817227ba 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestManager.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -1,5 +1,8 @@
 package emu.grasscutter.game.quest;
 
+import static emu.grasscutter.GameConstants.DEBUG;
+import static emu.grasscutter.config.Configuration.*;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.*;
@@ -12,16 +15,12 @@ import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
 import emu.grasscutter.server.packet.send.*;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import it.unimi.dsi.fastutil.ints.*;
-import lombok.*;
-
-import javax.annotation.Nonnull;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-
-import static emu.grasscutter.GameConstants.DEBUG;
-import static emu.grasscutter.config.Configuration.*;
+import javax.annotation.Nonnull;
+import lombok.*;
 
 public final class QuestManager extends BasePlayerManager {
     @Getter private final Player player;
@@ -32,10 +31,15 @@ public final class QuestManager extends BasePlayerManager {
     private long lastHourCheck = 0;
     private long lastDayCheck = 0;
 
-    public static final ExecutorService eventExecutor
-        = new ThreadPoolExecutor(4, 4,
-        60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(1000),
-        FastThreadLocalThread::new, new ThreadPoolExecutor.AbortPolicy());
+    public static final ExecutorService eventExecutor =
+            new ThreadPoolExecutor(
+                    4,
+                    4,
+                    60,
+                    TimeUnit.SECONDS,
+                    new LinkedBlockingDeque<>(1000),
+                    FastThreadLocalThread::new,
+                    new ThreadPoolExecutor.AbortPolicy());
 
     public static long getQuestKey(int mainQuestId) {
         QuestEncryptionKey questEncryptionKey = GameData.getMainQuestEncryptionMap().get(mainQuestId);
@@ -50,37 +54,37 @@ public final class QuestManager extends BasePlayerManager {
         this.loggedQuests = new ArrayList<>();
 
         if (DEBUG) {
-            this.loggedQuests.addAll(List.of(
-                31101, // Quest which holds talks 30902 and 30904.
-                35001, // Quest which unlocks world border & starts act 2.
-                30901, // Quest which is completed upon finishing all 3 initial dungeons.
-                30903, // Quest which is finished when re-entering scene 3. (home world)
-                30904, // Quest which unlocks the Adventurers' Guild
+            this.loggedQuests.addAll(
+                    List.of(
+                            31101, // Quest which holds talks 30902 and 30904.
+                            35001, // Quest which unlocks world border & starts act 2.
+                            30901, // Quest which is completed upon finishing all 3 initial dungeons.
+                            30903, // Quest which is finished when re-entering scene 3. (home world)
+                            30904, // Quest which unlocks the Adventurers' Guild
+                            46904, // Quest which is required to be started, but not completed for 31101's talks
+                            // to begin.
+                            // This quest is related to obtaining your first Anemoculus.
 
-                46904, // Quest which is required to be started, but not completed for 31101's talks to begin.
-                       // This quest is related to obtaining your first Anemoculus.
+                            35104, // Quest which is required to be finished for 46904 to begin.
+                            // This quest requires 31101 not be finished.
+                            // This quest should be accepted when the account is created.
 
-                35104, // Quest which is required to be finished for 46904 to begin.
-                       // This quest requires 31101 not be finished.
-                       // This quest should be accepted when the account is created.
-
-                       // These quests currently have bugged triggers.
-                30700, // Quest which is responsible for unlocking Crash Course.
-                30800, // Quest which is responsible for unlocking Sparks Amongst the Pages.
-
-                47001, 47002, 47003, 47004,
-
-                2010103, 2010144, // Prologue Act 2: Chasing Shadows,
-
-                2012 // This is the main quest ID for Chapter 2 Act 1.
-                     // Used for debugging giving items.
-            ));
+                            // These quests currently have bugged triggers.
+                            30700, // Quest which is responsible for unlocking Crash Course.
+                            30800, // Quest which is responsible for unlocking Sparks Amongst the Pages.
+                            47001,
+                            47002,
+                            47003,
+                            47004,
+                            2010103,
+                            2010144, // Prologue Act 2: Chasing Shadows,
+                            2012 // This is the main quest ID for Chapter 2 Act 1.
+                            // Used for debugging giving items.
+                            ));
         }
     }
 
-    /**
-     * Checks if questing can be enabled.
-     */
+    /** Checks if questing can be enabled. */
     public boolean isQuestingEnabled() {
         // Check if scripts are enabled.
         if (!SERVER.game.enableScriptInBigWorld) {
@@ -97,8 +101,7 @@ public final class QuestManager extends BasePlayerManager {
      * @param givingId The giving action ID.
      * @throws IllegalStateException If the giving action is already active.
      */
-    public void addGiveItemAction(int givingId)
-        throws IllegalStateException {
+    public void addGiveItemAction(int givingId) throws IllegalStateException {
         var progress = this.player.getPlayerProgress();
         var givings = progress.getItemGivings();
 
@@ -163,10 +166,9 @@ public final class QuestManager extends BasePlayerManager {
      * @return Serialized giving records to be used in a packet.
      */
     public Collection getGivingRecords() {
-        return this.getPlayer().getPlayerProgress()
-            .getItemGivings().values().stream()
-            .map(ItemGiveRecord::toProto)
-            .toList();
+        return this.getPlayer().getPlayerProgress().getItemGivings().values().stream()
+                .map(ItemGiveRecord::toProto)
+                .toList();
     }
 
     /**
@@ -199,7 +201,7 @@ public final class QuestManager extends BasePlayerManager {
      * @param bargainId The bargain ID.
      */
     public void stopBargain(int bargainId) {
-            var progress = this.player.getPlayerProgress();
+        var progress = this.player.getPlayerProgress();
         var bargains = progress.getBargains();
 
         // Check if the bargain is already present.
@@ -216,14 +218,10 @@ public final class QuestManager extends BasePlayerManager {
         this.player.sendPacket(new PacketBargainTerminateNotify(bargainId));
     }
 
-    /**
-     * Sends the giving records to the player.
-     */
+    /** Sends the giving records to the player. */
     public void sendGivingRecords() {
         // Send the record to the player.
-        this.player.sendPacket(
-            new PacketGivingRecordNotify(
-                this.getGivingRecords()));
+        this.player.sendPacket(new PacketGivingRecordNotify(this.getGivingRecords()));
     }
 
     public void onPlayerBorn() {
@@ -244,9 +242,9 @@ public final class QuestManager extends BasePlayerManager {
                 getPlayer().getPosition().set(rewindPos.get(0));
                 getPlayer().getRotation().set(rewindPos.get(1));
             }
-            if(activeQuest!=null && rewindPos!=null){
-                //activeSubs.add(activeQuest);
-                //player.sendPacket(new PacketQuestProgressUpdateNotify(activeQuest));
+            if (activeQuest != null && rewindPos != null) {
+                // activeSubs.add(activeQuest);
+                // player.sendPacket(new PacketQuestProgressUpdateNotify(activeQuest));
             }
             quest.checkProgress();
         }
@@ -270,29 +268,32 @@ public final class QuestManager extends BasePlayerManager {
         boolean checkDays = currentDays != lastDayCheck;
         boolean checkHours = currentHours != lastHourCheck;
 
-        if(!checkDays && !checkHours){
+        if (!checkDays && !checkHours) {
             return;
         }
 
         this.lastDayCheck = currentDays;
         this.lastHourCheck = currentHours;
 
-        player.getActiveQuestTimers().forEach(mainQuestId -> {
-            if (checkHours) {
-                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_GT_EQ, mainQuestId);
-                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ, mainQuestId);
-            }
-            if (checkDays) {
-                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_PASS_DAY, mainQuestId);
-                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY, mainQuestId);
-            }
-        });
+        player
+                .getActiveQuestTimers()
+                .forEach(
+                        mainQuestId -> {
+                            if (checkHours) {
+                                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_GT_EQ, mainQuestId);
+                                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ, mainQuestId);
+                            }
+                            if (checkDays) {
+                                this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_PASS_DAY, mainQuestId);
+                                this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY, mainQuestId);
+                            }
+                        });
     }
 
     private List addMultMainQuests(Set mainQuestIds) {
         List newQuests = new ArrayList<>();
         for (Integer id : mainQuestIds) {
-            getMainQuests().put(id.intValue(),new GameMainQuest(this.player, id));
+            getMainQuests().put(id.intValue(), new GameMainQuest(this.player, id));
             getMainQuestById(id).save();
             newQuests.add(getMainQuestById(id));
         }
@@ -319,27 +320,29 @@ public final class QuestManager extends BasePlayerManager {
      * Looking through mainQuests 72201-72208 and 72174, we can infer that a questGlobalVar's default value is 0
      */
     public Integer getQuestGlobalVarValue(Integer variable) {
-        return getPlayer().getQuestGlobalVariables()
-            .computeIfAbsent(variable, k -> this.getGlobalVarDefault(variable));
+        return getPlayer()
+                .getQuestGlobalVariables()
+                .computeIfAbsent(variable, k -> this.getGlobalVarDefault(variable));
     }
 
     public void setQuestGlobalVarValue(int variable, int setVal) {
         var prevVal = this.getPlayer().getQuestGlobalVariables().put(variable, setVal);
-        if (prevVal == null){
+        if (prevVal == null) {
             prevVal = this.getGlobalVarDefault(variable);
         }
         var newVal = this.getQuestGlobalVarValue(variable);
 
-        Grasscutter.getLogger().debug("Changed questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
+        Grasscutter.getLogger()
+                .debug("Changed questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
         this.triggerQuestGlobalVarAction(variable, setVal);
     }
 
     public void incQuestGlobalVarValue(int variable, int inc) {
         var prevVal = getQuestGlobalVarValue(variable);
-        var newVal = getPlayer().getQuestGlobalVariables()
-            .compute(variable, (k, v) -> prevVal + inc);
+        var newVal = getPlayer().getQuestGlobalVariables().compute(variable, (k, v) -> prevVal + inc);
 
-        Grasscutter.getLogger().debug("Incremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
+        Grasscutter.getLogger()
+                .debug("Incremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
         this.triggerQuestGlobalVarAction(variable, newVal);
     }
 
@@ -349,7 +352,8 @@ public final class QuestManager extends BasePlayerManager {
         this.getPlayer().getQuestGlobalVariables().put(variable, prevVal - dec);
         var newVal = getQuestGlobalVarValue(variable);
 
-        Grasscutter.getLogger().debug("Decremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
+        Grasscutter.getLogger()
+                .debug("Decremented questGlobalVar {} value from {} to {}", variable, prevVal, newVal);
         this.triggerQuestGlobalVarAction(variable, newVal);
     }
 
@@ -422,7 +426,7 @@ public final class QuestManager extends BasePlayerManager {
             return null;
         }
 
-       return this.addQuest(questConfig);
+        return this.addQuest(questConfig);
     }
 
     public GameQuest addQuest(@Nonnull QuestData questConfig) {
@@ -452,10 +456,10 @@ public final class QuestManager extends BasePlayerManager {
         }
 
         Arrays.stream(mainQuestData.getSubQuests())
-            .min(Comparator.comparingInt(MainQuestData.SubQuestData::getOrder))
-            .map(MainQuestData.SubQuestData::getSubId)
-            .ifPresent(this::addQuest);
-        //TODO find a better way then hardcoding to detect needed required quests
+                .min(Comparator.comparingInt(MainQuestData.SubQuestData::getOrder))
+                .map(MainQuestData.SubQuestData::getSubId)
+                .ifPresent(this::addQuest);
+        // TODO find a better way then hardcoding to detect needed required quests
         // if (mainQuestId == 355){
         //     startMainQuest(361);
         //     startMainQuest(418);
@@ -463,9 +467,11 @@ public final class QuestManager extends BasePlayerManager {
         //     startMainQuest(20509);
         // }
     }
+
     public void queueEvent(QuestCond condType, int... params) {
         queueEvent(condType, "", params);
     }
+
     public void queueEvent(QuestContent condType, int... params) {
         queueEvent(condType, "", params);
     }
@@ -478,57 +484,69 @@ public final class QuestManager extends BasePlayerManager {
         eventExecutor.submit(() -> triggerEvent(condType, paramStr, params));
     }
 
-    //QUEST_EXEC are handled directly by each subQuest
+    // QUEST_EXEC are handled directly by each subQuest
 
     public void triggerEvent(QuestCond condType, String paramStr, int... params) {
         Grasscutter.getLogger().trace("Trigger Event {}, {}, {}", condType, paramStr, params);
         var potentialQuests = GameData.getQuestDataByConditions(condType, params[0], paramStr);
-        if(potentialQuests == null){
+        if (potentialQuests == null) {
             return;
         }
 
         var questSystem = getPlayer().getServer().getQuestSystem();
         var owner = getPlayer();
 
-        potentialQuests.forEach(questData -> {
-            if(this.wasSubQuestStarted(questData)){
-                return;
-            }
-            val acceptCond = questData.getAcceptCond();
-            int[] accept = new int[acceptCond.size()];
-            for (int i = 0; i < acceptCond.size(); i++) {
-                val condition = acceptCond.get(i);
-                boolean result = questSystem.triggerCondition(owner, questData, condition, paramStr, params);
-                accept[i] = result ? 1 : 0;
-            }
+        potentialQuests.forEach(
+                questData -> {
+                    if (this.wasSubQuestStarted(questData)) {
+                        return;
+                    }
+                    val acceptCond = questData.getAcceptCond();
+                    int[] accept = new int[acceptCond.size()];
+                    for (int i = 0; i < acceptCond.size(); i++) {
+                        val condition = acceptCond.get(i);
+                        boolean result =
+                                questSystem.triggerCondition(owner, questData, condition, paramStr, params);
+                        accept[i] = result ? 1 : 0;
+                    }
 
-            boolean shouldAccept = LogicType.calculate(questData.getAcceptCondComb(), accept);
-            if (this.loggedQuests.contains(questData.getId())) {
-                Grasscutter.getLogger().debug(">>> Quest {} will be {} as a result of event trigger {} ({}, {}).",
-                    questData.getId(), shouldAccept ? "accepted" : "not accepted", condType.name(), paramStr,
-                    Arrays.stream(params).mapToObj(String::valueOf).collect(Collectors.joining(", ")));
-                for (var i = 0; i < accept.length; i++) {
-                    var condition = acceptCond.get(i);
-                    Grasscutter.getLogger().debug("^ Condition {} has params {} with result {}.",
-                        condition.getType().name(),
-                        Arrays.stream(condition.getParam())
-                            .filter(value -> value > 0)
-                            .mapToObj(String::valueOf)
-                            .collect(Collectors.joining(", ")),
-                        accept[i] == 1 ? "success" : "failure");
-                }
-            }
+                    boolean shouldAccept = LogicType.calculate(questData.getAcceptCondComb(), accept);
+                    if (this.loggedQuests.contains(questData.getId())) {
+                        Grasscutter.getLogger()
+                                .debug(
+                                        ">>> Quest {} will be {} as a result of event trigger {} ({}, {}).",
+                                        questData.getId(),
+                                        shouldAccept ? "accepted" : "not accepted",
+                                        condType.name(),
+                                        paramStr,
+                                        Arrays.stream(params)
+                                                .mapToObj(String::valueOf)
+                                                .collect(Collectors.joining(", ")));
+                        for (var i = 0; i < accept.length; i++) {
+                            var condition = acceptCond.get(i);
+                            Grasscutter.getLogger()
+                                    .debug(
+                                            "^ Condition {} has params {} with result {}.",
+                                            condition.getType().name(),
+                                            Arrays.stream(condition.getParam())
+                                                    .filter(value -> value > 0)
+                                                    .mapToObj(String::valueOf)
+                                                    .collect(Collectors.joining(", ")),
+                                            accept[i] == 1 ? "success" : "failure");
+                        }
+                    }
 
-            if (shouldAccept) {
-                GameQuest quest = owner.getQuestManager().addQuest(questData);
-                Grasscutter.getLogger().debug("Added quest {} result {}", questData.getSubId(), quest != null);
-            }
-        });
+                    if (shouldAccept) {
+                        GameQuest quest = owner.getQuestManager().addQuest(questData);
+                        Grasscutter.getLogger()
+                                .debug("Added quest {} result {}", questData.getSubId(), quest != null);
+                    }
+                });
     }
 
     public boolean wasSubQuestStarted(QuestData questData) {
         var quest = getQuestById(questData.getId());
-        if(quest == null) return false;
+        if (quest == null) return false;
 
         return quest.state != QuestState.QUEST_STATE_UNSTARTED;
     }
@@ -536,9 +554,10 @@ public final class QuestManager extends BasePlayerManager {
     public void triggerEvent(QuestContent condType, String paramStr, int... params) {
         Grasscutter.getLogger().trace("Trigger Event {}, {}, {}", condType, paramStr, params);
 
-        List checkMainQuests = this.getMainQuests().values().stream()
-            .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
-            .toList();
+        List checkMainQuests =
+                this.getMainQuests().values().stream()
+                        .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
+                        .toList();
         for (GameMainQuest mainQuest : checkMainQuests) {
             mainQuest.tryFailSubQuests(condType, paramStr, params);
             mainQuest.tryFinishSubQuests(condType, paramStr, params);
@@ -546,46 +565,58 @@ public final class QuestManager extends BasePlayerManager {
     }
 
     /**
-     * TODO maybe trigger them delayed to allow basic communication finish first
-     * TODO move content checks to use static informations where possible to allow direct already fulfilled checking
+     * TODO maybe trigger them delayed to allow basic communication finish first TODO move content
+     * checks to use static informations where possible to allow direct already fulfilled checking
+     *
      * @param quest The ID of the quest.
      */
-    public void checkQuestAlreadyFulfilled(GameQuest quest){
-        Grasscutter.getThreadPool().submit(() -> {
-            for (var condition : quest.getQuestData().getFinishCond()){
-                switch (condition.getType()) {
-                    case QUEST_CONTENT_OBTAIN_ITEM, QUEST_CONTENT_ITEM_LESS_THAN -> {
-                        //check if we already own enough of the item
-                        var item = getPlayer().getInventory().getItemByGuid(condition.getParam()[0]);
-                        queueEvent(condition.getType(), condition.getParam()[0], item != null ? item.getCount() : 0);
-                    }
-                    case QUEST_CONTENT_UNLOCK_TRANS_POINT -> {
-                        var scenePoints = getPlayer().getUnlockedScenePoints().get(condition.getParam()[0]);
-                        if (scenePoints != null && scenePoints.contains(condition.getParam()[1])) {
-                            queueEvent(condition.getType(), condition.getParam()[0], condition.getParam()[1]);
-                        }
-                    }
-                    case QUEST_CONTENT_UNLOCK_AREA -> {
-                        var sceneAreas = getPlayer().getUnlockedSceneAreas().get(condition.getParam()[0]);
-                        if (sceneAreas != null && sceneAreas.contains(condition.getParam()[1])) {
-                            queueEvent(condition.getType(), condition.getParam()[0], condition.getParam()[1]);
-                        }
-                    }
-                    case QUEST_CONTENT_PLAYER_LEVEL_UP -> queueEvent(condition.getType(), player.getLevel());
-                }
-            }
-        });
+    public void checkQuestAlreadyFulfilled(GameQuest quest) {
+        Grasscutter.getThreadPool()
+                .submit(
+                        () -> {
+                            for (var condition : quest.getQuestData().getFinishCond()) {
+                                switch (condition.getType()) {
+                                    case QUEST_CONTENT_OBTAIN_ITEM, QUEST_CONTENT_ITEM_LESS_THAN -> {
+                                        // check if we already own enough of the item
+                                        var item = getPlayer().getInventory().getItemByGuid(condition.getParam()[0]);
+                                        queueEvent(
+                                                condition.getType(),
+                                                condition.getParam()[0],
+                                                item != null ? item.getCount() : 0);
+                                    }
+                                    case QUEST_CONTENT_UNLOCK_TRANS_POINT -> {
+                                        var scenePoints =
+                                                getPlayer().getUnlockedScenePoints().get(condition.getParam()[0]);
+                                        if (scenePoints != null && scenePoints.contains(condition.getParam()[1])) {
+                                            queueEvent(
+                                                    condition.getType(), condition.getParam()[0], condition.getParam()[1]);
+                                        }
+                                    }
+                                    case QUEST_CONTENT_UNLOCK_AREA -> {
+                                        var sceneAreas =
+                                                getPlayer().getUnlockedSceneAreas().get(condition.getParam()[0]);
+                                        if (sceneAreas != null && sceneAreas.contains(condition.getParam()[1])) {
+                                            queueEvent(
+                                                    condition.getType(), condition.getParam()[0], condition.getParam()[1]);
+                                        }
+                                    }
+                                    case QUEST_CONTENT_PLAYER_LEVEL_UP -> queueEvent(
+                                            condition.getType(), player.getLevel());
+                                }
+                            }
+                        });
     }
 
     public List getSceneGroupSuite(int sceneId) {
         return getMainQuests().values().stream()
-            .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
-            .map(GameMainQuest::getQuestGroupSuites)
-            .filter(Objects::nonNull)
-            .flatMap(Collection::stream)
-            .filter(i -> i.getScene() == sceneId)
-            .toList();
+                .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
+                .map(GameMainQuest::getQuestGroupSuites)
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .filter(i -> i.getScene() == sceneId)
+                .toList();
     }
+
     public void loadFromDatabase() {
         List quests = DatabaseHelper.getAllQuests(getPlayer());
 
@@ -626,24 +657,30 @@ public final class QuestManager extends BasePlayerManager {
         var pointId = point.getPointData().getId();
         // Get the active quests.
         return this.getActiveMainQuests().stream()
-            // Get the sub-quests of the main quest.
-            .map(GameMainQuest::getChildQuests)
-            // Get the values of the sub-quests map.
-            .map(Map::values)
-            .map(quests -> quests.stream()
-                // Get the dungeon IDs of each quest.
-                .map(GameQuest::getDungeonIds)
-                .map(ids -> ids.stream()
-                    // Find entry points which match this dungeon.
-                    .filter(id -> id.rightInt() == pointId)
-                    .toList())
-                .map(ids -> ids.stream()
-                    // Of the remaining dungeons, find the ID of the quest dungeon.
-                    .map(IntIntImmutablePair::leftInt)
-                    .toList())
+                // Get the sub-quests of the main quest.
+                .map(GameMainQuest::getChildQuests)
+                // Get the values of the sub-quests map.
+                .map(Map::values)
+                .map(
+                        quests ->
+                                quests.stream()
+                                        // Get the dungeon IDs of each quest.
+                                        .map(GameQuest::getDungeonIds)
+                                        .map(
+                                                ids ->
+                                                        ids.stream()
+                                                                // Find entry points which match this dungeon.
+                                                                .filter(id -> id.rightInt() == pointId)
+                                                                .toList())
+                                        .map(
+                                                ids ->
+                                                        ids.stream()
+                                                                // Of the remaining dungeons, find the ID of the quest dungeon.
+                                                                .map(IntIntImmutablePair::leftInt)
+                                                                .toList())
+                                        .flatMap(Collection::stream)
+                                        .toList())
                 .flatMap(Collection::stream)
-                .toList())
-            .flatMap(Collection::stream)
-            .toList();
+                .toList();
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainFail.java b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainFail.java
index 3f88e0143..1bed1453b 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainFail.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainFail.java
@@ -3,13 +3,12 @@ package emu.grasscutter.game.quest.content;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.proto.BargainResultTypeOuterClass.BargainResultType;
 
 @QuestValueContent(QuestContent.QUEST_CONTENT_BARGAIN_FAIL)
 public final class ContentBargainFail extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0] &&
-                condition.getParam()[1] == params[1];
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainLessThan.java b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainLessThan.java
index 88ee00356..8bea45fba 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainLessThan.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainLessThan.java
@@ -3,13 +3,12 @@ package emu.grasscutter.game.quest.content;
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.proto.BargainResultTypeOuterClass.BargainResultType;
 
 @QuestValueContent(QuestContent.QUEST_CONTENT_ITEM_LESS_THAN_BARGAIN)
 public final class ContentBargainLessThan extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0] &&
-                condition.getParam()[1] == params[1];
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainSuccess.java b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainSuccess.java
index 8200355d1..63bb7bc8f 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainSuccess.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainSuccess.java
@@ -7,8 +7,8 @@ import emu.grasscutter.game.quest.enums.QuestContent;
 @QuestValueContent(QuestContent.QUEST_CONTENT_BARGAIN_SUCC)
 public final class ContentBargainSuccess extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0] &&
-                condition.getParam()[1] == params[1];
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishGivingItem.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishGivingItem.java
index 61f6605c9..cd9ed53cd 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishGivingItem.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishGivingItem.java
@@ -7,8 +7,8 @@ import emu.grasscutter.game.quest.enums.QuestContent;
 @QuestValueContent(QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING)
 public final class ContentFinishGivingItem extends BaseContent {
     @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0] &&
-                condition.getParam()[1] == params[1];
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecActiveItemGiving.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecActiveItemGiving.java
index c2f073967..93d8dabd6 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecActiveItemGiving.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecActiveItemGiving.java
@@ -17,12 +17,12 @@ public final class ExecActiveItemGiving extends QuestExecHandler {
         try {
             questManager.addGiveItemAction(givingId);
 
-            Grasscutter.getLogger().debug("Quest {} added give action {}.",
-                quest.getSubQuestId(), givingId);
+            Grasscutter.getLogger()
+                    .debug("Quest {} added give action {}.", quest.getSubQuestId(), givingId);
             return true;
         } catch (IllegalStateException ignored) {
-            Grasscutter.getLogger().warn("Quest {} attempted to add give action {} twice.",
-                quest.getSubQuestId(), givingId);
+            Grasscutter.getLogger()
+                    .warn("Quest {} attempted to add give action {} twice.", quest.getSubQuestId(), givingId);
             return false;
         }
     }
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecDeactivateItemGiving.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecDeactivateItemGiving.java
index 9f9f8d5ba..0a0161d57 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDeactivateItemGiving.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDeactivateItemGiving.java
@@ -17,8 +17,11 @@ public final class ExecDeactivateItemGiving extends QuestExecHandler {
             questManager.removeGivingItemAction(givingId);
             return true;
         } catch (IllegalStateException ignored) {
-            Grasscutter.getLogger().warn("Quest {} attempted to remove give action {} twice.",
-                quest.getSubQuestId(), givingId);
+            Grasscutter.getLogger()
+                    .warn(
+                            "Quest {} attempted to remove give action {} twice.",
+                            quest.getSubQuestId(),
+                            givingId);
             return false;
         }
     }
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecStartBargain.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecStartBargain.java
index 87b03ec23..2361541a9 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecStartBargain.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecStartBargain.java
@@ -15,8 +15,7 @@ public final class ExecStartBargain extends QuestExecHandler {
 
         try {
             // Start the bargain.
-            quest.getOwner().getQuestManager()
-                .startBargain(bargainId);
+            quest.getOwner().getQuestManager().startBargain(bargainId);
             Grasscutter.getLogger().debug("Bargain {} started.", bargainId);
             return true;
         } catch (RuntimeException ignored) {
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecStopBargain.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecStopBargain.java
index 0b5d09531..8a645d22d 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecStopBargain.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecStopBargain.java
@@ -15,8 +15,7 @@ public final class ExecStopBargain extends QuestExecHandler {
 
         try {
             // Start the bargain.
-            quest.getOwner().getQuestManager()
-                .stopBargain(bargainId);
+            quest.getOwner().getQuestManager().stopBargain(bargainId);
             Grasscutter.getLogger().debug("Bargain {} stopped.", bargainId);
             return true;
         } catch (RuntimeException ignored) {
diff --git a/src/main/java/emu/grasscutter/game/world/Scene.java b/src/main/java/emu/grasscutter/game/world/Scene.java
index a25dfa9c5..02a3df192 100644
--- a/src/main/java/emu/grasscutter/game/world/Scene.java
+++ b/src/main/java/emu/grasscutter/game/world/Scene.java
@@ -23,8 +23,8 @@ import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.QuestGroupSuite;
 import emu.grasscutter.game.world.data.TeleportProperties;
 import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
 import emu.grasscutter.net.proto.*;
+import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
 import emu.grasscutter.scripts.*;
 import emu.grasscutter.scripts.constants.EventType;
@@ -35,12 +35,11 @@ import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
 import emu.grasscutter.utils.objects.KahnsSort;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import lombok.*;
-
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import lombok.*;
 
 public final class Scene {
     @Getter private final World world;
diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
index 0170608f1..3f95ac45e 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
@@ -6,7 +6,7 @@ public final class PacketOpcodes {
 
     // Opcodes
     public static final int ACCKLIOPBHN = 205;
-    public static final int ACDCLDJFDFK = 26672;
+    public static final int PlayerEnterMapLayerNotify = 26672;
     public static final int ACOPFPFIJHN = 6465;
     public static final int AEHOGBMFIDK = 21196;
     public static final int AGBOEIBCIHC = 1992;
@@ -185,7 +185,7 @@ public final class PacketOpcodes {
     public static final int BKNAMDDEIKH = 1557;
     public static final int BKOHLDCHKBL = 20475;
     public static final int BLDHOHDIBHB = 27514;
-    public static final int BMODMHEPOFF = 2225;
+    public static final int PlayerEnterChildMapLayerNotify = 2225;
     public static final int BMODNHIFDPI = 7195;
     public static final int BMPHGPCILIK = 22933;
     public static final int BOFOFKKOBNO = 273;
diff --git a/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java b/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
index 4897910b9..42ec26680 100644
--- a/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
+++ b/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
@@ -4,9 +4,8 @@ import emu.grasscutter.*;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.scripts.*;
-import org.luaj.vm2.*;
-
 import javax.script.*;
+import org.luaj.vm2.*;
 
 public class EntityController {
     private transient CompiledScript entityController;
@@ -38,8 +37,11 @@ public class EntityController {
     public int onClientExecuteRequest(GameEntity entity, int param1, int param2, int param3) {
         if (DebugConstants.LOG_LUA_SCRIPTS) {
             Grasscutter.getLogger()
-                .debug(
-                    "Request on {}, {}: {}", entity.getGroupId(), param1, entity.getPosition().toString());
+                    .debug(
+                            "Request on {}, {}: {}",
+                            entity.getGroupId(),
+                            param1,
+                            entity.getPosition().toString());
         }
         LuaValue value =
                 callControllerScriptFunc(
diff --git a/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java b/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
index 14e98cbb6..f0399dc86 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
@@ -1,16 +1,15 @@
 package emu.grasscutter.server.game;
 
+import static emu.grasscutter.config.Configuration.GAME_INFO;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.event.game.ReceivePacketEvent;
 import emu.grasscutter.server.game.GameSession.SessionState;
 import it.unimi.dsi.fastutil.ints.*;
-import org.reflections.Reflections;
-
 import java.util.Set;
-
-import static emu.grasscutter.config.Configuration.GAME_INFO;
+import org.reflections.Reflections;
 
 @SuppressWarnings("unchecked")
 public class GameServerPacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/game/GameSession.java b/src/main/java/emu/grasscutter/server/game/GameSession.java
index 700483ad6..0cff31cd1 100644
--- a/src/main/java/emu/grasscutter/server/game/GameSession.java
+++ b/src/main/java/emu/grasscutter/server/game/GameSession.java
@@ -1,5 +1,8 @@
 package emu.grasscutter.server.game;
 
+import static emu.grasscutter.config.Configuration.*;
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
 import emu.grasscutter.game.Account;
@@ -8,14 +11,10 @@ import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.event.game.SendPacketEvent;
 import emu.grasscutter.utils.*;
 import io.netty.buffer.*;
-import lombok.*;
-
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
-
-import static emu.grasscutter.config.Configuration.*;
-import static emu.grasscutter.utils.lang.Language.translate;
+import lombok.*;
 
 public class GameSession implements GameSessionManager.KcpChannel {
     private final GameServer server;
diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java
index d72f984b5..718ca08b2 100644
--- a/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java
@@ -1,5 +1,7 @@
 package emu.grasscutter.server.http.dispatch;
 
+import static emu.grasscutter.utils.lang.Language.translate;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem;
 import emu.grasscutter.auth.OAuthAuthenticator.ClientType;
@@ -10,8 +12,6 @@ import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
 
-import static emu.grasscutter.utils.lang.Language.translate;
-
 /** Handles requests related to authentication. */
 public final class AuthenticationHandler implements Router {
     /**
diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
index e4f0ffac2..1b6a9561e 100644
--- a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
@@ -1,5 +1,7 @@
 package emu.grasscutter.server.http.dispatch;
 
+import static emu.grasscutter.config.Configuration.*;
+
 import com.google.gson.*;
 import com.google.protobuf.ByteString;
 import emu.grasscutter.*;
@@ -16,14 +18,11 @@ import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
 import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
-import org.slf4j.Logger;
-
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
-
-import static emu.grasscutter.config.Configuration.*;
+import org.slf4j.Logger;
 
 /** Handles requests related to region queries. */
 public final class RegionHandler implements Router {
@@ -114,8 +113,7 @@ public final class RegionHandler implements Router {
         customConfig.addProperty("sdkenv", "2");
         customConfig.addProperty("checkdevice", "false");
         customConfig.addProperty("loadPatch", "false");
-        customConfig.addProperty("showexception",
-            String.valueOf(GameConstants.DEBUG));
+        customConfig.addProperty("showexception", String.valueOf(GameConstants.DEBUG));
         customConfig.addProperty("regionConfig", "pm|fk|add");
         customConfig.addProperty("downloadMode", "0");
         customConfig.add("codeSwitch", codeSwitch);
@@ -254,11 +252,10 @@ public final class RegionHandler implements Router {
 
                 String key_id = ctx.queryParam("key_id");
 
-                if (
-                    versionMajor != GameConstants.VERSION_PARTS[0] ||
-                    versionMinor != GameConstants.VERSION_PARTS[1]
-                    // The 'fix' or 'patch' version is not checked because it is only used
-                    // when miHoYo is desperate and fucks up big time.
+                if (versionMajor != GameConstants.VERSION_PARTS[0]
+                        || versionMinor != GameConstants.VERSION_PARTS[1]
+                // The 'fix' or 'patch' version is not checked because it is only used
+                // when miHoYo is desperate and fucks up big time.
                 ) { // Reject clients when there is a version mismatch
 
                     boolean updateClient = GameConstants.VERSION.compareTo(clientVersion) > 0;
diff --git a/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java b/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java
index b95d6c07c..580b741e0 100644
--- a/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java
@@ -4,9 +4,9 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.ItemData;
-import emu.grasscutter.data.excels.scene.SceneData;
 import emu.grasscutter.data.excels.avatar.AvatarData;
 import emu.grasscutter.data.excels.monster.MonsterData;
+import emu.grasscutter.data.excels.scene.SceneData;
 import emu.grasscutter.utils.FileUtils;
 import emu.grasscutter.utils.lang.Language;
 import io.javalin.http.ContentType;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBargainOfferPriceReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBargainOfferPriceReq.java
index fbc776154..df4a8801e 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBargainOfferPriceReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBargainOfferPriceReq.java
@@ -9,8 +9,7 @@ import emu.grasscutter.server.packet.send.PacketBargainOfferPriceRsp;
 @Opcodes(PacketOpcodes.BargainOfferPriceReq)
 public final class HandlerBargainOfferPriceReq extends PacketHandler {
     @Override
-    public void handle(GameSession session, byte[] header, byte[] payload)
-        throws Exception {
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
         var packet = BargainOfferPriceReq.parseFrom(payload);
         var player = session.getPlayer();
 
@@ -27,14 +26,11 @@ public final class HandlerBargainOfferPriceReq extends PacketHandler {
         var questManager = player.getQuestManager();
         switch (result) {
             case BARGAIN_COMPLETE_SUCC -> questManager.queueEvent(
-                QuestContent.QUEST_CONTENT_BARGAIN_SUCC,
-                bargainId, 0);
+                    QuestContent.QUEST_CONTENT_BARGAIN_SUCC, bargainId, 0);
             case BARGAIN_SINGLE_FAIL -> questManager.queueEvent(
-                QuestContent.QUEST_CONTENT_ITEM_LESS_THAN_BARGAIN,
-                bargainId, 0);
+                    QuestContent.QUEST_CONTENT_ITEM_LESS_THAN_BARGAIN, bargainId, 0);
             case BARGAIN_COMPLETE_FAIL -> questManager.queueEvent(
-                QuestContent.QUEST_CONTENT_BARGAIN_FAIL,
-                bargainId, 0);
+                    QuestContent.QUEST_CONTENT_BARGAIN_FAIL, bargainId, 0);
         }
 
         // Return the resulting packet.
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllActivatedBargainDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllActivatedBargainDataReq.java
index 9955f356e..82738d856 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllActivatedBargainDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllActivatedBargainDataReq.java
@@ -8,10 +8,8 @@ import emu.grasscutter.server.packet.send.PacketGetAllActivatedBargainDataRsp;
 public final class HandlerGetAllActivatedBargainDataReq extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) {
-        session.send(new PacketGetAllActivatedBargainDataRsp(
-            session.getPlayer()
-                .getPlayerProgress()
-                .getBargains()
-                .values()));
+        session.send(
+                new PacketGetAllActivatedBargainDataRsp(
+                        session.getPlayer().getPlayerProgress().getBargains().values()));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetBargainDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetBargainDataReq.java
index aed038239..b6e94f9b5 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetBargainDataReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetBargainDataReq.java
@@ -9,18 +9,13 @@ import emu.grasscutter.server.packet.send.PacketGetBargainDataRsp;
 @Opcodes(PacketOpcodes.GetBargainDataReq)
 public final class HandlerGetBargainDataReq extends PacketHandler {
     @Override
-    public void handle(GameSession session, byte[] header, byte[] payload)
-        throws Exception {
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
         var packet = GetBargainDataReq.parseFrom(payload);
 
         var bargainId = packet.getBargainId();
-        var bargain = session.getPlayer()
-            .getPlayerProgress()
-            .getBargains()
-            .get(bargainId);
+        var bargain = session.getPlayer().getPlayerProgress().getBargains().get(bargainId);
         if (bargain == null) {
-            session.send(new PacketGetBargainDataRsp(
-                Retcode.RET_BARGAIN_NOT_ACTIVATED));
+            session.send(new PacketGetBargainDataRsp(Retcode.RET_BARGAIN_NOT_ACTIVATED));
             return;
         }
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
index 031448597..c18f48b79 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
@@ -1,5 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
@@ -11,12 +13,9 @@ import emu.grasscutter.server.game.GameSession.SessionState;
 import emu.grasscutter.server.packet.send.PacketGetPlayerTokenRsp;
 import emu.grasscutter.utils.*;
 import emu.grasscutter.utils.helpers.ByteHelper;
-
-import javax.crypto.Cipher;
 import java.nio.ByteBuffer;
 import java.security.Signature;
-
-import static emu.grasscutter.config.Configuration.ACCOUNT;
+import javax.crypto.Cipher;
 
 @Opcodes(PacketOpcodes.GetPlayerTokenReq)
 public class HandlerGetPlayerTokenReq extends PacketHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java
index d80846dda..15b73fcf0 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java
@@ -8,7 +8,6 @@ import emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketItemGivingRsp;
 import emu.grasscutter.server.packet.send.PacketItemGivingRsp.Mode;
-
 import java.util.*;
 
 @Opcodes(PacketOpcodes.ItemGivingReq)
@@ -31,7 +30,8 @@ public final class HandlerItemGivingReq extends PacketHandler {
 
                 // Check the items against the resources.
                 var data = GameData.getGivingDataMap().get(giveId);
-                if (data == null) throw new IllegalArgumentException("No giving data found for " + giveId + ".");
+                if (data == null)
+                    throw new IllegalArgumentException("No giving data found for " + giveId + ".");
 
                 switch (data.getGivingMethod()) {
                     case GIVING_METHOD_EXACT -> {
@@ -60,26 +60,28 @@ public final class HandlerItemGivingReq extends PacketHandler {
                         // Resolve potential item IDs.
                         var groupData = GameData.getGivingGroupDataMap();
                         data.getGivingGroupIds().stream()
-                            .map(groupId -> groupData.get((int) groupId))
-                            .filter(Objects::nonNull)
-                            .forEach(group -> {
-                                var itemIds = group.getItemIds();
+                                .map(groupId -> groupData.get((int) groupId))
+                                .filter(Objects::nonNull)
+                                .forEach(
+                                        group -> {
+                                            var itemIds = group.getItemIds();
 
-                                // Match item stacks to the group items.
-                                items.forEach(param -> {
-                                    // Get the item instance.
-                                    var itemInstance = inventory.getFirstItem(param.getItemId());
-                                    if (itemInstance == null) return;
+                                            // Match item stacks to the group items.
+                                            items.forEach(
+                                                    param -> {
+                                                        // Get the item instance.
+                                                        var itemInstance = inventory.getFirstItem(param.getItemId());
+                                                        if (itemInstance == null) return;
 
-                                    // Get the item ID.
-                                    var itemId = itemInstance.getItemId();
-                                    if (!itemIds.contains(itemId)) return;
+                                                        // Get the item ID.
+                                                        var itemId = itemInstance.getItemId();
+                                                        if (!itemIds.contains(itemId)) return;
 
-                                    // Add the item to the given items.
-                                    givenItems.put(itemId, param.getCount());
-                                    matchedGroups.add(group.getId());
-                                });
-                            });
+                                                        // Add the item to the given items.
+                                                        givenItems.put(itemId, param.getCount());
+                                                        matchedGroups.add(group.getId());
+                                                    });
+                                        });
 
                         // Check if the player has any items.
                         if (givenItems.isEmpty() && matchedGroups.isEmpty()) {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterChildMapLayerNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterChildMapLayerNotify.java
index 0e91fc821..1390d1aa3 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterChildMapLayerNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterChildMapLayerNotify.java
@@ -1,18 +1,15 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.BMODMHEPOFFOuterClass;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
-@Opcodes(PacketOpcodes.BMODMHEPOFF)
-public class HandlerPlayerEnterChildMapLayerNotify extends PacketHandler {
+@Opcodes(PacketOpcodes.PlayerEnterChildMapLayerNotify)
+public final class HandlerPlayerEnterChildMapLayerNotify extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var fromClient = BMODMHEPOFFOuterClass.BMODMHEPOFF.parseFrom(payload);
+        // var packet = PlayerEnterChildMapLayerNotify.parseFrom(payload);
         // probably
-        Grasscutter.getLogger().info("player entered child map layer: id {}", fromClient.getHJMMAOMEHOL());
+        // Grasscutter.getLogger()
+        //         .info("player entered child map layer: id {}", packet.getLayerId());
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterMapLayerNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterMapLayerNotify.java
index fc7ddfab4..22e2344d9 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterMapLayerNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerEnterMapLayerNotify.java
@@ -1,18 +1,14 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ACDCLDJFDFKOuterClass;
+import emu.grasscutter.net.packet.*;
 import emu.grasscutter.server.game.GameSession;
 
-@Opcodes(PacketOpcodes.ACDCLDJFDFK)
-public class HandlerPlayerEnterMapLayerNotify extends PacketHandler {
+@Opcodes(PacketOpcodes.PlayerEnterMapLayerNotify)
+public final class HandlerPlayerEnterMapLayerNotify extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var fromClient = ACDCLDJFDFKOuterClass.ACDCLDJFDFK.parseFrom(payload);
-        Grasscutter.getLogger().info("[DEBUG] Player found new map layer: id {}", fromClient.getPPLHKCKDHEC());
-
+        // var packet = ACDCLDJFDFKOuterClass.ACDCLDJFDFK.parseFrom(payload);
+        // Grasscutter.getLogger()
+        //         .info("[DEBUG] Player found new map layer: id {}", packet.getLayerId());
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBargainOfferPriceRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBargainOfferPriceRsp.java
index a9bdee9ba..cf1f78d2f 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBargainOfferPriceRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBargainOfferPriceRsp.java
@@ -10,12 +10,14 @@ public final class PacketBargainOfferPriceRsp extends BasePacket {
     public PacketBargainOfferPriceRsp(BargainResultType result, BargainRecord record) {
         super(PacketOpcodes.BargainOfferPriceRsp);
 
-        this.setData(BargainOfferPriceRsp.newBuilder()
-            .setRetcode(record.isFinished() ?
-                Retcode.RET_BARGAIN_FINISHED.getNumber() :
-                Retcode.RET_BARGAIN_NOT_ACTIVATED.getNumber())
-            .setCurMood(record.getCurrentMood())
-            .setBargainResult(result)
-            .setResultParam(0));
+        this.setData(
+                BargainOfferPriceRsp.newBuilder()
+                        .setRetcode(
+                                record.isFinished()
+                                        ? Retcode.RET_BARGAIN_FINISHED.getNumber()
+                                        : Retcode.RET_BARGAIN_NOT_ACTIVATED.getNumber())
+                        .setCurMood(record.getCurrentMood())
+                        .setBargainResult(result)
+                        .setResultParam(0));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBargainStartNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBargainStartNotify.java
index ec0a88d1a..efa7d55d1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBargainStartNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBargainStartNotify.java
@@ -8,8 +8,9 @@ public final class PacketBargainStartNotify extends BasePacket {
     public PacketBargainStartNotify(BargainRecord record) {
         super(PacketOpcodes.BargainStartNotify);
 
-        this.setData(BargainStartNotify.newBuilder()
-            .setBargainId(record.getBargainId())
-            .setSnapshot(record.toSnapshot()));
+        this.setData(
+                BargainStartNotify.newBuilder()
+                        .setBargainId(record.getBargainId())
+                        .setSnapshot(record.toSnapshot()));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketBargainTerminateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketBargainTerminateNotify.java
index 1dff443c9..d1dbc7c30 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBargainTerminateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBargainTerminateNotify.java
@@ -7,7 +7,6 @@ public final class PacketBargainTerminateNotify extends BasePacket {
     public PacketBargainTerminateNotify(int bargainId) {
         super(PacketOpcodes.BargainTerminateNotify);
 
-        this.setData(BargainTerminateNotify.newBuilder()
-            .setBargainId(bargainId));
+        this.setData(BargainTerminateNotify.newBuilder().setBargainId(bargainId));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java
index 1cb54b6a3..aa11585c4 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllActivatedBargainDataRsp.java
@@ -4,17 +4,15 @@ import emu.grasscutter.game.quest.BargainRecord;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GetAllActivatedBargainDataRspOuterClass.GetAllActivatedBargainDataRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-
 import java.util.Collection;
 
 public final class PacketGetAllActivatedBargainDataRsp extends BasePacket {
     public PacketGetAllActivatedBargainDataRsp(Collection records) {
         super(PacketOpcodes.GetAllActivatedBargainDataRsp);
 
-        this.setData(GetAllActivatedBargainDataRsp.newBuilder()
-            .setRetcode(Retcode.RET_SUCC.getNumber())
-            .addAllSnapshotList(records.stream()
-                .map(BargainRecord::toSnapshot)
-                .toList()));
+        this.setData(
+                GetAllActivatedBargainDataRsp.newBuilder()
+                        .setRetcode(Retcode.RET_SUCC.getNumber())
+                        .addAllSnapshotList(records.stream().map(BargainRecord::toSnapshot).toList()));
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetBargainDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetBargainDataRsp.java
index 965ae51d4..2e0ad81a8 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetBargainDataRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetBargainDataRsp.java
@@ -9,16 +9,16 @@ public final class PacketGetBargainDataRsp extends BasePacket {
     public PacketGetBargainDataRsp(Retcode retcode) {
         super(PacketOpcodes.GetBargainDataRsp);
 
-        this.setData(GetBargainDataRsp.newBuilder()
-            .setRetcode(retcode.getNumber()));
+        this.setData(GetBargainDataRsp.newBuilder().setRetcode(retcode.getNumber()));
     }
 
     public PacketGetBargainDataRsp(BargainRecord record) {
         super(PacketOpcodes.GetBargainDataRsp);
 
-        this.setData(GetBargainDataRsp.newBuilder()
-            .setRetcode(Retcode.RET_SUCC.getNumber())
-            .setBargainId(record.getBargainId())
-            .setSnapshot(record.toSnapshot()));
+        this.setData(
+                GetBargainDataRsp.newBuilder()
+                        .setRetcode(Retcode.RET_SUCC.getNumber())
+                        .setBargainId(record.getBargainId())
+                        .setSnapshot(record.toSnapshot()));
     }
 }
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 7b749aa3b..2f681d75c 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")
-                        .setEMFDHANIAHH(3) // setRegPlatform
+                        .setRegPlatform(3)
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .build();
 
@@ -46,7 +46,7 @@ public class PacketGetPlayerTokenRsp extends BasePacket {
                         .setRetcode(retcode)
                         .setMsg(msg)
                         .setBlackUidEndTime(blackEndTime)
-                        .setEMFDHANIAHH(3) // setRegPlatform
+                        .setRegPlatform(3)
                         .setCountryCode("US")
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .build();
@@ -73,7 +73,7 @@ public class PacketGetPlayerTokenRsp extends BasePacket {
                         .setChannelId(1)
                         .setCountryCode("US")
                         .setClientVersionRandomKey("c25-314dd05b0b5f")
-                        .setEMFDHANIAHH(3) // setRegPlatform
+                        .setRegPlatform(3)
                         .setClientIpStr(session.getAddress().getAddress().getHostAddress())
                         .setServerRandKey(encryptedSeed)
                         .setSign(encryptedSeedSign)
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java
index 46d87b047..1c1b6673c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java
@@ -14,13 +14,13 @@ public class PacketGetSceneAreaRsp extends BasePacket {
 
         GetSceneAreaRsp p =
                 GetSceneAreaRsp.newBuilder()
-                    .setSceneId(sceneId)
-                    .addAllAreaIdList(player.getUnlockedSceneAreas(sceneId))
-                    .addCityInfoList(player.getSotsManager().getCityInfo(1).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(2).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(3).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(4).toProto())
-                    .addCityInfoList(player.getSotsManager().getCityInfo(5).toProto())
+                        .setSceneId(sceneId)
+                        .addAllAreaIdList(player.getUnlockedSceneAreas(sceneId))
+                        .addCityInfoList(player.getSotsManager().getCityInfo(1).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(2).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(3).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(4).toProto())
+                        .addCityInfoList(player.getSotsManager().getCityInfo(5).toProto())
                         .build();
 
         this.setData(p);
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java
index ffbe29e3c..2e1a4bf09 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGivingRecordNotify.java
@@ -3,15 +3,12 @@ package emu.grasscutter.server.packet.send;
 import emu.grasscutter.net.packet.*;
 import emu.grasscutter.net.proto.GivingRecordNotifyOuterClass.GivingRecordNotify;
 import emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord;
-
 import java.util.Collection;
 
 public final class PacketGivingRecordNotify extends BasePacket {
     public PacketGivingRecordNotify(Collection records) {
         super(PacketOpcodes.GivingRecordNotify);
 
-        this.setData(GivingRecordNotify.newBuilder()
-            .addAllGivingRecordList(records)
-            .build());
+        this.setData(GivingRecordNotify.newBuilder().addAllGivingRecordList(records).build());
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketItemGivingRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketItemGivingRsp.java
index 250842a3f..d373b1fee 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketItemGivingRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketItemGivingRsp.java
@@ -11,8 +11,7 @@ public final class PacketItemGivingRsp extends BasePacket {
     public PacketItemGivingRsp(int value, Mode mode) {
         super(PacketOpcodes.ItemGivingRsp);
 
-        var packet = ItemGivingRsp.newBuilder()
-            .setRetcode(mode == Mode.FAILURE ? 1 : 0);
+        var packet = ItemGivingRsp.newBuilder().setRetcode(mode == Mode.FAILURE ? 1 : 0);
         if (mode == Mode.EXACT_SUCCESS) {
             packet.setGivingId(value);
         } else if (mode == Mode.GROUP_SUCCESS) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java
index 9fc623322..32d638f9c 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java
@@ -7,7 +7,6 @@ import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.MapLayerInfoOuterClass;
 import emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify;
 import emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo;
-
 import java.util.stream.IntStream;
 
 public class PacketPlayerWorldSceneInfoListNotify extends BasePacket {
@@ -16,49 +15,66 @@ public class PacketPlayerWorldSceneInfoListNotify extends BasePacket {
         super(PacketOpcodes.PlayerWorldSceneInfoListNotify); // Rename opcode later
 
         PlayerWorldSceneInfoListNotify.Builder proto =
-            PlayerWorldSceneInfoListNotify.newBuilder()
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(1).setIsLocked(false).build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder()
-                    .setSceneId(3)
-                    .setIsLocked(false)
-                    .addAllSceneTagIdList(GameData.getSceneTagDataMap().values().stream()
-                        .filter(sceneTag -> sceneTag.getSceneId() == 3)
-                        .filter(sceneTag -> sceneTag.isDefaultValid() || sceneTag.getCond().get(0).getCondType() != null)
-                        .map(SceneTagData::getId)
-                        .toList())
-                    //.addSceneTagIdList(102)  // Jade chamber (alr added)
-                    //.addSceneTagIdList(113)
-                    //.addSceneTagIdList(117)
-                    //.addSceneTagIdList(1093) // 3.0 Vana_real
-                    .addSceneTagIdList(1094)   // 3.0 Vana_dream
-                    //.addSceneTagIdList(1095) // 3.0 Vana_first
-                    //.addSceneTagIdList(1096) // 3.0 Vana_festival
-                    .addSceneTagIdList(152)    // 3.1 event
-                    .addSceneTagIdList(153)    // 3.1 event
-                    .addSceneTagIdList(1164)   // Desert Arena (XMSM_CWLTop)
-                    .addSceneTagIdList(1166)   // Desert Pyramid (CWL_Trans_02)
-                    .setMapLayerInfo(MapLayerInfoOuterClass.MapLayerInfo.newBuilder()
-                        .addAllUnlockedMapLayerIdList(GameData.getMapLayerDataMap().keySet())    // MapLayer Ids
-                        .addAllUnlockedMapLayerFloorIdList(GameData.getMapLayerFloorDataMap().keySet())
-                        .addAllUnlockedMapLayerGroupIdList(GameData.getMapLayerGroupDataMap().keySet())        // will show MapLayer options when hovered over
-                        .build())    //map layer test
-                    .build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder()
-                    .setSceneId(4)
-                    .setIsLocked(false)
-                    .addSceneTagIdList(106)
-                    .addSceneTagIdList(109)
-                    .addSceneTagIdList(117)
-                    .build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(5).setIsLocked(false).build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(6).setIsLocked(false).build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(7).setIsLocked(false).build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(9).setIsLocked(false)
-                    .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
-                    .build())
-                .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(10).setIsLocked(false)
-                    .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
-                    .build());    //3.8
+                PlayerWorldSceneInfoListNotify.newBuilder()
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(1).setIsLocked(false).build())
+                        .addInfoList(
+                                PlayerWorldSceneInfo.newBuilder()
+                                        .setSceneId(3)
+                                        .setIsLocked(false)
+                                        .addAllSceneTagIdList(
+                                                GameData.getSceneTagDataMap().values().stream()
+                                                        .filter(sceneTag -> sceneTag.getSceneId() == 3)
+                                                        .filter(
+                                                                sceneTag ->
+                                                                        sceneTag.isDefaultValid()
+                                                                                || sceneTag.getCond().get(0).getCondType() != null)
+                                                        .map(SceneTagData::getId)
+                                                        .toList())
+                                        // .addSceneTagIdList(102)  // Jade chamber (alr added)
+                                        // .addSceneTagIdList(113)
+                                        // .addSceneTagIdList(117)
+                                        // .addSceneTagIdList(1093) // 3.0 Vana_real
+                                        .addSceneTagIdList(1094) // 3.0 Vana_dream
+                                        // .addSceneTagIdList(1095) // 3.0 Vana_first
+                                        // .addSceneTagIdList(1096) // 3.0 Vana_festival
+                                        .addSceneTagIdList(152) // 3.1 event
+                                        .addSceneTagIdList(153) // 3.1 event
+                                        .addSceneTagIdList(1164) // Desert Arena (XMSM_CWLTop)
+                                        .addSceneTagIdList(1166) // Desert Pyramid (CWL_Trans_02)
+                                        .setMapLayerInfo(
+                                                MapLayerInfoOuterClass.MapLayerInfo.newBuilder()
+                                                        .addAllUnlockedMapLayerIdList(
+                                                                GameData.getMapLayerDataMap().keySet()) // MapLayer Ids
+                                                        .addAllUnlockedMapLayerFloorIdList(
+                                                                GameData.getMapLayerFloorDataMap().keySet())
+                                                        .addAllUnlockedMapLayerGroupIdList(
+                                                                GameData.getMapLayerGroupDataMap()
+                                                                        .keySet()) // will show MapLayer options when hovered over
+                                                        .build()) // map layer test
+                                        .build())
+                        .addInfoList(
+                                PlayerWorldSceneInfo.newBuilder()
+                                        .setSceneId(4)
+                                        .setIsLocked(false)
+                                        .addSceneTagIdList(106)
+                                        .addSceneTagIdList(109)
+                                        .addSceneTagIdList(117)
+                                        .build())
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(5).setIsLocked(false).build())
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(6).setIsLocked(false).build())
+                        .addInfoList(PlayerWorldSceneInfo.newBuilder().setSceneId(7).setIsLocked(false).build())
+                        .addInfoList(
+                                PlayerWorldSceneInfo.newBuilder()
+                                        .setSceneId(9)
+                                        .setIsLocked(false)
+                                        .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
+                                        .build())
+                        .addInfoList(
+                                PlayerWorldSceneInfo.newBuilder()
+                                        .setSceneId(10)
+                                        .setIsLocked(false)
+                                        .addAllSceneTagIdList(IntStream.range(0, 3000).boxed().toList())
+                                        .build()); // 3.8
 
         this.setData(proto);
     }