diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java index 4142386bb09..242f6a566df 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java @@ -19,30 +19,34 @@ public interface DestroyMaterialReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ java.util.List getMaterialListList(); /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterialList(int index); /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ int getMaterialListCount(); /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ java.util.List getMaterialListOrBuilderList(); /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder getMaterialListOrBuilder( int index); } /** + * 
+   * CmdId: 29395
+   *
+ * * Protobuf type {@code DestroyMaterialReq} */ public static final class DestroyMaterialReq extends @@ -89,7 +93,7 @@ private DestroyMaterialReq( case 0: done = true; break; - case 50: { + case 66: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { materialList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -133,17 +137,17 @@ private DestroyMaterialReq( emu.grasscutter.net.proto.DestroyMaterialReqOuterClass.DestroyMaterialReq.class, emu.grasscutter.net.proto.DestroyMaterialReqOuterClass.DestroyMaterialReq.Builder.class); } - public static final int MATERIAL_LIST_FIELD_NUMBER = 6; + public static final int MATERIAL_LIST_FIELD_NUMBER = 8; private java.util.List materialList_; /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ @java.lang.Override public java.util.List getMaterialListList() { return materialList_; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ @java.lang.Override public java.util.List @@ -151,21 +155,21 @@ public java.util.Listrepeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ @java.lang.Override public int getMaterialListCount() { return materialList_.size(); } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterialList(int index) { return materialList_.get(index); } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder getMaterialListOrBuilder( @@ -188,7 +192,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < materialList_.size(); i++) { - output.writeMessage(6, materialList_.get(i)); + output.writeMessage(8, materialList_.get(i)); } unknownFields.writeTo(output); } @@ -201,7 +205,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < materialList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, materialList_.get(i)); + .computeMessageSize(8, materialList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -331,6 +335,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 29395
+     *
+ * * Protobuf type {@code DestroyMaterialReq} */ public static final class Builder extends @@ -528,7 +536,7 @@ private void ensureMaterialListIsMutable() { emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder> materialListBuilder_; /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public java.util.List getMaterialListList() { if (materialListBuilder_ == null) { @@ -538,7 +546,7 @@ public java.util.Listrepeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public int getMaterialListCount() { if (materialListBuilder_ == null) { @@ -548,7 +556,7 @@ public int getMaterialListCount() { } } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterialList(int index) { if (materialListBuilder_ == null) { @@ -558,7 +566,7 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterial } } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder setMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo value) { @@ -575,7 +583,7 @@ public Builder setMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder setMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder builderForValue) { @@ -589,7 +597,7 @@ public Builder setMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder addMaterialList(emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo value) { if (materialListBuilder_ == null) { @@ -605,7 +613,7 @@ public Builder addMaterialList(emu.grasscutter.net.proto.MaterialInfoOuterClass. return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder addMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo value) { @@ -622,7 +630,7 @@ public Builder addMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder addMaterialList( emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder builderForValue) { @@ -636,7 +644,7 @@ public Builder addMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder addMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder builderForValue) { @@ -650,7 +658,7 @@ public Builder addMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder addAllMaterialList( java.lang.Iterable values) { @@ -665,7 +673,7 @@ public Builder addAllMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder clearMaterialList() { if (materialListBuilder_ == null) { @@ -678,7 +686,7 @@ public Builder clearMaterialList() { return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public Builder removeMaterialList(int index) { if (materialListBuilder_ == null) { @@ -691,14 +699,14 @@ public Builder removeMaterialList(int index) { return this; } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder getMaterialListBuilder( int index) { return getMaterialListFieldBuilder().getBuilder(index); } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder getMaterialListOrBuilder( int index) { @@ -708,7 +716,7 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder ge } } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public java.util.List getMaterialListOrBuilderList() { @@ -719,14 +727,14 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder ge } } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder addMaterialListBuilder() { return getMaterialListFieldBuilder().addBuilder( emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.getDefaultInstance()); } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder addMaterialListBuilder( int index) { @@ -734,7 +742,7 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder add index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.getDefaultInstance()); } /** - * repeated .MaterialInfo material_list = 6; + * repeated .MaterialInfo material_list = 8; */ public java.util.List getMaterialListBuilderList() { @@ -823,7 +831,7 @@ public emu.grasscutter.net.proto.DestroyMaterialReqOuterClass.DestroyMaterialReq java.lang.String[] descriptorData = { "\n\030DestroyMaterialReq.proto\032\022MaterialInfo" + ".proto\":\n\022DestroyMaterialReq\022$\n\rmaterial" + - "_list\030\006 \003(\0132\r.MaterialInfoB\033\n\031emu.grassc" + + "_list\030\010 \003(\0132\r.MaterialInfoB\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java index 6d8df33b061..af9e66b52db 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java @@ -19,46 +19,50 @@ public interface DestroyMaterialRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @return A list containing the itemCountList. */ java.util.List getItemCountListList(); /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @return The count of itemCountList. */ int getItemCountListCount(); /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @param index The index of the element to return. * @return The itemCountList at the given index. */ int getItemCountList(int index); /** - * repeated uint32 item_id_list = 11; + * int32 retcode = 12; + * @return The retcode. + */ + int getRetcode(); + + /** + * repeated uint32 item_id_list = 15; * @return A list containing the itemIdList. */ java.util.List getItemIdListList(); /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @return The count of itemIdList. */ int getItemIdListCount(); /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @param index The index of the element to return. * @return The itemIdList at the given index. */ int getItemIdList(int index); - - /** - * int32 retcode = 13; - * @return The retcode. - */ - int getRetcode(); } /** + * 
+   * CmdId: 24989
+   *
+ * * Protobuf type {@code DestroyMaterialRsp} */ public static final class DestroyMaterialRsp extends @@ -106,49 +110,49 @@ private DestroyMaterialRsp( case 0: done = true; break; - case 88: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - itemIdList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + case 16: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + itemCountList_ = newIntList(); + mutable_bitField0_ |= 0x00000001; } - itemIdList_.addInt(input.readUInt32()); + itemCountList_.addInt(input.readUInt32()); break; } - case 90: { + case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - itemIdList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + itemCountList_ = newIntList(); + mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - itemIdList_.addInt(input.readUInt32()); + itemCountList_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 104: { + case 96: { retcode_ = input.readInt32(); break; } case 120: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - itemCountList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + itemIdList_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } - itemCountList_.addInt(input.readUInt32()); + itemIdList_.addInt(input.readUInt32()); break; } case 122: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - itemCountList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + itemIdList_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - itemCountList_.addInt(input.readUInt32()); + itemIdList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -168,12 +172,12 @@ private DestroyMaterialRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - itemIdList_.makeImmutable(); // C - } if (((mutable_bitField0_ & 0x00000001) != 0)) { itemCountList_.makeImmutable(); // C } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + itemIdList_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -191,10 +195,10 @@ private DestroyMaterialRsp( emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.class, emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.Builder.class); } - public static final int ITEM_COUNT_LIST_FIELD_NUMBER = 15; + public static final int ITEM_COUNT_LIST_FIELD_NUMBER = 2; private com.google.protobuf.Internal.IntList itemCountList_; /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @return A list containing the itemCountList. */ @java.lang.Override @@ -203,14 +207,14 @@ private DestroyMaterialRsp( return itemCountList_; } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @return The count of itemCountList. */ public int getItemCountListCount() { return itemCountList_.size(); } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @param index The index of the element to return. * @return The itemCountList at the given index. */ @@ -219,10 +223,21 @@ public int getItemCountList(int index) { } private int itemCountListMemoizedSerializedSize = -1; - public static final int ITEM_ID_LIST_FIELD_NUMBER = 11; + public static final int RETCODE_FIELD_NUMBER = 12; + private int retcode_; + /** + * int32 retcode = 12; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int ITEM_ID_LIST_FIELD_NUMBER = 15; private com.google.protobuf.Internal.IntList itemIdList_; /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @return A list containing the itemIdList. */ @java.lang.Override @@ -231,14 +246,14 @@ public int getItemCountList(int index) { return itemIdList_; } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @return The count of itemIdList. */ public int getItemIdListCount() { return itemIdList_.size(); } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @param index The index of the element to return. * @return The itemIdList at the given index. */ @@ -247,17 +262,6 @@ public int getItemIdList(int index) { } private int itemIdListMemoizedSerializedSize = -1; - public static final int RETCODE_FIELD_NUMBER = 13; - private int retcode_; - /** - * int32 retcode = 13; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -273,22 +277,22 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getItemIdListList().size() > 0) { - output.writeUInt32NoTag(90); - output.writeUInt32NoTag(itemIdListMemoizedSerializedSize); + if (getItemCountListList().size() > 0) { + output.writeUInt32NoTag(18); + output.writeUInt32NoTag(itemCountListMemoizedSerializedSize); } - for (int i = 0; i < itemIdList_.size(); i++) { - output.writeUInt32NoTag(itemIdList_.getInt(i)); + for (int i = 0; i < itemCountList_.size(); i++) { + output.writeUInt32NoTag(itemCountList_.getInt(i)); } if (retcode_ != 0) { - output.writeInt32(13, retcode_); + output.writeInt32(12, retcode_); } - if (getItemCountListList().size() > 0) { + if (getItemIdListList().size() > 0) { output.writeUInt32NoTag(122); - output.writeUInt32NoTag(itemCountListMemoizedSerializedSize); + output.writeUInt32NoTag(itemIdListMemoizedSerializedSize); } - for (int i = 0; i < itemCountList_.size(); i++) { - output.writeUInt32NoTag(itemCountList_.getInt(i)); + for (int i = 0; i < itemIdList_.size(); i++) { + output.writeUInt32NoTag(itemIdList_.getInt(i)); } unknownFields.writeTo(output); } @@ -301,35 +305,35 @@ public int getSerializedSize() { size = 0; { int dataSize = 0; - for (int i = 0; i < itemIdList_.size(); i++) { + for (int i = 0; i < itemCountList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(itemIdList_.getInt(i)); + .computeUInt32SizeNoTag(itemCountList_.getInt(i)); } size += dataSize; - if (!getItemIdListList().isEmpty()) { + if (!getItemCountListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - itemIdListMemoizedSerializedSize = dataSize; + itemCountListMemoizedSerializedSize = dataSize; } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(13, retcode_); + .computeInt32Size(12, retcode_); } { int dataSize = 0; - for (int i = 0; i < itemCountList_.size(); i++) { + for (int i = 0; i < itemIdList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(itemCountList_.getInt(i)); + .computeUInt32SizeNoTag(itemIdList_.getInt(i)); } size += dataSize; - if (!getItemCountListList().isEmpty()) { + if (!getItemIdListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - itemCountListMemoizedSerializedSize = dataSize; + itemIdListMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -348,10 +352,10 @@ public boolean equals(final java.lang.Object obj) { if (!getItemCountListList() .equals(other.getItemCountListList())) return false; - if (!getItemIdListList() - .equals(other.getItemIdListList())) return false; if (getRetcode() != other.getRetcode()) return false; + if (!getItemIdListList() + .equals(other.getItemIdListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -367,12 +371,12 @@ public int hashCode() { hash = (37 * hash) + ITEM_COUNT_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemCountListList().hashCode(); } + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getItemIdListCount() > 0) { hash = (37 * hash) + ITEM_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemIdListList().hashCode(); } - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -469,6 +473,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 24989
+     *
+ * * Protobuf type {@code DestroyMaterialRsp} */ public static final class Builder extends @@ -508,10 +516,10 @@ public Builder clear() { super.clear(); itemCountList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - itemIdList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); retcode_ = 0; + itemIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -544,12 +552,12 @@ public emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp bitField0_ = (bitField0_ & ~0x00000001); } result.itemCountList_ = itemCountList_; + result.retcode_ = retcode_; if (((bitField0_ & 0x00000002) != 0)) { itemIdList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.itemIdList_ = itemIdList_; - result.retcode_ = retcode_; onBuilt(); return result; } @@ -608,6 +616,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.DestroyMaterialRspOuterClass. } onChanged(); } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (!other.itemIdList_.isEmpty()) { if (itemIdList_.isEmpty()) { itemIdList_ = other.itemIdList_; @@ -618,9 +629,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.DestroyMaterialRspOuterClass. } onChanged(); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -659,7 +667,7 @@ private void ensureItemCountListIsMutable() { } } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @return A list containing the itemCountList. */ public java.util.List @@ -668,14 +676,14 @@ private void ensureItemCountListIsMutable() { java.util.Collections.unmodifiableList(itemCountList_) : itemCountList_; } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @return The count of itemCountList. */ public int getItemCountListCount() { return itemCountList_.size(); } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @param index The index of the element to return. * @return The itemCountList at the given index. */ @@ -683,7 +691,7 @@ public int getItemCountList(int index) { return itemCountList_.getInt(index); } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @param index The index to set the value at. * @param value The itemCountList to set. * @return This builder for chaining. @@ -696,7 +704,7 @@ public Builder setItemCountList( return this; } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @param value The itemCountList to add. * @return This builder for chaining. */ @@ -707,7 +715,7 @@ public Builder addItemCountList(int value) { return this; } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @param values The itemCountList to add. * @return This builder for chaining. */ @@ -720,7 +728,7 @@ public Builder addAllItemCountList( return this; } /** - * repeated uint32 item_count_list = 15; + * repeated uint32 item_count_list = 2; * @return This builder for chaining. */ public Builder clearItemCountList() { @@ -730,6 +738,37 @@ public Builder clearItemCountList() { return this; } + private int retcode_ ; + /** + * int32 retcode = 12; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 12; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 12; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + private com.google.protobuf.Internal.IntList itemIdList_ = emptyIntList(); private void ensureItemIdListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { @@ -738,7 +777,7 @@ private void ensureItemIdListIsMutable() { } } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @return A list containing the itemIdList. */ public java.util.List @@ -747,14 +786,14 @@ private void ensureItemIdListIsMutable() { java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_; } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @return The count of itemIdList. */ public int getItemIdListCount() { return itemIdList_.size(); } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @param index The index of the element to return. * @return The itemIdList at the given index. */ @@ -762,7 +801,7 @@ public int getItemIdList(int index) { return itemIdList_.getInt(index); } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @param index The index to set the value at. * @param value The itemIdList to set. * @return This builder for chaining. @@ -775,7 +814,7 @@ public Builder setItemIdList( return this; } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @param value The itemIdList to add. * @return This builder for chaining. */ @@ -786,7 +825,7 @@ public Builder addItemIdList(int value) { return this; } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @param values The itemIdList to add. * @return This builder for chaining. */ @@ -799,7 +838,7 @@ public Builder addAllItemIdList( return this; } /** - * repeated uint32 item_id_list = 11; + * repeated uint32 item_id_list = 15; * @return This builder for chaining. */ public Builder clearItemIdList() { @@ -808,37 +847,6 @@ public Builder clearItemIdList() { onChanged(); return this; } - - private int retcode_ ; - /** - * int32 retcode = 13; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 13; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 13; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -907,8 +915,8 @@ public emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp static { java.lang.String[] descriptorData = { "\n\030DestroyMaterialRsp.proto\"T\n\022DestroyMat" + - "erialRsp\022\027\n\017item_count_list\030\017 \003(\r\022\024\n\014ite" + - "m_id_list\030\013 \003(\r\022\017\n\007retcode\030\r \001(\005B\033\n\031emu." + + "erialRsp\022\027\n\017item_count_list\030\002 \003(\r\022\017\n\007ret" + + "code\030\014 \001(\005\022\024\n\014item_id_list\030\017 \003(\rB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -920,7 +928,7 @@ public emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp internal_static_DestroyMaterialRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DestroyMaterialRsp_descriptor, - new java.lang.String[] { "ItemCountList", "ItemIdList", "Retcode", }); + new java.lang.String[] { "ItemCountList", "Retcode", "ItemIdList", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java index 99327a55a54..68837b87eb2 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java @@ -19,77 +19,81 @@ public interface GetActivityInfoRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 activated_sale_id_list = 14; - * @return A list containing the activatedSaleIdList. - */ - java.util.List getActivatedSaleIdListList(); - /** - * repeated uint32 activated_sale_id_list = 14; - * @return The count of activatedSaleIdList. - */ - int getActivatedSaleIdListCount(); - /** - * repeated uint32 activated_sale_id_list = 14; - * @param index The index of the element to return. - * @return The activatedSaleIdList at the given index. + * int32 retcode = 2; + * @return The retcode. */ - int getActivatedSaleIdList(int index); + int getRetcode(); /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ java.util.List getActivityInfoListList(); /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfoList(int index); /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ int getActivityInfoListCount(); /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ java.util.List getActivityInfoListOrBuilderList(); /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoListOrBuilder( int index); /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated uint32 activated_sale_id_list = 8; + * @return A list containing the activatedSaleIdList. + */ + java.util.List getActivatedSaleIdListList(); + /** + * repeated uint32 activated_sale_id_list = 8; + * @return The count of activatedSaleIdList. + */ + int getActivatedSaleIdListCount(); + /** + * repeated uint32 activated_sale_id_list = 8; + * @param index The index of the element to return. + * @return The activatedSaleIdList at the given index. + */ + int getActivatedSaleIdList(int index); + + /** + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ java.util.List getDisableTransferPointInteractionListList(); /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index); /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ int getDisableTransferPointInteractionListCount(); /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ java.util.List getDisableTransferPointInteractionListOrBuilderList(); /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder( int index); - - /** - * int32 retcode = 7; - * @return The retcode. - */ - int getRetcode(); } /** + * 
+   * CmdId: 27972
+   *
+ * * Protobuf type {@code GetActivityInfoRsp} */ public static final class GetActivityInfoRsp extends @@ -102,8 +106,8 @@ private GetActivityInfoRsp(com.google.protobuf.GeneratedMessageV3.Builder bui super(builder); } private GetActivityInfoRsp() { - activatedSaleIdList_ = emptyIntList(); activityInfoList_ = java.util.Collections.emptyList(); + activatedSaleIdList_ = emptyIntList(); disableTransferPointInteractionList_ = java.util.Collections.emptyList(); } @@ -138,34 +142,34 @@ private GetActivityInfoRsp( case 0: done = true; break; - case 10: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + case 16: { + + retcode_ = input.readInt32(); + break; + } + case 58: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { activityInfoList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } activityInfoList_.add( input.readMessage(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.parser(), extensionRegistry)); break; } - case 56: { - - retcode_ = input.readInt32(); - break; - } - case 112: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { + case 64: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { activatedSaleIdList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } activatedSaleIdList_.addInt(input.readUInt32()); break; } - case 114: { + case 66: { 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) { activatedSaleIdList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { activatedSaleIdList_.addInt(input.readUInt32()); @@ -173,7 +177,7 @@ private GetActivityInfoRsp( input.popLimit(limit); break; } - case 122: { + case 90: { if (!((mutable_bitField0_ & 0x00000004) != 0)) { disableTransferPointInteractionList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -197,10 +201,10 @@ private GetActivityInfoRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { activityInfoList_ = java.util.Collections.unmodifiableList(activityInfoList_); } - if (((mutable_bitField0_ & 0x00000001) != 0)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { activatedSaleIdList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000004) != 0)) { @@ -223,45 +227,28 @@ private GetActivityInfoRsp( emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp.class, emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp.Builder.class); } - public static final int ACTIVATED_SALE_ID_LIST_FIELD_NUMBER = 14; - private com.google.protobuf.Internal.IntList activatedSaleIdList_; + public static final int RETCODE_FIELD_NUMBER = 2; + private int retcode_; /** - * repeated uint32 activated_sale_id_list = 14; - * @return A list containing the activatedSaleIdList. + * int32 retcode = 2; + * @return The retcode. */ @java.lang.Override - public java.util.List - getActivatedSaleIdListList() { - return activatedSaleIdList_; - } - /** - * repeated uint32 activated_sale_id_list = 14; - * @return The count of activatedSaleIdList. - */ - public int getActivatedSaleIdListCount() { - return activatedSaleIdList_.size(); - } - /** - * repeated uint32 activated_sale_id_list = 14; - * @param index The index of the element to return. - * @return The activatedSaleIdList at the given index. - */ - public int getActivatedSaleIdList(int index) { - return activatedSaleIdList_.getInt(index); + public int getRetcode() { + return retcode_; } - private int activatedSaleIdListMemoizedSerializedSize = -1; - public static final int ACTIVITY_INFO_LIST_FIELD_NUMBER = 1; + public static final int ACTIVITY_INFO_LIST_FIELD_NUMBER = 7; private java.util.List activityInfoList_; /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ @java.lang.Override public java.util.List getActivityInfoListList() { return activityInfoList_; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ @java.lang.Override public java.util.List @@ -269,21 +256,21 @@ public java.util.Listrepeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ @java.lang.Override public int getActivityInfoListCount() { return activityInfoList_.size(); } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ @java.lang.Override public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfoList(int index) { return activityInfoList_.get(index); } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ @java.lang.Override public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoListOrBuilder( @@ -291,17 +278,45 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder ge return activityInfoList_.get(index); } - public static final int DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER = 15; + public static final int ACTIVATED_SALE_ID_LIST_FIELD_NUMBER = 8; + private com.google.protobuf.Internal.IntList activatedSaleIdList_; + /** + * repeated uint32 activated_sale_id_list = 8; + * @return A list containing the activatedSaleIdList. + */ + @java.lang.Override + public java.util.List + getActivatedSaleIdListList() { + return activatedSaleIdList_; + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @return The count of activatedSaleIdList. + */ + public int getActivatedSaleIdListCount() { + return activatedSaleIdList_.size(); + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @param index The index of the element to return. + * @return The activatedSaleIdList at the given index. + */ + public int getActivatedSaleIdList(int index) { + return activatedSaleIdList_.getInt(index); + } + private int activatedSaleIdListMemoizedSerializedSize = -1; + + public static final int DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER = 11; private java.util.List disableTransferPointInteractionList_; /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ @java.lang.Override public java.util.List getDisableTransferPointInteractionListList() { return disableTransferPointInteractionList_; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ @java.lang.Override public java.util.List @@ -309,21 +324,21 @@ public java.util.List return disableTransferPointInteractionList_; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ @java.lang.Override public int getDisableTransferPointInteractionListCount() { return disableTransferPointInteractionList_.size(); } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index) { return disableTransferPointInteractionList_.get(index); } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder( @@ -331,17 +346,6 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDis return disableTransferPointInteractionList_.get(index); } - public static final int RETCODE_FIELD_NUMBER = 7; - private int retcode_; - /** - * int32 retcode = 7; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -357,21 +361,21 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < activityInfoList_.size(); i++) { - output.writeMessage(1, activityInfoList_.get(i)); - } if (retcode_ != 0) { - output.writeInt32(7, retcode_); + output.writeInt32(2, retcode_); + } + for (int i = 0; i < activityInfoList_.size(); i++) { + output.writeMessage(7, activityInfoList_.get(i)); } if (getActivatedSaleIdListList().size() > 0) { - output.writeUInt32NoTag(114); + output.writeUInt32NoTag(66); output.writeUInt32NoTag(activatedSaleIdListMemoizedSerializedSize); } for (int i = 0; i < activatedSaleIdList_.size(); i++) { output.writeUInt32NoTag(activatedSaleIdList_.getInt(i)); } for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) { - output.writeMessage(15, disableTransferPointInteractionList_.get(i)); + output.writeMessage(11, disableTransferPointInteractionList_.get(i)); } unknownFields.writeTo(output); } @@ -382,13 +386,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < activityInfoList_.size(); i++) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, activityInfoList_.get(i)); + .computeInt32Size(2, retcode_); } - if (retcode_ != 0) { + for (int i = 0; i < activityInfoList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(7, retcode_); + .computeMessageSize(7, activityInfoList_.get(i)); } { int dataSize = 0; @@ -406,7 +410,7 @@ public int getSerializedSize() { } for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, disableTransferPointInteractionList_.get(i)); + .computeMessageSize(11, disableTransferPointInteractionList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -423,14 +427,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp other = (emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp) obj; - if (!getActivatedSaleIdListList() - .equals(other.getActivatedSaleIdListList())) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!getActivityInfoListList() .equals(other.getActivityInfoListList())) return false; + if (!getActivatedSaleIdListList() + .equals(other.getActivatedSaleIdListList())) return false; if (!getDisableTransferPointInteractionListList() .equals(other.getDisableTransferPointInteractionListList())) return false; - if (getRetcode() - != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -442,20 +446,20 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getActivatedSaleIdListCount() > 0) { - hash = (37 * hash) + ACTIVATED_SALE_ID_LIST_FIELD_NUMBER; - hash = (53 * hash) + getActivatedSaleIdListList().hashCode(); - } + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getActivityInfoListCount() > 0) { hash = (37 * hash) + ACTIVITY_INFO_LIST_FIELD_NUMBER; hash = (53 * hash) + getActivityInfoListList().hashCode(); } + if (getActivatedSaleIdListCount() > 0) { + hash = (37 * hash) + ACTIVATED_SALE_ID_LIST_FIELD_NUMBER; + hash = (53 * hash) + getActivatedSaleIdListList().hashCode(); + } if (getDisableTransferPointInteractionListCount() > 0) { hash = (37 * hash) + DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER; hash = (53 * hash) + getDisableTransferPointInteractionListList().hashCode(); } - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -552,6 +556,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 27972
+     *
+ * * Protobuf type {@code GetActivityInfoRsp} */ public static final class Builder extends @@ -591,22 +599,22 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - activatedSaleIdList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + retcode_ = 0; + if (activityInfoListBuilder_ == null) { activityInfoList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { activityInfoListBuilder_.clear(); } + activatedSaleIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); if (disableTransferPointInteractionListBuilder_ == null) { disableTransferPointInteractionList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); } else { disableTransferPointInteractionListBuilder_.clear(); } - retcode_ = 0; - return this; } @@ -634,20 +642,21 @@ public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp buildPartial() { emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp result = new emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) != 0)) { - activatedSaleIdList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.activatedSaleIdList_ = activatedSaleIdList_; + result.retcode_ = retcode_; if (activityInfoListBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { activityInfoList_ = java.util.Collections.unmodifiableList(activityInfoList_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.activityInfoList_ = activityInfoList_; } else { result.activityInfoList_ = activityInfoListBuilder_.build(); } + if (((bitField0_ & 0x00000002) != 0)) { + activatedSaleIdList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.activatedSaleIdList_ = activatedSaleIdList_; if (disableTransferPointInteractionListBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { disableTransferPointInteractionList_ = java.util.Collections.unmodifiableList(disableTransferPointInteractionList_); @@ -657,7 +666,6 @@ public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp } else { result.disableTransferPointInteractionList_ = disableTransferPointInteractionListBuilder_.build(); } - result.retcode_ = retcode_; onBuilt(); return result; } @@ -706,21 +714,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp other) { if (other == emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp.getDefaultInstance()) return this; - if (!other.activatedSaleIdList_.isEmpty()) { - if (activatedSaleIdList_.isEmpty()) { - activatedSaleIdList_ = other.activatedSaleIdList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureActivatedSaleIdListIsMutable(); - activatedSaleIdList_.addAll(other.activatedSaleIdList_); - } - onChanged(); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } if (activityInfoListBuilder_ == null) { if (!other.activityInfoList_.isEmpty()) { if (activityInfoList_.isEmpty()) { activityInfoList_ = other.activityInfoList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureActivityInfoListIsMutable(); activityInfoList_.addAll(other.activityInfoList_); @@ -733,7 +734,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass. activityInfoListBuilder_.dispose(); activityInfoListBuilder_ = null; activityInfoList_ = other.activityInfoList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); activityInfoListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getActivityInfoListFieldBuilder() : null; @@ -742,6 +743,16 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass. } } } + if (!other.activatedSaleIdList_.isEmpty()) { + if (activatedSaleIdList_.isEmpty()) { + activatedSaleIdList_ = other.activatedSaleIdList_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureActivatedSaleIdListIsMutable(); + activatedSaleIdList_.addAll(other.activatedSaleIdList_); + } + onChanged(); + } if (disableTransferPointInteractionListBuilder_ == null) { if (!other.disableTransferPointInteractionList_.isEmpty()) { if (disableTransferPointInteractionList_.isEmpty()) { @@ -768,9 +779,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass. } } } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -801,81 +809,33 @@ public Builder mergeFrom( } private int bitField0_; - private com.google.protobuf.Internal.IntList activatedSaleIdList_ = emptyIntList(); - private void ensureActivatedSaleIdListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - activatedSaleIdList_ = mutableCopy(activatedSaleIdList_); - bitField0_ |= 0x00000001; - } - } - /** - * repeated uint32 activated_sale_id_list = 14; - * @return A list containing the activatedSaleIdList. - */ - public java.util.List - getActivatedSaleIdListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(activatedSaleIdList_) : activatedSaleIdList_; - } - /** - * repeated uint32 activated_sale_id_list = 14; - * @return The count of activatedSaleIdList. - */ - public int getActivatedSaleIdListCount() { - return activatedSaleIdList_.size(); - } - /** - * repeated uint32 activated_sale_id_list = 14; - * @param index The index of the element to return. - * @return The activatedSaleIdList at the given index. - */ - public int getActivatedSaleIdList(int index) { - return activatedSaleIdList_.getInt(index); - } - /** - * repeated uint32 activated_sale_id_list = 14; - * @param index The index to set the value at. - * @param value The activatedSaleIdList to set. - * @return This builder for chaining. - */ - public Builder setActivatedSaleIdList( - int index, int value) { - ensureActivatedSaleIdListIsMutable(); - activatedSaleIdList_.setInt(index, value); - onChanged(); - return this; - } + private int retcode_ ; /** - * repeated uint32 activated_sale_id_list = 14; - * @param value The activatedSaleIdList to add. - * @return This builder for chaining. + * int32 retcode = 2; + * @return The retcode. */ - public Builder addActivatedSaleIdList(int value) { - ensureActivatedSaleIdListIsMutable(); - activatedSaleIdList_.addInt(value); - onChanged(); - return this; + @java.lang.Override + public int getRetcode() { + return retcode_; } /** - * repeated uint32 activated_sale_id_list = 14; - * @param values The activatedSaleIdList to add. + * int32 retcode = 2; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder addAllActivatedSaleIdList( - java.lang.Iterable values) { - ensureActivatedSaleIdListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, activatedSaleIdList_); + public Builder setRetcode(int value) { + + retcode_ = value; onChanged(); return this; } /** - * repeated uint32 activated_sale_id_list = 14; + * int32 retcode = 2; * @return This builder for chaining. */ - public Builder clearActivatedSaleIdList() { - activatedSaleIdList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder clearRetcode() { + + retcode_ = 0; onChanged(); return this; } @@ -883,9 +843,9 @@ public Builder clearActivatedSaleIdList() { private java.util.List activityInfoList_ = java.util.Collections.emptyList(); private void ensureActivityInfoListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { activityInfoList_ = new java.util.ArrayList(activityInfoList_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } @@ -893,7 +853,7 @@ private void ensureActivityInfoListIsMutable() { emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> activityInfoListBuilder_; /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public java.util.List getActivityInfoListList() { if (activityInfoListBuilder_ == null) { @@ -903,7 +863,7 @@ public java.util.Listrepeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public int getActivityInfoListCount() { if (activityInfoListBuilder_ == null) { @@ -913,7 +873,7 @@ public int getActivityInfoListCount() { } } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfoList(int index) { if (activityInfoListBuilder_ == null) { @@ -923,7 +883,7 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivity } } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder setActivityInfoList( int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) { @@ -940,7 +900,7 @@ public Builder setActivityInfoList( return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder setActivityInfoList( int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) { @@ -954,7 +914,7 @@ public Builder setActivityInfoList( return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder addActivityInfoList(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) { if (activityInfoListBuilder_ == null) { @@ -970,7 +930,7 @@ public Builder addActivityInfoList(emu.grasscutter.net.proto.ActivityInfoOuterCl return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder addActivityInfoList( int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) { @@ -987,7 +947,7 @@ public Builder addActivityInfoList( return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder addActivityInfoList( emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) { @@ -1001,7 +961,7 @@ public Builder addActivityInfoList( return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder addActivityInfoList( int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) { @@ -1015,7 +975,7 @@ public Builder addActivityInfoList( return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder addAllActivityInfoList( java.lang.Iterable values) { @@ -1030,12 +990,12 @@ public Builder addAllActivityInfoList( return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder clearActivityInfoList() { if (activityInfoListBuilder_ == null) { activityInfoList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { activityInfoListBuilder_.clear(); @@ -1043,7 +1003,7 @@ public Builder clearActivityInfoList() { return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public Builder removeActivityInfoList(int index) { if (activityInfoListBuilder_ == null) { @@ -1056,14 +1016,14 @@ public Builder removeActivityInfoList(int index) { return this; } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder getActivityInfoListBuilder( int index) { return getActivityInfoListFieldBuilder().getBuilder(index); } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoListOrBuilder( int index) { @@ -1073,7 +1033,7 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder ge } } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public java.util.List getActivityInfoListOrBuilderList() { @@ -1084,14 +1044,14 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder ge } } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder addActivityInfoListBuilder() { return getActivityInfoListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.getDefaultInstance()); } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder addActivityInfoListBuilder( int index) { @@ -1099,7 +1059,7 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder add index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.getDefaultInstance()); } /** - * repeated .ActivityInfo activity_info_list = 1; + * repeated .ActivityInfo activity_info_list = 7; */ public java.util.List getActivityInfoListBuilderList() { @@ -1112,7 +1072,7 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder add activityInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder>( activityInfoList_, - ((bitField0_ & 0x00000002) != 0), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); activityInfoList_ = null; @@ -1120,6 +1080,85 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder add return activityInfoListBuilder_; } + private com.google.protobuf.Internal.IntList activatedSaleIdList_ = emptyIntList(); + private void ensureActivatedSaleIdListIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + activatedSaleIdList_ = mutableCopy(activatedSaleIdList_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @return A list containing the activatedSaleIdList. + */ + public java.util.List + getActivatedSaleIdListList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(activatedSaleIdList_) : activatedSaleIdList_; + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @return The count of activatedSaleIdList. + */ + public int getActivatedSaleIdListCount() { + return activatedSaleIdList_.size(); + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @param index The index of the element to return. + * @return The activatedSaleIdList at the given index. + */ + public int getActivatedSaleIdList(int index) { + return activatedSaleIdList_.getInt(index); + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @param index The index to set the value at. + * @param value The activatedSaleIdList to set. + * @return This builder for chaining. + */ + public Builder setActivatedSaleIdList( + int index, int value) { + ensureActivatedSaleIdListIsMutable(); + activatedSaleIdList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @param value The activatedSaleIdList to add. + * @return This builder for chaining. + */ + public Builder addActivatedSaleIdList(int value) { + ensureActivatedSaleIdListIsMutable(); + activatedSaleIdList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @param values The activatedSaleIdList to add. + * @return This builder for chaining. + */ + public Builder addAllActivatedSaleIdList( + java.lang.Iterable values) { + ensureActivatedSaleIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, activatedSaleIdList_); + onChanged(); + return this; + } + /** + * repeated uint32 activated_sale_id_list = 8; + * @return This builder for chaining. + */ + public Builder clearActivatedSaleIdList() { + activatedSaleIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + private java.util.List disableTransferPointInteractionList_ = java.util.Collections.emptyList(); private void ensureDisableTransferPointInteractionListIsMutable() { @@ -1133,7 +1172,7 @@ private void ensureDisableTransferPointInteractionListIsMutable() { emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> disableTransferPointInteractionListBuilder_; /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public java.util.List getDisableTransferPointInteractionListList() { if (disableTransferPointInteractionListBuilder_ == null) { @@ -1143,7 +1182,7 @@ public java.util.List } } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public int getDisableTransferPointInteractionListCount() { if (disableTransferPointInteractionListBuilder_ == null) { @@ -1153,7 +1192,7 @@ public int getDisableTransferPointInteractionListCount() { } } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index) { if (disableTransferPointInteractionListBuilder_ == null) { @@ -1163,7 +1202,7 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTrans } } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder setDisableTransferPointInteractionList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) { @@ -1180,7 +1219,7 @@ public Builder setDisableTransferPointInteractionList( return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder setDisableTransferPointInteractionList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) { @@ -1194,7 +1233,7 @@ public Builder setDisableTransferPointInteractionList( return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder addDisableTransferPointInteractionList(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) { if (disableTransferPointInteractionListBuilder_ == null) { @@ -1210,7 +1249,7 @@ public Builder addDisableTransferPointInteractionList(emu.grasscutter.net.proto. return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder addDisableTransferPointInteractionList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) { @@ -1227,7 +1266,7 @@ public Builder addDisableTransferPointInteractionList( return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder addDisableTransferPointInteractionList( emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) { @@ -1241,7 +1280,7 @@ public Builder addDisableTransferPointInteractionList( return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder addDisableTransferPointInteractionList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) { @@ -1255,7 +1294,7 @@ public Builder addDisableTransferPointInteractionList( return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder addAllDisableTransferPointInteractionList( java.lang.Iterable values) { @@ -1270,7 +1309,7 @@ public Builder addAllDisableTransferPointInteractionList( return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder clearDisableTransferPointInteractionList() { if (disableTransferPointInteractionListBuilder_ == null) { @@ -1283,7 +1322,7 @@ public Builder clearDisableTransferPointInteractionList() { return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public Builder removeDisableTransferPointInteractionList(int index) { if (disableTransferPointInteractionListBuilder_ == null) { @@ -1296,14 +1335,14 @@ public Builder removeDisableTransferPointInteractionList(int index) { return this; } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder getDisableTransferPointInteractionListBuilder( int index) { return getDisableTransferPointInteractionListFieldBuilder().getBuilder(index); } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder( int index) { @@ -1313,7 +1352,7 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDis } } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public java.util.List getDisableTransferPointInteractionListOrBuilderList() { @@ -1324,14 +1363,14 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDis } } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisableTransferPointInteractionListBuilder() { return getDisableTransferPointInteractionListFieldBuilder().addBuilder( emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance()); } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisableTransferPointInteractionListBuilder( int index) { @@ -1339,7 +1378,7 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisa index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance()); } /** - * repeated .Uint32Pair disable_transfer_point_interaction_list = 15; + * repeated .Uint32Pair disable_transfer_point_interaction_list = 11; */ public java.util.List getDisableTransferPointInteractionListBuilderList() { @@ -1359,37 +1398,6 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisa } return disableTransferPointInteractionListBuilder_; } - - private int retcode_ ; - /** - * int32 retcode = 7; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 7; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 7; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1459,11 +1467,11 @@ public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp java.lang.String[] descriptorData = { "\n\030GetActivityInfoRsp.proto\032\022ActivityInfo" + ".proto\032\020Uint32Pair.proto\"\256\001\n\022GetActivity" + - "InfoRsp\022\036\n\026activated_sale_id_list\030\016 \003(\r\022" + - ")\n\022activity_info_list\030\001 \003(\0132\r.ActivityIn" + - "fo\022<\n\'disable_transfer_point_interaction" + - "_list\030\017 \003(\0132\013.Uint32Pair\022\017\n\007retcode\030\007 \001(" + - "\005B\033\n\031emu.grasscutter.net.protob\006proto3" + "InfoRsp\022\017\n\007retcode\030\002 \001(\005\022)\n\022activity_inf" + + "o_list\030\007 \003(\0132\r.ActivityInfo\022\036\n\026activated" + + "_sale_id_list\030\010 \003(\r\022<\n\'disable_transfer_" + + "point_interaction_list\030\013 \003(\0132\013.Uint32Pai" + + "rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1476,7 +1484,7 @@ public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp internal_static_GetActivityInfoRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GetActivityInfoRsp_descriptor, - new java.lang.String[] { "ActivatedSaleIdList", "ActivityInfoList", "DisableTransferPointInteractionList", "Retcode", }); + new java.lang.String[] { "Retcode", "ActivityInfoList", "ActivatedSaleIdList", "DisableTransferPointInteractionList", }); emu.grasscutter.net.proto.ActivityInfoOuterClass.getDescriptor(); emu.grasscutter.net.proto.Uint32PairOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java index 5bf43a4a625..12121bfae6b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java @@ -19,12 +19,16 @@ public interface PersonalSceneJumpReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 point_id = 9; + * uint32 point_id = 11; * @return The pointId. */ int getPointId(); } /** + * 
+   * CmdId: 21464
+   *
+ * * Protobuf type {@code PersonalSceneJumpReq} */ public static final class PersonalSceneJumpReq extends @@ -69,7 +73,7 @@ private PersonalSceneJumpReq( case 0: done = true; break; - case 72: { + case 88: { pointId_ = input.readUInt32(); break; @@ -106,10 +110,10 @@ private PersonalSceneJumpReq( emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq.class, emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq.Builder.class); } - public static final int POINT_ID_FIELD_NUMBER = 9; + public static final int POINT_ID_FIELD_NUMBER = 11; private int pointId_; /** - * uint32 point_id = 9; + * uint32 point_id = 11; * @return The pointId. */ @java.lang.Override @@ -132,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (pointId_ != 0) { - output.writeUInt32(9, pointId_); + output.writeUInt32(11, pointId_); } unknownFields.writeTo(output); } @@ -145,7 +149,7 @@ public int getSerializedSize() { size = 0; if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, pointId_); + .computeUInt32Size(11, pointId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -273,6 +277,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 21464
+     *
+ * * Protobuf type {@code PersonalSceneJumpReq} */ public static final class Builder extends @@ -421,7 +429,7 @@ public Builder mergeFrom( private int pointId_ ; /** - * uint32 point_id = 9; + * uint32 point_id = 11; * @return The pointId. */ @java.lang.Override @@ -429,7 +437,7 @@ public int getPointId() { return pointId_; } /** - * uint32 point_id = 9; + * uint32 point_id = 11; * @param value The pointId to set. * @return This builder for chaining. */ @@ -440,7 +448,7 @@ public Builder setPointId(int value) { return this; } /** - * uint32 point_id = 9; + * uint32 point_id = 11; * @return This builder for chaining. */ public Builder clearPointId() { @@ -517,7 +525,7 @@ public emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJum static { java.lang.String[] descriptorData = { "\n\032PersonalSceneJumpReq.proto\"(\n\024Personal" + - "SceneJumpReq\022\020\n\010point_id\030\t \001(\rB\033\n\031emu.gr" + + "SceneJumpReq\022\020\n\010point_id\030\013 \001(\rB\033\n\031emu.gr" + "asscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 494d67bc0c4..6e2009844c8 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -187,6 +187,10 @@ public final class PacketOpcodes { public static final int GachaWishRsp = 26208; public static final int DungeonEntryInfoReq = 730; public static final int DungeonEntryInfoRsp = 27078; + public static final int GetActivityInfoRsp = 27972; + public static final int PersonalSceneJumpReq = 21464; + public static final int DestroyMaterialReq = 29395; + public static final int DestroyMaterialRsp = 24989; // 4.7.0 Obfuscated @@ -195,10 +199,7 @@ public final class PacketOpcodes { public static final int SceneTransToPointRsp = 1; public static final int WindSeedClientNotify = 1; public static final int SceneEntityUpdateNotify = 1; - public static final int DestroyMaterialReq = 1; - public static final int DestroyMaterialRsp = 1; public static final int EvtCreateGadgetNotify = 1; - public static final int GetActivityInfoRsp = 1; public static final int GetFriendShowNameCardInfoRsp = 1; public static final int EvtAiSyncSkillCdNotify = 1; public static final int EvtDestroyGadgetNotify = 1; @@ -214,7 +215,6 @@ public final class PacketOpcodes { public static final int WeaponPromoteRsp = 1; public static final int WeaponAwakenReq = 1; public static final int WeaponAwakenRsp = 1; - public static final int PersonalSceneJumpReq = 1; public static final int GetWidgetQuickSlotListReq = 1; public static final int CardProductRewardNotify = 1; public static final int TakePlayerLevelRewardReq = 1;