diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java index 7a4b9cff1c8..57614816b2d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java @@ -19,28 +19,24 @@ public interface AiSyncInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 entity_id = 2; + * uint32 entity_id = 9; * @return The entityId. */ int getEntityId(); /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 10; * @return The hasPathToTarget. */ boolean getHasPathToTarget(); /** - * bool is_self_killing = 1; + * bool is_self_killing = 11; * @return The isSelfKilling. */ boolean getIsSelfKilling(); } /** - * 
-   * Obf: HLGFNMAEPJO
-   *
- * * Protobuf type {@code AiSyncInfo} */ public static final class AiSyncInfo extends @@ -85,19 +81,19 @@ private AiSyncInfo( case 0: done = true; break; - case 8: { + case 72: { - isSelfKilling_ = input.readBool(); + entityId_ = input.readUInt32(); break; } - case 16: { + case 80: { - entityId_ = input.readUInt32(); + hasPathToTarget_ = input.readBool(); break; } - case 32: { + case 88: { - hasPathToTarget_ = input.readBool(); + isSelfKilling_ = input.readBool(); break; } default: { @@ -132,10 +128,10 @@ private AiSyncInfo( emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.class, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder.class); } - public static final int ENTITY_ID_FIELD_NUMBER = 2; + public static final int ENTITY_ID_FIELD_NUMBER = 9; private int entityId_; /** - * uint32 entity_id = 2; + * uint32 entity_id = 9; * @return The entityId. */ @java.lang.Override @@ -143,10 +139,10 @@ public int getEntityId() { return entityId_; } - public static final int HAS_PATH_TO_TARGET_FIELD_NUMBER = 4; + public static final int HAS_PATH_TO_TARGET_FIELD_NUMBER = 10; private boolean hasPathToTarget_; /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 10; * @return The hasPathToTarget. */ @java.lang.Override @@ -154,10 +150,10 @@ public boolean getHasPathToTarget() { return hasPathToTarget_; } - public static final int IS_SELF_KILLING_FIELD_NUMBER = 1; + public static final int IS_SELF_KILLING_FIELD_NUMBER = 11; private boolean isSelfKilling_; /** - * bool is_self_killing = 1; + * bool is_self_killing = 11; * @return The isSelfKilling. */ @java.lang.Override @@ -179,14 +175,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (isSelfKilling_ != false) { - output.writeBool(1, isSelfKilling_); - } if (entityId_ != 0) { - output.writeUInt32(2, entityId_); + output.writeUInt32(9, entityId_); } if (hasPathToTarget_ != false) { - output.writeBool(4, hasPathToTarget_); + output.writeBool(10, hasPathToTarget_); + } + if (isSelfKilling_ != false) { + output.writeBool(11, isSelfKilling_); } unknownFields.writeTo(output); } @@ -197,17 +193,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (isSelfKilling_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, isSelfKilling_); - } if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, entityId_); + .computeUInt32Size(9, entityId_); } if (hasPathToTarget_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, hasPathToTarget_); + .computeBoolSize(10, hasPathToTarget_); + } + if (isSelfKilling_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(11, isSelfKilling_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -345,10 +341,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: HLGFNMAEPJO
-     *
- * * Protobuf type {@code AiSyncInfo} */ public static final class Builder extends @@ -509,7 +501,7 @@ public Builder mergeFrom( private int entityId_ ; /** - * uint32 entity_id = 2; + * uint32 entity_id = 9; * @return The entityId. */ @java.lang.Override @@ -517,7 +509,7 @@ public int getEntityId() { return entityId_; } /** - * uint32 entity_id = 2; + * uint32 entity_id = 9; * @param value The entityId to set. * @return This builder for chaining. */ @@ -528,7 +520,7 @@ public Builder setEntityId(int value) { return this; } /** - * uint32 entity_id = 2; + * uint32 entity_id = 9; * @return This builder for chaining. */ public Builder clearEntityId() { @@ -540,7 +532,7 @@ public Builder clearEntityId() { private boolean hasPathToTarget_ ; /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 10; * @return The hasPathToTarget. */ @java.lang.Override @@ -548,7 +540,7 @@ public boolean getHasPathToTarget() { return hasPathToTarget_; } /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 10; * @param value The hasPathToTarget to set. * @return This builder for chaining. */ @@ -559,7 +551,7 @@ public Builder setHasPathToTarget(boolean value) { return this; } /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 10; * @return This builder for chaining. */ public Builder clearHasPathToTarget() { @@ -571,7 +563,7 @@ public Builder clearHasPathToTarget() { private boolean isSelfKilling_ ; /** - * bool is_self_killing = 1; + * bool is_self_killing = 11; * @return The isSelfKilling. */ @java.lang.Override @@ -579,7 +571,7 @@ public boolean getIsSelfKilling() { return isSelfKilling_; } /** - * bool is_self_killing = 1; + * bool is_self_killing = 11; * @param value The isSelfKilling to set. * @return This builder for chaining. */ @@ -590,7 +582,7 @@ public Builder setIsSelfKilling(boolean value) { return this; } /** - * bool is_self_killing = 1; + * bool is_self_killing = 11; * @return This builder for chaining. */ public Builder clearIsSelfKilling() { @@ -667,8 +659,8 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getDefaultInsta static { java.lang.String[] descriptorData = { "\n\020AiSyncInfo.proto\"T\n\nAiSyncInfo\022\021\n\tenti" + - "ty_id\030\002 \001(\r\022\032\n\022has_path_to_target\030\004 \001(\010\022" + - "\027\n\017is_self_killing\030\001 \001(\010B\033\n\031emu.grasscut" + + "ty_id\030\t \001(\r\022\032\n\022has_path_to_target\030\n \001(\010\022" + + "\027\n\017is_self_killing\030\013 \001(\010B\033\n\031emu.grasscut" + "ter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java index 55b5918dd02..4fc1f8cf14c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java @@ -19,69 +19,64 @@ public interface DungeonChallengeBeginNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 challenge_index = 11; - * @return The challengeIndex. + * repeated uint32 param_list = 4; + * @return A list containing the paramList. */ - int getChallengeIndex(); - + java.util.List getParamListList(); /** - * uint32 group_id = 10; - * @return The groupId. + * repeated uint32 param_list = 4; + * @return The count of paramList. */ - int getGroupId(); + int getParamListCount(); + /** + * repeated uint32 param_list = 4; + * @param index The index of the element to return. + * @return The paramList at the given index. + */ + int getParamList(int index); /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @return A list containing the uidList. */ java.util.List getUidListList(); /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @return The count of uidList. */ int getUidListCount(); /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @param index The index of the element to return. * @return The uidList at the given index. */ int getUidList(int index); /** - * uint32 father_index = 4; - * @return The fatherIndex. - */ - int getFatherIndex(); - - /** - * uint32 challenge_id = 3; + * uint32 challenge_id = 10; * @return The challengeId. */ int getChallengeId(); /** - * repeated uint32 param_list = 6; - * @return A list containing the paramList. + * uint32 group_id = 8; + * @return The groupId. */ - java.util.List getParamListList(); + int getGroupId(); + /** - * repeated uint32 param_list = 6; - * @return The count of paramList. + * uint32 father_index = 5; + * @return The fatherIndex. */ - int getParamListCount(); + int getFatherIndex(); + /** - * repeated uint32 param_list = 6; - * @param index The index of the element to return. - * @return The paramList at the given index. + * uint32 challenge_index = 11; + * @return The challengeIndex. */ - int getParamList(int index); + int getChallengeIndex(); } /** - * 
-   * CmdId: 8891
-   * Obf: FPMGJHAEAML
-   *
- * * Protobuf type {@code DungeonChallengeBeginNotify} */ public static final class DungeonChallengeBeginNotify extends @@ -94,8 +89,8 @@ private DungeonChallengeBeginNotify(com.google.protobuf.GeneratedMessageV3.Build super(builder); } private DungeonChallengeBeginNotify() { - uidList_ = emptyIntList(); paramList_ = emptyIntList(); + uidList_ = emptyIntList(); } @java.lang.Override @@ -129,30 +124,20 @@ private DungeonChallengeBeginNotify( case 0: done = true; break; - case 24: { - - challengeId_ = input.readUInt32(); - break; - } case 32: { - - fatherIndex_ = input.readUInt32(); - break; - } - case 48: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { paramList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } paramList_.addInt(input.readUInt32()); break; } - case 50: { + case 34: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { paramList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { paramList_.addInt(input.readUInt32()); @@ -160,30 +145,40 @@ private DungeonChallengeBeginNotify( input.popLimit(limit); break; } - case 80: { + case 40: { + + fatherIndex_ = input.readUInt32(); + break; + } + case 64: { groupId_ = input.readUInt32(); break; } + case 80: { + + challengeId_ = input.readUInt32(); + break; + } case 88: { challengeIndex_ = input.readUInt32(); break; } - case 120: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { + case 96: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { uidList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } uidList_.addInt(input.readUInt32()); break; } - case 122: { + case 98: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { uidList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { uidList_.addInt(input.readUInt32()); @@ -206,10 +201,10 @@ private DungeonChallengeBeginNotify( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { paramList_.makeImmutable(); // C } - if (((mutable_bitField0_ & 0x00000001) != 0)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { uidList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); @@ -229,32 +224,38 @@ private DungeonChallengeBeginNotify( emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify.class, emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify.Builder.class); } - public static final int CHALLENGE_INDEX_FIELD_NUMBER = 11; - private int challengeIndex_; + public static final int PARAM_LIST_FIELD_NUMBER = 4; + private com.google.protobuf.Internal.IntList paramList_; /** - * uint32 challenge_index = 11; - * @return The challengeIndex. + * repeated uint32 param_list = 4; + * @return A list containing the paramList. */ @java.lang.Override - public int getChallengeIndex() { - return challengeIndex_; + public java.util.List + getParamListList() { + return paramList_; } - - public static final int GROUP_ID_FIELD_NUMBER = 10; - private int groupId_; /** - * uint32 group_id = 10; - * @return The groupId. + * repeated uint32 param_list = 4; + * @return The count of paramList. */ - @java.lang.Override - public int getGroupId() { - return groupId_; + public int getParamListCount() { + return paramList_.size(); + } + /** + * repeated uint32 param_list = 4; + * @param index The index of the element to return. + * @return The paramList at the given index. + */ + public int getParamList(int index) { + return paramList_.getInt(index); } + private int paramListMemoizedSerializedSize = -1; - public static final int UID_LIST_FIELD_NUMBER = 15; + public static final int UID_LIST_FIELD_NUMBER = 12; private com.google.protobuf.Internal.IntList uidList_; /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @return A list containing the uidList. */ @java.lang.Override @@ -263,14 +264,14 @@ public int getGroupId() { return uidList_; } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @return The count of uidList. */ public int getUidListCount() { return uidList_.size(); } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @param index The index of the element to return. * @return The uidList at the given index. */ @@ -279,21 +280,10 @@ public int getUidList(int index) { } private int uidListMemoizedSerializedSize = -1; - public static final int FATHER_INDEX_FIELD_NUMBER = 4; - private int fatherIndex_; - /** - * uint32 father_index = 4; - * @return The fatherIndex. - */ - @java.lang.Override - public int getFatherIndex() { - return fatherIndex_; - } - - public static final int CHALLENGE_ID_FIELD_NUMBER = 3; + public static final int CHALLENGE_ID_FIELD_NUMBER = 10; private int challengeId_; /** - * uint32 challenge_id = 3; + * uint32 challenge_id = 10; * @return The challengeId. */ @java.lang.Override @@ -301,33 +291,38 @@ public int getChallengeId() { return challengeId_; } - public static final int PARAM_LIST_FIELD_NUMBER = 6; - private com.google.protobuf.Internal.IntList paramList_; + public static final int GROUP_ID_FIELD_NUMBER = 8; + private int groupId_; /** - * repeated uint32 param_list = 6; - * @return A list containing the paramList. + * uint32 group_id = 8; + * @return The groupId. */ @java.lang.Override - public java.util.List - getParamListList() { - return paramList_; + public int getGroupId() { + return groupId_; } + + public static final int FATHER_INDEX_FIELD_NUMBER = 5; + private int fatherIndex_; /** - * repeated uint32 param_list = 6; - * @return The count of paramList. + * uint32 father_index = 5; + * @return The fatherIndex. */ - public int getParamListCount() { - return paramList_.size(); + @java.lang.Override + public int getFatherIndex() { + return fatherIndex_; } + + public static final int CHALLENGE_INDEX_FIELD_NUMBER = 11; + private int challengeIndex_; /** - * repeated uint32 param_list = 6; - * @param index The index of the element to return. - * @return The paramList at the given index. + * uint32 challenge_index = 11; + * @return The challengeIndex. */ - public int getParamList(int index) { - return paramList_.getInt(index); + @java.lang.Override + public int getChallengeIndex() { + return challengeIndex_; } - private int paramListMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -344,27 +339,27 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (challengeId_ != 0) { - output.writeUInt32(3, challengeId_); - } - if (fatherIndex_ != 0) { - output.writeUInt32(4, fatherIndex_); - } if (getParamListList().size() > 0) { - output.writeUInt32NoTag(50); + output.writeUInt32NoTag(34); output.writeUInt32NoTag(paramListMemoizedSerializedSize); } for (int i = 0; i < paramList_.size(); i++) { output.writeUInt32NoTag(paramList_.getInt(i)); } + if (fatherIndex_ != 0) { + output.writeUInt32(5, fatherIndex_); + } if (groupId_ != 0) { - output.writeUInt32(10, groupId_); + output.writeUInt32(8, groupId_); + } + if (challengeId_ != 0) { + output.writeUInt32(10, challengeId_); } if (challengeIndex_ != 0) { output.writeUInt32(11, challengeIndex_); } if (getUidListList().size() > 0) { - output.writeUInt32NoTag(122); + output.writeUInt32NoTag(98); output.writeUInt32NoTag(uidListMemoizedSerializedSize); } for (int i = 0; i < uidList_.size(); i++) { @@ -379,14 +374,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (challengeId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, challengeId_); - } - if (fatherIndex_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, fatherIndex_); - } { int dataSize = 0; for (int i = 0; i < paramList_.size(); i++) { @@ -401,9 +388,17 @@ public int getSerializedSize() { } paramListMemoizedSerializedSize = dataSize; } + if (fatherIndex_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(5, fatherIndex_); + } if (groupId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, groupId_); + .computeUInt32Size(8, groupId_); + } + if (challengeId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(10, challengeId_); } if (challengeIndex_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -438,18 +433,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify other = (emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify) obj; - if (getChallengeIndex() - != other.getChallengeIndex()) return false; - if (getGroupId() - != other.getGroupId()) return false; + if (!getParamListList() + .equals(other.getParamListList())) return false; if (!getUidListList() .equals(other.getUidListList())) return false; - if (getFatherIndex() - != other.getFatherIndex()) return false; if (getChallengeId() != other.getChallengeId()) return false; - if (!getParamListList() - .equals(other.getParamListList())) return false; + if (getGroupId() + != other.getGroupId()) return false; + if (getFatherIndex() + != other.getFatherIndex()) return false; + if (getChallengeIndex() + != other.getChallengeIndex()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -461,22 +456,22 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER; - hash = (53 * hash) + getChallengeIndex(); - hash = (37 * hash) + GROUP_ID_FIELD_NUMBER; - hash = (53 * hash) + getGroupId(); + if (getParamListCount() > 0) { + hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER; + hash = (53 * hash) + getParamListList().hashCode(); + } if (getUidListCount() > 0) { hash = (37 * hash) + UID_LIST_FIELD_NUMBER; hash = (53 * hash) + getUidListList().hashCode(); } - hash = (37 * hash) + FATHER_INDEX_FIELD_NUMBER; - hash = (53 * hash) + getFatherIndex(); hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER; hash = (53 * hash) + getChallengeId(); - if (getParamListCount() > 0) { - hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getParamListList().hashCode(); - } + hash = (37 * hash) + GROUP_ID_FIELD_NUMBER; + hash = (53 * hash) + getGroupId(); + hash = (37 * hash) + FATHER_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getFatherIndex(); + hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getChallengeIndex(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -573,11 +568,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 8891
-     * Obf: FPMGJHAEAML
-     *
- * * Protobuf type {@code DungeonChallengeBeginNotify} */ public static final class Builder extends @@ -615,18 +605,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - challengeIndex_ = 0; + paramList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + uidList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + challengeId_ = 0; groupId_ = 0; - uidList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); fatherIndex_ = 0; - challengeId_ = 0; + challengeIndex_ = 0; - paramList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -654,20 +644,20 @@ public emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonCh public emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify buildPartial() { emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify result = new emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify(this); int from_bitField0_ = bitField0_; - result.challengeIndex_ = challengeIndex_; - result.groupId_ = groupId_; if (((bitField0_ & 0x00000001) != 0)) { - uidList_.makeImmutable(); + paramList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.uidList_ = uidList_; - result.fatherIndex_ = fatherIndex_; - result.challengeId_ = challengeId_; + result.paramList_ = paramList_; if (((bitField0_ & 0x00000002) != 0)) { - paramList_.makeImmutable(); + uidList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.paramList_ = paramList_; + result.uidList_ = uidList_; + result.challengeId_ = challengeId_; + result.groupId_ = groupId_; + result.fatherIndex_ = fatherIndex_; + result.challengeIndex_ = challengeIndex_; onBuilt(); return result; } @@ -716,37 +706,37 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify other) { if (other == emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify.getDefaultInstance()) return this; - if (other.getChallengeIndex() != 0) { - setChallengeIndex(other.getChallengeIndex()); - } - if (other.getGroupId() != 0) { - setGroupId(other.getGroupId()); + if (!other.paramList_.isEmpty()) { + if (paramList_.isEmpty()) { + paramList_ = other.paramList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureParamListIsMutable(); + paramList_.addAll(other.paramList_); + } + onChanged(); } if (!other.uidList_.isEmpty()) { if (uidList_.isEmpty()) { uidList_ = other.uidList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureUidListIsMutable(); uidList_.addAll(other.uidList_); } onChanged(); } - if (other.getFatherIndex() != 0) { - setFatherIndex(other.getFatherIndex()); - } if (other.getChallengeId() != 0) { setChallengeId(other.getChallengeId()); } - if (!other.paramList_.isEmpty()) { - if (paramList_.isEmpty()) { - paramList_ = other.paramList_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureParamListIsMutable(); - paramList_.addAll(other.paramList_); - } - onChanged(); + if (other.getGroupId() != 0) { + setGroupId(other.getGroupId()); + } + if (other.getFatherIndex() != 0) { + setFatherIndex(other.getFatherIndex()); + } + if (other.getChallengeIndex() != 0) { + setChallengeIndex(other.getChallengeIndex()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -778,93 +768,110 @@ public Builder mergeFrom( } private int bitField0_; - private int challengeIndex_ ; + private com.google.protobuf.Internal.IntList paramList_ = emptyIntList(); + private void ensureParamListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + paramList_ = mutableCopy(paramList_); + bitField0_ |= 0x00000001; + } + } /** - * uint32 challenge_index = 11; - * @return The challengeIndex. + * repeated uint32 param_list = 4; + * @return A list containing the paramList. */ - @java.lang.Override - public int getChallengeIndex() { - return challengeIndex_; + public java.util.List + getParamListList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(paramList_) : paramList_; } /** - * uint32 challenge_index = 11; - * @param value The challengeIndex to set. - * @return This builder for chaining. + * repeated uint32 param_list = 4; + * @return The count of paramList. */ - public Builder setChallengeIndex(int value) { - - challengeIndex_ = value; - onChanged(); - return this; + public int getParamListCount() { + return paramList_.size(); } /** - * uint32 challenge_index = 11; + * repeated uint32 param_list = 4; + * @param index The index of the element to return. + * @return The paramList at the given index. + */ + public int getParamList(int index) { + return paramList_.getInt(index); + } + /** + * repeated uint32 param_list = 4; + * @param index The index to set the value at. + * @param value The paramList to set. * @return This builder for chaining. */ - public Builder clearChallengeIndex() { - - challengeIndex_ = 0; + public Builder setParamList( + int index, int value) { + ensureParamListIsMutable(); + paramList_.setInt(index, value); onChanged(); return this; } - - private int groupId_ ; /** - * uint32 group_id = 10; - * @return The groupId. + * repeated uint32 param_list = 4; + * @param value The paramList to add. + * @return This builder for chaining. */ - @java.lang.Override - public int getGroupId() { - return groupId_; + public Builder addParamList(int value) { + ensureParamListIsMutable(); + paramList_.addInt(value); + onChanged(); + return this; } /** - * uint32 group_id = 10; - * @param value The groupId to set. + * repeated uint32 param_list = 4; + * @param values The paramList to add. * @return This builder for chaining. */ - public Builder setGroupId(int value) { - - groupId_ = value; + public Builder addAllParamList( + java.lang.Iterable values) { + ensureParamListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, paramList_); onChanged(); return this; } /** - * uint32 group_id = 10; + * repeated uint32 param_list = 4; * @return This builder for chaining. */ - public Builder clearGroupId() { - - groupId_ = 0; + public Builder clearParamList() { + paramList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } private com.google.protobuf.Internal.IntList uidList_ = emptyIntList(); private void ensureUidListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { uidList_ = mutableCopy(uidList_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @return A list containing the uidList. */ public java.util.List getUidListList() { - return ((bitField0_ & 0x00000001) != 0) ? + return ((bitField0_ & 0x00000002) != 0) ? java.util.Collections.unmodifiableList(uidList_) : uidList_; } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @return The count of uidList. */ public int getUidListCount() { return uidList_.size(); } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @param index The index of the element to return. * @return The uidList at the given index. */ @@ -872,7 +879,7 @@ public int getUidList(int index) { return uidList_.getInt(index); } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @param index The index to set the value at. * @param value The uidList to set. * @return This builder for chaining. @@ -885,7 +892,7 @@ public Builder setUidList( return this; } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @param value The uidList to add. * @return This builder for chaining. */ @@ -896,7 +903,7 @@ public Builder addUidList(int value) { return this; } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @param values The uidList to add. * @return This builder for chaining. */ @@ -909,153 +916,136 @@ public Builder addAllUidList( return this; } /** - * repeated uint32 uid_list = 15; + * repeated uint32 uid_list = 12; * @return This builder for chaining. */ public Builder clearUidList() { uidList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private int fatherIndex_ ; + private int challengeId_ ; /** - * uint32 father_index = 4; - * @return The fatherIndex. + * uint32 challenge_id = 10; + * @return The challengeId. */ @java.lang.Override - public int getFatherIndex() { - return fatherIndex_; + public int getChallengeId() { + return challengeId_; } /** - * uint32 father_index = 4; - * @param value The fatherIndex to set. + * uint32 challenge_id = 10; + * @param value The challengeId to set. * @return This builder for chaining. */ - public Builder setFatherIndex(int value) { + public Builder setChallengeId(int value) { - fatherIndex_ = value; + challengeId_ = value; onChanged(); return this; } /** - * uint32 father_index = 4; + * uint32 challenge_id = 10; * @return This builder for chaining. */ - public Builder clearFatherIndex() { + public Builder clearChallengeId() { - fatherIndex_ = 0; + challengeId_ = 0; onChanged(); return this; } - private int challengeId_ ; + private int groupId_ ; /** - * uint32 challenge_id = 3; - * @return The challengeId. + * uint32 group_id = 8; + * @return The groupId. */ @java.lang.Override - public int getChallengeId() { - return challengeId_; + public int getGroupId() { + return groupId_; } /** - * uint32 challenge_id = 3; - * @param value The challengeId to set. + * uint32 group_id = 8; + * @param value The groupId to set. * @return This builder for chaining. */ - public Builder setChallengeId(int value) { + public Builder setGroupId(int value) { - challengeId_ = value; + groupId_ = value; onChanged(); return this; } /** - * uint32 challenge_id = 3; + * uint32 group_id = 8; * @return This builder for chaining. */ - public Builder clearChallengeId() { + public Builder clearGroupId() { - challengeId_ = 0; + groupId_ = 0; onChanged(); return this; } - private com.google.protobuf.Internal.IntList paramList_ = emptyIntList(); - private void ensureParamListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - paramList_ = mutableCopy(paramList_); - bitField0_ |= 0x00000002; - } - } - /** - * repeated uint32 param_list = 6; - * @return A list containing the paramList. - */ - public java.util.List - getParamListList() { - return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(paramList_) : paramList_; - } - /** - * repeated uint32 param_list = 6; - * @return The count of paramList. - */ - public int getParamListCount() { - return paramList_.size(); - } + private int fatherIndex_ ; /** - * repeated uint32 param_list = 6; - * @param index The index of the element to return. - * @return The paramList at the given index. + * uint32 father_index = 5; + * @return The fatherIndex. */ - public int getParamList(int index) { - return paramList_.getInt(index); + @java.lang.Override + public int getFatherIndex() { + return fatherIndex_; } /** - * repeated uint32 param_list = 6; - * @param index The index to set the value at. - * @param value The paramList to set. + * uint32 father_index = 5; + * @param value The fatherIndex to set. * @return This builder for chaining. */ - public Builder setParamList( - int index, int value) { - ensureParamListIsMutable(); - paramList_.setInt(index, value); + public Builder setFatherIndex(int value) { + + fatherIndex_ = value; onChanged(); return this; } /** - * repeated uint32 param_list = 6; - * @param value The paramList to add. + * uint32 father_index = 5; * @return This builder for chaining. */ - public Builder addParamList(int value) { - ensureParamListIsMutable(); - paramList_.addInt(value); + public Builder clearFatherIndex() { + + fatherIndex_ = 0; onChanged(); return this; } + + private int challengeIndex_ ; /** - * repeated uint32 param_list = 6; - * @param values The paramList to add. + * uint32 challenge_index = 11; + * @return The challengeIndex. + */ + @java.lang.Override + public int getChallengeIndex() { + return challengeIndex_; + } + /** + * uint32 challenge_index = 11; + * @param value The challengeIndex to set. * @return This builder for chaining. */ - public Builder addAllParamList( - java.lang.Iterable values) { - ensureParamListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, paramList_); + public Builder setChallengeIndex(int value) { + + challengeIndex_ = value; onChanged(); return this; } /** - * repeated uint32 param_list = 6; + * uint32 challenge_index = 11; * @return This builder for chaining. */ - public Builder clearParamList() { - paramList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); + public Builder clearChallengeIndex() { + + challengeIndex_ = 0; onChanged(); return this; } @@ -1127,10 +1117,10 @@ public emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonCh static { java.lang.String[] descriptorData = { "\n!DungeonChallengeBeginNotify.proto\"\232\001\n\033" + - "DungeonChallengeBeginNotify\022\027\n\017challenge" + - "_index\030\013 \001(\r\022\020\n\010group_id\030\n \001(\r\022\020\n\010uid_li" + - "st\030\017 \003(\r\022\024\n\014father_index\030\004 \001(\r\022\024\n\014challe" + - "nge_id\030\003 \001(\r\022\022\n\nparam_list\030\006 \003(\rB\033\n\031emu." + + "DungeonChallengeBeginNotify\022\022\n\nparam_lis" + + "t\030\004 \003(\r\022\020\n\010uid_list\030\014 \003(\r\022\024\n\014challenge_i" + + "d\030\n \001(\r\022\020\n\010group_id\030\010 \001(\r\022\024\n\014father_inde" + + "x\030\005 \001(\r\022\027\n\017challenge_index\030\013 \001(\rB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1142,7 +1132,7 @@ public emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonCh internal_static_DungeonChallengeBeginNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonChallengeBeginNotify_descriptor, - new java.lang.String[] { "ChallengeIndex", "GroupId", "UidList", "FatherIndex", "ChallengeId", "ParamList", }); + new java.lang.String[] { "ParamList", "UidList", "ChallengeId", "GroupId", "FatherIndex", "ChallengeIndex", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java index b4b9ba7627f..ea2adf21aad 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java @@ -19,52 +19,11 @@ public interface DungeonChallengeFinishNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .ChallengeFinishType finish_type = 7; - * @return The enum numeric value on the wire for finishType. - */ - int getFinishTypeValue(); - /** - * .ChallengeFinishType finish_type = 7; - * @return The finishType. - */ - emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType(); - - /** - * bool is_success = 11; - * @return The isSuccess. - */ - boolean getIsSuccess(); - - /** - * uint32 challenge_index = 8; - * @return The challengeIndex. - */ - int getChallengeIndex(); - - /** - * uint32 currentValue = 14; - * @return The currentValue. - */ - int getCurrentValue(); - - /** - * bool is_new_record = 15; - * @return The isNewRecord. - */ - boolean getIsNewRecord(); - - /** - * uint32 time_cost = 13; - * @return The timeCost. - */ - int getTimeCost(); - - /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ int getStrengthenPointDataMapCount(); /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ boolean containsStrengthenPointDataMap( int key); @@ -75,98 +34,134 @@ boolean containsStrengthenPointDataMap( java.util.Map getStrengthenPointDataMap(); /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ java.util.Map getStrengthenPointDataMapMap(); /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrDefault( int key, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData defaultValue); /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrThrow( int key); /** - * uint32 challengeRecordType = 4; + * uint32 challenge_record_type = 9; * @return The challengeRecordType. */ int getChallengeRecordType(); /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * bool is_success = 1; + * @return The isSuccess. + */ + boolean getIsSuccess(); + + /** + * bool is_new_record = 10; + * @return The isNewRecord. + */ + boolean getIsNewRecord(); + + /** + * .ChallengeFinishType finish_type = 7; + * @return The enum numeric value on the wire for finishType. + */ + int getFinishTypeValue(); + /** + * .ChallengeFinishType finish_type = 7; + * @return The finishType. + */ + emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType(); + + /** + * uint32 time_cost = 6; + * @return The timeCost. + */ + int getTimeCost(); + + /** + * uint32 challenge_index = 5; + * @return The challengeIndex. + */ + int getChallengeIndex(); + + /** + * uint32 current_value = 12; + * @return The currentValue. + */ + int getCurrentValue(); + + /** + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; * @return Whether the channellerSlabLoopDungeonResultInfo field is set. */ boolean hasChannellerSlabLoopDungeonResultInfo(); /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; * @return The channellerSlabLoopDungeonResultInfo. */ emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo(); /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder(); /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; * @return Whether the effigyChallengeDungeonResultInfo field is set. */ boolean hasEffigyChallengeDungeonResultInfo(); /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; * @return The effigyChallengeDungeonResultInfo. */ emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo(); /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder(); /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; * @return Whether the potionDungeonResultInfo field is set. */ boolean hasPotionDungeonResultInfo(); /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; * @return The potionDungeonResultInfo. */ emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo(); /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder(); /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; * @return Whether the customDungeonResultInfo field is set. */ boolean hasCustomDungeonResultInfo(); /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; * @return The customDungeonResultInfo. */ emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo getCustomDungeonResultInfo(); /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder getCustomDungeonResultInfoOrBuilder(); public emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify.DetailCase getDetailCase(); } /** - * 
-   * CmdId: 5847
-   * Obf: JBNHPHABEGG
-   *
- * * Protobuf type {@code DungeonChallengeFinishNotify} */ public static final class DungeonChallengeFinishNotify extends @@ -213,58 +208,58 @@ private DungeonChallengeFinishNotify( case 0: done = true; break; - case 32: { + case 8: { - challengeRecordType_ = input.readUInt32(); + isSuccess_ = input.readBool(); break; } - case 42: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - strengthenPointDataMap_ = com.google.protobuf.MapField.newMapField( - StrengthenPointDataMapDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry - strengthenPointDataMap__ = input.readMessage( - StrengthenPointDataMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - strengthenPointDataMap_.getMutableMap().put( - strengthenPointDataMap__.getKey(), strengthenPointDataMap__.getValue()); + case 40: { + + challengeIndex_ = input.readUInt32(); break; } - case 56: { - int rawValue = input.readEnum(); + case 48: { - finishType_ = rawValue; + timeCost_ = input.readUInt32(); break; } - case 64: { + case 56: { + int rawValue = input.readEnum(); - challengeIndex_ = input.readUInt32(); + finishType_ = rawValue; break; } - case 88: { + case 72: { - isSuccess_ = input.readBool(); + challengeRecordType_ = input.readUInt32(); break; } - case 104: { + case 80: { - timeCost_ = input.readUInt32(); + isNewRecord_ = input.readBool(); break; } - case 112: { + case 96: { currentValue_ = input.readUInt32(); break; } - case 120: { - - isNewRecord_ = input.readBool(); + case 106: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + strengthenPointDataMap_ = com.google.protobuf.MapField.newMapField( + StrengthenPointDataMapDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000001; + } + com.google.protobuf.MapEntry + strengthenPointDataMap__ = input.readMessage( + StrengthenPointDataMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + strengthenPointDataMap_.getMutableMap().put( + strengthenPointDataMap__.getKey(), strengthenPointDataMap__.getValue()); break; } - case 2714: { + case 2554: { emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder subBuilder = null; - if (detailCase_ == 339) { + if (detailCase_ == 319) { subBuilder = ((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_).toBuilder(); } detail_ = @@ -273,26 +268,12 @@ private DungeonChallengeFinishNotify( subBuilder.mergeFrom((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_); detail_ = subBuilder.buildPartial(); } - detailCase_ = 339; - break; - } - case 2810: { - emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder subBuilder = null; - if (detailCase_ == 351) { - subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_).toBuilder(); - } - detail_ = - input.readMessage(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); - detail_ = subBuilder.buildPartial(); - } - detailCase_ = 351; + detailCase_ = 319; break; } - case 7322: { + case 6586: { emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder subBuilder = null; - if (detailCase_ == 915) { + if (detailCase_ == 823) { subBuilder = ((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_).toBuilder(); } detail_ = @@ -301,12 +282,12 @@ private DungeonChallengeFinishNotify( subBuilder.mergeFrom((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_); detail_ = subBuilder.buildPartial(); } - detailCase_ = 915; + detailCase_ = 823; break; } - case 8890: { + case 11114: { emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder subBuilder = null; - if (detailCase_ == 1111) { + if (detailCase_ == 1389) { subBuilder = ((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_).toBuilder(); } detail_ = @@ -315,7 +296,21 @@ private DungeonChallengeFinishNotify( subBuilder.mergeFrom((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); detail_ = subBuilder.buildPartial(); } - detailCase_ = 1111; + detailCase_ = 1389; + break; + } + case 13098: { + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder subBuilder = null; + if (detailCase_ == 1637) { + subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 1637; break; } default: { @@ -347,7 +342,7 @@ private DungeonChallengeFinishNotify( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 5: + case 13: return internalGetStrengthenPointDataMap(); default: throw new RuntimeException( @@ -367,10 +362,10 @@ protected com.google.protobuf.MapField internalGetMapField( public enum DetailCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { - CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO(1111), - EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO(351), - POTION_DUNGEON_RESULT_INFO(339), - CUSTOM_DUNGEON_RESULT_INFO(915), + CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO(1389), + EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO(1637), + POTION_DUNGEON_RESULT_INFO(319), + CUSTOM_DUNGEON_RESULT_INFO(823), DETAIL_NOT_SET(0); private final int value; private DetailCase(int value) { @@ -388,10 +383,10 @@ public static DetailCase valueOf(int value) { public static DetailCase forNumber(int value) { switch (value) { - case 1111: return CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO; - case 351: return EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO; - case 339: return POTION_DUNGEON_RESULT_INFO; - case 915: return CUSTOM_DUNGEON_RESULT_INFO; + case 1389: return CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO; + case 1637: return EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO; + case 319: return POTION_DUNGEON_RESULT_INFO; + case 823: return CUSTOM_DUNGEON_RESULT_INFO; case 0: return DETAIL_NOT_SET; default: return null; } @@ -407,81 +402,7 @@ public int getNumber() { detailCase_); } - public static final int FINISH_TYPE_FIELD_NUMBER = 7; - private int finishType_; - /** - * .ChallengeFinishType finish_type = 7; - * @return The enum numeric value on the wire for finishType. - */ - @java.lang.Override public int getFinishTypeValue() { - return finishType_; - } - /** - * .ChallengeFinishType finish_type = 7; - * @return The finishType. - */ - @java.lang.Override public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_); - return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result; - } - - public static final int IS_SUCCESS_FIELD_NUMBER = 11; - private boolean isSuccess_; - /** - * bool is_success = 11; - * @return The isSuccess. - */ - @java.lang.Override - public boolean getIsSuccess() { - return isSuccess_; - } - - public static final int CHALLENGE_INDEX_FIELD_NUMBER = 8; - private int challengeIndex_; - /** - * uint32 challenge_index = 8; - * @return The challengeIndex. - */ - @java.lang.Override - public int getChallengeIndex() { - return challengeIndex_; - } - - public static final int CURRENTVALUE_FIELD_NUMBER = 14; - private int currentValue_; - /** - * uint32 currentValue = 14; - * @return The currentValue. - */ - @java.lang.Override - public int getCurrentValue() { - return currentValue_; - } - - public static final int IS_NEW_RECORD_FIELD_NUMBER = 15; - private boolean isNewRecord_; - /** - * bool is_new_record = 15; - * @return The isNewRecord. - */ - @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; - } - - public static final int TIME_COST_FIELD_NUMBER = 13; - private int timeCost_; - /** - * uint32 time_cost = 13; - * @return The timeCost. - */ - @java.lang.Override - public int getTimeCost() { - return timeCost_; - } - - public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 5; + public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 13; private static final class StrengthenPointDataMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> defaultEntry = @@ -508,7 +429,7 @@ public int getStrengthenPointDataMapCount() { return internalGetStrengthenPointDataMap().getMap().size(); } /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ @java.lang.Override @@ -526,7 +447,7 @@ public java.util.Mapmap<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ @java.lang.Override @@ -534,7 +455,7 @@ public java.util.Mapmap<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ @java.lang.Override @@ -547,7 +468,7 @@ public emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointDa return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ @java.lang.Override @@ -562,10 +483,10 @@ public emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointDa return map.get(key); } - public static final int CHALLENGERECORDTYPE_FIELD_NUMBER = 4; + public static final int CHALLENGE_RECORD_TYPE_FIELD_NUMBER = 9; private int challengeRecordType_; /** - * uint32 challengeRecordType = 4; + * uint32 challenge_record_type = 9; * @return The challengeRecordType. */ @java.lang.Override @@ -573,125 +494,199 @@ public int getChallengeRecordType() { return challengeRecordType_; } - public static final int CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER = 1111; + public static final int IS_SUCCESS_FIELD_NUMBER = 1; + private boolean isSuccess_; /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; - * @return Whether the channellerSlabLoopDungeonResultInfo field is set. + * bool is_success = 1; + * @return The isSuccess. */ @java.lang.Override - public boolean hasChannellerSlabLoopDungeonResultInfo() { - return detailCase_ == 1111; + public boolean getIsSuccess() { + return isSuccess_; } + + public static final int IS_NEW_RECORD_FIELD_NUMBER = 10; + private boolean isNewRecord_; /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; - * @return The channellerSlabLoopDungeonResultInfo. + * bool is_new_record = 10; + * @return The isNewRecord. */ @java.lang.Override - public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() { - if (detailCase_ == 1111) { - return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; - } - return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + public boolean getIsNewRecord() { + return isNewRecord_; } + + public static final int FINISH_TYPE_FIELD_NUMBER = 7; + private int finishType_; /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChallengeFinishType finish_type = 7; + * @return The enum numeric value on the wire for finishType. */ - @java.lang.Override - public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() { - if (detailCase_ == 1111) { - return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; - } - return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + @java.lang.Override public int getFinishTypeValue() { + return finishType_; } - - public static final int EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER = 351; /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; - * @return Whether the effigyChallengeDungeonResultInfo field is set. + * .ChallengeFinishType finish_type = 7; + * @return The finishType. */ - @java.lang.Override - public boolean hasEffigyChallengeDungeonResultInfo() { - return detailCase_ == 351; + @java.lang.Override public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_); + return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result; } + + public static final int TIME_COST_FIELD_NUMBER = 6; + private int timeCost_; /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; - * @return The effigyChallengeDungeonResultInfo. + * uint32 time_cost = 6; + * @return The timeCost. */ @java.lang.Override - public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() { - if (detailCase_ == 351) { - return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; - } - return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + public int getTimeCost() { + return timeCost_; } + + public static final int CHALLENGE_INDEX_FIELD_NUMBER = 5; + private int challengeIndex_; /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * uint32 challenge_index = 5; + * @return The challengeIndex. */ @java.lang.Override - public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() { - if (detailCase_ == 351) { - return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; - } - return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + public int getChallengeIndex() { + return challengeIndex_; } - public static final int POTION_DUNGEON_RESULT_INFO_FIELD_NUMBER = 339; + public static final int CURRENT_VALUE_FIELD_NUMBER = 12; + private int currentValue_; /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; - * @return Whether the potionDungeonResultInfo field is set. + * uint32 current_value = 12; + * @return The currentValue. + */ + @java.lang.Override + public int getCurrentValue() { + return currentValue_; + } + + public static final int CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER = 1389; + /** + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; + * @return Whether the channellerSlabLoopDungeonResultInfo field is set. + */ + @java.lang.Override + public boolean hasChannellerSlabLoopDungeonResultInfo() { + return detailCase_ == 1389; + } + /** + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; + * @return The channellerSlabLoopDungeonResultInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() { + if (detailCase_ == 1389) { + return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } + /** + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() { + if (detailCase_ == 1389) { + return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } + + public static final int EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER = 1637; + /** + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; + * @return Whether the effigyChallengeDungeonResultInfo field is set. + */ + @java.lang.Override + public boolean hasEffigyChallengeDungeonResultInfo() { + return detailCase_ == 1637; + } + /** + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; + * @return The effigyChallengeDungeonResultInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() { + if (detailCase_ == 1637) { + return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } + /** + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() { + if (detailCase_ == 1637) { + return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } + + public static final int POTION_DUNGEON_RESULT_INFO_FIELD_NUMBER = 319; + /** + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; + * @return Whether the potionDungeonResultInfo field is set. */ @java.lang.Override public boolean hasPotionDungeonResultInfo() { - return detailCase_ == 339; + return detailCase_ == 319; } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; * @return The potionDungeonResultInfo. */ @java.lang.Override public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo() { - if (detailCase_ == 339) { + if (detailCase_ == 319) { return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance(); } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ @java.lang.Override public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder() { - if (detailCase_ == 339) { + if (detailCase_ == 319) { return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance(); } - public static final int CUSTOM_DUNGEON_RESULT_INFO_FIELD_NUMBER = 915; + public static final int CUSTOM_DUNGEON_RESULT_INFO_FIELD_NUMBER = 823; /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; * @return Whether the customDungeonResultInfo field is set. */ @java.lang.Override public boolean hasCustomDungeonResultInfo() { - return detailCase_ == 915; + return detailCase_ == 823; } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; * @return The customDungeonResultInfo. */ @java.lang.Override public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo getCustomDungeonResultInfo() { - if (detailCase_ == 915) { + if (detailCase_ == 823) { return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance(); } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ @java.lang.Override public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder getCustomDungeonResultInfoOrBuilder() { - if (detailCase_ == 915) { + if (detailCase_ == 823) { return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance(); @@ -711,44 +706,44 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (challengeRecordType_ != 0) { - output.writeUInt32(4, challengeRecordType_); - } - com.google.protobuf.GeneratedMessageV3 - .serializeIntegerMapTo( - output, - internalGetStrengthenPointDataMap(), - StrengthenPointDataMapDefaultEntryHolder.defaultEntry, - 5); - if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) { - output.writeEnum(7, finishType_); + if (isSuccess_ != false) { + output.writeBool(1, isSuccess_); } if (challengeIndex_ != 0) { - output.writeUInt32(8, challengeIndex_); - } - if (isSuccess_ != false) { - output.writeBool(11, isSuccess_); + output.writeUInt32(5, challengeIndex_); } if (timeCost_ != 0) { - output.writeUInt32(13, timeCost_); + output.writeUInt32(6, timeCost_); } - if (currentValue_ != 0) { - output.writeUInt32(14, currentValue_); + if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) { + output.writeEnum(7, finishType_); + } + if (challengeRecordType_ != 0) { + output.writeUInt32(9, challengeRecordType_); } if (isNewRecord_ != false) { - output.writeBool(15, isNewRecord_); + output.writeBool(10, isNewRecord_); + } + if (currentValue_ != 0) { + output.writeUInt32(12, currentValue_); } - if (detailCase_ == 339) { - output.writeMessage(339, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_); + com.google.protobuf.GeneratedMessageV3 + .serializeIntegerMapTo( + output, + internalGetStrengthenPointDataMap(), + StrengthenPointDataMapDefaultEntryHolder.defaultEntry, + 13); + if (detailCase_ == 319) { + output.writeMessage(319, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_); } - if (detailCase_ == 351) { - output.writeMessage(351, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); + if (detailCase_ == 823) { + output.writeMessage(823, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_); } - if (detailCase_ == 915) { - output.writeMessage(915, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_); + if (detailCase_ == 1389) { + output.writeMessage(1389, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); } - if (detailCase_ == 1111) { - output.writeMessage(1111, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); + if (detailCase_ == 1637) { + output.writeMessage(1637, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); } unknownFields.writeTo(output); } @@ -759,59 +754,59 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (challengeRecordType_ != 0) { + if (isSuccess_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, challengeRecordType_); + .computeBoolSize(1, isSuccess_); } - for (java.util.Map.Entry entry - : internalGetStrengthenPointDataMap().getMap().entrySet()) { - com.google.protobuf.MapEntry - strengthenPointDataMap__ = StrengthenPointDataMapDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + if (challengeIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, strengthenPointDataMap__); + .computeUInt32Size(5, challengeIndex_); } - if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) { + if (timeCost_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(7, finishType_); + .computeUInt32Size(6, timeCost_); } - if (challengeIndex_ != 0) { + if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, challengeIndex_); + .computeEnumSize(7, finishType_); } - if (isSuccess_ != false) { + if (challengeRecordType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(11, isSuccess_); + .computeUInt32Size(9, challengeRecordType_); } - if (timeCost_ != 0) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, timeCost_); + .computeBoolSize(10, isNewRecord_); } if (currentValue_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, currentValue_); + .computeUInt32Size(12, currentValue_); } - if (isNewRecord_ != false) { + for (java.util.Map.Entry entry + : internalGetStrengthenPointDataMap().getMap().entrySet()) { + com.google.protobuf.MapEntry + strengthenPointDataMap__ = StrengthenPointDataMapDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeBoolSize(15, isNewRecord_); + .computeMessageSize(13, strengthenPointDataMap__); } - if (detailCase_ == 339) { + if (detailCase_ == 319) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(339, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_); + .computeMessageSize(319, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_); } - if (detailCase_ == 351) { + if (detailCase_ == 823) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(351, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); + .computeMessageSize(823, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_); } - if (detailCase_ == 915) { + if (detailCase_ == 1389) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(915, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_); + .computeMessageSize(1389, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); } - if (detailCase_ == 1111) { + if (detailCase_ == 1637) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1111, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); + .computeMessageSize(1637, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -828,36 +823,36 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify other = (emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify) obj; - if (finishType_ != other.finishType_) return false; + if (!internalGetStrengthenPointDataMap().equals( + other.internalGetStrengthenPointDataMap())) return false; + if (getChallengeRecordType() + != other.getChallengeRecordType()) return false; if (getIsSuccess() != other.getIsSuccess()) return false; - if (getChallengeIndex() - != other.getChallengeIndex()) return false; - if (getCurrentValue() - != other.getCurrentValue()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; + if (finishType_ != other.finishType_) return false; if (getTimeCost() != other.getTimeCost()) return false; - if (!internalGetStrengthenPointDataMap().equals( - other.internalGetStrengthenPointDataMap())) return false; - if (getChallengeRecordType() - != other.getChallengeRecordType()) return false; + if (getChallengeIndex() + != other.getChallengeIndex()) return false; + if (getCurrentValue() + != other.getCurrentValue()) return false; if (!getDetailCase().equals(other.getDetailCase())) return false; switch (detailCase_) { - case 1111: + case 1389: if (!getChannellerSlabLoopDungeonResultInfo() .equals(other.getChannellerSlabLoopDungeonResultInfo())) return false; break; - case 351: + case 1637: if (!getEffigyChallengeDungeonResultInfo() .equals(other.getEffigyChallengeDungeonResultInfo())) return false; break; - case 339: + case 319: if (!getPotionDungeonResultInfo() .equals(other.getPotionDungeonResultInfo())) return false; break; - case 915: + case 823: if (!getCustomDungeonResultInfo() .equals(other.getCustomDungeonResultInfo())) return false; break; @@ -875,40 +870,40 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + FINISH_TYPE_FIELD_NUMBER; - hash = (53 * hash) + finishType_; + if (!internalGetStrengthenPointDataMap().getMap().isEmpty()) { + hash = (37 * hash) + STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER; + hash = (53 * hash) + internalGetStrengthenPointDataMap().hashCode(); + } + hash = (37 * hash) + CHALLENGE_RECORD_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getChallengeRecordType(); hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSuccess()); - hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER; - hash = (53 * hash) + getChallengeIndex(); - hash = (37 * hash) + CURRENTVALUE_FIELD_NUMBER; - hash = (53 * hash) + getCurrentValue(); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); + hash = (37 * hash) + FINISH_TYPE_FIELD_NUMBER; + hash = (53 * hash) + finishType_; hash = (37 * hash) + TIME_COST_FIELD_NUMBER; hash = (53 * hash) + getTimeCost(); - if (!internalGetStrengthenPointDataMap().getMap().isEmpty()) { - hash = (37 * hash) + STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER; - hash = (53 * hash) + internalGetStrengthenPointDataMap().hashCode(); - } - hash = (37 * hash) + CHALLENGERECORDTYPE_FIELD_NUMBER; - hash = (53 * hash) + getChallengeRecordType(); + hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getChallengeIndex(); + hash = (37 * hash) + CURRENT_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getCurrentValue(); switch (detailCase_) { - case 1111: + case 1389: hash = (37 * hash) + CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER; hash = (53 * hash) + getChannellerSlabLoopDungeonResultInfo().hashCode(); break; - case 351: + case 1637: hash = (37 * hash) + EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER; hash = (53 * hash) + getEffigyChallengeDungeonResultInfo().hashCode(); break; - case 339: + case 319: hash = (37 * hash) + POTION_DUNGEON_RESULT_INFO_FIELD_NUMBER; hash = (53 * hash) + getPotionDungeonResultInfo().hashCode(); break; - case 915: + case 823: hash = (37 * hash) + CUSTOM_DUNGEON_RESULT_INFO_FIELD_NUMBER; hash = (53 * hash) + getCustomDungeonResultInfo().hashCode(); break; @@ -1011,11 +1006,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 5847
-     * Obf: JBNHPHABEGG
-     *
- * * Protobuf type {@code DungeonChallengeFinishNotify} */ public static final class Builder extends @@ -1031,7 +1021,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 5: + case 13: return internalGetStrengthenPointDataMap(); default: throw new RuntimeException( @@ -1042,7 +1032,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 5: + case 13: return internalGetMutableStrengthenPointDataMap(); default: throw new RuntimeException( @@ -1075,20 +1065,20 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - finishType_ = 0; + internalGetMutableStrengthenPointDataMap().clear(); + challengeRecordType_ = 0; isSuccess_ = false; - challengeIndex_ = 0; - - currentValue_ = 0; - isNewRecord_ = false; + finishType_ = 0; + timeCost_ = 0; - internalGetMutableStrengthenPointDataMap().clear(); - challengeRecordType_ = 0; + challengeIndex_ = 0; + + currentValue_ = 0; detailCase_ = 0; detail_ = null; @@ -1119,37 +1109,37 @@ public emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonC public emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify buildPartial() { emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify result = new emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify(this); int from_bitField0_ = bitField0_; - result.finishType_ = finishType_; - result.isSuccess_ = isSuccess_; - result.challengeIndex_ = challengeIndex_; - result.currentValue_ = currentValue_; - result.isNewRecord_ = isNewRecord_; - result.timeCost_ = timeCost_; result.strengthenPointDataMap_ = internalGetStrengthenPointDataMap(); result.strengthenPointDataMap_.makeImmutable(); result.challengeRecordType_ = challengeRecordType_; - if (detailCase_ == 1111) { + result.isSuccess_ = isSuccess_; + result.isNewRecord_ = isNewRecord_; + result.finishType_ = finishType_; + result.timeCost_ = timeCost_; + result.challengeIndex_ = challengeIndex_; + result.currentValue_ = currentValue_; + if (detailCase_ == 1389) { if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { result.detail_ = detail_; } else { result.detail_ = channellerSlabLoopDungeonResultInfoBuilder_.build(); } } - if (detailCase_ == 351) { + if (detailCase_ == 1637) { if (effigyChallengeDungeonResultInfoBuilder_ == null) { result.detail_ = detail_; } else { result.detail_ = effigyChallengeDungeonResultInfoBuilder_.build(); } } - if (detailCase_ == 339) { + if (detailCase_ == 319) { if (potionDungeonResultInfoBuilder_ == null) { result.detail_ = detail_; } else { result.detail_ = potionDungeonResultInfoBuilder_.build(); } } - if (detailCase_ == 915) { + if (detailCase_ == 823) { if (customDungeonResultInfoBuilder_ == null) { result.detail_ = detail_; } else { @@ -1205,28 +1195,28 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify other) { if (other == emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify.getDefaultInstance()) return this; - if (other.finishType_ != 0) { - setFinishTypeValue(other.getFinishTypeValue()); + internalGetMutableStrengthenPointDataMap().mergeFrom( + other.internalGetStrengthenPointDataMap()); + if (other.getChallengeRecordType() != 0) { + setChallengeRecordType(other.getChallengeRecordType()); } if (other.getIsSuccess() != false) { setIsSuccess(other.getIsSuccess()); } - if (other.getChallengeIndex() != 0) { - setChallengeIndex(other.getChallengeIndex()); - } - if (other.getCurrentValue() != 0) { - setCurrentValue(other.getCurrentValue()); - } if (other.getIsNewRecord() != false) { setIsNewRecord(other.getIsNewRecord()); } + if (other.finishType_ != 0) { + setFinishTypeValue(other.getFinishTypeValue()); + } if (other.getTimeCost() != 0) { setTimeCost(other.getTimeCost()); } - internalGetMutableStrengthenPointDataMap().mergeFrom( - other.internalGetStrengthenPointDataMap()); - if (other.getChallengeRecordType() != 0) { - setChallengeRecordType(other.getChallengeRecordType()); + if (other.getChallengeIndex() != 0) { + setChallengeIndex(other.getChallengeIndex()); + } + if (other.getCurrentValue() != 0) { + setCurrentValue(other.getCurrentValue()); } switch (other.getDetailCase()) { case CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO: { @@ -1294,156 +1284,199 @@ public Builder clearDetail() { private int bitField0_; - private int finishType_ = 0; - /** - * .ChallengeFinishType finish_type = 7; - * @return The enum numeric value on the wire for finishType. - */ - @java.lang.Override public int getFinishTypeValue() { - return finishType_; + private com.google.protobuf.MapField< + java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> strengthenPointDataMap_; + private com.google.protobuf.MapField + internalGetStrengthenPointDataMap() { + if (strengthenPointDataMap_ == null) { + return com.google.protobuf.MapField.emptyMapField( + StrengthenPointDataMapDefaultEntryHolder.defaultEntry); + } + return strengthenPointDataMap_; + } + private com.google.protobuf.MapField + internalGetMutableStrengthenPointDataMap() { + onChanged();; + if (strengthenPointDataMap_ == null) { + strengthenPointDataMap_ = com.google.protobuf.MapField.newMapField( + StrengthenPointDataMapDefaultEntryHolder.defaultEntry); + } + if (!strengthenPointDataMap_.isMutable()) { + strengthenPointDataMap_ = strengthenPointDataMap_.copy(); + } + return strengthenPointDataMap_; + } + + public int getStrengthenPointDataMapCount() { + return internalGetStrengthenPointDataMap().getMap().size(); } /** - * .ChallengeFinishType finish_type = 7; - * @param value The enum numeric value on the wire for finishType to set. - * @return This builder for chaining. + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ - public Builder setFinishTypeValue(int value) { + + @java.lang.Override + public boolean containsStrengthenPointDataMap( + int key) { - finishType_ = value; - onChanged(); - return this; + return internalGetStrengthenPointDataMap().getMap().containsKey(key); } /** - * .ChallengeFinishType finish_type = 7; - * @return The finishType. + * Use {@link #getStrengthenPointDataMapMap()} instead. */ @java.lang.Override - public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_); - return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result; + @java.lang.Deprecated + public java.util.Map getStrengthenPointDataMap() { + return getStrengthenPointDataMapMap(); } /** - * .ChallengeFinishType finish_type = 7; - * @param value The finishType to set. - * @return This builder for chaining. + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ - public Builder setFinishType(emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType value) { - if (value == null) { - throw new NullPointerException(); - } + @java.lang.Override + + public java.util.Map getStrengthenPointDataMapMap() { + return internalGetStrengthenPointDataMap().getMap(); + } + /** + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; + */ + @java.lang.Override + + public emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrDefault( + int key, + emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData defaultValue) { - finishType_ = value.getNumber(); - onChanged(); - return this; + java.util.Map map = + internalGetStrengthenPointDataMap().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * .ChallengeFinishType finish_type = 7; - * @return This builder for chaining. + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ - public Builder clearFinishType() { + @java.lang.Override + + public emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrThrow( + int key) { - finishType_ = 0; - onChanged(); + java.util.Map map = + internalGetStrengthenPointDataMap().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearStrengthenPointDataMap() { + internalGetMutableStrengthenPointDataMap().getMutableMap() + .clear(); return this; } + /** + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; + */ - private boolean isSuccess_ ; + public Builder removeStrengthenPointDataMap( + int key) { + + internalGetMutableStrengthenPointDataMap().getMutableMap() + .remove(key); + return this; + } /** - * bool is_success = 11; - * @return The isSuccess. + * Use alternate mutation accessors instead. */ - @java.lang.Override - public boolean getIsSuccess() { - return isSuccess_; + @java.lang.Deprecated + public java.util.Map + getMutableStrengthenPointDataMap() { + return internalGetMutableStrengthenPointDataMap().getMutableMap(); } /** - * bool is_success = 11; - * @param value The isSuccess to set. - * @return This builder for chaining. + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ - public Builder setIsSuccess(boolean value) { + public Builder putStrengthenPointDataMap( + int key, + emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData value) { - isSuccess_ = value; - onChanged(); + if (value == null) { throw new java.lang.NullPointerException(); } + internalGetMutableStrengthenPointDataMap().getMutableMap() + .put(key, value); return this; } /** - * bool is_success = 11; - * @return This builder for chaining. + * map<uint32, .StrengthenPointData> strengthen_point_data_map = 13; */ - public Builder clearIsSuccess() { - - isSuccess_ = false; - onChanged(); + + public Builder putAllStrengthenPointDataMap( + java.util.Map values) { + internalGetMutableStrengthenPointDataMap().getMutableMap() + .putAll(values); return this; } - private int challengeIndex_ ; + private int challengeRecordType_ ; /** - * uint32 challenge_index = 8; - * @return The challengeIndex. + * uint32 challenge_record_type = 9; + * @return The challengeRecordType. */ @java.lang.Override - public int getChallengeIndex() { - return challengeIndex_; + public int getChallengeRecordType() { + return challengeRecordType_; } /** - * uint32 challenge_index = 8; - * @param value The challengeIndex to set. + * uint32 challenge_record_type = 9; + * @param value The challengeRecordType to set. * @return This builder for chaining. */ - public Builder setChallengeIndex(int value) { + public Builder setChallengeRecordType(int value) { - challengeIndex_ = value; + challengeRecordType_ = value; onChanged(); return this; } /** - * uint32 challenge_index = 8; + * uint32 challenge_record_type = 9; * @return This builder for chaining. */ - public Builder clearChallengeIndex() { + public Builder clearChallengeRecordType() { - challengeIndex_ = 0; + challengeRecordType_ = 0; onChanged(); return this; } - private int currentValue_ ; + private boolean isSuccess_ ; /** - * uint32 currentValue = 14; - * @return The currentValue. + * bool is_success = 1; + * @return The isSuccess. */ @java.lang.Override - public int getCurrentValue() { - return currentValue_; + public boolean getIsSuccess() { + return isSuccess_; } /** - * uint32 currentValue = 14; - * @param value The currentValue to set. + * bool is_success = 1; + * @param value The isSuccess to set. * @return This builder for chaining. */ - public Builder setCurrentValue(int value) { + public Builder setIsSuccess(boolean value) { - currentValue_ = value; + isSuccess_ = value; onChanged(); return this; } /** - * uint32 currentValue = 14; + * bool is_success = 1; * @return This builder for chaining. */ - public Builder clearCurrentValue() { + public Builder clearIsSuccess() { - currentValue_ = 0; + isSuccess_ = false; onChanged(); return this; } private boolean isNewRecord_ ; /** - * bool is_new_record = 15; + * bool is_new_record = 10; * @return The isNewRecord. */ @java.lang.Override @@ -1451,7 +1484,7 @@ public boolean getIsNewRecord() { return isNewRecord_; } /** - * bool is_new_record = 15; + * bool is_new_record = 10; * @param value The isNewRecord to set. * @return This builder for chaining. */ @@ -1462,7 +1495,7 @@ public Builder setIsNewRecord(boolean value) { return this; } /** - * bool is_new_record = 15; + * bool is_new_record = 10; * @return This builder for chaining. */ public Builder clearIsNewRecord() { @@ -1472,192 +1505,149 @@ public Builder clearIsNewRecord() { return this; } - private int timeCost_ ; + private int finishType_ = 0; /** - * uint32 time_cost = 13; - * @return The timeCost. + * .ChallengeFinishType finish_type = 7; + * @return The enum numeric value on the wire for finishType. */ - @java.lang.Override - public int getTimeCost() { - return timeCost_; + @java.lang.Override public int getFinishTypeValue() { + return finishType_; } /** - * uint32 time_cost = 13; - * @param value The timeCost to set. + * .ChallengeFinishType finish_type = 7; + * @param value The enum numeric value on the wire for finishType to set. * @return This builder for chaining. */ - public Builder setTimeCost(int value) { + public Builder setFinishTypeValue(int value) { - timeCost_ = value; + finishType_ = value; onChanged(); return this; } /** - * uint32 time_cost = 13; + * .ChallengeFinishType finish_type = 7; + * @return The finishType. + */ + @java.lang.Override + public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_); + return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result; + } + /** + * .ChallengeFinishType finish_type = 7; + * @param value The finishType to set. * @return This builder for chaining. */ - public Builder clearTimeCost() { + public Builder setFinishType(emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType value) { + if (value == null) { + throw new NullPointerException(); + } - timeCost_ = 0; + finishType_ = value.getNumber(); onChanged(); return this; } - - private com.google.protobuf.MapField< - java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> strengthenPointDataMap_; - private com.google.protobuf.MapField - internalGetStrengthenPointDataMap() { - if (strengthenPointDataMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - StrengthenPointDataMapDefaultEntryHolder.defaultEntry); - } - return strengthenPointDataMap_; - } - private com.google.protobuf.MapField - internalGetMutableStrengthenPointDataMap() { - onChanged();; - if (strengthenPointDataMap_ == null) { - strengthenPointDataMap_ = com.google.protobuf.MapField.newMapField( - StrengthenPointDataMapDefaultEntryHolder.defaultEntry); - } - if (!strengthenPointDataMap_.isMutable()) { - strengthenPointDataMap_ = strengthenPointDataMap_.copy(); - } - return strengthenPointDataMap_; - } - - public int getStrengthenPointDataMapCount() { - return internalGetStrengthenPointDataMap().getMap().size(); - } /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * .ChallengeFinishType finish_type = 7; + * @return This builder for chaining. */ - - @java.lang.Override - public boolean containsStrengthenPointDataMap( - int key) { + public Builder clearFinishType() { - return internalGetStrengthenPointDataMap().getMap().containsKey(key); - } - /** - * Use {@link #getStrengthenPointDataMapMap()} instead. - */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getStrengthenPointDataMap() { - return getStrengthenPointDataMapMap(); + finishType_ = 0; + onChanged(); + return this; } - /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; - */ - @java.lang.Override - public java.util.Map getStrengthenPointDataMapMap() { - return internalGetStrengthenPointDataMap().getMap(); - } + private int timeCost_ ; /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * uint32 time_cost = 6; + * @return The timeCost. */ @java.lang.Override - - public emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrDefault( - int key, - emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData defaultValue) { - - java.util.Map map = - internalGetStrengthenPointDataMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + public int getTimeCost() { + return timeCost_; } /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * uint32 time_cost = 6; + * @param value The timeCost to set. + * @return This builder for chaining. */ - @java.lang.Override - - public emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrThrow( - int key) { + public Builder setTimeCost(int value) { - java.util.Map map = - internalGetStrengthenPointDataMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); - } - - public Builder clearStrengthenPointDataMap() { - internalGetMutableStrengthenPointDataMap().getMutableMap() - .clear(); + timeCost_ = value; + onChanged(); return this; } /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * uint32 time_cost = 6; + * @return This builder for chaining. */ - - public Builder removeStrengthenPointDataMap( - int key) { + public Builder clearTimeCost() { - internalGetMutableStrengthenPointDataMap().getMutableMap() - .remove(key); + timeCost_ = 0; + onChanged(); return this; } + + private int challengeIndex_ ; /** - * Use alternate mutation accessors instead. + * uint32 challenge_index = 5; + * @return The challengeIndex. */ - @java.lang.Deprecated - public java.util.Map - getMutableStrengthenPointDataMap() { - return internalGetMutableStrengthenPointDataMap().getMutableMap(); + @java.lang.Override + public int getChallengeIndex() { + return challengeIndex_; } /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * uint32 challenge_index = 5; + * @param value The challengeIndex to set. + * @return This builder for chaining. */ - public Builder putStrengthenPointDataMap( - int key, - emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData value) { + public Builder setChallengeIndex(int value) { - if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableStrengthenPointDataMap().getMutableMap() - .put(key, value); + challengeIndex_ = value; + onChanged(); return this; } /** - * map<uint32, .StrengthenPointData> strengthen_point_data_map = 5; + * uint32 challenge_index = 5; + * @return This builder for chaining. */ - - public Builder putAllStrengthenPointDataMap( - java.util.Map values) { - internalGetMutableStrengthenPointDataMap().getMutableMap() - .putAll(values); + public Builder clearChallengeIndex() { + + challengeIndex_ = 0; + onChanged(); return this; } - private int challengeRecordType_ ; + private int currentValue_ ; /** - * uint32 challengeRecordType = 4; - * @return The challengeRecordType. + * uint32 current_value = 12; + * @return The currentValue. */ @java.lang.Override - public int getChallengeRecordType() { - return challengeRecordType_; + public int getCurrentValue() { + return currentValue_; } /** - * uint32 challengeRecordType = 4; - * @param value The challengeRecordType to set. + * uint32 current_value = 12; + * @param value The currentValue to set. * @return This builder for chaining. */ - public Builder setChallengeRecordType(int value) { + public Builder setCurrentValue(int value) { - challengeRecordType_ = value; + currentValue_ = value; onChanged(); return this; } /** - * uint32 challengeRecordType = 4; + * uint32 current_value = 12; * @return This builder for chaining. */ - public Builder clearChallengeRecordType() { + public Builder clearCurrentValue() { - challengeRecordType_ = 0; + currentValue_ = 0; onChanged(); return this; } @@ -1665,33 +1655,33 @@ public Builder clearChallengeRecordType() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> channellerSlabLoopDungeonResultInfoBuilder_; /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; * @return Whether the channellerSlabLoopDungeonResultInfo field is set. */ @java.lang.Override public boolean hasChannellerSlabLoopDungeonResultInfo() { - return detailCase_ == 1111; + return detailCase_ == 1389; } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; * @return The channellerSlabLoopDungeonResultInfo. */ @java.lang.Override public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() { if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 1111) { + if (detailCase_ == 1389) { return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); } else { - if (detailCase_ == 1111) { + if (detailCase_ == 1389) { return channellerSlabLoopDungeonResultInfoBuilder_.getMessage(); } return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); } } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ public Builder setChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) { if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { @@ -1703,11 +1693,11 @@ public Builder setChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto. } else { channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 1111; + detailCase_ = 1389; return this; } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ public Builder setChannellerSlabLoopDungeonResultInfo( emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder builderForValue) { @@ -1717,15 +1707,15 @@ public Builder setChannellerSlabLoopDungeonResultInfo( } else { channellerSlabLoopDungeonResultInfoBuilder_.setMessage(builderForValue.build()); } - detailCase_ = 1111; + detailCase_ = 1389; return this; } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ public Builder mergeChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) { if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 1111 && + if (detailCase_ == 1389 && detail_ != emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance()) { detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_) .mergeFrom(value).buildPartial(); @@ -1734,26 +1724,26 @@ public Builder mergeChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.prot } onChanged(); } else { - if (detailCase_ == 1111) { + if (detailCase_ == 1389) { channellerSlabLoopDungeonResultInfoBuilder_.mergeFrom(value); } channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 1111; + detailCase_ = 1389; return this; } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ public Builder clearChannellerSlabLoopDungeonResultInfo() { if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 1111) { + if (detailCase_ == 1389) { detailCase_ = 0; detail_ = null; onChanged(); } } else { - if (detailCase_ == 1111) { + if (detailCase_ == 1389) { detailCase_ = 0; detail_ = null; } @@ -1762,33 +1752,33 @@ public Builder clearChannellerSlabLoopDungeonResultInfo() { return this; } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder getChannellerSlabLoopDungeonResultInfoBuilder() { return getChannellerSlabLoopDungeonResultInfoFieldBuilder().getBuilder(); } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ @java.lang.Override public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() { - if ((detailCase_ == 1111) && (channellerSlabLoopDungeonResultInfoBuilder_ != null)) { + if ((detailCase_ == 1389) && (channellerSlabLoopDungeonResultInfoBuilder_ != null)) { return channellerSlabLoopDungeonResultInfoBuilder_.getMessageOrBuilder(); } else { - if (detailCase_ == 1111) { + if (detailCase_ == 1389) { return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); } } /** - * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111; + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1389; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> getChannellerSlabLoopDungeonResultInfoFieldBuilder() { if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { - if (!(detailCase_ == 1111)) { + if (!(detailCase_ == 1389)) { detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); } channellerSlabLoopDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -1798,7 +1788,7 @@ public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.C isClean()); detail_ = null; } - detailCase_ = 1111; + detailCase_ = 1389; onChanged();; return channellerSlabLoopDungeonResultInfoBuilder_; } @@ -1806,33 +1796,33 @@ public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.C private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> effigyChallengeDungeonResultInfoBuilder_; /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; * @return Whether the effigyChallengeDungeonResultInfo field is set. */ @java.lang.Override public boolean hasEffigyChallengeDungeonResultInfo() { - return detailCase_ == 351; + return detailCase_ == 1637; } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; * @return The effigyChallengeDungeonResultInfo. */ @java.lang.Override public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() { if (effigyChallengeDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 351) { + if (detailCase_ == 1637) { return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); } else { - if (detailCase_ == 351) { + if (detailCase_ == 1637) { return effigyChallengeDungeonResultInfoBuilder_.getMessage(); } return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); } } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ public Builder setEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) { if (effigyChallengeDungeonResultInfoBuilder_ == null) { @@ -1844,11 +1834,11 @@ public Builder setEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.Eff } else { effigyChallengeDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 351; + detailCase_ = 1637; return this; } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ public Builder setEffigyChallengeDungeonResultInfo( emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder builderForValue) { @@ -1858,15 +1848,15 @@ public Builder setEffigyChallengeDungeonResultInfo( } else { effigyChallengeDungeonResultInfoBuilder_.setMessage(builderForValue.build()); } - detailCase_ = 351; + detailCase_ = 1637; return this; } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ public Builder mergeEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) { if (effigyChallengeDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 351 && + if (detailCase_ == 1637 && detail_ != emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance()) { detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_) .mergeFrom(value).buildPartial(); @@ -1875,26 +1865,26 @@ public Builder mergeEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.E } onChanged(); } else { - if (detailCase_ == 351) { + if (detailCase_ == 1637) { effigyChallengeDungeonResultInfoBuilder_.mergeFrom(value); } effigyChallengeDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 351; + detailCase_ = 1637; return this; } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ public Builder clearEffigyChallengeDungeonResultInfo() { if (effigyChallengeDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 351) { + if (detailCase_ == 1637) { detailCase_ = 0; detail_ = null; onChanged(); } } else { - if (detailCase_ == 351) { + if (detailCase_ == 1637) { detailCase_ = 0; detail_ = null; } @@ -1903,33 +1893,33 @@ public Builder clearEffigyChallengeDungeonResultInfo() { return this; } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder getEffigyChallengeDungeonResultInfoBuilder() { return getEffigyChallengeDungeonResultInfoFieldBuilder().getBuilder(); } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ @java.lang.Override public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() { - if ((detailCase_ == 351) && (effigyChallengeDungeonResultInfoBuilder_ != null)) { + if ((detailCase_ == 1637) && (effigyChallengeDungeonResultInfoBuilder_ != null)) { return effigyChallengeDungeonResultInfoBuilder_.getMessageOrBuilder(); } else { - if (detailCase_ == 351) { + if (detailCase_ == 1637) { return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); } } /** - * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351; + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1637; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> getEffigyChallengeDungeonResultInfoFieldBuilder() { if (effigyChallengeDungeonResultInfoBuilder_ == null) { - if (!(detailCase_ == 351)) { + if (!(detailCase_ == 1637)) { detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); } effigyChallengeDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -1939,7 +1929,7 @@ public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.Effi isClean()); detail_ = null; } - detailCase_ = 351; + detailCase_ = 1637; onChanged();; return effigyChallengeDungeonResultInfoBuilder_; } @@ -1947,33 +1937,33 @@ public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.Effi private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder> potionDungeonResultInfoBuilder_; /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; * @return Whether the potionDungeonResultInfo field is set. */ @java.lang.Override public boolean hasPotionDungeonResultInfo() { - return detailCase_ == 339; + return detailCase_ == 319; } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; * @return The potionDungeonResultInfo. */ @java.lang.Override public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo() { if (potionDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 339) { + if (detailCase_ == 319) { return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance(); } else { - if (detailCase_ == 339) { + if (detailCase_ == 319) { return potionDungeonResultInfoBuilder_.getMessage(); } return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance(); } } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ public Builder setPotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo value) { if (potionDungeonResultInfoBuilder_ == null) { @@ -1985,11 +1975,11 @@ public Builder setPotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDungeo } else { potionDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 339; + detailCase_ = 319; return this; } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ public Builder setPotionDungeonResultInfo( emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder builderForValue) { @@ -1999,15 +1989,15 @@ public Builder setPotionDungeonResultInfo( } else { potionDungeonResultInfoBuilder_.setMessage(builderForValue.build()); } - detailCase_ = 339; + detailCase_ = 319; return this; } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ public Builder mergePotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo value) { if (potionDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 339 && + if (detailCase_ == 319 && detail_ != emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance()) { detail_ = emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_) .mergeFrom(value).buildPartial(); @@ -2016,26 +2006,26 @@ public Builder mergePotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDung } onChanged(); } else { - if (detailCase_ == 339) { + if (detailCase_ == 319) { potionDungeonResultInfoBuilder_.mergeFrom(value); } potionDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 339; + detailCase_ = 319; return this; } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ public Builder clearPotionDungeonResultInfo() { if (potionDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 339) { + if (detailCase_ == 319) { detailCase_ = 0; detail_ = null; onChanged(); } } else { - if (detailCase_ == 339) { + if (detailCase_ == 319) { detailCase_ = 0; detail_ = null; } @@ -2044,33 +2034,33 @@ public Builder clearPotionDungeonResultInfo() { return this; } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder getPotionDungeonResultInfoBuilder() { return getPotionDungeonResultInfoFieldBuilder().getBuilder(); } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ @java.lang.Override public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder() { - if ((detailCase_ == 339) && (potionDungeonResultInfoBuilder_ != null)) { + if ((detailCase_ == 319) && (potionDungeonResultInfoBuilder_ != null)) { return potionDungeonResultInfoBuilder_.getMessageOrBuilder(); } else { - if (detailCase_ == 339) { + if (detailCase_ == 319) { return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance(); } } /** - * .PotionDungeonResultInfo potion_dungeon_result_info = 339; + * .PotionDungeonResultInfo potion_dungeon_result_info = 319; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder> getPotionDungeonResultInfoFieldBuilder() { if (potionDungeonResultInfoBuilder_ == null) { - if (!(detailCase_ == 339)) { + if (!(detailCase_ == 319)) { detail_ = emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance(); } potionDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -2080,7 +2070,7 @@ public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeon isClean()); detail_ = null; } - detailCase_ = 339; + detailCase_ = 319; onChanged();; return potionDungeonResultInfoBuilder_; } @@ -2088,33 +2078,33 @@ public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeon private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder> customDungeonResultInfoBuilder_; /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; * @return Whether the customDungeonResultInfo field is set. */ @java.lang.Override public boolean hasCustomDungeonResultInfo() { - return detailCase_ == 915; + return detailCase_ == 823; } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; * @return The customDungeonResultInfo. */ @java.lang.Override public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo getCustomDungeonResultInfo() { if (customDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 915) { + if (detailCase_ == 823) { return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance(); } else { - if (detailCase_ == 915) { + if (detailCase_ == 823) { return customDungeonResultInfoBuilder_.getMessage(); } return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance(); } } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ public Builder setCustomDungeonResultInfo(emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo value) { if (customDungeonResultInfoBuilder_ == null) { @@ -2126,11 +2116,11 @@ public Builder setCustomDungeonResultInfo(emu.grasscutter.net.proto.CustomDungeo } else { customDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 915; + detailCase_ = 823; return this; } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ public Builder setCustomDungeonResultInfo( emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder builderForValue) { @@ -2140,15 +2130,15 @@ public Builder setCustomDungeonResultInfo( } else { customDungeonResultInfoBuilder_.setMessage(builderForValue.build()); } - detailCase_ = 915; + detailCase_ = 823; return this; } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ public Builder mergeCustomDungeonResultInfo(emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo value) { if (customDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 915 && + if (detailCase_ == 823 && detail_ != emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance()) { detail_ = emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_) .mergeFrom(value).buildPartial(); @@ -2157,26 +2147,26 @@ public Builder mergeCustomDungeonResultInfo(emu.grasscutter.net.proto.CustomDung } onChanged(); } else { - if (detailCase_ == 915) { + if (detailCase_ == 823) { customDungeonResultInfoBuilder_.mergeFrom(value); } customDungeonResultInfoBuilder_.setMessage(value); } - detailCase_ = 915; + detailCase_ = 823; return this; } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ public Builder clearCustomDungeonResultInfo() { if (customDungeonResultInfoBuilder_ == null) { - if (detailCase_ == 915) { + if (detailCase_ == 823) { detailCase_ = 0; detail_ = null; onChanged(); } } else { - if (detailCase_ == 915) { + if (detailCase_ == 823) { detailCase_ = 0; detail_ = null; } @@ -2185,33 +2175,33 @@ public Builder clearCustomDungeonResultInfo() { return this; } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder getCustomDungeonResultInfoBuilder() { return getCustomDungeonResultInfoFieldBuilder().getBuilder(); } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ @java.lang.Override public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder getCustomDungeonResultInfoOrBuilder() { - if ((detailCase_ == 915) && (customDungeonResultInfoBuilder_ != null)) { + if ((detailCase_ == 823) && (customDungeonResultInfoBuilder_ != null)) { return customDungeonResultInfoBuilder_.getMessageOrBuilder(); } else { - if (detailCase_ == 915) { + if (detailCase_ == 823) { return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_; } return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance(); } } /** - * .CustomDungeonResultInfo custom_dungeon_result_info = 915; + * .CustomDungeonResultInfo custom_dungeon_result_info = 823; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder> getCustomDungeonResultInfoFieldBuilder() { if (customDungeonResultInfoBuilder_ == null) { - if (!(detailCase_ == 915)) { + if (!(detailCase_ == 823)) { detail_ = emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance(); } customDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -2221,7 +2211,7 @@ public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeon isClean()); detail_ = null; } - detailCase_ = 915; + detailCase_ = 823; onChanged();; return customDungeonResultInfoBuilder_; } @@ -2302,26 +2292,26 @@ public emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonC "Data.proto\032)ChannellerSlabLoopDungeonRes" + "ultInfo.proto\032&EffigyChallengeDungeonRes" + "ultInfo.proto\032\035PotionDungeonResultInfo.p" + - "roto\032\035CustomDungeonResultInfo.proto\"\301\005\n\034" + - "DungeonChallengeFinishNotify\022)\n\013finish_t" + - "ype\030\007 \001(\0162\024.ChallengeFinishType\022\022\n\nis_su" + - "ccess\030\013 \001(\010\022\027\n\017challenge_index\030\010 \001(\r\022\024\n\014" + - "currentValue\030\016 \001(\r\022\025\n\ris_new_record\030\017 \001(" + - "\010\022\021\n\ttime_cost\030\r \001(\r\022\\\n\031strengthen_point" + - "_data_map\030\005 \003(\01329.DungeonChallengeFinish" + - "Notify.StrengthenPointDataMapEntry\022\033\n\023ch" + - "allengeRecordType\030\004 \001(\r\022Y\n(channeller_sl" + - "ab_loop_dungeon_result_info\030\327\010 \001(\0132$.Cha" + - "nnellerSlabLoopDungeonResultInfoH\000\022R\n$ef" + - "figy_challenge_dungeon_result_info\030\337\002 \001(" + - "\0132!.EffigyChallengeDungeonResultInfoH\000\022?" + - "\n\032potion_dungeon_result_info\030\323\002 \001(\0132\030.Po" + - "tionDungeonResultInfoH\000\022?\n\032custom_dungeo" + - "n_result_info\030\223\007 \001(\0132\030.CustomDungeonResu" + - "ltInfoH\000\032S\n\033StrengthenPointDataMapEntry\022" + - "\013\n\003key\030\001 \001(\r\022#\n\005value\030\002 \001(\0132\024.Strengthen" + - "PointData:\0028\001B\010\n\006detailB\033\n\031emu.grasscutt" + - "er.net.protob\006proto3" + "roto\032\035CustomDungeonResultInfo.proto\"\304\005\n\034" + + "DungeonChallengeFinishNotify\022\\\n\031strength" + + "en_point_data_map\030\r \003(\01329.DungeonChallen" + + "geFinishNotify.StrengthenPointDataMapEnt" + + "ry\022\035\n\025challenge_record_type\030\t \001(\r\022\022\n\nis_" + + "success\030\001 \001(\010\022\025\n\ris_new_record\030\n \001(\010\022)\n\013" + + "finish_type\030\007 \001(\0162\024.ChallengeFinishType\022" + + "\021\n\ttime_cost\030\006 \001(\r\022\027\n\017challenge_index\030\005 " + + "\001(\r\022\025\n\rcurrent_value\030\014 \001(\r\022Y\n(channeller" + + "_slab_loop_dungeon_result_info\030\355\n \001(\0132$." + + "ChannellerSlabLoopDungeonResultInfoH\000\022R\n" + + "$effigy_challenge_dungeon_result_info\030\345\014" + + " \001(\0132!.EffigyChallengeDungeonResultInfoH" + + "\000\022?\n\032potion_dungeon_result_info\030\277\002 \001(\0132\030" + + ".PotionDungeonResultInfoH\000\022?\n\032custom_dun" + + "geon_result_info\030\267\006 \001(\0132\030.CustomDungeonR" + + "esultInfoH\000\032S\n\033StrengthenPointDataMapEnt" + + "ry\022\013\n\003key\030\001 \001(\r\022#\n\005value\030\002 \001(\0132\024.Strengt" + + "henPointData:\0028\001B\010\n\006detailB\033\n\031emu.grassc" + + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -2338,7 +2328,7 @@ public emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonC internal_static_DungeonChallengeFinishNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonChallengeFinishNotify_descriptor, - new java.lang.String[] { "FinishType", "IsSuccess", "ChallengeIndex", "CurrentValue", "IsNewRecord", "TimeCost", "StrengthenPointDataMap", "ChallengeRecordType", "ChannellerSlabLoopDungeonResultInfo", "EffigyChallengeDungeonResultInfo", "PotionDungeonResultInfo", "CustomDungeonResultInfo", "Detail", }); + new java.lang.String[] { "StrengthenPointDataMap", "ChallengeRecordType", "IsSuccess", "IsNewRecord", "FinishType", "TimeCost", "ChallengeIndex", "CurrentValue", "ChannellerSlabLoopDungeonResultInfo", "EffigyChallengeDungeonResultInfo", "PotionDungeonResultInfo", "CustomDungeonResultInfo", "Detail", }); internal_static_DungeonChallengeFinishNotify_StrengthenPointDataMapEntry_descriptor = internal_static_DungeonChallengeFinishNotify_descriptor.getNestedTypes().get(0); internal_static_DungeonChallengeFinishNotify_StrengthenPointDataMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java index b8379c7f023..509b5ad903e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java @@ -19,28 +19,23 @@ public interface DungeonDieOptionReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_quit_immediately = 13; - * @return The isQuitImmediately. - */ - boolean getIsQuitImmediately(); - - /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @return The enum numeric value on the wire for dieOption. */ int getDieOptionValue(); /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @return The dieOption. */ emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption(); + + /** + * bool is_quit_immediately = 3; + * @return The isQuitImmediately. + */ + boolean getIsQuitImmediately(); } /** - * 
-   * CmdId: 3884
-   * Obf: MOHIGAEGAKN
-   *
- * * Protobuf type {@code DungeonDieOptionReq} */ public static final class DungeonDieOptionReq extends @@ -86,13 +81,13 @@ private DungeonDieOptionReq( case 0: done = true; break; - case 64: { + case 16: { int rawValue = input.readEnum(); dieOption_ = rawValue; break; } - case 104: { + case 24: { isQuitImmediately_ = input.readBool(); break; @@ -129,28 +124,17 @@ private DungeonDieOptionReq( emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq.class, emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq.Builder.class); } - public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 13; - private boolean isQuitImmediately_; - /** - * bool is_quit_immediately = 13; - * @return The isQuitImmediately. - */ - @java.lang.Override - public boolean getIsQuitImmediately() { - return isQuitImmediately_; - } - - public static final int DIE_OPTION_FIELD_NUMBER = 8; + public static final int DIE_OPTION_FIELD_NUMBER = 2; private int dieOption_; /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @return The enum numeric value on the wire for dieOption. */ @java.lang.Override public int getDieOptionValue() { return dieOption_; } /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @return The dieOption. */ @java.lang.Override public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption() { @@ -159,6 +143,17 @@ public boolean getIsQuitImmediately() { return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result; } + public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 3; + private boolean isQuitImmediately_; + /** + * bool is_quit_immediately = 3; + * @return The isQuitImmediately. + */ + @java.lang.Override + public boolean getIsQuitImmediately() { + return isQuitImmediately_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -174,10 +169,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) { - output.writeEnum(8, dieOption_); + output.writeEnum(2, dieOption_); } if (isQuitImmediately_ != false) { - output.writeBool(13, isQuitImmediately_); + output.writeBool(3, isQuitImmediately_); } unknownFields.writeTo(output); } @@ -190,11 +185,11 @@ public int getSerializedSize() { size = 0; if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(8, dieOption_); + .computeEnumSize(2, dieOption_); } if (isQuitImmediately_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(13, isQuitImmediately_); + .computeBoolSize(3, isQuitImmediately_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -211,9 +206,9 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq other = (emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq) obj; + if (dieOption_ != other.dieOption_) return false; if (getIsQuitImmediately() != other.getIsQuitImmediately()) return false; - if (dieOption_ != other.dieOption_) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -225,11 +220,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + DIE_OPTION_FIELD_NUMBER; + hash = (53 * hash) + dieOption_; hash = (37 * hash) + IS_QUIT_IMMEDIATELY_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsQuitImmediately()); - hash = (37 * hash) + DIE_OPTION_FIELD_NUMBER; - hash = (53 * hash) + dieOption_; hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -326,11 +321,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 3884
-     * Obf: MOHIGAEGAKN
-     *
- * * Protobuf type {@code DungeonDieOptionReq} */ public static final class Builder extends @@ -368,10 +358,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isQuitImmediately_ = false; - dieOption_ = 0; + isQuitImmediately_ = false; + return this; } @@ -398,8 +388,8 @@ public emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionR @java.lang.Override public emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq buildPartial() { emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq result = new emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq(this); - result.isQuitImmediately_ = isQuitImmediately_; result.dieOption_ = dieOption_; + result.isQuitImmediately_ = isQuitImmediately_; onBuilt(); return result; } @@ -448,12 +438,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq other) { if (other == emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq.getDefaultInstance()) return this; - if (other.getIsQuitImmediately() != false) { - setIsQuitImmediately(other.getIsQuitImmediately()); - } if (other.dieOption_ != 0) { setDieOptionValue(other.getDieOptionValue()); } + if (other.getIsQuitImmediately() != false) { + setIsQuitImmediately(other.getIsQuitImmediately()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -483,47 +473,16 @@ public Builder mergeFrom( return this; } - private boolean isQuitImmediately_ ; - /** - * bool is_quit_immediately = 13; - * @return The isQuitImmediately. - */ - @java.lang.Override - public boolean getIsQuitImmediately() { - return isQuitImmediately_; - } - /** - * bool is_quit_immediately = 13; - * @param value The isQuitImmediately to set. - * @return This builder for chaining. - */ - public Builder setIsQuitImmediately(boolean value) { - - isQuitImmediately_ = value; - onChanged(); - return this; - } - /** - * bool is_quit_immediately = 13; - * @return This builder for chaining. - */ - public Builder clearIsQuitImmediately() { - - isQuitImmediately_ = false; - onChanged(); - return this; - } - private int dieOption_ = 0; /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @return The enum numeric value on the wire for dieOption. */ @java.lang.Override public int getDieOptionValue() { return dieOption_; } /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @param value The enum numeric value on the wire for dieOption to set. * @return This builder for chaining. */ @@ -534,7 +493,7 @@ public Builder setDieOptionValue(int value) { return this; } /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @return The dieOption. */ @java.lang.Override @@ -544,7 +503,7 @@ public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDi return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result; } /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @param value The dieOption to set. * @return This builder for chaining. */ @@ -558,7 +517,7 @@ public Builder setDieOption(emu.grasscutter.net.proto.PlayerDieOptionOuterClass. return this; } /** - * .PlayerDieOption die_option = 8; + * .PlayerDieOption die_option = 2; * @return This builder for chaining. */ public Builder clearDieOption() { @@ -567,6 +526,37 @@ public Builder clearDieOption() { onChanged(); return this; } + + private boolean isQuitImmediately_ ; + /** + * bool is_quit_immediately = 3; + * @return The isQuitImmediately. + */ + @java.lang.Override + public boolean getIsQuitImmediately() { + return isQuitImmediately_; + } + /** + * bool is_quit_immediately = 3; + * @param value The isQuitImmediately to set. + * @return This builder for chaining. + */ + public Builder setIsQuitImmediately(boolean value) { + + isQuitImmediately_ = value; + onChanged(); + return this; + } + /** + * bool is_quit_immediately = 3; + * @return This builder for chaining. + */ + public Builder clearIsQuitImmediately() { + + isQuitImmediately_ = false; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -635,9 +625,9 @@ public emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionR static { java.lang.String[] descriptorData = { "\n\031DungeonDieOptionReq.proto\032\025PlayerDieOp" + - "tion.proto\"X\n\023DungeonDieOptionReq\022\033\n\023is_" + - "quit_immediately\030\r \001(\010\022$\n\ndie_option\030\010 \001" + - "(\0162\020.PlayerDieOptionB\033\n\031emu.grasscutter." + + "tion.proto\"X\n\023DungeonDieOptionReq\022$\n\ndie" + + "_option\030\002 \001(\0162\020.PlayerDieOption\022\033\n\023is_qu" + + "it_immediately\030\003 \001(\010B\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -650,7 +640,7 @@ public emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionR internal_static_DungeonDieOptionReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonDieOptionReq_descriptor, - new java.lang.String[] { "IsQuitImmediately", "DieOption", }); + new java.lang.String[] { "DieOption", "IsQuitImmediately", }); emu.grasscutter.net.proto.PlayerDieOptionOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java index 0e9c1d8ac4c..9a38699ca74 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java @@ -19,34 +19,29 @@ public interface DungeonDieOptionRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 revive_count = 5; - * @return The reviveCount. + * .PlayerDieOption die_option = 2; + * @return The enum numeric value on the wire for dieOption. */ - int getReviveCount(); + int getDieOptionValue(); + /** + * .PlayerDieOption die_option = 2; + * @return The dieOption. + */ + emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption(); /** - * int32 retcode = 10; + * int32 retcode = 11; * @return The retcode. */ int getRetcode(); /** - * .PlayerDieOption die_option = 1; - * @return The enum numeric value on the wire for dieOption. - */ - int getDieOptionValue(); - /** - * .PlayerDieOption die_option = 1; - * @return The dieOption. + * uint32 revive_count = 14; + * @return The reviveCount. */ - emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption(); + int getReviveCount(); } /** - * 
-   * CmdId: 28454
-   * Obf: JBMMJNEGEKF
-   *
- * * Protobuf type {@code DungeonDieOptionRsp} */ public static final class DungeonDieOptionRsp extends @@ -92,20 +87,20 @@ private DungeonDieOptionRsp( case 0: done = true; break; - case 8: { + case 16: { int rawValue = input.readEnum(); dieOption_ = rawValue; break; } - case 40: { + case 88: { - reviveCount_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 80: { + case 112: { - retcode_ = input.readInt32(); + reviveCount_ = input.readUInt32(); break; } default: { @@ -140,21 +135,29 @@ private DungeonDieOptionRsp( emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp.class, emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp.Builder.class); } - public static final int REVIVE_COUNT_FIELD_NUMBER = 5; - private int reviveCount_; + public static final int DIE_OPTION_FIELD_NUMBER = 2; + private int dieOption_; /** - * uint32 revive_count = 5; - * @return The reviveCount. + * .PlayerDieOption die_option = 2; + * @return The enum numeric value on the wire for dieOption. */ - @java.lang.Override - public int getReviveCount() { - return reviveCount_; + @java.lang.Override public int getDieOptionValue() { + return dieOption_; + } + /** + * .PlayerDieOption die_option = 2; + * @return The dieOption. + */ + @java.lang.Override public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption result = emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.valueOf(dieOption_); + return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result; } - public static final int RETCODE_FIELD_NUMBER = 10; + public static final int RETCODE_FIELD_NUMBER = 11; private int retcode_; /** - * int32 retcode = 10; + * int32 retcode = 11; * @return The retcode. */ @java.lang.Override @@ -162,23 +165,15 @@ public int getRetcode() { return retcode_; } - public static final int DIE_OPTION_FIELD_NUMBER = 1; - private int dieOption_; - /** - * .PlayerDieOption die_option = 1; - * @return The enum numeric value on the wire for dieOption. - */ - @java.lang.Override public int getDieOptionValue() { - return dieOption_; - } + public static final int REVIVE_COUNT_FIELD_NUMBER = 14; + private int reviveCount_; /** - * .PlayerDieOption die_option = 1; - * @return The dieOption. + * uint32 revive_count = 14; + * @return The reviveCount. */ - @java.lang.Override public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption result = emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.valueOf(dieOption_); - return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result; + @java.lang.Override + public int getReviveCount() { + return reviveCount_; } private byte memoizedIsInitialized = -1; @@ -196,13 +191,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) { - output.writeEnum(1, dieOption_); - } - if (reviveCount_ != 0) { - output.writeUInt32(5, reviveCount_); + output.writeEnum(2, dieOption_); } if (retcode_ != 0) { - output.writeInt32(10, retcode_); + output.writeInt32(11, retcode_); + } + if (reviveCount_ != 0) { + output.writeUInt32(14, reviveCount_); } unknownFields.writeTo(output); } @@ -215,15 +210,15 @@ public int getSerializedSize() { size = 0; if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, dieOption_); + .computeEnumSize(2, dieOption_); } - if (reviveCount_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, reviveCount_); + .computeInt32Size(11, retcode_); } - if (retcode_ != 0) { + if (reviveCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, retcode_); + .computeUInt32Size(14, reviveCount_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -240,11 +235,11 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp other = (emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp) obj; - if (getReviveCount() - != other.getReviveCount()) return false; + if (dieOption_ != other.dieOption_) return false; if (getRetcode() != other.getRetcode()) return false; - if (dieOption_ != other.dieOption_) return false; + if (getReviveCount() + != other.getReviveCount()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -256,12 +251,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + REVIVE_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getReviveCount(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + DIE_OPTION_FIELD_NUMBER; hash = (53 * hash) + dieOption_; + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + REVIVE_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getReviveCount(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -358,11 +353,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 28454
-     * Obf: JBMMJNEGEKF
-     *
- * * Protobuf type {@code DungeonDieOptionRsp} */ public static final class Builder extends @@ -400,11 +390,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - reviveCount_ = 0; + dieOption_ = 0; retcode_ = 0; - dieOption_ = 0; + reviveCount_ = 0; return this; } @@ -432,9 +422,9 @@ public emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionR @java.lang.Override public emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp buildPartial() { emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp result = new emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp(this); - result.reviveCount_ = reviveCount_; - result.retcode_ = retcode_; result.dieOption_ = dieOption_; + result.retcode_ = retcode_; + result.reviveCount_ = reviveCount_; onBuilt(); return result; } @@ -483,14 +473,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp other) { if (other == emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp.getDefaultInstance()) return this; - if (other.getReviveCount() != 0) { - setReviveCount(other.getReviveCount()); + if (other.dieOption_ != 0) { + setDieOptionValue(other.getDieOptionValue()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.dieOption_ != 0) { - setDieOptionValue(other.getDieOptionValue()); + if (other.getReviveCount() != 0) { + setReviveCount(other.getReviveCount()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -521,40 +511,63 @@ public Builder mergeFrom( return this; } - private int reviveCount_ ; + private int dieOption_ = 0; /** - * uint32 revive_count = 5; - * @return The reviveCount. + * .PlayerDieOption die_option = 2; + * @return The enum numeric value on the wire for dieOption. + */ + @java.lang.Override public int getDieOptionValue() { + return dieOption_; + } + /** + * .PlayerDieOption die_option = 2; + * @param value The enum numeric value on the wire for dieOption to set. + * @return This builder for chaining. + */ + public Builder setDieOptionValue(int value) { + + dieOption_ = value; + onChanged(); + return this; + } + /** + * .PlayerDieOption die_option = 2; + * @return The dieOption. */ @java.lang.Override - public int getReviveCount() { - return reviveCount_; + public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption result = emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.valueOf(dieOption_); + return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result; } /** - * uint32 revive_count = 5; - * @param value The reviveCount to set. + * .PlayerDieOption die_option = 2; + * @param value The dieOption to set. * @return This builder for chaining. */ - public Builder setReviveCount(int value) { + public Builder setDieOption(emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption value) { + if (value == null) { + throw new NullPointerException(); + } - reviveCount_ = value; + dieOption_ = value.getNumber(); onChanged(); return this; } /** - * uint32 revive_count = 5; + * .PlayerDieOption die_option = 2; * @return This builder for chaining. */ - public Builder clearReviveCount() { + public Builder clearDieOption() { - reviveCount_ = 0; + dieOption_ = 0; onChanged(); return this; } private int retcode_ ; /** - * int32 retcode = 10; + * int32 retcode = 11; * @return The retcode. */ @java.lang.Override @@ -562,7 +575,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 10; + * int32 retcode = 11; * @param value The retcode to set. * @return This builder for chaining. */ @@ -573,7 +586,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 10; + * int32 retcode = 11; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -583,56 +596,33 @@ public Builder clearRetcode() { return this; } - private int dieOption_ = 0; - /** - * .PlayerDieOption die_option = 1; - * @return The enum numeric value on the wire for dieOption. - */ - @java.lang.Override public int getDieOptionValue() { - return dieOption_; - } - /** - * .PlayerDieOption die_option = 1; - * @param value The enum numeric value on the wire for dieOption to set. - * @return This builder for chaining. - */ - public Builder setDieOptionValue(int value) { - - dieOption_ = value; - onChanged(); - return this; - } + private int reviveCount_ ; /** - * .PlayerDieOption die_option = 1; - * @return The dieOption. + * uint32 revive_count = 14; + * @return The reviveCount. */ @java.lang.Override - public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption result = emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.valueOf(dieOption_); - return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result; + public int getReviveCount() { + return reviveCount_; } /** - * .PlayerDieOption die_option = 1; - * @param value The dieOption to set. + * uint32 revive_count = 14; + * @param value The reviveCount to set. * @return This builder for chaining. */ - public Builder setDieOption(emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setReviveCount(int value) { - dieOption_ = value.getNumber(); + reviveCount_ = value; onChanged(); return this; } /** - * .PlayerDieOption die_option = 1; + * uint32 revive_count = 14; * @return This builder for chaining. */ - public Builder clearDieOption() { + public Builder clearReviveCount() { - dieOption_ = 0; + reviveCount_ = 0; onChanged(); return this; } @@ -704,9 +694,9 @@ public emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionR static { java.lang.String[] descriptorData = { "\n\031DungeonDieOptionRsp.proto\032\025PlayerDieOp" + - "tion.proto\"b\n\023DungeonDieOptionRsp\022\024\n\014rev" + - "ive_count\030\005 \001(\r\022\017\n\007retcode\030\n \001(\005\022$\n\ndie_" + - "option\030\001 \001(\0162\020.PlayerDieOptionB\033\n\031emu.gr" + + "tion.proto\"b\n\023DungeonDieOptionRsp\022$\n\ndie" + + "_option\030\002 \001(\0162\020.PlayerDieOption\022\017\n\007retco" + + "de\030\013 \001(\005\022\024\n\014revive_count\030\016 \001(\rB\033\n\031emu.gr" + "asscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -719,7 +709,7 @@ public emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionR internal_static_DungeonDieOptionRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonDieOptionRsp_descriptor, - new java.lang.String[] { "ReviveCount", "Retcode", "DieOption", }); + new java.lang.String[] { "DieOption", "Retcode", "ReviveCount", }); emu.grasscutter.net.proto.PlayerDieOptionOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEnterPosInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEnterPosInfoOuterClass.java index 675c424b511..89a6f5d546f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEnterPosInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEnterPosInfoOuterClass.java @@ -19,22 +19,18 @@ public interface DungeonEnterPosInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 point_id = 13; - * @return The pointId. + * uint32 quest_id = 13; + * @return The questId. */ - int getPointId(); + int getQuestId(); /** - * uint32 quest_id = 12; - * @return The questId. + * uint32 point_id = 1; + * @return The pointId. */ - int getQuestId(); + int getPointId(); } /** - * 
-   * Obf: DALBJGGPCNF
-   *
- * * Protobuf type {@code DungeonEnterPosInfo} */ public static final class DungeonEnterPosInfo extends @@ -79,14 +75,14 @@ private DungeonEnterPosInfo( case 0: done = true; break; - case 96: { + case 8: { - questId_ = input.readUInt32(); + pointId_ = input.readUInt32(); break; } case 104: { - pointId_ = input.readUInt32(); + questId_ = input.readUInt32(); break; } default: { @@ -121,26 +117,26 @@ private DungeonEnterPosInfo( emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.class, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder.class); } - public static final int POINT_ID_FIELD_NUMBER = 13; - private int pointId_; + public static final int QUEST_ID_FIELD_NUMBER = 13; + private int questId_; /** - * uint32 point_id = 13; - * @return The pointId. + * uint32 quest_id = 13; + * @return The questId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getQuestId() { + return questId_; } - public static final int QUEST_ID_FIELD_NUMBER = 12; - private int questId_; + public static final int POINT_ID_FIELD_NUMBER = 1; + private int pointId_; /** - * uint32 quest_id = 12; - * @return The questId. + * uint32 point_id = 1; + * @return The pointId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getPointId() { + return pointId_; } private byte memoizedIsInitialized = -1; @@ -157,11 +153,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (questId_ != 0) { - output.writeUInt32(12, questId_); - } if (pointId_ != 0) { - output.writeUInt32(13, pointId_); + output.writeUInt32(1, pointId_); + } + if (questId_ != 0) { + output.writeUInt32(13, questId_); } unknownFields.writeTo(output); } @@ -172,13 +168,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (questId_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, questId_); + .computeUInt32Size(1, pointId_); } - if (pointId_ != 0) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, pointId_); + .computeUInt32Size(13, questId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -195,10 +191,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo other = (emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo) obj; - if (getPointId() - != other.getPointId()) return false; if (getQuestId() != other.getQuestId()) return false; + if (getPointId() + != other.getPointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -210,10 +206,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + POINT_ID_FIELD_NUMBER; - hash = (53 * hash) + getPointId(); hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; hash = (53 * hash) + getQuestId(); + hash = (37 * hash) + POINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getPointId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -310,10 +306,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: DALBJGGPCNF
-     *
- * * Protobuf type {@code DungeonEnterPosInfo} */ public static final class Builder extends @@ -351,10 +343,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pointId_ = 0; - questId_ = 0; + pointId_ = 0; + return this; } @@ -381,8 +373,8 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn @java.lang.Override public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo buildPartial() { emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo result = new emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo(this); - result.pointId_ = pointId_; result.questId_ = questId_; + result.pointId_ = pointId_; onBuilt(); return result; } @@ -431,12 +423,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo other) { if (other == emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.getDefaultInstance()) return this; - if (other.getPointId() != 0) { - setPointId(other.getPointId()); - } if (other.getQuestId() != 0) { setQuestId(other.getQuestId()); } + if (other.getPointId() != 0) { + setPointId(other.getPointId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -466,64 +458,64 @@ public Builder mergeFrom( return this; } - private int pointId_ ; + private int questId_ ; /** - * uint32 point_id = 13; - * @return The pointId. + * uint32 quest_id = 13; + * @return The questId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getQuestId() { + return questId_; } /** - * uint32 point_id = 13; - * @param value The pointId to set. + * uint32 quest_id = 13; + * @param value The questId to set. * @return This builder for chaining. */ - public Builder setPointId(int value) { + public Builder setQuestId(int value) { - pointId_ = value; + questId_ = value; onChanged(); return this; } /** - * uint32 point_id = 13; + * uint32 quest_id = 13; * @return This builder for chaining. */ - public Builder clearPointId() { + public Builder clearQuestId() { - pointId_ = 0; + questId_ = 0; onChanged(); return this; } - private int questId_ ; + private int pointId_ ; /** - * uint32 quest_id = 12; - * @return The questId. + * uint32 point_id = 1; + * @return The pointId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getPointId() { + return pointId_; } /** - * uint32 quest_id = 12; - * @param value The questId to set. + * uint32 point_id = 1; + * @param value The pointId to set. * @return This builder for chaining. */ - public Builder setQuestId(int value) { + public Builder setPointId(int value) { - questId_ = value; + pointId_ = value; onChanged(); return this; } /** - * uint32 quest_id = 12; + * uint32 point_id = 1; * @return This builder for chaining. */ - public Builder clearQuestId() { + public Builder clearPointId() { - questId_ = 0; + pointId_ = 0; onChanged(); return this; } @@ -595,8 +587,8 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn static { java.lang.String[] descriptorData = { "\n\031DungeonEnterPosInfo.proto\"9\n\023DungeonEn" + - "terPosInfo\022\020\n\010point_id\030\r \001(\r\022\020\n\010quest_id" + - "\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + + "terPosInfo\022\020\n\010quest_id\030\r \001(\r\022\020\n\010point_id" + + "\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -608,7 +600,7 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn internal_static_DungeonEnterPosInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonEnterPosInfo_descriptor, - new java.lang.String[] { "PointId", "QuestId", }); + new java.lang.String[] { "QuestId", "PointId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java index 19b6335b06a..d5712c5f17f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java @@ -19,52 +19,47 @@ public interface EntityAiSyncNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @return A list containing the localAvatarAlertedMonsterList. */ java.util.List getLocalAvatarAlertedMonsterListList(); /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @return The count of localAvatarAlertedMonsterList. */ int getLocalAvatarAlertedMonsterListCount(); /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @param index The index of the element to return. * @return The localAvatarAlertedMonsterList at the given index. */ int getLocalAvatarAlertedMonsterList(int index); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ java.util.List getInfoListList(); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int index); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ int getInfoListCount(); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ java.util.List getInfoListOrBuilderList(); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInfoListOrBuilder( int index); } /** - * 
-   * CmdId: 5447
-   * Obf: HKGLOBEAHIN
-   *
- * * Protobuf type {@code EntityAiSyncNotify} */ public static final class EntityAiSyncNotify extends @@ -112,7 +107,16 @@ private EntityAiSyncNotify( case 0: done = true; break; - case 32: { + case 66: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + infoList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + infoList_.add( + input.readMessage(emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.parser(), extensionRegistry)); + break; + } + case 96: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { localAvatarAlertedMonsterList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -120,7 +124,7 @@ private EntityAiSyncNotify( localAvatarAlertedMonsterList_.addInt(input.readUInt32()); break; } - case 34: { + case 98: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -133,15 +137,6 @@ private EntityAiSyncNotify( input.popLimit(limit); break; } - case 42: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - infoList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - infoList_.add( - input.readMessage(emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.parser(), extensionRegistry)); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -157,12 +152,12 @@ private EntityAiSyncNotify( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - localAvatarAlertedMonsterList_.makeImmutable(); // C - } if (((mutable_bitField0_ & 0x00000002) != 0)) { infoList_ = java.util.Collections.unmodifiableList(infoList_); } + if (((mutable_bitField0_ & 0x00000001) != 0)) { + localAvatarAlertedMonsterList_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -180,10 +175,10 @@ private EntityAiSyncNotify( emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify.class, emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify.Builder.class); } - public static final int LOCAL_AVATAR_ALERTED_MONSTER_LIST_FIELD_NUMBER = 4; + public static final int LOCAL_AVATAR_ALERTED_MONSTER_LIST_FIELD_NUMBER = 12; private com.google.protobuf.Internal.IntList localAvatarAlertedMonsterList_; /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @return A list containing the localAvatarAlertedMonsterList. */ @java.lang.Override @@ -192,14 +187,14 @@ private EntityAiSyncNotify( return localAvatarAlertedMonsterList_; } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @return The count of localAvatarAlertedMonsterList. */ public int getLocalAvatarAlertedMonsterListCount() { return localAvatarAlertedMonsterList_.size(); } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @param index The index of the element to return. * @return The localAvatarAlertedMonsterList at the given index. */ @@ -208,17 +203,17 @@ public int getLocalAvatarAlertedMonsterList(int index) { } private int localAvatarAlertedMonsterListMemoizedSerializedSize = -1; - public static final int INFO_LIST_FIELD_NUMBER = 5; + public static final int INFO_LIST_FIELD_NUMBER = 8; private java.util.List infoList_; /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ @java.lang.Override public java.util.List getInfoListList() { return infoList_; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ @java.lang.Override public java.util.List @@ -226,21 +221,21 @@ public java.util.List return infoList_; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ @java.lang.Override public int getInfoListCount() { return infoList_.size(); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int index) { return infoList_.get(index); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInfoListOrBuilder( @@ -263,16 +258,16 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); + for (int i = 0; i < infoList_.size(); i++) { + output.writeMessage(8, infoList_.get(i)); + } if (getLocalAvatarAlertedMonsterListList().size() > 0) { - output.writeUInt32NoTag(34); + output.writeUInt32NoTag(98); output.writeUInt32NoTag(localAvatarAlertedMonsterListMemoizedSerializedSize); } for (int i = 0; i < localAvatarAlertedMonsterList_.size(); i++) { output.writeUInt32NoTag(localAvatarAlertedMonsterList_.getInt(i)); } - for (int i = 0; i < infoList_.size(); i++) { - output.writeMessage(5, infoList_.get(i)); - } unknownFields.writeTo(output); } @@ -282,6 +277,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + for (int i = 0; i < infoList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, infoList_.get(i)); + } { int dataSize = 0; for (int i = 0; i < localAvatarAlertedMonsterList_.size(); i++) { @@ -296,10 +295,6 @@ public int getSerializedSize() { } localAvatarAlertedMonsterListMemoizedSerializedSize = dataSize; } - for (int i = 0; i < infoList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, infoList_.get(i)); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -434,11 +429,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 5447
-     * Obf: HKGLOBEAHIN
-     *
- * * Protobuf type {@code EntityAiSyncNotify} */ public static final class Builder extends @@ -648,7 +638,7 @@ private void ensureLocalAvatarAlertedMonsterListIsMutable() { } } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @return A list containing the localAvatarAlertedMonsterList. */ public java.util.List @@ -657,14 +647,14 @@ private void ensureLocalAvatarAlertedMonsterListIsMutable() { java.util.Collections.unmodifiableList(localAvatarAlertedMonsterList_) : localAvatarAlertedMonsterList_; } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @return The count of localAvatarAlertedMonsterList. */ public int getLocalAvatarAlertedMonsterListCount() { return localAvatarAlertedMonsterList_.size(); } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @param index The index of the element to return. * @return The localAvatarAlertedMonsterList at the given index. */ @@ -672,7 +662,7 @@ public int getLocalAvatarAlertedMonsterList(int index) { return localAvatarAlertedMonsterList_.getInt(index); } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @param index The index to set the value at. * @param value The localAvatarAlertedMonsterList to set. * @return This builder for chaining. @@ -685,7 +675,7 @@ public Builder setLocalAvatarAlertedMonsterList( return this; } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @param value The localAvatarAlertedMonsterList to add. * @return This builder for chaining. */ @@ -696,7 +686,7 @@ public Builder addLocalAvatarAlertedMonsterList(int value) { return this; } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @param values The localAvatarAlertedMonsterList to add. * @return This builder for chaining. */ @@ -709,7 +699,7 @@ public Builder addAllLocalAvatarAlertedMonsterList( return this; } /** - * repeated uint32 local_avatar_alerted_monster_list = 4; + * repeated uint32 local_avatar_alerted_monster_list = 12; * @return This builder for chaining. */ public Builder clearLocalAvatarAlertedMonsterList() { @@ -732,7 +722,7 @@ private void ensureInfoListIsMutable() { emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder> infoListBuilder_; /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public java.util.List getInfoListList() { if (infoListBuilder_ == null) { @@ -742,7 +732,7 @@ public java.util.List } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public int getInfoListCount() { if (infoListBuilder_ == null) { @@ -752,7 +742,7 @@ public int getInfoListCount() { } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int index) { if (infoListBuilder_ == null) { @@ -762,7 +752,7 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder setInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo value) { @@ -779,7 +769,7 @@ public Builder setInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder setInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder builderForValue) { @@ -793,7 +783,7 @@ public Builder setInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder addInfoList(emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo value) { if (infoListBuilder_ == null) { @@ -809,7 +799,7 @@ public Builder addInfoList(emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSync return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder addInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo value) { @@ -826,7 +816,7 @@ public Builder addInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder addInfoList( emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder builderForValue) { @@ -840,7 +830,7 @@ public Builder addInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder addInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder builderForValue) { @@ -854,7 +844,7 @@ public Builder addInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder addAllInfoList( java.lang.Iterable values) { @@ -869,7 +859,7 @@ public Builder addAllInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder clearInfoList() { if (infoListBuilder_ == null) { @@ -882,7 +872,7 @@ public Builder clearInfoList() { return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public Builder removeInfoList(int index) { if (infoListBuilder_ == null) { @@ -895,14 +885,14 @@ public Builder removeInfoList(int index) { return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder getInfoListBuilder( int index) { return getInfoListFieldBuilder().getBuilder(index); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInfoListOrBuilder( int index) { @@ -912,7 +902,7 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInf } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public java.util.List getInfoListOrBuilderList() { @@ -923,14 +913,14 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInf } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder addInfoListBuilder() { return getInfoListFieldBuilder().addBuilder( emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.getDefaultInstance()); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder addInfoListBuilder( int index) { @@ -938,7 +928,7 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder addInfo index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.getDefaultInstance()); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 8; */ public java.util.List getInfoListBuilderList() { @@ -1027,8 +1017,8 @@ public emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify java.lang.String[] descriptorData = { "\n\030EntityAiSyncNotify.proto\032\020AiSyncInfo.p" + "roto\"_\n\022EntityAiSyncNotify\022)\n!local_avat" + - "ar_alerted_monster_list\030\004 \003(\r\022\036\n\tinfo_li" + - "st\030\005 \003(\0132\013.AiSyncInfoB\033\n\031emu.grasscutter" + + "ar_alerted_monster_list\030\014 \003(\r\022\036\n\tinfo_li" + + "st\030\010 \003(\0132\013.AiSyncInfoB\033\n\031emu.grasscutter" + ".net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieOptionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieOptionOuterClass.java index d80b4caff02..502ac0b4962 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieOptionOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieOptionOuterClass.java @@ -15,10 +15,6 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } /** - * 
-   * Obf: FEBNBMEEDHK
-   *
- * * Protobuf enum {@code PlayerDieOption} */ public enum PlayerDieOption diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonReqOuterClass.java index 6fe5cbc9c21..f1d01baf038 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonReqOuterClass.java @@ -19,38 +19,33 @@ public interface PlayerEnterDungeonReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 dungeon_id = 11; - * @return The dungeonId. - */ - int getDungeonId(); - - /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; * @return Whether the enterPosInfo field is set. */ boolean hasEnterPosInfo(); /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; * @return The enterPosInfo. */ emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo getEnterPosInfo(); /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder(); /** - * uint32 point_id = 15; + * uint32 dungeon_id = 14; + * @return The dungeonId. + */ + int getDungeonId(); + + /** + * uint32 point_id = 2; * @return The pointId. */ int getPointId(); } /** - * 
-   * CmdId: 28791
-   * Obf: IPCFJHGFFPP
-   *
- * * Protobuf type {@code PlayerEnterDungeonReq} */ public static final class PlayerEnterDungeonReq extends @@ -95,7 +90,12 @@ private PlayerEnterDungeonReq( case 0: done = true; break; - case 26: { + case 16: { + + pointId_ = input.readUInt32(); + break; + } + case 42: { emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder subBuilder = null; if (enterPosInfo_ != null) { subBuilder = enterPosInfo_.toBuilder(); @@ -108,16 +108,11 @@ private PlayerEnterDungeonReq( break; } - case 88: { + case 112: { dungeonId_ = input.readUInt32(); break; } - case 120: { - - pointId_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -150,21 +145,10 @@ private PlayerEnterDungeonReq( emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.class, emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.Builder.class); } - public static final int DUNGEON_ID_FIELD_NUMBER = 11; - private int dungeonId_; - /** - * uint32 dungeon_id = 11; - * @return The dungeonId. - */ - @java.lang.Override - public int getDungeonId() { - return dungeonId_; - } - - public static final int ENTER_POS_INFO_FIELD_NUMBER = 3; + public static final int ENTER_POS_INFO_FIELD_NUMBER = 5; private emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo enterPosInfo_; /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; * @return Whether the enterPosInfo field is set. */ @java.lang.Override @@ -172,7 +156,7 @@ public boolean hasEnterPosInfo() { return enterPosInfo_ != null; } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; * @return The enterPosInfo. */ @java.lang.Override @@ -180,17 +164,28 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn return enterPosInfo_ == null ? emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.getDefaultInstance() : enterPosInfo_; } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ @java.lang.Override public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder() { return getEnterPosInfo(); } - public static final int POINT_ID_FIELD_NUMBER = 15; + public static final int DUNGEON_ID_FIELD_NUMBER = 14; + private int dungeonId_; + /** + * uint32 dungeon_id = 14; + * @return The dungeonId. + */ + @java.lang.Override + public int getDungeonId() { + return dungeonId_; + } + + public static final int POINT_ID_FIELD_NUMBER = 2; private int pointId_; /** - * uint32 point_id = 15; + * uint32 point_id = 2; * @return The pointId. */ @java.lang.Override @@ -212,14 +207,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (pointId_ != 0) { + output.writeUInt32(2, pointId_); + } if (enterPosInfo_ != null) { - output.writeMessage(3, getEnterPosInfo()); + output.writeMessage(5, getEnterPosInfo()); } if (dungeonId_ != 0) { - output.writeUInt32(11, dungeonId_); - } - if (pointId_ != 0) { - output.writeUInt32(15, pointId_); + output.writeUInt32(14, dungeonId_); } unknownFields.writeTo(output); } @@ -230,17 +225,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (enterPosInfo_ != null) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getEnterPosInfo()); + .computeUInt32Size(2, pointId_); } - if (dungeonId_ != 0) { + if (enterPosInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, dungeonId_); + .computeMessageSize(5, getEnterPosInfo()); } - if (pointId_ != 0) { + if (dungeonId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, pointId_); + .computeUInt32Size(14, dungeonId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -257,13 +252,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq other = (emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq) obj; - if (getDungeonId() - != other.getDungeonId()) return false; if (hasEnterPosInfo() != other.hasEnterPosInfo()) return false; if (hasEnterPosInfo()) { if (!getEnterPosInfo() .equals(other.getEnterPosInfo())) return false; } + if (getDungeonId() + != other.getDungeonId()) return false; if (getPointId() != other.getPointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -277,12 +272,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER; - hash = (53 * hash) + getDungeonId(); if (hasEnterPosInfo()) { hash = (37 * hash) + ENTER_POS_INFO_FIELD_NUMBER; hash = (53 * hash) + getEnterPosInfo().hashCode(); } + hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER; + hash = (53 * hash) + getDungeonId(); hash = (37 * hash) + POINT_ID_FIELD_NUMBER; hash = (53 * hash) + getPointId(); hash = (29 * hash) + unknownFields.hashCode(); @@ -381,11 +376,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 28791
-     * Obf: IPCFJHGFFPP
-     *
- * * Protobuf type {@code PlayerEnterDungeonReq} */ public static final class Builder extends @@ -423,14 +413,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - dungeonId_ = 0; - if (enterPosInfoBuilder_ == null) { enterPosInfo_ = null; } else { enterPosInfo_ = null; enterPosInfoBuilder_ = null; } + dungeonId_ = 0; + pointId_ = 0; return this; @@ -459,12 +449,12 @@ public emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDung @java.lang.Override public emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq buildPartial() { emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq result = new emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq(this); - result.dungeonId_ = dungeonId_; if (enterPosInfoBuilder_ == null) { result.enterPosInfo_ = enterPosInfo_; } else { result.enterPosInfo_ = enterPosInfoBuilder_.build(); } + result.dungeonId_ = dungeonId_; result.pointId_ = pointId_; onBuilt(); return result; @@ -514,12 +504,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq other) { if (other == emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.getDefaultInstance()) return this; - if (other.getDungeonId() != 0) { - setDungeonId(other.getDungeonId()); - } if (other.hasEnterPosInfo()) { mergeEnterPosInfo(other.getEnterPosInfo()); } + if (other.getDungeonId() != 0) { + setDungeonId(other.getDungeonId()); + } if (other.getPointId() != 0) { setPointId(other.getPointId()); } @@ -552,49 +542,18 @@ public Builder mergeFrom( return this; } - private int dungeonId_ ; - /** - * uint32 dungeon_id = 11; - * @return The dungeonId. - */ - @java.lang.Override - public int getDungeonId() { - return dungeonId_; - } - /** - * uint32 dungeon_id = 11; - * @param value The dungeonId to set. - * @return This builder for chaining. - */ - public Builder setDungeonId(int value) { - - dungeonId_ = value; - onChanged(); - return this; - } - /** - * uint32 dungeon_id = 11; - * @return This builder for chaining. - */ - public Builder clearDungeonId() { - - dungeonId_ = 0; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo enterPosInfo_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder> enterPosInfoBuilder_; /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; * @return Whether the enterPosInfo field is set. */ public boolean hasEnterPosInfo() { return enterPosInfoBuilder_ != null || enterPosInfo_ != null; } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; * @return The enterPosInfo. */ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo getEnterPosInfo() { @@ -605,7 +564,7 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn } } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ public Builder setEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo value) { if (enterPosInfoBuilder_ == null) { @@ -621,7 +580,7 @@ public Builder setEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOute return this; } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ public Builder setEnterPosInfo( emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder builderForValue) { @@ -635,7 +594,7 @@ public Builder setEnterPosInfo( return this; } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ public Builder mergeEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo value) { if (enterPosInfoBuilder_ == null) { @@ -653,7 +612,7 @@ public Builder mergeEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOu return this; } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ public Builder clearEnterPosInfo() { if (enterPosInfoBuilder_ == null) { @@ -667,7 +626,7 @@ public Builder clearEnterPosInfo() { return this; } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder getEnterPosInfoBuilder() { @@ -675,7 +634,7 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn return getEnterPosInfoFieldBuilder().getBuilder(); } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder() { if (enterPosInfoBuilder_ != null) { @@ -686,7 +645,7 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn } } /** - * .DungeonEnterPosInfo enter_pos_info = 3; + * .DungeonEnterPosInfo enter_pos_info = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder> @@ -702,9 +661,40 @@ public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosIn return enterPosInfoBuilder_; } + private int dungeonId_ ; + /** + * uint32 dungeon_id = 14; + * @return The dungeonId. + */ + @java.lang.Override + public int getDungeonId() { + return dungeonId_; + } + /** + * uint32 dungeon_id = 14; + * @param value The dungeonId to set. + * @return This builder for chaining. + */ + public Builder setDungeonId(int value) { + + dungeonId_ = value; + onChanged(); + return this; + } + /** + * uint32 dungeon_id = 14; + * @return This builder for chaining. + */ + public Builder clearDungeonId() { + + dungeonId_ = 0; + onChanged(); + return this; + } + private int pointId_ ; /** - * uint32 point_id = 15; + * uint32 point_id = 2; * @return The pointId. */ @java.lang.Override @@ -712,7 +702,7 @@ public int getPointId() { return pointId_; } /** - * uint32 point_id = 15; + * uint32 point_id = 2; * @param value The pointId to set. * @return This builder for chaining. */ @@ -723,7 +713,7 @@ public Builder setPointId(int value) { return this; } /** - * uint32 point_id = 15; + * uint32 point_id = 2; * @return This builder for chaining. */ public Builder clearPointId() { @@ -801,9 +791,9 @@ public emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDung java.lang.String[] descriptorData = { "\n\033PlayerEnterDungeonReq.proto\032\031DungeonEn" + "terPosInfo.proto\"k\n\025PlayerEnterDungeonRe" + - "q\022\022\n\ndungeon_id\030\013 \001(\r\022,\n\016enter_pos_info\030" + - "\003 \001(\0132\024.DungeonEnterPosInfo\022\020\n\010point_id\030" + - "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + + "q\022,\n\016enter_pos_info\030\005 \001(\0132\024.DungeonEnter" + + "PosInfo\022\022\n\ndungeon_id\030\016 \001(\r\022\020\n\010point_id\030" + + "\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -816,7 +806,7 @@ public emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDung internal_static_PlayerEnterDungeonReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerEnterDungeonReq_descriptor, - new java.lang.String[] { "DungeonId", "EnterPosInfo", "PointId", }); + new java.lang.String[] { "EnterPosInfo", "DungeonId", "PointId", }); emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java index 0857e44909f..2fbe97b9646 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java @@ -19,29 +19,24 @@ public interface PlayerEnterDungeonRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 point_id = 1; + * uint32 point_id = 13; * @return The pointId. */ int getPointId(); /** - * uint32 dungeon_id = 10; + * uint32 dungeon_id = 1; * @return The dungeonId. */ int getDungeonId(); /** - * int32 retcode = 2; + * int32 retcode = 15; * @return The retcode. */ int getRetcode(); } /** - * 
-   * CmdId: 24874
-   * Obf: IPGDOPKIBPO
-   *
- * * Protobuf type {@code PlayerEnterDungeonRsp} */ public static final class PlayerEnterDungeonRsp extends @@ -88,17 +83,17 @@ private PlayerEnterDungeonRsp( break; case 8: { - pointId_ = input.readUInt32(); + dungeonId_ = input.readUInt32(); break; } - case 16: { + case 104: { - retcode_ = input.readInt32(); + pointId_ = input.readUInt32(); break; } - case 80: { + case 120: { - dungeonId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } default: { @@ -133,10 +128,10 @@ private PlayerEnterDungeonRsp( emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp.class, emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp.Builder.class); } - public static final int POINT_ID_FIELD_NUMBER = 1; + public static final int POINT_ID_FIELD_NUMBER = 13; private int pointId_; /** - * uint32 point_id = 1; + * uint32 point_id = 13; * @return The pointId. */ @java.lang.Override @@ -144,10 +139,10 @@ public int getPointId() { return pointId_; } - public static final int DUNGEON_ID_FIELD_NUMBER = 10; + public static final int DUNGEON_ID_FIELD_NUMBER = 1; private int dungeonId_; /** - * uint32 dungeon_id = 10; + * uint32 dungeon_id = 1; * @return The dungeonId. */ @java.lang.Override @@ -155,10 +150,10 @@ public int getDungeonId() { return dungeonId_; } - public static final int RETCODE_FIELD_NUMBER = 2; + public static final int RETCODE_FIELD_NUMBER = 15; private int retcode_; /** - * int32 retcode = 2; + * int32 retcode = 15; * @return The retcode. */ @java.lang.Override @@ -180,14 +175,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (dungeonId_ != 0) { + output.writeUInt32(1, dungeonId_); + } if (pointId_ != 0) { - output.writeUInt32(1, pointId_); + output.writeUInt32(13, pointId_); } if (retcode_ != 0) { - output.writeInt32(2, retcode_); - } - if (dungeonId_ != 0) { - output.writeUInt32(10, dungeonId_); + output.writeInt32(15, retcode_); } unknownFields.writeTo(output); } @@ -198,17 +193,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (pointId_ != 0) { + if (dungeonId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, pointId_); + .computeUInt32Size(1, dungeonId_); } - if (retcode_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, retcode_); + .computeUInt32Size(13, pointId_); } - if (dungeonId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, dungeonId_); + .computeInt32Size(15, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -344,11 +339,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 24874
-     * Obf: IPGDOPKIBPO
-     *
- * * Protobuf type {@code PlayerEnterDungeonRsp} */ public static final class Builder extends @@ -509,7 +499,7 @@ public Builder mergeFrom( private int pointId_ ; /** - * uint32 point_id = 1; + * uint32 point_id = 13; * @return The pointId. */ @java.lang.Override @@ -517,7 +507,7 @@ public int getPointId() { return pointId_; } /** - * uint32 point_id = 1; + * uint32 point_id = 13; * @param value The pointId to set. * @return This builder for chaining. */ @@ -528,7 +518,7 @@ public Builder setPointId(int value) { return this; } /** - * uint32 point_id = 1; + * uint32 point_id = 13; * @return This builder for chaining. */ public Builder clearPointId() { @@ -540,7 +530,7 @@ public Builder clearPointId() { private int dungeonId_ ; /** - * uint32 dungeon_id = 10; + * uint32 dungeon_id = 1; * @return The dungeonId. */ @java.lang.Override @@ -548,7 +538,7 @@ public int getDungeonId() { return dungeonId_; } /** - * uint32 dungeon_id = 10; + * uint32 dungeon_id = 1; * @param value The dungeonId to set. * @return This builder for chaining. */ @@ -559,7 +549,7 @@ public Builder setDungeonId(int value) { return this; } /** - * uint32 dungeon_id = 10; + * uint32 dungeon_id = 1; * @return This builder for chaining. */ public Builder clearDungeonId() { @@ -571,7 +561,7 @@ public Builder clearDungeonId() { private int retcode_ ; /** - * int32 retcode = 2; + * int32 retcode = 15; * @return The retcode. */ @java.lang.Override @@ -579,7 +569,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 2; + * int32 retcode = 15; * @param value The retcode to set. * @return This builder for chaining. */ @@ -590,7 +580,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 2; + * int32 retcode = 15; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -667,8 +657,8 @@ public emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDung static { java.lang.String[] descriptorData = { "\n\033PlayerEnterDungeonRsp.proto\"N\n\025PlayerE" + - "nterDungeonRsp\022\020\n\010point_id\030\001 \001(\r\022\022\n\ndung" + - "eon_id\030\n \001(\r\022\017\n\007retcode\030\002 \001(\005B\033\n\031emu.gra" + + "nterDungeonRsp\022\020\n\010point_id\030\r \001(\r\022\022\n\ndung" + + "eon_id\030\001 \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonReqOuterClass.java index 337ff7a6bf0..de7ad248b42 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonReqOuterClass.java @@ -19,23 +19,18 @@ public interface PlayerQuitDungeonReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 point_id = 5; - * @return The pointId. + * bool is_quit_immediately = 7; + * @return The isQuitImmediately. */ - int getPointId(); + boolean getIsQuitImmediately(); /** - * bool is_quit_immediately = 13; - * @return The isQuitImmediately. + * uint32 point_id = 6; + * @return The pointId. */ - boolean getIsQuitImmediately(); + int getPointId(); } /** - * 
-   * CmdId: 20980
-   * Obf: CCMGMAFLDCH
-   *
- * * Protobuf type {@code PlayerQuitDungeonReq} */ public static final class PlayerQuitDungeonReq extends @@ -80,12 +75,12 @@ private PlayerQuitDungeonReq( case 0: done = true; break; - case 40: { + case 48: { pointId_ = input.readUInt32(); break; } - case 104: { + case 56: { isQuitImmediately_ = input.readBool(); break; @@ -122,26 +117,26 @@ private PlayerQuitDungeonReq( emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.class, emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.Builder.class); } - public static final int POINT_ID_FIELD_NUMBER = 5; - private int pointId_; + public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 7; + private boolean isQuitImmediately_; /** - * uint32 point_id = 5; - * @return The pointId. + * bool is_quit_immediately = 7; + * @return The isQuitImmediately. */ @java.lang.Override - public int getPointId() { - return pointId_; + public boolean getIsQuitImmediately() { + return isQuitImmediately_; } - public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 13; - private boolean isQuitImmediately_; + public static final int POINT_ID_FIELD_NUMBER = 6; + private int pointId_; /** - * bool is_quit_immediately = 13; - * @return The isQuitImmediately. + * uint32 point_id = 6; + * @return The pointId. */ @java.lang.Override - public boolean getIsQuitImmediately() { - return isQuitImmediately_; + public int getPointId() { + return pointId_; } private byte memoizedIsInitialized = -1; @@ -159,10 +154,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (pointId_ != 0) { - output.writeUInt32(5, pointId_); + output.writeUInt32(6, pointId_); } if (isQuitImmediately_ != false) { - output.writeBool(13, isQuitImmediately_); + output.writeBool(7, isQuitImmediately_); } unknownFields.writeTo(output); } @@ -175,11 +170,11 @@ public int getSerializedSize() { size = 0; if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, pointId_); + .computeUInt32Size(6, pointId_); } if (isQuitImmediately_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(13, isQuitImmediately_); + .computeBoolSize(7, isQuitImmediately_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +191,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq other = (emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq) obj; - if (getPointId() - != other.getPointId()) return false; if (getIsQuitImmediately() != other.getIsQuitImmediately()) return false; + if (getPointId() + != other.getPointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,11 +206,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + POINT_ID_FIELD_NUMBER; - hash = (53 * hash) + getPointId(); hash = (37 * hash) + IS_QUIT_IMMEDIATELY_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsQuitImmediately()); + hash = (37 * hash) + POINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getPointId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,11 +307,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 20980
-     * Obf: CCMGMAFLDCH
-     *
- * * Protobuf type {@code PlayerQuitDungeonReq} */ public static final class Builder extends @@ -354,10 +344,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pointId_ = 0; - isQuitImmediately_ = false; + pointId_ = 0; + return this; } @@ -384,8 +374,8 @@ public emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeo @java.lang.Override public emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq buildPartial() { emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq result = new emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq(this); - result.pointId_ = pointId_; result.isQuitImmediately_ = isQuitImmediately_; + result.pointId_ = pointId_; onBuilt(); return result; } @@ -434,12 +424,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq other) { if (other == emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.getDefaultInstance()) return this; - if (other.getPointId() != 0) { - setPointId(other.getPointId()); - } if (other.getIsQuitImmediately() != false) { setIsQuitImmediately(other.getIsQuitImmediately()); } + if (other.getPointId() != 0) { + setPointId(other.getPointId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -469,64 +459,64 @@ public Builder mergeFrom( return this; } - private int pointId_ ; + private boolean isQuitImmediately_ ; /** - * uint32 point_id = 5; - * @return The pointId. + * bool is_quit_immediately = 7; + * @return The isQuitImmediately. */ @java.lang.Override - public int getPointId() { - return pointId_; + public boolean getIsQuitImmediately() { + return isQuitImmediately_; } /** - * uint32 point_id = 5; - * @param value The pointId to set. + * bool is_quit_immediately = 7; + * @param value The isQuitImmediately to set. * @return This builder for chaining. */ - public Builder setPointId(int value) { + public Builder setIsQuitImmediately(boolean value) { - pointId_ = value; + isQuitImmediately_ = value; onChanged(); return this; } /** - * uint32 point_id = 5; + * bool is_quit_immediately = 7; * @return This builder for chaining. */ - public Builder clearPointId() { + public Builder clearIsQuitImmediately() { - pointId_ = 0; + isQuitImmediately_ = false; onChanged(); return this; } - private boolean isQuitImmediately_ ; + private int pointId_ ; /** - * bool is_quit_immediately = 13; - * @return The isQuitImmediately. + * uint32 point_id = 6; + * @return The pointId. */ @java.lang.Override - public boolean getIsQuitImmediately() { - return isQuitImmediately_; + public int getPointId() { + return pointId_; } /** - * bool is_quit_immediately = 13; - * @param value The isQuitImmediately to set. + * uint32 point_id = 6; + * @param value The pointId to set. * @return This builder for chaining. */ - public Builder setIsQuitImmediately(boolean value) { + public Builder setPointId(int value) { - isQuitImmediately_ = value; + pointId_ = value; onChanged(); return this; } /** - * bool is_quit_immediately = 13; + * uint32 point_id = 6; * @return This builder for chaining. */ - public Builder clearIsQuitImmediately() { + public Builder clearPointId() { - isQuitImmediately_ = false; + pointId_ = 0; onChanged(); return this; } @@ -598,8 +588,8 @@ public emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeo static { java.lang.String[] descriptorData = { "\n\032PlayerQuitDungeonReq.proto\"E\n\024PlayerQu" + - "itDungeonReq\022\020\n\010point_id\030\005 \001(\r\022\033\n\023is_qui" + - "t_immediately\030\r \001(\010B\033\n\031emu.grasscutter.n" + + "itDungeonReq\022\033\n\023is_quit_immediately\030\007 \001(" + + "\010\022\020\n\010point_id\030\006 \001(\rB\033\n\031emu.grasscutter.n" + "et.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -611,7 +601,7 @@ public emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeo internal_static_PlayerQuitDungeonReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerQuitDungeonReq_descriptor, - new java.lang.String[] { "PointId", "IsQuitImmediately", }); + new java.lang.String[] { "IsQuitImmediately", "PointId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java index 87860104026..dce6ae346b0 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java @@ -19,23 +19,18 @@ public interface SelectWorktopOptionReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 gadget_entity_id = 12; + * uint32 gadget_entity_id = 9; * @return The gadgetEntityId. */ int getGadgetEntityId(); /** - * uint32 option_id = 6; + * uint32 option_id = 12; * @return The optionId. */ int getOptionId(); } /** - * 
-   * CmdId: 24949
-   * Obf: KGNHIFGFOIA
-   *
- * * Protobuf type {@code SelectWorktopOptionReq} */ public static final class SelectWorktopOptionReq extends @@ -80,14 +75,14 @@ private SelectWorktopOptionReq( case 0: done = true; break; - case 48: { + case 72: { - optionId_ = input.readUInt32(); + gadgetEntityId_ = input.readUInt32(); break; } case 96: { - gadgetEntityId_ = input.readUInt32(); + optionId_ = input.readUInt32(); break; } default: { @@ -122,10 +117,10 @@ private SelectWorktopOptionReq( emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq.class, emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq.Builder.class); } - public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 12; + public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 9; private int gadgetEntityId_; /** - * uint32 gadget_entity_id = 12; + * uint32 gadget_entity_id = 9; * @return The gadgetEntityId. */ @java.lang.Override @@ -133,10 +128,10 @@ public int getGadgetEntityId() { return gadgetEntityId_; } - public static final int OPTION_ID_FIELD_NUMBER = 6; + public static final int OPTION_ID_FIELD_NUMBER = 12; private int optionId_; /** - * uint32 option_id = 6; + * uint32 option_id = 12; * @return The optionId. */ @java.lang.Override @@ -158,11 +153,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (optionId_ != 0) { - output.writeUInt32(6, optionId_); - } if (gadgetEntityId_ != 0) { - output.writeUInt32(12, gadgetEntityId_); + output.writeUInt32(9, gadgetEntityId_); + } + if (optionId_ != 0) { + output.writeUInt32(12, optionId_); } unknownFields.writeTo(output); } @@ -173,13 +168,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (optionId_ != 0) { + if (gadgetEntityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, optionId_); + .computeUInt32Size(9, gadgetEntityId_); } - if (gadgetEntityId_ != 0) { + if (optionId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, gadgetEntityId_); + .computeUInt32Size(12, optionId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -311,11 +306,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 24949
-     * Obf: KGNHIFGFOIA
-     *
- * * Protobuf type {@code SelectWorktopOptionReq} */ public static final class Builder extends @@ -470,7 +460,7 @@ public Builder mergeFrom( private int gadgetEntityId_ ; /** - * uint32 gadget_entity_id = 12; + * uint32 gadget_entity_id = 9; * @return The gadgetEntityId. */ @java.lang.Override @@ -478,7 +468,7 @@ public int getGadgetEntityId() { return gadgetEntityId_; } /** - * uint32 gadget_entity_id = 12; + * uint32 gadget_entity_id = 9; * @param value The gadgetEntityId to set. * @return This builder for chaining. */ @@ -489,7 +479,7 @@ public Builder setGadgetEntityId(int value) { return this; } /** - * uint32 gadget_entity_id = 12; + * uint32 gadget_entity_id = 9; * @return This builder for chaining. */ public Builder clearGadgetEntityId() { @@ -501,7 +491,7 @@ public Builder clearGadgetEntityId() { private int optionId_ ; /** - * uint32 option_id = 6; + * uint32 option_id = 12; * @return The optionId. */ @java.lang.Override @@ -509,7 +499,7 @@ public int getOptionId() { return optionId_; } /** - * uint32 option_id = 6; + * uint32 option_id = 12; * @param value The optionId to set. * @return This builder for chaining. */ @@ -520,7 +510,7 @@ public Builder setOptionId(int value) { return this; } /** - * uint32 option_id = 6; + * uint32 option_id = 12; * @return This builder for chaining. */ public Builder clearOptionId() { @@ -597,8 +587,8 @@ public emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopO static { java.lang.String[] descriptorData = { "\n\034SelectWorktopOptionReq.proto\"E\n\026Select" + - "WorktopOptionReq\022\030\n\020gadget_entity_id\030\014 \001" + - "(\r\022\021\n\toption_id\030\006 \001(\rB\033\n\031emu.grasscutter" + + "WorktopOptionReq\022\030\n\020gadget_entity_id\030\t \001" + + "(\r\022\021\n\toption_id\030\014 \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/SelectWorktopOptionRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionRspOuterClass.java index 2b9a1548243..3d4fc0190c8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionRspOuterClass.java @@ -19,29 +19,24 @@ public interface SelectWorktopOptionRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 option_id = 13; + * uint32 gadget_entity_id = 7; + * @return The gadgetEntityId. + */ + int getGadgetEntityId(); + + /** + * uint32 option_id = 15; * @return The optionId. */ int getOptionId(); /** - * int32 retcode = 9; + * int32 retcode = 11; * @return The retcode. */ int getRetcode(); - - /** - * uint32 gadget_entity_id = 14; - * @return The gadgetEntityId. - */ - int getGadgetEntityId(); } /** - * 
-   * CmdId: 27194
-   * Obf: MJHAKKACKEC
-   *
- * * Protobuf type {@code SelectWorktopOptionRsp} */ public static final class SelectWorktopOptionRsp extends @@ -86,19 +81,19 @@ private SelectWorktopOptionRsp( case 0: done = true; break; - case 72: { + case 56: { - retcode_ = input.readInt32(); + gadgetEntityId_ = input.readUInt32(); break; } - case 104: { + case 88: { - optionId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 112: { + case 120: { - gadgetEntityId_ = input.readUInt32(); + optionId_ = input.readUInt32(); break; } default: { @@ -133,10 +128,21 @@ private SelectWorktopOptionRsp( emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp.class, emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp.Builder.class); } - public static final int OPTION_ID_FIELD_NUMBER = 13; + public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 7; + private int gadgetEntityId_; + /** + * uint32 gadget_entity_id = 7; + * @return The gadgetEntityId. + */ + @java.lang.Override + public int getGadgetEntityId() { + return gadgetEntityId_; + } + + public static final int OPTION_ID_FIELD_NUMBER = 15; private int optionId_; /** - * uint32 option_id = 13; + * uint32 option_id = 15; * @return The optionId. */ @java.lang.Override @@ -144,10 +150,10 @@ public int getOptionId() { return optionId_; } - public static final int RETCODE_FIELD_NUMBER = 9; + public static final int RETCODE_FIELD_NUMBER = 11; private int retcode_; /** - * int32 retcode = 9; + * int32 retcode = 11; * @return The retcode. */ @java.lang.Override @@ -155,17 +161,6 @@ public int getRetcode() { return retcode_; } - public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 14; - private int gadgetEntityId_; - /** - * uint32 gadget_entity_id = 14; - * @return The gadgetEntityId. - */ - @java.lang.Override - public int getGadgetEntityId() { - return gadgetEntityId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,14 +175,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (gadgetEntityId_ != 0) { + output.writeUInt32(7, gadgetEntityId_); + } if (retcode_ != 0) { - output.writeInt32(9, retcode_); + output.writeInt32(11, retcode_); } if (optionId_ != 0) { - output.writeUInt32(13, optionId_); - } - if (gadgetEntityId_ != 0) { - output.writeUInt32(14, gadgetEntityId_); + output.writeUInt32(15, optionId_); } unknownFields.writeTo(output); } @@ -198,17 +193,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { + if (gadgetEntityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, retcode_); + .computeUInt32Size(7, gadgetEntityId_); } - if (optionId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, optionId_); + .computeInt32Size(11, retcode_); } - if (gadgetEntityId_ != 0) { + if (optionId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, gadgetEntityId_); + .computeUInt32Size(15, optionId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +220,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp other = (emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp) obj; + if (getGadgetEntityId() + != other.getGadgetEntityId()) return false; if (getOptionId() != other.getOptionId()) return false; if (getRetcode() != other.getRetcode()) return false; - if (getGadgetEntityId() - != other.getGadgetEntityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +237,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getGadgetEntityId(); hash = (37 * hash) + OPTION_ID_FIELD_NUMBER; hash = (53 * hash) + getOptionId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getGadgetEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -344,11 +339,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 27194
-     * Obf: MJHAKKACKEC
-     *
- * * Protobuf type {@code SelectWorktopOptionRsp} */ public static final class Builder extends @@ -386,12 +376,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + gadgetEntityId_ = 0; + optionId_ = 0; retcode_ = 0; - gadgetEntityId_ = 0; - return this; } @@ -418,9 +408,9 @@ public emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopO @java.lang.Override public emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp buildPartial() { emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp result = new emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp(this); + result.gadgetEntityId_ = gadgetEntityId_; result.optionId_ = optionId_; result.retcode_ = retcode_; - result.gadgetEntityId_ = gadgetEntityId_; onBuilt(); return result; } @@ -469,15 +459,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp other) { if (other == emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp.getDefaultInstance()) return this; + if (other.getGadgetEntityId() != 0) { + setGadgetEntityId(other.getGadgetEntityId()); + } if (other.getOptionId() != 0) { setOptionId(other.getOptionId()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.getGadgetEntityId() != 0) { - setGadgetEntityId(other.getGadgetEntityId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -507,95 +497,95 @@ public Builder mergeFrom( return this; } - private int optionId_ ; + private int gadgetEntityId_ ; /** - * uint32 option_id = 13; - * @return The optionId. + * uint32 gadget_entity_id = 7; + * @return The gadgetEntityId. */ @java.lang.Override - public int getOptionId() { - return optionId_; + public int getGadgetEntityId() { + return gadgetEntityId_; } /** - * uint32 option_id = 13; - * @param value The optionId to set. + * uint32 gadget_entity_id = 7; + * @param value The gadgetEntityId to set. * @return This builder for chaining. */ - public Builder setOptionId(int value) { + public Builder setGadgetEntityId(int value) { - optionId_ = value; + gadgetEntityId_ = value; onChanged(); return this; } /** - * uint32 option_id = 13; + * uint32 gadget_entity_id = 7; * @return This builder for chaining. */ - public Builder clearOptionId() { + public Builder clearGadgetEntityId() { - optionId_ = 0; + gadgetEntityId_ = 0; onChanged(); return this; } - private int retcode_ ; + private int optionId_ ; /** - * int32 retcode = 9; - * @return The retcode. + * uint32 option_id = 15; + * @return The optionId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getOptionId() { + return optionId_; } /** - * int32 retcode = 9; - * @param value The retcode to set. + * uint32 option_id = 15; + * @param value The optionId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setOptionId(int value) { - retcode_ = value; + optionId_ = value; onChanged(); return this; } /** - * int32 retcode = 9; + * uint32 option_id = 15; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearOptionId() { - retcode_ = 0; + optionId_ = 0; onChanged(); return this; } - private int gadgetEntityId_ ; + private int retcode_ ; /** - * uint32 gadget_entity_id = 14; - * @return The gadgetEntityId. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getGadgetEntityId() { - return gadgetEntityId_; + public int getRetcode() { + return retcode_; } /** - * uint32 gadget_entity_id = 14; - * @param value The gadgetEntityId to set. + * int32 retcode = 11; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setGadgetEntityId(int value) { + public Builder setRetcode(int value) { - gadgetEntityId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 gadget_entity_id = 14; + * int32 retcode = 11; * @return This builder for chaining. */ - public Builder clearGadgetEntityId() { + public Builder clearRetcode() { - gadgetEntityId_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -667,8 +657,8 @@ public emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopO static { java.lang.String[] descriptorData = { "\n\034SelectWorktopOptionRsp.proto\"V\n\026Select" + - "WorktopOptionRsp\022\021\n\toption_id\030\r \001(\r\022\017\n\007r" + - "etcode\030\t \001(\005\022\030\n\020gadget_entity_id\030\016 \001(\rB\033" + + "WorktopOptionRsp\022\030\n\020gadget_entity_id\030\007 \001" + + "(\r\022\021\n\toption_id\030\017 \001(\r\022\017\n\007retcode\030\013 \001(\005B\033" + "\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +670,7 @@ public emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopO internal_static_SelectWorktopOptionRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SelectWorktopOptionRsp_descriptor, - new java.lang.String[] { "OptionId", "Retcode", "GadgetEntityId", }); + new java.lang.String[] { "GadgetEntityId", "OptionId", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 537dd11380c..400c43eec74 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -159,6 +159,16 @@ public final class PacketOpcodes { public static final int AvatarFightPropNotify = 22148; public static final int AvatarGainCostumeNotify = 4152; public static final int AvatarGainFlycloakNotify = 493; + public static final int PlayerEnterDungeonReq = 23186; + public static final int PlayerEnterDungeonRsp = 1575; + public static final int SelectWorktopOptionReq = 22043; + public static final int SelectWorktopOptionRsp = 22513; + public static final int PlayerQuitDungeonReq = 8558; + public static final int DungeonChallengeBeginNotify = 29742; + public static final int DungeonChallengeFinishNotify = 3894; + public static final int DungeonDieOptionReq = 20063; + public static final int DungeonDieOptionRsp = 354; + public static final int EntityAiSyncNotify = 919; // 4.5.0 Obfuscated public static final int OFCNFIEOFJD = 27048; @@ -523,7 +533,6 @@ public final class PacketOpcodes { public static final int KHELHLJNKPP = 4781; public static final int OKJJNPJKCJA = 9120; public static final int GDLEDADOAAN = 8340; - public static final int NMFNAMPLKAO = 23186; public static final int IEFHDHGAFLB = 2909; public static final int MJDIGHPGBKN = 21999; public static final int JENBENLEALO = 22069; @@ -646,7 +655,6 @@ public final class PacketOpcodes { public static final int OBEFAGNMMPA = 4361; public static final int LHEKAGJOLNM = 6688; public static final int CMDMABCGHFC = 6658; - public static final int EHOKNKPNCFP = 22043; public static final int MDLHOMFDJMM = 6047; public static final int AAAMGONIAOE = 28267; public static final int HGLBLLPACEF = 464; @@ -672,7 +680,6 @@ public final class PacketOpcodes { public static final int PLFHJJGHJHA = 26590; public static final int JAJBEMCOKCK = 4336; public static final int JEBJCIPMPAI = 6034; - public static final int BBOFLKINOOL = 22513; public static final int PGBJOBHNPEF = 28637; public static final int AAHJMNEFGHE = 29589; public static final int HGLECCGCBIP = 23872; @@ -1155,7 +1162,6 @@ public final class PacketOpcodes { public static final int OBKPCOBPOHM = 23834; public static final int MAAHCCLAKPK = 8341; public static final int NELMBKODBGO = 3708; - public static final int GIKFNMJPHDM = 3894; public static final int MEEFEJIDOMC = 24642; public static final int GFHOFEOGIFH = 25308; public static final int NHMJCDGDINA = 4399; @@ -1208,7 +1214,6 @@ public final class PacketOpcodes { public static final int PLJNNGBCIKI = 28234; public static final int OCEFMNNNONE = 23392; public static final int GHHGLHAENLF = 20745; - public static final int LOLGPBOFELG = 1575; public static final int KBBJANMHJND = 26983; public static final int FLGJNJJEJCI = 4969; public static final int LJDAJPBKJBM = 23208; @@ -2030,7 +2035,6 @@ public final class PacketOpcodes { public static final int NLMMNEHIALO = 23241; public static final int AABKPHLDFIJ = 5662; public static final int NCLJEKOFHAC = 1424; - public static final int OCPHPCLKHAK = 20063; public static final int GPDHBMPCEDP = 5088; public static final int LKGBCNJJFKA = 27731; public static final int JCEOLEDDMCF = 7877; @@ -2157,7 +2161,6 @@ public final class PacketOpcodes { public static final int BIGMMKHKBLN = 179; public static final int FBNIFMOEAID = 20637; public static final int HCOBMCNEIOJ = 25075; - public static final int ABKIDCLEILA = 354; public static final int KDEMHBGKFKJ = 6704; public static final int DPONGBODJEP = 24580; public static final int HJHMFJPBGJM = 24072; @@ -2534,7 +2537,6 @@ public final class PacketOpcodes { public static final int NGNOOOIEABG = 9132; public static final int HGKBILPKNAD = 20979; public static final int HHNCKELKCCE = 22496; - public static final int JGHMAKCFCBG = 29742; public static final int MBKEICLHPIH = 23471; public static final int PIFBIOIFGOD = 1300; public static final int HABMLCODAHD = 26035; @@ -2595,7 +2597,6 @@ public final class PacketOpcodes { public static final int KFJNOLKBLGP = 1963; public static final int JDMOLODIMFA = 4610; public static final int PFDMDGBOACE = 1904; - public static final int EOHDDGDAHPG = 8558; public static final int LLPKEFALICK = 6337; public static final int CAHICNEAMMD = 1157; public static final int CKJIOGGNGCB = 25546; @@ -2654,7 +2655,6 @@ public final class PacketOpcodes { public static final int POGGADGMMBF = 28385; public static final int MHGLMDEJEOB = 23326; public static final int BCPDIKNPMBM = 26930; - public static final int OFPGPANPMKH = 919; public static final int LLIBLMJOOLE = 1331; public static final int CGEOCKGMGCP = 29065; public static final int CMNOOEHGEHP = 22548; @@ -3365,11 +3365,7 @@ public final class PacketOpcodes { public static final int DungeonCandidateTeamSetChangingAvatarRsp = 1; public static final int DungeonCandidateTeamSetReadyReq = 1; public static final int DungeonCandidateTeamSetReadyRsp = 1; - public static final int DungeonChallengeBeginNotify = 1; - public static final int DungeonChallengeFinishNotify = 1; public static final int DungeonDataNotify = 1; - public static final int DungeonDieOptionReq = 1; - public static final int DungeonDieOptionRsp = 1; public static final int DungeonEntryToBeExploreNotify = 1; public static final int DungeonFollowNotify = 1; public static final int DungeonGetStatueDropReq = 1; @@ -3464,7 +3460,6 @@ public final class PacketOpcodes { public static final int EnterWorldAreaReq = 1; public static final int EnterWorldAreaRsp = 1; public static final int EntityAiKillSelfNotify = 1; - public static final int EntityAiSyncNotify = 1; public static final int EntityAuthorityChangeNotify = 1; public static final int EntityConfigHashNotify = 1; public static final int EntityFightPropNotify = 1; @@ -4569,8 +4564,6 @@ public final class PacketOpcodes { public static final int PlayerCookReq = 1; public static final int PlayerCookRsp = 1; public static final int PlayerDeathZoneNotify = 1; - public static final int PlayerEnterDungeonReq = 1; - public static final int PlayerEnterDungeonRsp = 1; public static final int PlayerEyePointStateNotify = 1; public static final int PlayerFishingDataNotify = 1; public static final int PlayerForceExitReq = 1; @@ -4603,7 +4596,6 @@ public final class PacketOpcodes { public static final int PlayerOfferingReq = 1; public static final int PlayerOfferingRsp = 1; public static final int PlayerPreEnterMpNotify = 1; - public static final int PlayerQuitDungeonReq = 1; public static final int PlayerQuitDungeonRsp = 1; public static final int PlayerQuitFromHomeNotify = 1; public static final int PlayerQuitFromMpNotify = 1; @@ -4863,8 +4855,6 @@ public final class PacketOpcodes { public static final int SelectEffigyChallengeConditionRsp = 1; public static final int SelectRoguelikeDungeonCardReq = 1; public static final int SelectRoguelikeDungeonCardRsp = 1; - public static final int SelectWorktopOptionReq = 1; - public static final int SelectWorktopOptionRsp = 1; public static final int ServerAnnounceNotify = 1; public static final int ServerAnnounceRevokeNotify = 1; public static final int ServerBuffChangeNotify = 1;