From 968e019460933bc78b8f0e1023b834f4040812e4 Mon Sep 17 00:00:00 2001 From: WatchAndyTW Date: Wed, 28 Aug 2024 17:42:56 +0800 Subject: [PATCH] Fix some upgrade and unlock protos --- .../AvatarSkillUpgradeReqOuterClass.java | 146 +- .../AvatarSkillUpgradeRspOuterClass.java | 234 ++- .../AvatarUnlockTalentNotifyOuterClass.java | 234 ++- .../net/proto/AvatarUpgradeReqOuterClass.java | 158 +- ...WeaponUpgradeReturnItemsReqOuterClass.java | 268 ++- ...WeaponUpgradeReturnItemsRspOuterClass.java | 234 ++- .../GetQuestLackingResourceRspOuterClass.java | 370 ++-- .../proto/HomeAvatarTalkReqOuterClass.java | 24 +- .../proto/LackingResourceInfoOuterClass.java | 1680 ++++++++--------- .../net/proto/QueryFilterOuterClass.java | 146 +- .../net/proto/QueryPathReqOuterClass.java | 1324 ++++++------- .../net/proto/QueryPathRspOuterClass.java | 536 +++--- .../proto/SetEquipLockStateReqOuterClass.java | 120 +- .../proto/SetEquipLockStateRspOuterClass.java | 182 +- .../proto/UnlockTransPointReqOuterClass.java | 128 +- .../proto/UnlockTransPointRspOuterClass.java | 10 - .../net/proto/WeaponAwakenReqOuterClass.java | 590 +++--- .../net/proto/WeaponAwakenRspOuterClass.java | 666 +++---- .../net/proto/WeaponPromoteReqOuterClass.java | 28 +- .../net/proto/WeaponPromoteRspOuterClass.java | 186 +- .../net/proto/WeaponUpgradeReqOuterClass.java | 160 +- .../net/proto/WeaponUpgradeRspOuterClass.java | 428 ++--- .../grasscutter/net/packet/PacketOpcodes.java | 61 +- .../net/packet/PacketOpcodesUtils.java | 4 +- 24 files changed, 3887 insertions(+), 4030 deletions(-) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java index 3f47b6b5559..aadda350162 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java @@ -19,27 +19,26 @@ public interface AvatarSkillUpgradeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 avatar_skill_id = 13; - * @return The avatarSkillId. + * uint32 old_level = 10; + * @return The oldLevel. */ - int getAvatarSkillId(); + int getOldLevel(); /** - * uint32 old_level = 9; - * @return The oldLevel. + * uint32 avatar_skill_id = 12; + * @return The avatarSkillId. */ - int getOldLevel(); + int getAvatarSkillId(); /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 6; * @return The avatarGuid. */ long getAvatarGuid(); } /** * 
-   * CmdId: 29541
-   * Obf: JLJFPGIINAB
+   * CmdId: 25062
    *
* * Protobuf type {@code AvatarSkillUpgradeReq} @@ -86,17 +85,17 @@ private AvatarSkillUpgradeReq( case 0: done = true; break; - case 24: { + case 48: { avatarGuid_ = input.readUInt64(); break; } - case 72: { + case 80: { oldLevel_ = input.readUInt32(); break; } - case 104: { + case 96: { avatarSkillId_ = input.readUInt32(); break; @@ -133,32 +132,32 @@ private AvatarSkillUpgradeReq( emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.class, emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.Builder.class); } - public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 13; - private int avatarSkillId_; + public static final int OLD_LEVEL_FIELD_NUMBER = 10; + private int oldLevel_; /** - * uint32 avatar_skill_id = 13; - * @return The avatarSkillId. + * uint32 old_level = 10; + * @return The oldLevel. */ @java.lang.Override - public int getAvatarSkillId() { - return avatarSkillId_; + public int getOldLevel() { + return oldLevel_; } - public static final int OLD_LEVEL_FIELD_NUMBER = 9; - private int oldLevel_; + public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 12; + private int avatarSkillId_; /** - * uint32 old_level = 9; - * @return The oldLevel. + * uint32 avatar_skill_id = 12; + * @return The avatarSkillId. */ @java.lang.Override - public int getOldLevel() { - return oldLevel_; + public int getAvatarSkillId() { + return avatarSkillId_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 3; + public static final int AVATAR_GUID_FIELD_NUMBER = 6; private long avatarGuid_; /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 6; * @return The avatarGuid. */ @java.lang.Override @@ -181,13 +180,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (avatarGuid_ != 0L) { - output.writeUInt64(3, avatarGuid_); + output.writeUInt64(6, avatarGuid_); } if (oldLevel_ != 0) { - output.writeUInt32(9, oldLevel_); + output.writeUInt32(10, oldLevel_); } if (avatarSkillId_ != 0) { - output.writeUInt32(13, avatarSkillId_); + output.writeUInt32(12, avatarSkillId_); } unknownFields.writeTo(output); } @@ -200,15 +199,15 @@ public int getSerializedSize() { size = 0; if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(3, avatarGuid_); + .computeUInt64Size(6, avatarGuid_); } if (oldLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, oldLevel_); + .computeUInt32Size(10, oldLevel_); } if (avatarSkillId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, avatarSkillId_); + .computeUInt32Size(12, avatarSkillId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,10 +224,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other = (emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq) obj; - if (getAvatarSkillId() - != other.getAvatarSkillId()) return false; if (getOldLevel() != other.getOldLevel()) return false; + if (getAvatarSkillId() + != other.getAvatarSkillId()) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -242,10 +241,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarSkillId(); hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; hash = (53 * hash) + getOldLevel(); + hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarSkillId(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); @@ -346,8 +345,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29541
-     * Obf: JLJFPGIINAB
+     * CmdId: 25062
      *
* * Protobuf type {@code AvatarSkillUpgradeReq} @@ -387,10 +385,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - avatarSkillId_ = 0; - oldLevel_ = 0; + avatarSkillId_ = 0; + avatarGuid_ = 0L; return this; @@ -419,8 +417,8 @@ public emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgr @java.lang.Override public emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq buildPartial() { emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq result = new emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq(this); - result.avatarSkillId_ = avatarSkillId_; result.oldLevel_ = oldLevel_; + result.avatarSkillId_ = avatarSkillId_; result.avatarGuid_ = avatarGuid_; onBuilt(); return result; @@ -470,12 +468,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other) { if (other == emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.getDefaultInstance()) return this; - if (other.getAvatarSkillId() != 0) { - setAvatarSkillId(other.getAvatarSkillId()); - } if (other.getOldLevel() != 0) { setOldLevel(other.getOldLevel()); } + if (other.getAvatarSkillId() != 0) { + setAvatarSkillId(other.getAvatarSkillId()); + } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } @@ -508,71 +506,71 @@ public Builder mergeFrom( return this; } - private int avatarSkillId_ ; + private int oldLevel_ ; /** - * uint32 avatar_skill_id = 13; - * @return The avatarSkillId. + * uint32 old_level = 10; + * @return The oldLevel. */ @java.lang.Override - public int getAvatarSkillId() { - return avatarSkillId_; + public int getOldLevel() { + return oldLevel_; } /** - * uint32 avatar_skill_id = 13; - * @param value The avatarSkillId to set. + * uint32 old_level = 10; + * @param value The oldLevel to set. * @return This builder for chaining. */ - public Builder setAvatarSkillId(int value) { + public Builder setOldLevel(int value) { - avatarSkillId_ = value; + oldLevel_ = value; onChanged(); return this; } /** - * uint32 avatar_skill_id = 13; + * uint32 old_level = 10; * @return This builder for chaining. */ - public Builder clearAvatarSkillId() { + public Builder clearOldLevel() { - avatarSkillId_ = 0; + oldLevel_ = 0; onChanged(); return this; } - private int oldLevel_ ; + private int avatarSkillId_ ; /** - * uint32 old_level = 9; - * @return The oldLevel. + * uint32 avatar_skill_id = 12; + * @return The avatarSkillId. */ @java.lang.Override - public int getOldLevel() { - return oldLevel_; + public int getAvatarSkillId() { + return avatarSkillId_; } /** - * uint32 old_level = 9; - * @param value The oldLevel to set. + * uint32 avatar_skill_id = 12; + * @param value The avatarSkillId to set. * @return This builder for chaining. */ - public Builder setOldLevel(int value) { + public Builder setAvatarSkillId(int value) { - oldLevel_ = value; + avatarSkillId_ = value; onChanged(); return this; } /** - * uint32 old_level = 9; + * uint32 avatar_skill_id = 12; * @return This builder for chaining. */ - public Builder clearOldLevel() { + public Builder clearAvatarSkillId() { - oldLevel_ = 0; + avatarSkillId_ = 0; onChanged(); return this; } private long avatarGuid_ ; /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 6; * @return The avatarGuid. */ @java.lang.Override @@ -580,7 +578,7 @@ public long getAvatarGuid() { return avatarGuid_; } /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 6; * @param value The avatarGuid to set. * @return This builder for chaining. */ @@ -591,7 +589,7 @@ public Builder setAvatarGuid(long value) { return this; } /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 6; * @return This builder for chaining. */ public Builder clearAvatarGuid() { @@ -668,8 +666,8 @@ public emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgr static { java.lang.String[] descriptorData = { "\n\033AvatarSkillUpgradeReq.proto\"X\n\025AvatarS" + - "killUpgradeReq\022\027\n\017avatar_skill_id\030\r \001(\r\022" + - "\021\n\told_level\030\t \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B" + + "killUpgradeReq\022\021\n\told_level\030\n \001(\r\022\027\n\017ava" + + "tar_skill_id\030\014 \001(\r\022\023\n\013avatar_guid\030\006 \001(\004B" + "\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +679,7 @@ public emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgr internal_static_AvatarSkillUpgradeReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarSkillUpgradeReq_descriptor, - new java.lang.String[] { "AvatarSkillId", "OldLevel", "AvatarGuid", }); + new java.lang.String[] { "OldLevel", "AvatarSkillId", "AvatarGuid", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java index e5831f46400..df26eb095ab 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java @@ -19,39 +19,38 @@ public interface AvatarSkillUpgradeRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 cur_level = 2; - * @return The curLevel. - */ - int getCurLevel(); - - /** - * uint32 old_level = 9; + * uint32 old_level = 2; * @return The oldLevel. */ int getOldLevel(); /** - * int32 retcode = 4; + * int32 retcode = 3; * @return The retcode. */ int getRetcode(); /** - * uint32 avatar_skill_id = 1; + * uint32 cur_level = 6; + * @return The curLevel. + */ + int getCurLevel(); + + /** + * uint32 avatar_skill_id = 9; * @return The avatarSkillId. */ int getAvatarSkillId(); /** - * uint64 avatar_guid = 7; + * uint64 avatar_guid = 11; * @return The avatarGuid. */ long getAvatarGuid(); } /** * 
-   * CmdId: 22584
-   * Obf: JDINKHGKCON
+   * CmdId: 7799
    *
* * Protobuf type {@code AvatarSkillUpgradeRsp} @@ -98,29 +97,29 @@ private AvatarSkillUpgradeRsp( case 0: done = true; break; - case 8: { - - avatarSkillId_ = input.readUInt32(); - break; - } case 16: { - curLevel_ = input.readUInt32(); + oldLevel_ = input.readUInt32(); break; } - case 32: { + case 24: { retcode_ = input.readInt32(); break; } - case 56: { + case 48: { - avatarGuid_ = input.readUInt64(); + curLevel_ = input.readUInt32(); break; } case 72: { - oldLevel_ = input.readUInt32(); + avatarSkillId_ = input.readUInt32(); + break; + } + case 88: { + + avatarGuid_ = input.readUInt64(); break; } default: { @@ -155,21 +154,10 @@ private AvatarSkillUpgradeRsp( emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.class, emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.Builder.class); } - public static final int CUR_LEVEL_FIELD_NUMBER = 2; - private int curLevel_; - /** - * uint32 cur_level = 2; - * @return The curLevel. - */ - @java.lang.Override - public int getCurLevel() { - return curLevel_; - } - - public static final int OLD_LEVEL_FIELD_NUMBER = 9; + public static final int OLD_LEVEL_FIELD_NUMBER = 2; private int oldLevel_; /** - * uint32 old_level = 9; + * uint32 old_level = 2; * @return The oldLevel. */ @java.lang.Override @@ -177,10 +165,10 @@ public int getOldLevel() { return oldLevel_; } - public static final int RETCODE_FIELD_NUMBER = 4; + public static final int RETCODE_FIELD_NUMBER = 3; private int retcode_; /** - * int32 retcode = 4; + * int32 retcode = 3; * @return The retcode. */ @java.lang.Override @@ -188,10 +176,21 @@ public int getRetcode() { return retcode_; } - public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 1; + public static final int CUR_LEVEL_FIELD_NUMBER = 6; + private int curLevel_; + /** + * uint32 cur_level = 6; + * @return The curLevel. + */ + @java.lang.Override + public int getCurLevel() { + return curLevel_; + } + + public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 9; private int avatarSkillId_; /** - * uint32 avatar_skill_id = 1; + * uint32 avatar_skill_id = 9; * @return The avatarSkillId. */ @java.lang.Override @@ -199,10 +198,10 @@ public int getAvatarSkillId() { return avatarSkillId_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 7; + public static final int AVATAR_GUID_FIELD_NUMBER = 11; private long avatarGuid_; /** - * uint64 avatar_guid = 7; + * uint64 avatar_guid = 11; * @return The avatarGuid. */ @java.lang.Override @@ -224,20 +223,20 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (avatarSkillId_ != 0) { - output.writeUInt32(1, avatarSkillId_); + if (oldLevel_ != 0) { + output.writeUInt32(2, oldLevel_); + } + if (retcode_ != 0) { + output.writeInt32(3, retcode_); } if (curLevel_ != 0) { - output.writeUInt32(2, curLevel_); + output.writeUInt32(6, curLevel_); } - if (retcode_ != 0) { - output.writeInt32(4, retcode_); + if (avatarSkillId_ != 0) { + output.writeUInt32(9, avatarSkillId_); } if (avatarGuid_ != 0L) { - output.writeUInt64(7, avatarGuid_); - } - if (oldLevel_ != 0) { - output.writeUInt32(9, oldLevel_); + output.writeUInt64(11, avatarGuid_); } unknownFields.writeTo(output); } @@ -248,25 +247,25 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (avatarSkillId_ != 0) { + if (oldLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, avatarSkillId_); + .computeUInt32Size(2, oldLevel_); } - if (curLevel_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, curLevel_); + .computeInt32Size(3, retcode_); } - if (retcode_ != 0) { + if (curLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, retcode_); + .computeUInt32Size(6, curLevel_); } - if (avatarGuid_ != 0L) { + if (avatarSkillId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(7, avatarGuid_); + .computeUInt32Size(9, avatarSkillId_); } - if (oldLevel_ != 0) { + if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, oldLevel_); + .computeUInt64Size(11, avatarGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -283,12 +282,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp other = (emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp) obj; - if (getCurLevel() - != other.getCurLevel()) return false; if (getOldLevel() != other.getOldLevel()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getCurLevel() + != other.getCurLevel()) return false; if (getAvatarSkillId() != other.getAvatarSkillId()) return false; if (getAvatarGuid() @@ -304,12 +303,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getCurLevel(); hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; hash = (53 * hash) + getOldLevel(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getCurLevel(); hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER; hash = (53 * hash) + getAvatarSkillId(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; @@ -412,8 +411,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 22584
-     * Obf: JDINKHGKCON
+     * CmdId: 7799
      *
* * Protobuf type {@code AvatarSkillUpgradeRsp} @@ -453,12 +451,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - curLevel_ = 0; - oldLevel_ = 0; retcode_ = 0; + curLevel_ = 0; + avatarSkillId_ = 0; avatarGuid_ = 0L; @@ -489,9 +487,9 @@ public emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgr @java.lang.Override public emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp buildPartial() { emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp result = new emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp(this); - result.curLevel_ = curLevel_; result.oldLevel_ = oldLevel_; result.retcode_ = retcode_; + result.curLevel_ = curLevel_; result.avatarSkillId_ = avatarSkillId_; result.avatarGuid_ = avatarGuid_; onBuilt(); @@ -542,15 +540,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp other) { if (other == emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.getDefaultInstance()) return this; - if (other.getCurLevel() != 0) { - setCurLevel(other.getCurLevel()); - } if (other.getOldLevel() != 0) { setOldLevel(other.getOldLevel()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } + if (other.getCurLevel() != 0) { + setCurLevel(other.getCurLevel()); + } if (other.getAvatarSkillId() != 0) { setAvatarSkillId(other.getAvatarSkillId()); } @@ -586,102 +584,102 @@ public Builder mergeFrom( return this; } - private int curLevel_ ; + private int oldLevel_ ; /** - * uint32 cur_level = 2; - * @return The curLevel. + * uint32 old_level = 2; + * @return The oldLevel. */ @java.lang.Override - public int getCurLevel() { - return curLevel_; + public int getOldLevel() { + return oldLevel_; } /** - * uint32 cur_level = 2; - * @param value The curLevel to set. + * uint32 old_level = 2; + * @param value The oldLevel to set. * @return This builder for chaining. */ - public Builder setCurLevel(int value) { + public Builder setOldLevel(int value) { - curLevel_ = value; + oldLevel_ = value; onChanged(); return this; } /** - * uint32 cur_level = 2; + * uint32 old_level = 2; * @return This builder for chaining. */ - public Builder clearCurLevel() { + public Builder clearOldLevel() { - curLevel_ = 0; + oldLevel_ = 0; onChanged(); return this; } - private int oldLevel_ ; + private int retcode_ ; /** - * uint32 old_level = 9; - * @return The oldLevel. + * int32 retcode = 3; + * @return The retcode. */ @java.lang.Override - public int getOldLevel() { - return oldLevel_; + public int getRetcode() { + return retcode_; } /** - * uint32 old_level = 9; - * @param value The oldLevel to set. + * int32 retcode = 3; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setOldLevel(int value) { + public Builder setRetcode(int value) { - oldLevel_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 old_level = 9; + * int32 retcode = 3; * @return This builder for chaining. */ - public Builder clearOldLevel() { + public Builder clearRetcode() { - oldLevel_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int curLevel_ ; /** - * int32 retcode = 4; - * @return The retcode. + * uint32 cur_level = 6; + * @return The curLevel. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getCurLevel() { + return curLevel_; } /** - * int32 retcode = 4; - * @param value The retcode to set. + * uint32 cur_level = 6; + * @param value The curLevel to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setCurLevel(int value) { - retcode_ = value; + curLevel_ = value; onChanged(); return this; } /** - * int32 retcode = 4; + * uint32 cur_level = 6; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearCurLevel() { - retcode_ = 0; + curLevel_ = 0; onChanged(); return this; } private int avatarSkillId_ ; /** - * uint32 avatar_skill_id = 1; + * uint32 avatar_skill_id = 9; * @return The avatarSkillId. */ @java.lang.Override @@ -689,7 +687,7 @@ public int getAvatarSkillId() { return avatarSkillId_; } /** - * uint32 avatar_skill_id = 1; + * uint32 avatar_skill_id = 9; * @param value The avatarSkillId to set. * @return This builder for chaining. */ @@ -700,7 +698,7 @@ public Builder setAvatarSkillId(int value) { return this; } /** - * uint32 avatar_skill_id = 1; + * uint32 avatar_skill_id = 9; * @return This builder for chaining. */ public Builder clearAvatarSkillId() { @@ -712,7 +710,7 @@ public Builder clearAvatarSkillId() { private long avatarGuid_ ; /** - * uint64 avatar_guid = 7; + * uint64 avatar_guid = 11; * @return The avatarGuid. */ @java.lang.Override @@ -720,7 +718,7 @@ public long getAvatarGuid() { return avatarGuid_; } /** - * uint64 avatar_guid = 7; + * uint64 avatar_guid = 11; * @param value The avatarGuid to set. * @return This builder for chaining. */ @@ -731,7 +729,7 @@ public Builder setAvatarGuid(long value) { return this; } /** - * uint64 avatar_guid = 7; + * uint64 avatar_guid = 11; * @return This builder for chaining. */ public Builder clearAvatarGuid() { @@ -808,9 +806,9 @@ public emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgr static { java.lang.String[] descriptorData = { "\n\033AvatarSkillUpgradeRsp.proto\"|\n\025AvatarS" + - "killUpgradeRsp\022\021\n\tcur_level\030\002 \001(\r\022\021\n\told" + - "_level\030\t \001(\r\022\017\n\007retcode\030\004 \001(\005\022\027\n\017avatar_" + - "skill_id\030\001 \001(\r\022\023\n\013avatar_guid\030\007 \001(\004B\033\n\031e" + + "killUpgradeRsp\022\021\n\told_level\030\002 \001(\r\022\017\n\007ret" + + "code\030\003 \001(\005\022\021\n\tcur_level\030\006 \001(\r\022\027\n\017avatar_" + + "skill_id\030\t \001(\r\022\023\n\013avatar_guid\030\013 \001(\004B\033\n\031e" + "mu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -822,7 +820,7 @@ public emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgr internal_static_AvatarSkillUpgradeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarSkillUpgradeRsp_descriptor, - new java.lang.String[] { "CurLevel", "OldLevel", "Retcode", "AvatarSkillId", "AvatarGuid", }); + new java.lang.String[] { "OldLevel", "Retcode", "CurLevel", "AvatarSkillId", "AvatarGuid", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java index 2e665ab92a8..01736f40fb4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java @@ -19,33 +19,32 @@ public interface AvatarUnlockTalentNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 talent_id = 3; - * @return The talentId. + * uint32 skill_depot_id = 1; + * @return The skillDepotId. */ - int getTalentId(); + int getSkillDepotId(); /** - * uint64 avatar_guid = 9; + * uint64 avatar_guid = 8; * @return The avatarGuid. */ long getAvatarGuid(); /** - * uint32 skill_depot_id = 8; - * @return The skillDepotId. + * uint32 entity_id = 10; + * @return The entityId. */ - int getSkillDepotId(); + int getEntityId(); /** - * uint32 entity_id = 1; - * @return The entityId. + * uint32 talent_id = 14; + * @return The talentId. */ - int getEntityId(); + int getTalentId(); } /** * 
-   * CmdId: 1805
-   * Obf: KNLJFLHONOK
+   * CmdId: 28793
    *
* * Protobuf type {@code AvatarUnlockTalentNotify} @@ -94,22 +93,22 @@ private AvatarUnlockTalentNotify( break; case 8: { - entityId_ = input.readUInt32(); + skillDepotId_ = input.readUInt32(); break; } - case 24: { + case 64: { - talentId_ = input.readUInt32(); + avatarGuid_ = input.readUInt64(); break; } - case 64: { + case 80: { - skillDepotId_ = input.readUInt32(); + entityId_ = input.readUInt32(); break; } - case 72: { + case 112: { - avatarGuid_ = input.readUInt64(); + talentId_ = input.readUInt32(); break; } default: { @@ -144,21 +143,21 @@ private AvatarUnlockTalentNotify( emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.class, emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.Builder.class); } - public static final int TALENT_ID_FIELD_NUMBER = 3; - private int talentId_; + public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 1; + private int skillDepotId_; /** - * uint32 talent_id = 3; - * @return The talentId. + * uint32 skill_depot_id = 1; + * @return The skillDepotId. */ @java.lang.Override - public int getTalentId() { - return talentId_; + public int getSkillDepotId() { + return skillDepotId_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 9; + public static final int AVATAR_GUID_FIELD_NUMBER = 8; private long avatarGuid_; /** - * uint64 avatar_guid = 9; + * uint64 avatar_guid = 8; * @return The avatarGuid. */ @java.lang.Override @@ -166,26 +165,26 @@ public long getAvatarGuid() { return avatarGuid_; } - public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 8; - private int skillDepotId_; + public static final int ENTITY_ID_FIELD_NUMBER = 10; + private int entityId_; /** - * uint32 skill_depot_id = 8; - * @return The skillDepotId. + * uint32 entity_id = 10; + * @return The entityId. */ @java.lang.Override - public int getSkillDepotId() { - return skillDepotId_; + public int getEntityId() { + return entityId_; } - public static final int ENTITY_ID_FIELD_NUMBER = 1; - private int entityId_; + public static final int TALENT_ID_FIELD_NUMBER = 14; + private int talentId_; /** - * uint32 entity_id = 1; - * @return The entityId. + * uint32 talent_id = 14; + * @return The talentId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getTalentId() { + return talentId_; } private byte memoizedIsInitialized = -1; @@ -202,17 +201,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (entityId_ != 0) { - output.writeUInt32(1, entityId_); - } - if (talentId_ != 0) { - output.writeUInt32(3, talentId_); - } if (skillDepotId_ != 0) { - output.writeUInt32(8, skillDepotId_); + output.writeUInt32(1, skillDepotId_); } if (avatarGuid_ != 0L) { - output.writeUInt64(9, avatarGuid_); + output.writeUInt64(8, avatarGuid_); + } + if (entityId_ != 0) { + output.writeUInt32(10, entityId_); + } + if (talentId_ != 0) { + output.writeUInt32(14, talentId_); } unknownFields.writeTo(output); } @@ -223,21 +222,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (entityId_ != 0) { + if (skillDepotId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, entityId_); + .computeUInt32Size(1, skillDepotId_); } - if (talentId_ != 0) { + if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, talentId_); + .computeUInt64Size(8, avatarGuid_); } - if (skillDepotId_ != 0) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, skillDepotId_); + .computeUInt32Size(10, entityId_); } - if (avatarGuid_ != 0L) { + if (talentId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(9, avatarGuid_); + .computeUInt32Size(14, talentId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -254,14 +253,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify other = (emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify) obj; - if (getTalentId() - != other.getTalentId()) return false; - if (getAvatarGuid() - != other.getAvatarGuid()) return false; if (getSkillDepotId() != other.getSkillDepotId()) return false; + if (getAvatarGuid() + != other.getAvatarGuid()) return false; if (getEntityId() != other.getEntityId()) return false; + if (getTalentId() + != other.getTalentId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -273,15 +272,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + TALENT_ID_FIELD_NUMBER; - hash = (53 * hash) + getTalentId(); + hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER; + hash = (53 * hash) + getSkillDepotId(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); - hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER; - hash = (53 * hash) + getSkillDepotId(); hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; hash = (53 * hash) + getEntityId(); + hash = (37 * hash) + TALENT_ID_FIELD_NUMBER; + hash = (53 * hash) + getTalentId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -379,8 +378,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1805
-     * Obf: KNLJFLHONOK
+     * CmdId: 28793
      *
* * Protobuf type {@code AvatarUnlockTalentNotify} @@ -420,14 +418,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - talentId_ = 0; + skillDepotId_ = 0; avatarGuid_ = 0L; - skillDepotId_ = 0; - entityId_ = 0; + talentId_ = 0; + return this; } @@ -454,10 +452,10 @@ public emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlock @java.lang.Override public emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify buildPartial() { emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify result = new emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify(this); - result.talentId_ = talentId_; - result.avatarGuid_ = avatarGuid_; result.skillDepotId_ = skillDepotId_; + result.avatarGuid_ = avatarGuid_; result.entityId_ = entityId_; + result.talentId_ = talentId_; onBuilt(); return result; } @@ -506,18 +504,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify other) { if (other == emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.getDefaultInstance()) return this; - if (other.getTalentId() != 0) { - setTalentId(other.getTalentId()); + if (other.getSkillDepotId() != 0) { + setSkillDepotId(other.getSkillDepotId()); } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } - if (other.getSkillDepotId() != 0) { - setSkillDepotId(other.getSkillDepotId()); - } if (other.getEntityId() != 0) { setEntityId(other.getEntityId()); } + if (other.getTalentId() != 0) { + setTalentId(other.getTalentId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -547,40 +545,40 @@ public Builder mergeFrom( return this; } - private int talentId_ ; + private int skillDepotId_ ; /** - * uint32 talent_id = 3; - * @return The talentId. + * uint32 skill_depot_id = 1; + * @return The skillDepotId. */ @java.lang.Override - public int getTalentId() { - return talentId_; + public int getSkillDepotId() { + return skillDepotId_; } /** - * uint32 talent_id = 3; - * @param value The talentId to set. + * uint32 skill_depot_id = 1; + * @param value The skillDepotId to set. * @return This builder for chaining. */ - public Builder setTalentId(int value) { + public Builder setSkillDepotId(int value) { - talentId_ = value; + skillDepotId_ = value; onChanged(); return this; } /** - * uint32 talent_id = 3; + * uint32 skill_depot_id = 1; * @return This builder for chaining. */ - public Builder clearTalentId() { + public Builder clearSkillDepotId() { - talentId_ = 0; + skillDepotId_ = 0; onChanged(); return this; } private long avatarGuid_ ; /** - * uint64 avatar_guid = 9; + * uint64 avatar_guid = 8; * @return The avatarGuid. */ @java.lang.Override @@ -588,7 +586,7 @@ public long getAvatarGuid() { return avatarGuid_; } /** - * uint64 avatar_guid = 9; + * uint64 avatar_guid = 8; * @param value The avatarGuid to set. * @return This builder for chaining. */ @@ -599,7 +597,7 @@ public Builder setAvatarGuid(long value) { return this; } /** - * uint64 avatar_guid = 9; + * uint64 avatar_guid = 8; * @return This builder for chaining. */ public Builder clearAvatarGuid() { @@ -609,64 +607,64 @@ public Builder clearAvatarGuid() { return this; } - private int skillDepotId_ ; + private int entityId_ ; /** - * uint32 skill_depot_id = 8; - * @return The skillDepotId. + * uint32 entity_id = 10; + * @return The entityId. */ @java.lang.Override - public int getSkillDepotId() { - return skillDepotId_; + public int getEntityId() { + return entityId_; } /** - * uint32 skill_depot_id = 8; - * @param value The skillDepotId to set. + * uint32 entity_id = 10; + * @param value The entityId to set. * @return This builder for chaining. */ - public Builder setSkillDepotId(int value) { + public Builder setEntityId(int value) { - skillDepotId_ = value; + entityId_ = value; onChanged(); return this; } /** - * uint32 skill_depot_id = 8; + * uint32 entity_id = 10; * @return This builder for chaining. */ - public Builder clearSkillDepotId() { + public Builder clearEntityId() { - skillDepotId_ = 0; + entityId_ = 0; onChanged(); return this; } - private int entityId_ ; + private int talentId_ ; /** - * uint32 entity_id = 1; - * @return The entityId. + * uint32 talent_id = 14; + * @return The talentId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getTalentId() { + return talentId_; } /** - * uint32 entity_id = 1; - * @param value The entityId to set. + * uint32 talent_id = 14; + * @param value The talentId to set. * @return This builder for chaining. */ - public Builder setEntityId(int value) { + public Builder setTalentId(int value) { - entityId_ = value; + talentId_ = value; onChanged(); return this; } /** - * uint32 entity_id = 1; + * uint32 talent_id = 14; * @return This builder for chaining. */ - public Builder clearEntityId() { + public Builder clearTalentId() { - entityId_ = 0; + talentId_ = 0; onChanged(); return this; } @@ -738,9 +736,9 @@ public emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlock static { java.lang.String[] descriptorData = { "\n\036AvatarUnlockTalentNotify.proto\"m\n\030Avat" + - "arUnlockTalentNotify\022\021\n\ttalent_id\030\003 \001(\r\022" + - "\023\n\013avatar_guid\030\t \001(\004\022\026\n\016skill_depot_id\030\010" + - " \001(\r\022\021\n\tentity_id\030\001 \001(\rB\033\n\031emu.grasscutt" + + "arUnlockTalentNotify\022\026\n\016skill_depot_id\030\001" + + " \001(\r\022\023\n\013avatar_guid\030\010 \001(\004\022\021\n\tentity_id\030\n" + + " \001(\r\022\021\n\ttalent_id\030\016 \001(\rB\033\n\031emu.grasscutt" + "er.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -752,7 +750,7 @@ public emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlock internal_static_AvatarUnlockTalentNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarUnlockTalentNotify_descriptor, - new java.lang.String[] { "TalentId", "AvatarGuid", "SkillDepotId", "EntityId", }); + new java.lang.String[] { "SkillDepotId", "AvatarGuid", "EntityId", "TalentId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java index 5ea7080c34b..41438534148 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java @@ -19,27 +19,26 @@ public interface AvatarUpgradeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 item_id = 5; - * @return The itemId. + * uint64 avatar_guid = 5; + * @return The avatarGuid. */ - int getItemId(); + long getAvatarGuid(); /** - * uint64 avatar_guid = 10; - * @return The avatarGuid. + * uint32 item_id = 2; + * @return The itemId. */ - long getAvatarGuid(); + int getItemId(); /** - * uint32 count = 1; + * uint32 count = 10; * @return The count. */ int getCount(); } /** * 
-   * CmdId: 28204
-   * Obf: CFIFEHLBHPM
+   * CmdId: 5978
    *
* * Protobuf type {@code AvatarUpgradeReq} @@ -86,19 +85,19 @@ private AvatarUpgradeReq( case 0: done = true; break; - case 8: { + case 16: { - count_ = input.readUInt32(); + itemId_ = input.readUInt32(); break; } case 40: { - itemId_ = input.readUInt32(); + avatarGuid_ = input.readUInt64(); break; } case 80: { - avatarGuid_ = input.readUInt64(); + count_ = input.readUInt32(); break; } default: { @@ -133,32 +132,32 @@ private AvatarUpgradeReq( emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.class, emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.Builder.class); } - public static final int ITEM_ID_FIELD_NUMBER = 5; - private int itemId_; + public static final int AVATAR_GUID_FIELD_NUMBER = 5; + private long avatarGuid_; /** - * uint32 item_id = 5; - * @return The itemId. + * uint64 avatar_guid = 5; + * @return The avatarGuid. */ @java.lang.Override - public int getItemId() { - return itemId_; + public long getAvatarGuid() { + return avatarGuid_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 10; - private long avatarGuid_; + public static final int ITEM_ID_FIELD_NUMBER = 2; + private int itemId_; /** - * uint64 avatar_guid = 10; - * @return The avatarGuid. + * uint32 item_id = 2; + * @return The itemId. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getItemId() { + return itemId_; } - public static final int COUNT_FIELD_NUMBER = 1; + public static final int COUNT_FIELD_NUMBER = 10; private int count_; /** - * uint32 count = 1; + * uint32 count = 10; * @return The count. */ @java.lang.Override @@ -180,14 +179,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (count_ != 0) { - output.writeUInt32(1, count_); - } if (itemId_ != 0) { - output.writeUInt32(5, itemId_); + output.writeUInt32(2, itemId_); } if (avatarGuid_ != 0L) { - output.writeUInt64(10, avatarGuid_); + output.writeUInt64(5, avatarGuid_); + } + if (count_ != 0) { + output.writeUInt32(10, count_); } unknownFields.writeTo(output); } @@ -198,17 +197,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (count_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, count_); - } if (itemId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, itemId_); + .computeUInt32Size(2, itemId_); } if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(10, avatarGuid_); + .computeUInt64Size(5, avatarGuid_); + } + if (count_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(10, count_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,10 +224,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other = (emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq) obj; - if (getItemId() - != other.getItemId()) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; + if (getItemId() + != other.getItemId()) return false; if (getCount() != other.getCount()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -242,11 +241,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ITEM_ID_FIELD_NUMBER; - hash = (53 * hash) + getItemId(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); + hash = (37 * hash) + ITEM_ID_FIELD_NUMBER; + hash = (53 * hash) + getItemId(); hash = (37 * hash) + COUNT_FIELD_NUMBER; hash = (53 * hash) + getCount(); hash = (29 * hash) + unknownFields.hashCode(); @@ -346,8 +345,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28204
-     * Obf: CFIFEHLBHPM
+     * CmdId: 5978
      *
* * Protobuf type {@code AvatarUpgradeReq} @@ -387,10 +385,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - itemId_ = 0; - avatarGuid_ = 0L; + itemId_ = 0; + count_ = 0; return this; @@ -419,8 +417,8 @@ public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq bui @java.lang.Override public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq buildPartial() { emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq result = new emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq(this); - result.itemId_ = itemId_; result.avatarGuid_ = avatarGuid_; + result.itemId_ = itemId_; result.count_ = count_; onBuilt(); return result; @@ -470,12 +468,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other) { if (other == emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.getDefaultInstance()) return this; - if (other.getItemId() != 0) { - setItemId(other.getItemId()); - } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } + if (other.getItemId() != 0) { + setItemId(other.getItemId()); + } if (other.getCount() != 0) { setCount(other.getCount()); } @@ -508,71 +506,71 @@ public Builder mergeFrom( return this; } - private int itemId_ ; + private long avatarGuid_ ; /** - * uint32 item_id = 5; - * @return The itemId. + * uint64 avatar_guid = 5; + * @return The avatarGuid. */ @java.lang.Override - public int getItemId() { - return itemId_; + public long getAvatarGuid() { + return avatarGuid_; } /** - * uint32 item_id = 5; - * @param value The itemId to set. + * uint64 avatar_guid = 5; + * @param value The avatarGuid to set. * @return This builder for chaining. */ - public Builder setItemId(int value) { + public Builder setAvatarGuid(long value) { - itemId_ = value; + avatarGuid_ = value; onChanged(); return this; } /** - * uint32 item_id = 5; + * uint64 avatar_guid = 5; * @return This builder for chaining. */ - public Builder clearItemId() { + public Builder clearAvatarGuid() { - itemId_ = 0; + avatarGuid_ = 0L; onChanged(); return this; } - private long avatarGuid_ ; + private int itemId_ ; /** - * uint64 avatar_guid = 10; - * @return The avatarGuid. + * uint32 item_id = 2; + * @return The itemId. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getItemId() { + return itemId_; } /** - * uint64 avatar_guid = 10; - * @param value The avatarGuid to set. + * uint32 item_id = 2; + * @param value The itemId to set. * @return This builder for chaining. */ - public Builder setAvatarGuid(long value) { + public Builder setItemId(int value) { - avatarGuid_ = value; + itemId_ = value; onChanged(); return this; } /** - * uint64 avatar_guid = 10; + * uint32 item_id = 2; * @return This builder for chaining. */ - public Builder clearAvatarGuid() { + public Builder clearItemId() { - avatarGuid_ = 0L; + itemId_ = 0; onChanged(); return this; } private int count_ ; /** - * uint32 count = 1; + * uint32 count = 10; * @return The count. */ @java.lang.Override @@ -580,7 +578,7 @@ public int getCount() { return count_; } /** - * uint32 count = 1; + * uint32 count = 10; * @param value The count to set. * @return This builder for chaining. */ @@ -591,7 +589,7 @@ public Builder setCount(int value) { return this; } /** - * uint32 count = 1; + * uint32 count = 10; * @return This builder for chaining. */ public Builder clearCount() { @@ -668,8 +666,8 @@ public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq get static { java.lang.String[] descriptorData = { "\n\026AvatarUpgradeReq.proto\"G\n\020AvatarUpgrad" + - "eReq\022\017\n\007item_id\030\005 \001(\r\022\023\n\013avatar_guid\030\n \001" + - "(\004\022\r\n\005count\030\001 \001(\rB\033\n\031emu.grasscutter.net" + + "eReq\022\023\n\013avatar_guid\030\005 \001(\004\022\017\n\007item_id\030\002 \001" + + "(\r\022\r\n\005count\030\n \001(\rB\033\n\031emu.grasscutter.net" + ".protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +679,7 @@ public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq get internal_static_AvatarUpgradeReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarUpgradeReq_descriptor, - new java.lang.String[] { "ItemId", "AvatarGuid", "Count", }); + new java.lang.String[] { "AvatarGuid", "ItemId", "Count", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java index f26077d4f2c..8f01aced3a8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java @@ -19,56 +19,55 @@ public interface CalcWeaponUpgradeReturnItemsReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ java.util.List getItemParamListList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ int getItemParamListCount(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ java.util.List getItemParamListOrBuilderList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index); /** - * uint64 target_weapon_guid = 1; - * @return The targetWeaponGuid. - */ - long getTargetWeaponGuid(); - - /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @return A list containing the foodWeaponGuidList. */ java.util.List getFoodWeaponGuidListList(); /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @return The count of foodWeaponGuidList. */ int getFoodWeaponGuidListCount(); /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @param index The index of the element to return. * @return The foodWeaponGuidList at the given index. */ long getFoodWeaponGuidList(int index); + + /** + * uint64 target_weapon_guid = 14; + * @return The targetWeaponGuid. + */ + long getTargetWeaponGuid(); } /** * 
-   * CmdId: 23232
-   * Obf: GJIAADPBGKA
+   * CmdId: 20908
    *
* * Protobuf type {@code CalcWeaponUpgradeReturnItemsReq} @@ -118,12 +117,21 @@ private CalcWeaponUpgradeReturnItemsReq( case 0: done = true; break; - case 8: { + case 66: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + itemParamList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + itemParamList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } + case 112: { targetWeaponGuid_ = input.readUInt64(); break; } - case 112: { + case 120: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { foodWeaponGuidList_ = newLongList(); mutable_bitField0_ |= 0x00000002; @@ -131,7 +139,7 @@ private CalcWeaponUpgradeReturnItemsReq( foodWeaponGuidList_.addLong(input.readUInt64()); break; } - case 114: { + case 122: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { @@ -144,15 +152,6 @@ private CalcWeaponUpgradeReturnItemsReq( input.popLimit(limit); break; } - case 122: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - itemParamList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - itemParamList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -168,12 +167,12 @@ private CalcWeaponUpgradeReturnItemsReq( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - foodWeaponGuidList_.makeImmutable(); // C - } if (((mutable_bitField0_ & 0x00000001) != 0)) { itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + foodWeaponGuidList_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -191,17 +190,17 @@ private CalcWeaponUpgradeReturnItemsReq( emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcWeaponUpgradeReturnItemsReq.class, emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcWeaponUpgradeReturnItemsReq.Builder.class); } - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 15; + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 8; private java.util.List itemParamList_; /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ @java.lang.Override public java.util.List getItemParamListList() { return itemParamList_; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ @java.lang.Override public java.util.List @@ -209,21 +208,21 @@ public java.util.List g return itemParamList_; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ @java.lang.Override public int getItemParamListCount() { return itemParamList_.size(); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { return itemParamList_.get(index); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( @@ -231,21 +230,10 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP return itemParamList_.get(index); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 1; - private long targetWeaponGuid_; - /** - * uint64 target_weapon_guid = 1; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - - public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 14; + public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 15; private com.google.protobuf.Internal.LongList foodWeaponGuidList_; /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @return A list containing the foodWeaponGuidList. */ @java.lang.Override @@ -254,14 +242,14 @@ public long getTargetWeaponGuid() { return foodWeaponGuidList_; } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @return The count of foodWeaponGuidList. */ public int getFoodWeaponGuidListCount() { return foodWeaponGuidList_.size(); } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @param index The index of the element to return. * @return The foodWeaponGuidList at the given index. */ @@ -270,6 +258,17 @@ public long getFoodWeaponGuidList(int index) { } private int foodWeaponGuidListMemoizedSerializedSize = -1; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 14; + private long targetWeaponGuid_; + /** + * uint64 target_weapon_guid = 14; + * @return The targetWeaponGuid. + */ + @java.lang.Override + public long getTargetWeaponGuid() { + return targetWeaponGuid_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -285,19 +284,19 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); + for (int i = 0; i < itemParamList_.size(); i++) { + output.writeMessage(8, itemParamList_.get(i)); + } if (targetWeaponGuid_ != 0L) { - output.writeUInt64(1, targetWeaponGuid_); + output.writeUInt64(14, targetWeaponGuid_); } if (getFoodWeaponGuidListList().size() > 0) { - output.writeUInt32NoTag(114); + output.writeUInt32NoTag(122); output.writeUInt32NoTag(foodWeaponGuidListMemoizedSerializedSize); } for (int i = 0; i < foodWeaponGuidList_.size(); i++) { output.writeUInt64NoTag(foodWeaponGuidList_.getLong(i)); } - for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(15, itemParamList_.get(i)); - } unknownFields.writeTo(output); } @@ -307,9 +306,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + for (int i = 0; i < itemParamList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, itemParamList_.get(i)); + } if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(1, targetWeaponGuid_); + .computeUInt64Size(14, targetWeaponGuid_); } { int dataSize = 0; @@ -325,10 +328,6 @@ public int getSerializedSize() { } foodWeaponGuidListMemoizedSerializedSize = dataSize; } - for (int i = 0; i < itemParamList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, itemParamList_.get(i)); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -346,10 +345,10 @@ public boolean equals(final java.lang.Object obj) { if (!getItemParamListList() .equals(other.getItemParamListList())) return false; - if (getTargetWeaponGuid() - != other.getTargetWeaponGuid()) return false; if (!getFoodWeaponGuidListList() .equals(other.getFoodWeaponGuidListList())) return false; + if (getTargetWeaponGuid() + != other.getTargetWeaponGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -365,13 +364,13 @@ public int hashCode() { hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemParamListList().hashCode(); } - hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTargetWeaponGuid()); if (getFoodWeaponGuidListCount() > 0) { hash = (37 * hash) + FOOD_WEAPON_GUID_LIST_FIELD_NUMBER; hash = (53 * hash) + getFoodWeaponGuidListList().hashCode(); } + hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getTargetWeaponGuid()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -469,8 +468,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23232
-     * Obf: GJIAADPBGKA
+     * CmdId: 20908
      *
* * Protobuf type {@code CalcWeaponUpgradeReturnItemsReq} @@ -517,10 +515,10 @@ public Builder clear() { } else { itemParamListBuilder_.clear(); } - targetWeaponGuid_ = 0L; - foodWeaponGuidList_ = emptyLongList(); bitField0_ = (bitField0_ & ~0x00000002); + targetWeaponGuid_ = 0L; + return this; } @@ -557,12 +555,12 @@ public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcW } else { result.itemParamList_ = itemParamListBuilder_.build(); } - result.targetWeaponGuid_ = targetWeaponGuid_; if (((bitField0_ & 0x00000002) != 0)) { foodWeaponGuidList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.foodWeaponGuidList_ = foodWeaponGuidList_; + result.targetWeaponGuid_ = targetWeaponGuid_; onBuilt(); return result; } @@ -637,9 +635,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsR } } } - if (other.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); - } if (!other.foodWeaponGuidList_.isEmpty()) { if (foodWeaponGuidList_.isEmpty()) { foodWeaponGuidList_ = other.foodWeaponGuidList_; @@ -650,6 +645,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsR } onChanged(); } + if (other.getTargetWeaponGuid() != 0L) { + setTargetWeaponGuid(other.getTargetWeaponGuid()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -693,7 +691,7 @@ private void ensureItemParamListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_; /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -703,7 +701,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -713,7 +711,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -723,7 +721,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -740,7 +738,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -754,7 +752,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -770,7 +768,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -787,7 +785,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -801,7 +799,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -815,7 +813,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -830,7 +828,7 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { @@ -843,7 +841,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -856,14 +854,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder( int index) { return getItemParamListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -873,7 +871,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public java.util.List getItemParamListOrBuilderList() { @@ -884,14 +882,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() { return getItemParamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -899,7 +897,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 8; */ public java.util.List getItemParamListBuilderList() { @@ -920,37 +918,6 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa return itemParamListBuilder_; } - private long targetWeaponGuid_ ; - /** - * uint64 target_weapon_guid = 1; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - /** - * uint64 target_weapon_guid = 1; - * @param value The targetWeaponGuid to set. - * @return This builder for chaining. - */ - public Builder setTargetWeaponGuid(long value) { - - targetWeaponGuid_ = value; - onChanged(); - return this; - } - /** - * uint64 target_weapon_guid = 1; - * @return This builder for chaining. - */ - public Builder clearTargetWeaponGuid() { - - targetWeaponGuid_ = 0L; - onChanged(); - return this; - } - private com.google.protobuf.Internal.LongList foodWeaponGuidList_ = emptyLongList(); private void ensureFoodWeaponGuidListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { @@ -959,7 +926,7 @@ private void ensureFoodWeaponGuidListIsMutable() { } } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @return A list containing the foodWeaponGuidList. */ public java.util.List @@ -968,14 +935,14 @@ private void ensureFoodWeaponGuidListIsMutable() { java.util.Collections.unmodifiableList(foodWeaponGuidList_) : foodWeaponGuidList_; } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @return The count of foodWeaponGuidList. */ public int getFoodWeaponGuidListCount() { return foodWeaponGuidList_.size(); } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @param index The index of the element to return. * @return The foodWeaponGuidList at the given index. */ @@ -983,7 +950,7 @@ public long getFoodWeaponGuidList(int index) { return foodWeaponGuidList_.getLong(index); } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @param index The index to set the value at. * @param value The foodWeaponGuidList to set. * @return This builder for chaining. @@ -996,7 +963,7 @@ public Builder setFoodWeaponGuidList( return this; } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @param value The foodWeaponGuidList to add. * @return This builder for chaining. */ @@ -1007,7 +974,7 @@ public Builder addFoodWeaponGuidList(long value) { return this; } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @param values The foodWeaponGuidList to add. * @return This builder for chaining. */ @@ -1020,7 +987,7 @@ public Builder addAllFoodWeaponGuidList( return this; } /** - * repeated uint64 food_weapon_guid_list = 14; + * repeated uint64 food_weapon_guid_list = 15; * @return This builder for chaining. */ public Builder clearFoodWeaponGuidList() { @@ -1029,6 +996,37 @@ public Builder clearFoodWeaponGuidList() { onChanged(); return this; } + + private long targetWeaponGuid_ ; + /** + * uint64 target_weapon_guid = 14; + * @return The targetWeaponGuid. + */ + @java.lang.Override + public long getTargetWeaponGuid() { + return targetWeaponGuid_; + } + /** + * uint64 target_weapon_guid = 14; + * @param value The targetWeaponGuid to set. + * @return This builder for chaining. + */ + public Builder setTargetWeaponGuid(long value) { + + targetWeaponGuid_ = value; + onChanged(); + return this; + } + /** + * uint64 target_weapon_guid = 14; + * @return This builder for chaining. + */ + public Builder clearTargetWeaponGuid() { + + targetWeaponGuid_ = 0L; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1098,9 +1096,9 @@ public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcW java.lang.String[] descriptorData = { "\n%CalcWeaponUpgradeReturnItemsReq.proto\032" + "\017ItemParam.proto\"\201\001\n\037CalcWeaponUpgradeRe" + - "turnItemsReq\022#\n\017item_param_list\030\017 \003(\0132\n." + - "ItemParam\022\032\n\022target_weapon_guid\030\001 \001(\004\022\035\n" + - "\025food_weapon_guid_list\030\016 \003(\004B\033\n\031emu.gras" + + "turnItemsReq\022#\n\017item_param_list\030\010 \003(\0132\n." + + "ItemParam\022\035\n\025food_weapon_guid_list\030\017 \003(\004" + + "\022\032\n\022target_weapon_guid\030\016 \001(\004B\033\n\031emu.gras" + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1113,7 +1111,7 @@ public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcW internal_static_CalcWeaponUpgradeReturnItemsReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CalcWeaponUpgradeReturnItemsReq_descriptor, - new java.lang.String[] { "ItemParamList", "TargetWeaponGuid", "FoodWeaponGuidList", }); + new java.lang.String[] { "ItemParamList", "FoodWeaponGuidList", "TargetWeaponGuid", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java index f708eb8270f..79c9b061f73 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java @@ -19,45 +19,44 @@ public interface CalcWeaponUpgradeReturnItemsRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ItemParam item_param_list = 10; + * int32 retcode = 3; + * @return The retcode. + */ + int getRetcode(); + + /** + * repeated .ItemParam item_param_list = 6; */ java.util.List getItemParamListList(); /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ int getItemParamListCount(); /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ java.util.List getItemParamListOrBuilderList(); /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index); /** - * uint64 target_weapon_guid = 15; + * uint64 target_weapon_guid = 7; * @return The targetWeaponGuid. */ long getTargetWeaponGuid(); - - /** - * int32 retcode = 14; - * @return The retcode. - */ - int getRetcode(); } /** * 
-   * CmdId: 24299
-   * Obf: EFEMOPJBOBD
+   * CmdId: 6706
    *
* * Protobuf type {@code CalcWeaponUpgradeReturnItemsRsp} @@ -106,7 +105,12 @@ private CalcWeaponUpgradeReturnItemsRsp( case 0: done = true; break; - case 82: { + case 24: { + + retcode_ = input.readInt32(); + break; + } + case 50: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { itemParamList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -115,12 +119,7 @@ private CalcWeaponUpgradeReturnItemsRsp( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 112: { - - retcode_ = input.readInt32(); - break; - } - case 120: { + case 56: { targetWeaponGuid_ = input.readUInt64(); break; @@ -160,17 +159,28 @@ private CalcWeaponUpgradeReturnItemsRsp( emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp.class, emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp.Builder.class); } - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 10; + public static final int RETCODE_FIELD_NUMBER = 3; + private int retcode_; + /** + * int32 retcode = 3; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 6; private java.util.List itemParamList_; /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ @java.lang.Override public java.util.List getItemParamListList() { return itemParamList_; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ @java.lang.Override public java.util.List @@ -178,21 +188,21 @@ public java.util.List g return itemParamList_; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ @java.lang.Override public int getItemParamListCount() { return itemParamList_.size(); } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { return itemParamList_.get(index); } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( @@ -200,10 +210,10 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP return itemParamList_.get(index); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 15; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 7; private long targetWeaponGuid_; /** - * uint64 target_weapon_guid = 15; + * uint64 target_weapon_guid = 7; * @return The targetWeaponGuid. */ @java.lang.Override @@ -211,17 +221,6 @@ public long getTargetWeaponGuid() { return targetWeaponGuid_; } - public static final int RETCODE_FIELD_NUMBER = 14; - private int retcode_; - /** - * int32 retcode = 14; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -236,14 +235,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(10, itemParamList_.get(i)); - } if (retcode_ != 0) { - output.writeInt32(14, retcode_); + output.writeInt32(3, retcode_); + } + for (int i = 0; i < itemParamList_.size(); i++) { + output.writeMessage(6, itemParamList_.get(i)); } if (targetWeaponGuid_ != 0L) { - output.writeUInt64(15, targetWeaponGuid_); + output.writeUInt64(7, targetWeaponGuid_); } unknownFields.writeTo(output); } @@ -254,17 +253,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < itemParamList_.size(); i++) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, itemParamList_.get(i)); + .computeInt32Size(3, retcode_); } - if (retcode_ != 0) { + for (int i = 0; i < itemParamList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, retcode_); + .computeMessageSize(6, itemParamList_.get(i)); } if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(15, targetWeaponGuid_); + .computeUInt64Size(7, targetWeaponGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -281,12 +280,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp other = (emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp) obj; + if (getRetcode() + != other.getRetcode()) return false; if (!getItemParamListList() .equals(other.getItemParamListList())) return false; if (getTargetWeaponGuid() != other.getTargetWeaponGuid()) return false; - if (getRetcode() - != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -298,6 +297,8 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getItemParamListCount() > 0) { hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemParamListList().hashCode(); @@ -305,8 +306,6 @@ public int hashCode() { hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getTargetWeaponGuid()); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -404,8 +403,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 24299
-     * Obf: EFEMOPJBOBD
+     * CmdId: 6706
      *
* * Protobuf type {@code CalcWeaponUpgradeReturnItemsRsp} @@ -446,6 +444,8 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + retcode_ = 0; + if (itemParamListBuilder_ == null) { itemParamList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); @@ -454,8 +454,6 @@ public Builder clear() { } targetWeaponGuid_ = 0L; - retcode_ = 0; - return this; } @@ -483,6 +481,7 @@ public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcW public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp buildPartial() { emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp result = new emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp(this); int from_bitField0_ = bitField0_; + result.retcode_ = retcode_; if (itemParamListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); @@ -493,7 +492,6 @@ public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcW result.itemParamList_ = itemParamListBuilder_.build(); } result.targetWeaponGuid_ = targetWeaponGuid_; - result.retcode_ = retcode_; onBuilt(); return result; } @@ -542,6 +540,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp other) { if (other == emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp.getDefaultInstance()) return this; + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (itemParamListBuilder_ == null) { if (!other.itemParamList_.isEmpty()) { if (itemParamList_.isEmpty()) { @@ -571,9 +572,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsR if (other.getTargetWeaponGuid() != 0L) { setTargetWeaponGuid(other.getTargetWeaponGuid()); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -604,6 +602,37 @@ public Builder mergeFrom( } private int bitField0_; + private int retcode_ ; + /** + * int32 retcode = 3; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 3; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 3; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + private java.util.List itemParamList_ = java.util.Collections.emptyList(); private void ensureItemParamListIsMutable() { @@ -617,7 +646,7 @@ private void ensureItemParamListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_; /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -627,7 +656,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -637,7 +666,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -647,7 +676,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -664,7 +693,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -678,7 +707,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -694,7 +723,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -711,7 +740,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -725,7 +754,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -739,7 +768,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -754,7 +783,7 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { @@ -767,7 +796,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -780,14 +809,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder( int index) { return getItemParamListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -797,7 +826,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public java.util.List getItemParamListOrBuilderList() { @@ -808,14 +837,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() { return getItemParamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -823,7 +852,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 10; + * repeated .ItemParam item_param_list = 6; */ public java.util.List getItemParamListBuilderList() { @@ -846,7 +875,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa private long targetWeaponGuid_ ; /** - * uint64 target_weapon_guid = 15; + * uint64 target_weapon_guid = 7; * @return The targetWeaponGuid. */ @java.lang.Override @@ -854,7 +883,7 @@ public long getTargetWeaponGuid() { return targetWeaponGuid_; } /** - * uint64 target_weapon_guid = 15; + * uint64 target_weapon_guid = 7; * @param value The targetWeaponGuid to set. * @return This builder for chaining. */ @@ -865,7 +894,7 @@ public Builder setTargetWeaponGuid(long value) { return this; } /** - * uint64 target_weapon_guid = 15; + * uint64 target_weapon_guid = 7; * @return This builder for chaining. */ public Builder clearTargetWeaponGuid() { @@ -874,37 +903,6 @@ public Builder clearTargetWeaponGuid() { onChanged(); return this; } - - private int retcode_ ; - /** - * int32 retcode = 14; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 14; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 14; - * @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) { @@ -974,9 +972,9 @@ public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcW java.lang.String[] descriptorData = { "\n%CalcWeaponUpgradeReturnItemsRsp.proto\032" + "\017ItemParam.proto\"s\n\037CalcWeaponUpgradeRet" + - "urnItemsRsp\022#\n\017item_param_list\030\n \003(\0132\n.I" + - "temParam\022\032\n\022target_weapon_guid\030\017 \001(\004\022\017\n\007" + - "retcode\030\016 \001(\005B\033\n\031emu.grasscutter.net.pro" + + "urnItemsRsp\022\017\n\007retcode\030\003 \001(\005\022#\n\017item_par" + + "am_list\030\006 \003(\0132\n.ItemParam\022\032\n\022target_weap" + + "on_guid\030\007 \001(\004B\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -989,7 +987,7 @@ public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcW internal_static_CalcWeaponUpgradeReturnItemsRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CalcWeaponUpgradeReturnItemsRsp_descriptor, - new java.lang.String[] { "ItemParamList", "TargetWeaponGuid", "Retcode", }); + new java.lang.String[] { "Retcode", "ItemParamList", "TargetWeaponGuid", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceRspOuterClass.java index 80344f54125..9475b516a6a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceRspOuterClass.java @@ -19,35 +19,35 @@ public interface GetQuestLackingResourceRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .LackingResourceInfo BCOAJLAHNNM = 4; - * @return Whether the bCOAJLAHNNM field is set. + * uint32 quest_id = 4; + * @return The questId. */ - boolean hasBCOAJLAHNNM(); + int getQuestId(); + /** - * .LackingResourceInfo BCOAJLAHNNM = 4; - * @return The bCOAJLAHNNM. + * .LackingResourceInfo lacking_resources_info = 8; + * @return Whether the lackingResourcesInfo field is set. */ - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getBCOAJLAHNNM(); + boolean hasLackingResourcesInfo(); /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; + * @return The lackingResourcesInfo. */ - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getBCOAJLAHNNMOrBuilder(); - + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo(); /** - * int32 retcode = 5; - * @return The retcode. + * .LackingResourceInfo lacking_resources_info = 8; */ - int getRetcode(); + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder(); /** - * uint32 quest_id = 15; - * @return The questId. + * int32 retcode = 10; + * @return The retcode. */ - int getQuestId(); + int getRetcode(); } /** * 
-   * CmdId: 25570
+   * CmdId: 27981
    *
* * Protobuf type {@code GetQuestLackingResourceRsp} @@ -94,29 +94,29 @@ private GetQuestLackingResourceRsp( case 0: done = true; break; - case 34: { + case 32: { + + questId_ = input.readUInt32(); + break; + } + case 66: { emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder subBuilder = null; - if (bCOAJLAHNNM_ != null) { - subBuilder = bCOAJLAHNNM_.toBuilder(); + if (lackingResourcesInfo_ != null) { + subBuilder = lackingResourcesInfo_.toBuilder(); } - bCOAJLAHNNM_ = input.readMessage(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.parser(), extensionRegistry); + lackingResourcesInfo_ = input.readMessage(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(bCOAJLAHNNM_); - bCOAJLAHNNM_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(lackingResourcesInfo_); + lackingResourcesInfo_ = subBuilder.buildPartial(); } break; } - case 40: { + case 80: { retcode_ = input.readInt32(); break; } - case 120: { - - questId_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -149,52 +149,52 @@ private GetQuestLackingResourceRsp( emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp.class, emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp.Builder.class); } - public static final int BCOAJLAHNNM_FIELD_NUMBER = 4; - private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo bCOAJLAHNNM_; + public static final int QUEST_ID_FIELD_NUMBER = 4; + private int questId_; /** - * .LackingResourceInfo BCOAJLAHNNM = 4; - * @return Whether the bCOAJLAHNNM field is set. + * uint32 quest_id = 4; + * @return The questId. */ @java.lang.Override - public boolean hasBCOAJLAHNNM() { - return bCOAJLAHNNM_ != null; + public int getQuestId() { + return questId_; } + + public static final int LACKING_RESOURCES_INFO_FIELD_NUMBER = 8; + private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo lackingResourcesInfo_; /** - * .LackingResourceInfo BCOAJLAHNNM = 4; - * @return The bCOAJLAHNNM. + * .LackingResourceInfo lacking_resources_info = 8; + * @return Whether the lackingResourcesInfo field is set. */ @java.lang.Override - public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getBCOAJLAHNNM() { - return bCOAJLAHNNM_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : bCOAJLAHNNM_; + public boolean hasLackingResourcesInfo() { + return lackingResourcesInfo_ != null; } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; + * @return The lackingResourcesInfo. */ @java.lang.Override - public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getBCOAJLAHNNMOrBuilder() { - return getBCOAJLAHNNM(); + public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo() { + return lackingResourcesInfo_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_; } - - public static final int RETCODE_FIELD_NUMBER = 5; - private int retcode_; /** - * int32 retcode = 5; - * @return The retcode. + * .LackingResourceInfo lacking_resources_info = 8; */ @java.lang.Override - public int getRetcode() { - return retcode_; + public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder() { + return getLackingResourcesInfo(); } - public static final int QUEST_ID_FIELD_NUMBER = 15; - private int questId_; + public static final int RETCODE_FIELD_NUMBER = 10; + private int retcode_; /** - * uint32 quest_id = 15; - * @return The questId. + * int32 retcode = 10; + * @return The retcode. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -211,14 +211,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (bCOAJLAHNNM_ != null) { - output.writeMessage(4, getBCOAJLAHNNM()); + if (questId_ != 0) { + output.writeUInt32(4, questId_); } - if (retcode_ != 0) { - output.writeInt32(5, retcode_); + if (lackingResourcesInfo_ != null) { + output.writeMessage(8, getLackingResourcesInfo()); } - if (questId_ != 0) { - output.writeUInt32(15, questId_); + if (retcode_ != 0) { + output.writeInt32(10, retcode_); } unknownFields.writeTo(output); } @@ -229,17 +229,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (bCOAJLAHNNM_ != null) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getBCOAJLAHNNM()); + .computeUInt32Size(4, questId_); } - if (retcode_ != 0) { + if (lackingResourcesInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, retcode_); + .computeMessageSize(8, getLackingResourcesInfo()); } - if (questId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, questId_); + .computeInt32Size(10, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -256,15 +256,15 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp other = (emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp) obj; - if (hasBCOAJLAHNNM() != other.hasBCOAJLAHNNM()) return false; - if (hasBCOAJLAHNNM()) { - if (!getBCOAJLAHNNM() - .equals(other.getBCOAJLAHNNM())) return false; + if (getQuestId() + != other.getQuestId()) return false; + if (hasLackingResourcesInfo() != other.hasLackingResourcesInfo()) return false; + if (hasLackingResourcesInfo()) { + if (!getLackingResourcesInfo() + .equals(other.getLackingResourcesInfo())) return false; } if (getRetcode() != other.getRetcode()) return false; - if (getQuestId() - != other.getQuestId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -276,14 +276,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasBCOAJLAHNNM()) { - hash = (37 * hash) + BCOAJLAHNNM_FIELD_NUMBER; - hash = (53 * hash) + getBCOAJLAHNNM().hashCode(); + hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getQuestId(); + if (hasLackingResourcesInfo()) { + hash = (37 * hash) + LACKING_RESOURCES_INFO_FIELD_NUMBER; + hash = (53 * hash) + getLackingResourcesInfo().hashCode(); } hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; - hash = (53 * hash) + getQuestId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -381,7 +381,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25570
+     * CmdId: 27981
      *
* * Protobuf type {@code GetQuestLackingResourceRsp} @@ -421,16 +421,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (bCOAJLAHNNMBuilder_ == null) { - bCOAJLAHNNM_ = null; + questId_ = 0; + + if (lackingResourcesInfoBuilder_ == null) { + lackingResourcesInfo_ = null; } else { - bCOAJLAHNNM_ = null; - bCOAJLAHNNMBuilder_ = null; + lackingResourcesInfo_ = null; + lackingResourcesInfoBuilder_ = null; } retcode_ = 0; - questId_ = 0; - return this; } @@ -457,13 +457,13 @@ public emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLa @java.lang.Override public emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp buildPartial() { emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp result = new emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp(this); - if (bCOAJLAHNNMBuilder_ == null) { - result.bCOAJLAHNNM_ = bCOAJLAHNNM_; + result.questId_ = questId_; + if (lackingResourcesInfoBuilder_ == null) { + result.lackingResourcesInfo_ = lackingResourcesInfo_; } else { - result.bCOAJLAHNNM_ = bCOAJLAHNNMBuilder_.build(); + result.lackingResourcesInfo_ = lackingResourcesInfoBuilder_.build(); } result.retcode_ = retcode_; - result.questId_ = questId_; onBuilt(); return result; } @@ -512,15 +512,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp other) { if (other == emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp.getDefaultInstance()) return this; - if (other.hasBCOAJLAHNNM()) { - mergeBCOAJLAHNNM(other.getBCOAJLAHNNM()); + if (other.getQuestId() != 0) { + setQuestId(other.getQuestId()); + } + if (other.hasLackingResourcesInfo()) { + mergeLackingResourcesInfo(other.getLackingResourcesInfo()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.getQuestId() != 0) { - setQuestId(other.getQuestId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -550,128 +550,159 @@ public Builder mergeFrom( return this; } - private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo bCOAJLAHNNM_; + private int questId_ ; + /** + * uint32 quest_id = 4; + * @return The questId. + */ + @java.lang.Override + public int getQuestId() { + return questId_; + } + /** + * uint32 quest_id = 4; + * @param value The questId to set. + * @return This builder for chaining. + */ + public Builder setQuestId(int value) { + + questId_ = value; + onChanged(); + return this; + } + /** + * uint32 quest_id = 4; + * @return This builder for chaining. + */ + public Builder clearQuestId() { + + questId_ = 0; + onChanged(); + return this; + } + + private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo lackingResourcesInfo_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder> bCOAJLAHNNMBuilder_; + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder> lackingResourcesInfoBuilder_; /** - * .LackingResourceInfo BCOAJLAHNNM = 4; - * @return Whether the bCOAJLAHNNM field is set. + * .LackingResourceInfo lacking_resources_info = 8; + * @return Whether the lackingResourcesInfo field is set. */ - public boolean hasBCOAJLAHNNM() { - return bCOAJLAHNNMBuilder_ != null || bCOAJLAHNNM_ != null; + public boolean hasLackingResourcesInfo() { + return lackingResourcesInfoBuilder_ != null || lackingResourcesInfo_ != null; } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; - * @return The bCOAJLAHNNM. + * .LackingResourceInfo lacking_resources_info = 8; + * @return The lackingResourcesInfo. */ - public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getBCOAJLAHNNM() { - if (bCOAJLAHNNMBuilder_ == null) { - return bCOAJLAHNNM_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : bCOAJLAHNNM_; + public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo() { + if (lackingResourcesInfoBuilder_ == null) { + return lackingResourcesInfo_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_; } else { - return bCOAJLAHNNMBuilder_.getMessage(); + return lackingResourcesInfoBuilder_.getMessage(); } } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; */ - public Builder setBCOAJLAHNNM(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) { - if (bCOAJLAHNNMBuilder_ == null) { + public Builder setLackingResourcesInfo(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) { + if (lackingResourcesInfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - bCOAJLAHNNM_ = value; + lackingResourcesInfo_ = value; onChanged(); } else { - bCOAJLAHNNMBuilder_.setMessage(value); + lackingResourcesInfoBuilder_.setMessage(value); } return this; } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; */ - public Builder setBCOAJLAHNNM( + public Builder setLackingResourcesInfo( emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder builderForValue) { - if (bCOAJLAHNNMBuilder_ == null) { - bCOAJLAHNNM_ = builderForValue.build(); + if (lackingResourcesInfoBuilder_ == null) { + lackingResourcesInfo_ = builderForValue.build(); onChanged(); } else { - bCOAJLAHNNMBuilder_.setMessage(builderForValue.build()); + lackingResourcesInfoBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; */ - public Builder mergeBCOAJLAHNNM(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) { - if (bCOAJLAHNNMBuilder_ == null) { - if (bCOAJLAHNNM_ != null) { - bCOAJLAHNNM_ = - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.newBuilder(bCOAJLAHNNM_).mergeFrom(value).buildPartial(); + public Builder mergeLackingResourcesInfo(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) { + if (lackingResourcesInfoBuilder_ == null) { + if (lackingResourcesInfo_ != null) { + lackingResourcesInfo_ = + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.newBuilder(lackingResourcesInfo_).mergeFrom(value).buildPartial(); } else { - bCOAJLAHNNM_ = value; + lackingResourcesInfo_ = value; } onChanged(); } else { - bCOAJLAHNNMBuilder_.mergeFrom(value); + lackingResourcesInfoBuilder_.mergeFrom(value); } return this; } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; */ - public Builder clearBCOAJLAHNNM() { - if (bCOAJLAHNNMBuilder_ == null) { - bCOAJLAHNNM_ = null; + public Builder clearLackingResourcesInfo() { + if (lackingResourcesInfoBuilder_ == null) { + lackingResourcesInfo_ = null; onChanged(); } else { - bCOAJLAHNNM_ = null; - bCOAJLAHNNMBuilder_ = null; + lackingResourcesInfo_ = null; + lackingResourcesInfoBuilder_ = null; } return this; } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; */ - public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder getBCOAJLAHNNMBuilder() { + public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder getLackingResourcesInfoBuilder() { onChanged(); - return getBCOAJLAHNNMFieldBuilder().getBuilder(); + return getLackingResourcesInfoFieldBuilder().getBuilder(); } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; */ - public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getBCOAJLAHNNMOrBuilder() { - if (bCOAJLAHNNMBuilder_ != null) { - return bCOAJLAHNNMBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder() { + if (lackingResourcesInfoBuilder_ != null) { + return lackingResourcesInfoBuilder_.getMessageOrBuilder(); } else { - return bCOAJLAHNNM_ == null ? - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : bCOAJLAHNNM_; + return lackingResourcesInfo_ == null ? + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_; } } /** - * .LackingResourceInfo BCOAJLAHNNM = 4; + * .LackingResourceInfo lacking_resources_info = 8; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder> - getBCOAJLAHNNMFieldBuilder() { - if (bCOAJLAHNNMBuilder_ == null) { - bCOAJLAHNNMBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getLackingResourcesInfoFieldBuilder() { + if (lackingResourcesInfoBuilder_ == null) { + lackingResourcesInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder>( - getBCOAJLAHNNM(), + getLackingResourcesInfo(), getParentForChildren(), isClean()); - bCOAJLAHNNM_ = null; + lackingResourcesInfo_ = null; } - return bCOAJLAHNNMBuilder_; + return lackingResourcesInfoBuilder_; } private int retcode_ ; /** - * int32 retcode = 5; + * int32 retcode = 10; * @return The retcode. */ @java.lang.Override @@ -679,7 +710,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 5; + * int32 retcode = 10; * @param value The retcode to set. * @return This builder for chaining. */ @@ -690,7 +721,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 5; + * int32 retcode = 10; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -699,37 +730,6 @@ public Builder clearRetcode() { onChanged(); return this; } - - private int questId_ ; - /** - * uint32 quest_id = 15; - * @return The questId. - */ - @java.lang.Override - public int getQuestId() { - return questId_; - } - /** - * uint32 quest_id = 15; - * @param value The questId to set. - * @return This builder for chaining. - */ - public Builder setQuestId(int value) { - - questId_ = value; - onChanged(); - return this; - } - /** - * uint32 quest_id = 15; - * @return This builder for chaining. - */ - public Builder clearQuestId() { - - questId_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -798,11 +798,11 @@ public emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLa static { java.lang.String[] descriptorData = { "\n GetQuestLackingResourceRsp.proto\032\031Lack" + - "ingResourceInfo.proto\"j\n\032GetQuestLacking" + - "ResourceRsp\022)\n\013BCOAJLAHNNM\030\004 \001(\0132\024.Lacki" + - "ngResourceInfo\022\017\n\007retcode\030\005 \001(\005\022\020\n\010quest" + - "_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006" + - "proto3" + "ingResourceInfo.proto\"u\n\032GetQuestLacking" + + "ResourceRsp\022\020\n\010quest_id\030\004 \001(\r\0224\n\026lacking" + + "_resources_info\030\010 \001(\0132\024.LackingResourceI" + + "nfo\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter." + + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -814,7 +814,7 @@ public emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLa internal_static_GetQuestLackingResourceRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GetQuestLackingResourceRsp_descriptor, - new java.lang.String[] { "BCOAJLAHNNM", "Retcode", "QuestId", }); + new java.lang.String[] { "QuestId", "LackingResourcesInfo", "Retcode", }); emu.grasscutter.net.proto.LackingResourceInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java index f410772a915..94daf4c7faa 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java @@ -25,14 +25,14 @@ public interface HomeAvatarTalkReqOrBuilder extends int getTalkId(); /** - * uint32 avatar_id = 15; + * uint32 avatar_id = 8; * @return The avatarId. */ int getAvatarId(); } /** * 
-   * CmdId: 29305
+   * CmdId: 21992
    *
* * Protobuf type {@code HomeAvatarTalkReq} @@ -84,7 +84,7 @@ private HomeAvatarTalkReq( talkId_ = input.readUInt32(); break; } - case 120: { + case 64: { avatarId_ = input.readUInt32(); break; @@ -132,10 +132,10 @@ public int getTalkId() { return talkId_; } - public static final int AVATAR_ID_FIELD_NUMBER = 15; + public static final int AVATAR_ID_FIELD_NUMBER = 8; private int avatarId_; /** - * uint32 avatar_id = 15; + * uint32 avatar_id = 8; * @return The avatarId. */ @java.lang.Override @@ -161,7 +161,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt32(4, talkId_); } if (avatarId_ != 0) { - output.writeUInt32(15, avatarId_); + output.writeUInt32(8, avatarId_); } unknownFields.writeTo(output); } @@ -178,7 +178,7 @@ public int getSerializedSize() { } if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, avatarId_); + .computeUInt32Size(8, avatarId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -311,7 +311,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29305
+     * CmdId: 21992
      *
* * Protobuf type {@code HomeAvatarTalkReq} @@ -499,7 +499,7 @@ public Builder clearTalkId() { private int avatarId_ ; /** - * uint32 avatar_id = 15; + * uint32 avatar_id = 8; * @return The avatarId. */ @java.lang.Override @@ -507,7 +507,7 @@ public int getAvatarId() { return avatarId_; } /** - * uint32 avatar_id = 15; + * uint32 avatar_id = 8; * @param value The avatarId to set. * @return This builder for chaining. */ @@ -518,7 +518,7 @@ public Builder setAvatarId(int value) { return this; } /** - * uint32 avatar_id = 15; + * uint32 avatar_id = 8; * @return This builder for chaining. */ public Builder clearAvatarId() { @@ -595,7 +595,7 @@ public emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq g static { java.lang.String[] descriptorData = { "\n\027HomeAvatarTalkReq.proto\"7\n\021HomeAvatarT" + - "alkReq\022\017\n\007talk_id\030\004 \001(\r\022\021\n\tavatar_id\030\017 \001" + + "alkReq\022\017\n\007talk_id\030\004 \001(\r\022\021\n\tavatar_id\030\010 \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/LackingResourceInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LackingResourceInfoOuterClass.java index 0eea81ff89a..521179e8003 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/LackingResourceInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/LackingResourceInfoOuterClass.java @@ -19,208 +19,208 @@ public interface LackingResourceInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 PDFBJCPKGAD = 1; - * @return A list containing the pDFBJCPKGAD. + * repeated uint32 JAODPKILOHD = 1; + * @return A list containing the jAODPKILOHD. */ - java.util.List getPDFBJCPKGADList(); + java.util.List getJAODPKILOHDList(); /** - * repeated uint32 PDFBJCPKGAD = 1; - * @return The count of pDFBJCPKGAD. + * repeated uint32 JAODPKILOHD = 1; + * @return The count of jAODPKILOHD. */ - int getPDFBJCPKGADCount(); + int getJAODPKILOHDCount(); /** - * repeated uint32 PDFBJCPKGAD = 1; + * repeated uint32 JAODPKILOHD = 1; * @param index The index of the element to return. - * @return The pDFBJCPKGAD at the given index. + * @return The jAODPKILOHD at the given index. */ - int getPDFBJCPKGAD(int index); + int getJAODPKILOHD(int index); /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ - int getJHOJDJGELLKCount(); + int getIGIDHGKOODOCount(); /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ - boolean containsJHOJDJGELLK( + boolean containsIGIDHGKOODO( int key); /** - * Use {@link #getJHOJDJGELLKMap()} instead. + * Use {@link #getIGIDHGKOODOMap()} instead. */ @java.lang.Deprecated java.util.Map - getJHOJDJGELLK(); + getIGIDHGKOODO(); /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ java.util.Map - getJHOJDJGELLKMap(); + getIGIDHGKOODOMap(); /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ - int getJHOJDJGELLKOrDefault( + int getIGIDHGKOODOOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ - int getJHOJDJGELLKOrThrow( + int getIGIDHGKOODOOrThrow( int key); /** - * repeated uint32 GEPBOPLIEMB = 3; - * @return A list containing the gEPBOPLIEMB. + * repeated uint32 OBAKLGMMOEO = 3; + * @return A list containing the oBAKLGMMOEO. */ - java.util.List getGEPBOPLIEMBList(); + java.util.List getOBAKLGMMOEOList(); /** - * repeated uint32 GEPBOPLIEMB = 3; - * @return The count of gEPBOPLIEMB. + * repeated uint32 OBAKLGMMOEO = 3; + * @return The count of oBAKLGMMOEO. */ - int getGEPBOPLIEMBCount(); + int getOBAKLGMMOEOCount(); /** - * repeated uint32 GEPBOPLIEMB = 3; + * repeated uint32 OBAKLGMMOEO = 3; * @param index The index of the element to return. - * @return The gEPBOPLIEMB at the given index. + * @return The oBAKLGMMOEO at the given index. */ - int getGEPBOPLIEMB(int index); + int getOBAKLGMMOEO(int index); /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ - int getKBEAGMAGFPDCount(); + int getLELGNGJOJAICount(); /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ - boolean containsKBEAGMAGFPD( + boolean containsLELGNGJOJAI( int key); /** - * Use {@link #getKBEAGMAGFPDMap()} instead. + * Use {@link #getLELGNGJOJAIMap()} instead. */ @java.lang.Deprecated java.util.Map - getKBEAGMAGFPD(); + getLELGNGJOJAI(); /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ java.util.Map - getKBEAGMAGFPDMap(); + getLELGNGJOJAIMap(); /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ - int getKBEAGMAGFPDOrDefault( + int getLELGNGJOJAIOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ - int getKBEAGMAGFPDOrThrow( + int getLELGNGJOJAIOrThrow( int key); /** - * repeated uint32 NGBJMLNHLBB = 5; - * @return A list containing the nGBJMLNHLBB. + * repeated uint32 AOECKDLECIJ = 5; + * @return A list containing the aOECKDLECIJ. */ - java.util.List getNGBJMLNHLBBList(); + java.util.List getAOECKDLECIJList(); /** - * repeated uint32 NGBJMLNHLBB = 5; - * @return The count of nGBJMLNHLBB. + * repeated uint32 AOECKDLECIJ = 5; + * @return The count of aOECKDLECIJ. */ - int getNGBJMLNHLBBCount(); + int getAOECKDLECIJCount(); /** - * repeated uint32 NGBJMLNHLBB = 5; + * repeated uint32 AOECKDLECIJ = 5; * @param index The index of the element to return. - * @return The nGBJMLNHLBB at the given index. + * @return The aOECKDLECIJ at the given index. */ - int getNGBJMLNHLBB(int index); + int getAOECKDLECIJ(int index); /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ - int getGJBFBFOCLJLCount(); + int getACAAJJBNCDMCount(); /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ - boolean containsGJBFBFOCLJL( + boolean containsACAAJJBNCDM( int key); /** - * Use {@link #getGJBFBFOCLJLMap()} instead. + * Use {@link #getACAAJJBNCDMMap()} instead. */ @java.lang.Deprecated java.util.Map - getGJBFBFOCLJL(); + getACAAJJBNCDM(); /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ java.util.Map - getGJBFBFOCLJLMap(); + getACAAJJBNCDMMap(); /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ - int getGJBFBFOCLJLOrDefault( + int getACAAJJBNCDMOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ - int getGJBFBFOCLJLOrThrow( + int getACAAJJBNCDMOrThrow( int key); /** - * repeated uint32 IFLMBHBHLMC = 7; - * @return A list containing the iFLMBHBHLMC. + * repeated uint32 LHEGFHKBMKF = 7; + * @return A list containing the lHEGFHKBMKF. */ - java.util.List getIFLMBHBHLMCList(); + java.util.List getLHEGFHKBMKFList(); /** - * repeated uint32 IFLMBHBHLMC = 7; - * @return The count of iFLMBHBHLMC. + * repeated uint32 LHEGFHKBMKF = 7; + * @return The count of lHEGFHKBMKF. */ - int getIFLMBHBHLMCCount(); + int getLHEGFHKBMKFCount(); /** - * repeated uint32 IFLMBHBHLMC = 7; + * repeated uint32 LHEGFHKBMKF = 7; * @param index The index of the element to return. - * @return The iFLMBHBHLMC at the given index. + * @return The lHEGFHKBMKF at the given index. */ - int getIFLMBHBHLMC(int index); + int getLHEGFHKBMKF(int index); /** - * repeated uint32 PLGICBELJNB = 8; - * @return A list containing the pLGICBELJNB. + * repeated uint32 HIIHFCBJLDI = 8; + * @return A list containing the hIIHFCBJLDI. */ - java.util.List getPLGICBELJNBList(); + java.util.List getHIIHFCBJLDIList(); /** - * repeated uint32 PLGICBELJNB = 8; - * @return The count of pLGICBELJNB. + * repeated uint32 HIIHFCBJLDI = 8; + * @return The count of hIIHFCBJLDI. */ - int getPLGICBELJNBCount(); + int getHIIHFCBJLDICount(); /** - * repeated uint32 PLGICBELJNB = 8; + * repeated uint32 HIIHFCBJLDI = 8; * @param index The index of the element to return. - * @return The pLGICBELJNB at the given index. + * @return The hIIHFCBJLDI at the given index. */ - int getPLGICBELJNB(int index); + int getHIIHFCBJLDI(int index); /** - * repeated uint32 FOIHNLFBPFI = 9; - * @return A list containing the fOIHNLFBPFI. + * repeated uint32 HCPKDCNKPGD = 9; + * @return A list containing the hCPKDCNKPGD. */ - java.util.List getFOIHNLFBPFIList(); + java.util.List getHCPKDCNKPGDList(); /** - * repeated uint32 FOIHNLFBPFI = 9; - * @return The count of fOIHNLFBPFI. + * repeated uint32 HCPKDCNKPGD = 9; + * @return The count of hCPKDCNKPGD. */ - int getFOIHNLFBPFICount(); + int getHCPKDCNKPGDCount(); /** - * repeated uint32 FOIHNLFBPFI = 9; + * repeated uint32 HCPKDCNKPGD = 9; * @param index The index of the element to return. - * @return The fOIHNLFBPFI at the given index. + * @return The hCPKDCNKPGD at the given index. */ - int getFOIHNLFBPFI(int index); + int getHCPKDCNKPGD(int index); } /** * Protobuf type {@code LackingResourceInfo} @@ -235,12 +235,12 @@ private LackingResourceInfo(com.google.protobuf.GeneratedMessageV3.Builder bu super(builder); } private LackingResourceInfo() { - pDFBJCPKGAD_ = emptyIntList(); - gEPBOPLIEMB_ = emptyIntList(); - nGBJMLNHLBB_ = emptyIntList(); - iFLMBHBHLMC_ = emptyIntList(); - pLGICBELJNB_ = emptyIntList(); - fOIHNLFBPFI_ = emptyIntList(); + jAODPKILOHD_ = emptyIntList(); + oBAKLGMMOEO_ = emptyIntList(); + aOECKDLECIJ_ = emptyIntList(); + lHEGFHKBMKF_ = emptyIntList(); + hIIHFCBJLDI_ = emptyIntList(); + hCPKDCNKPGD_ = emptyIntList(); } @java.lang.Override @@ -276,165 +276,165 @@ private LackingResourceInfo( break; case 8: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - pDFBJCPKGAD_ = newIntList(); + jAODPKILOHD_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - pDFBJCPKGAD_.addInt(input.readUInt32()); + jAODPKILOHD_.addInt(input.readUInt32()); break; } case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - pDFBJCPKGAD_ = newIntList(); + jAODPKILOHD_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - pDFBJCPKGAD_.addInt(input.readUInt32()); + jAODPKILOHD_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 18: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - jHOJDJGELLK_ = com.google.protobuf.MapField.newMapField( - JHOJDJGELLKDefaultEntryHolder.defaultEntry); + iGIDHGKOODO_ = com.google.protobuf.MapField.newMapField( + IGIDHGKOODODefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000002; } com.google.protobuf.MapEntry - jHOJDJGELLK__ = input.readMessage( - JHOJDJGELLKDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - jHOJDJGELLK_.getMutableMap().put( - jHOJDJGELLK__.getKey(), jHOJDJGELLK__.getValue()); + iGIDHGKOODO__ = input.readMessage( + IGIDHGKOODODefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + iGIDHGKOODO_.getMutableMap().put( + iGIDHGKOODO__.getKey(), iGIDHGKOODO__.getValue()); break; } case 24: { if (!((mutable_bitField0_ & 0x00000004) != 0)) { - gEPBOPLIEMB_ = newIntList(); + oBAKLGMMOEO_ = newIntList(); mutable_bitField0_ |= 0x00000004; } - gEPBOPLIEMB_.addInt(input.readUInt32()); + oBAKLGMMOEO_.addInt(input.readUInt32()); break; } case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { - gEPBOPLIEMB_ = newIntList(); + oBAKLGMMOEO_ = newIntList(); mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { - gEPBOPLIEMB_.addInt(input.readUInt32()); + oBAKLGMMOEO_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 34: { if (!((mutable_bitField0_ & 0x00000008) != 0)) { - kBEAGMAGFPD_ = com.google.protobuf.MapField.newMapField( - KBEAGMAGFPDDefaultEntryHolder.defaultEntry); + lELGNGJOJAI_ = com.google.protobuf.MapField.newMapField( + LELGNGJOJAIDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000008; } com.google.protobuf.MapEntry - kBEAGMAGFPD__ = input.readMessage( - KBEAGMAGFPDDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - kBEAGMAGFPD_.getMutableMap().put( - kBEAGMAGFPD__.getKey(), kBEAGMAGFPD__.getValue()); + lELGNGJOJAI__ = input.readMessage( + LELGNGJOJAIDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + lELGNGJOJAI_.getMutableMap().put( + lELGNGJOJAI__.getKey(), lELGNGJOJAI__.getValue()); break; } case 40: { if (!((mutable_bitField0_ & 0x00000010) != 0)) { - nGBJMLNHLBB_ = newIntList(); + aOECKDLECIJ_ = newIntList(); mutable_bitField0_ |= 0x00000010; } - nGBJMLNHLBB_.addInt(input.readUInt32()); + aOECKDLECIJ_.addInt(input.readUInt32()); break; } case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) { - nGBJMLNHLBB_ = newIntList(); + aOECKDLECIJ_ = newIntList(); mutable_bitField0_ |= 0x00000010; } while (input.getBytesUntilLimit() > 0) { - nGBJMLNHLBB_.addInt(input.readUInt32()); + aOECKDLECIJ_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 50: { if (!((mutable_bitField0_ & 0x00000020) != 0)) { - gJBFBFOCLJL_ = com.google.protobuf.MapField.newMapField( - GJBFBFOCLJLDefaultEntryHolder.defaultEntry); + aCAAJJBNCDM_ = com.google.protobuf.MapField.newMapField( + ACAAJJBNCDMDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000020; } com.google.protobuf.MapEntry - gJBFBFOCLJL__ = input.readMessage( - GJBFBFOCLJLDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - gJBFBFOCLJL_.getMutableMap().put( - gJBFBFOCLJL__.getKey(), gJBFBFOCLJL__.getValue()); + aCAAJJBNCDM__ = input.readMessage( + ACAAJJBNCDMDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + aCAAJJBNCDM_.getMutableMap().put( + aCAAJJBNCDM__.getKey(), aCAAJJBNCDM__.getValue()); break; } case 56: { if (!((mutable_bitField0_ & 0x00000040) != 0)) { - iFLMBHBHLMC_ = newIntList(); + lHEGFHKBMKF_ = newIntList(); mutable_bitField0_ |= 0x00000040; } - iFLMBHBHLMC_.addInt(input.readUInt32()); + lHEGFHKBMKF_.addInt(input.readUInt32()); break; } case 58: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) { - iFLMBHBHLMC_ = newIntList(); + lHEGFHKBMKF_ = newIntList(); mutable_bitField0_ |= 0x00000040; } while (input.getBytesUntilLimit() > 0) { - iFLMBHBHLMC_.addInt(input.readUInt32()); + lHEGFHKBMKF_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 64: { if (!((mutable_bitField0_ & 0x00000080) != 0)) { - pLGICBELJNB_ = newIntList(); + hIIHFCBJLDI_ = newIntList(); mutable_bitField0_ |= 0x00000080; } - pLGICBELJNB_.addInt(input.readUInt32()); + hIIHFCBJLDI_.addInt(input.readUInt32()); break; } case 66: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) { - pLGICBELJNB_ = newIntList(); + hIIHFCBJLDI_ = newIntList(); mutable_bitField0_ |= 0x00000080; } while (input.getBytesUntilLimit() > 0) { - pLGICBELJNB_.addInt(input.readUInt32()); + hIIHFCBJLDI_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 72: { if (!((mutable_bitField0_ & 0x00000100) != 0)) { - fOIHNLFBPFI_ = newIntList(); + hCPKDCNKPGD_ = newIntList(); mutable_bitField0_ |= 0x00000100; } - fOIHNLFBPFI_.addInt(input.readUInt32()); + hCPKDCNKPGD_.addInt(input.readUInt32()); break; } case 74: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) { - fOIHNLFBPFI_ = newIntList(); + hCPKDCNKPGD_ = newIntList(); mutable_bitField0_ |= 0x00000100; } while (input.getBytesUntilLimit() > 0) { - fOIHNLFBPFI_.addInt(input.readUInt32()); + hCPKDCNKPGD_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -455,22 +455,22 @@ private LackingResourceInfo( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - pDFBJCPKGAD_.makeImmutable(); // C + jAODPKILOHD_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000004) != 0)) { - gEPBOPLIEMB_.makeImmutable(); // C + oBAKLGMMOEO_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000010) != 0)) { - nGBJMLNHLBB_.makeImmutable(); // C + aOECKDLECIJ_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000040) != 0)) { - iFLMBHBHLMC_.makeImmutable(); // C + lHEGFHKBMKF_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000080) != 0)) { - pLGICBELJNB_.makeImmutable(); // C + hIIHFCBJLDI_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000100) != 0)) { - fOIHNLFBPFI_.makeImmutable(); // C + hCPKDCNKPGD_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -487,11 +487,11 @@ protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { case 2: - return internalGetJHOJDJGELLK(); + return internalGetIGIDHGKOODO(); case 4: - return internalGetKBEAGMAGFPD(); + return internalGetLELGNGJOJAI(); case 6: - return internalGetGJBFBFOCLJL(); + return internalGetACAAJJBNCDM(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -505,416 +505,416 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.class, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder.class); } - public static final int PDFBJCPKGAD_FIELD_NUMBER = 1; - private com.google.protobuf.Internal.IntList pDFBJCPKGAD_; + public static final int JAODPKILOHD_FIELD_NUMBER = 1; + private com.google.protobuf.Internal.IntList jAODPKILOHD_; /** - * repeated uint32 PDFBJCPKGAD = 1; - * @return A list containing the pDFBJCPKGAD. + * repeated uint32 JAODPKILOHD = 1; + * @return A list containing the jAODPKILOHD. */ @java.lang.Override public java.util.List - getPDFBJCPKGADList() { - return pDFBJCPKGAD_; + getJAODPKILOHDList() { + return jAODPKILOHD_; } /** - * repeated uint32 PDFBJCPKGAD = 1; - * @return The count of pDFBJCPKGAD. + * repeated uint32 JAODPKILOHD = 1; + * @return The count of jAODPKILOHD. */ - public int getPDFBJCPKGADCount() { - return pDFBJCPKGAD_.size(); + public int getJAODPKILOHDCount() { + return jAODPKILOHD_.size(); } /** - * repeated uint32 PDFBJCPKGAD = 1; + * repeated uint32 JAODPKILOHD = 1; * @param index The index of the element to return. - * @return The pDFBJCPKGAD at the given index. + * @return The jAODPKILOHD at the given index. */ - public int getPDFBJCPKGAD(int index) { - return pDFBJCPKGAD_.getInt(index); + public int getJAODPKILOHD(int index) { + return jAODPKILOHD_.getInt(index); } - private int pDFBJCPKGADMemoizedSerializedSize = -1; + private int jAODPKILOHDMemoizedSerializedSize = -1; - public static final int JHOJDJGELLK_FIELD_NUMBER = 2; - private static final class JHOJDJGELLKDefaultEntryHolder { + public static final int IGIDHGKOODO_FIELD_NUMBER = 2; + private static final class IGIDHGKOODODefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_JHOJDJGELLKEntry_descriptor, + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_IGIDHGKOODOEntry_descriptor, com.google.protobuf.WireFormat.FieldType.UINT32, 0, com.google.protobuf.WireFormat.FieldType.UINT32, 0); } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> jHOJDJGELLK_; + java.lang.Integer, java.lang.Integer> iGIDHGKOODO_; private com.google.protobuf.MapField - internalGetJHOJDJGELLK() { - if (jHOJDJGELLK_ == null) { + internalGetIGIDHGKOODO() { + if (iGIDHGKOODO_ == null) { return com.google.protobuf.MapField.emptyMapField( - JHOJDJGELLKDefaultEntryHolder.defaultEntry); + IGIDHGKOODODefaultEntryHolder.defaultEntry); } - return jHOJDJGELLK_; + return iGIDHGKOODO_; } - public int getJHOJDJGELLKCount() { - return internalGetJHOJDJGELLK().getMap().size(); + public int getIGIDHGKOODOCount() { + return internalGetIGIDHGKOODO().getMap().size(); } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public boolean containsJHOJDJGELLK( + public boolean containsIGIDHGKOODO( int key) { - return internalGetJHOJDJGELLK().getMap().containsKey(key); + return internalGetIGIDHGKOODO().getMap().containsKey(key); } /** - * Use {@link #getJHOJDJGELLKMap()} instead. + * Use {@link #getIGIDHGKOODOMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getJHOJDJGELLK() { - return getJHOJDJGELLKMap(); + public java.util.Map getIGIDHGKOODO() { + return getIGIDHGKOODOMap(); } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public java.util.Map getJHOJDJGELLKMap() { - return internalGetJHOJDJGELLK().getMap(); + public java.util.Map getIGIDHGKOODOMap() { + return internalGetIGIDHGKOODO().getMap(); } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public int getJHOJDJGELLKOrDefault( + public int getIGIDHGKOODOOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetJHOJDJGELLK().getMap(); + internalGetIGIDHGKOODO().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public int getJHOJDJGELLKOrThrow( + public int getIGIDHGKOODOOrThrow( int key) { java.util.Map map = - internalGetJHOJDJGELLK().getMap(); + internalGetIGIDHGKOODO().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public static final int GEPBOPLIEMB_FIELD_NUMBER = 3; - private com.google.protobuf.Internal.IntList gEPBOPLIEMB_; + public static final int OBAKLGMMOEO_FIELD_NUMBER = 3; + private com.google.protobuf.Internal.IntList oBAKLGMMOEO_; /** - * repeated uint32 GEPBOPLIEMB = 3; - * @return A list containing the gEPBOPLIEMB. + * repeated uint32 OBAKLGMMOEO = 3; + * @return A list containing the oBAKLGMMOEO. */ @java.lang.Override public java.util.List - getGEPBOPLIEMBList() { - return gEPBOPLIEMB_; + getOBAKLGMMOEOList() { + return oBAKLGMMOEO_; } /** - * repeated uint32 GEPBOPLIEMB = 3; - * @return The count of gEPBOPLIEMB. + * repeated uint32 OBAKLGMMOEO = 3; + * @return The count of oBAKLGMMOEO. */ - public int getGEPBOPLIEMBCount() { - return gEPBOPLIEMB_.size(); + public int getOBAKLGMMOEOCount() { + return oBAKLGMMOEO_.size(); } /** - * repeated uint32 GEPBOPLIEMB = 3; + * repeated uint32 OBAKLGMMOEO = 3; * @param index The index of the element to return. - * @return The gEPBOPLIEMB at the given index. + * @return The oBAKLGMMOEO at the given index. */ - public int getGEPBOPLIEMB(int index) { - return gEPBOPLIEMB_.getInt(index); + public int getOBAKLGMMOEO(int index) { + return oBAKLGMMOEO_.getInt(index); } - private int gEPBOPLIEMBMemoizedSerializedSize = -1; + private int oBAKLGMMOEOMemoizedSerializedSize = -1; - public static final int KBEAGMAGFPD_FIELD_NUMBER = 4; - private static final class KBEAGMAGFPDDefaultEntryHolder { + public static final int LELGNGJOJAI_FIELD_NUMBER = 4; + private static final class LELGNGJOJAIDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_KBEAGMAGFPDEntry_descriptor, + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_LELGNGJOJAIEntry_descriptor, com.google.protobuf.WireFormat.FieldType.UINT32, 0, com.google.protobuf.WireFormat.FieldType.UINT32, 0); } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> kBEAGMAGFPD_; + java.lang.Integer, java.lang.Integer> lELGNGJOJAI_; private com.google.protobuf.MapField - internalGetKBEAGMAGFPD() { - if (kBEAGMAGFPD_ == null) { + internalGetLELGNGJOJAI() { + if (lELGNGJOJAI_ == null) { return com.google.protobuf.MapField.emptyMapField( - KBEAGMAGFPDDefaultEntryHolder.defaultEntry); + LELGNGJOJAIDefaultEntryHolder.defaultEntry); } - return kBEAGMAGFPD_; + return lELGNGJOJAI_; } - public int getKBEAGMAGFPDCount() { - return internalGetKBEAGMAGFPD().getMap().size(); + public int getLELGNGJOJAICount() { + return internalGetLELGNGJOJAI().getMap().size(); } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public boolean containsKBEAGMAGFPD( + public boolean containsLELGNGJOJAI( int key) { - return internalGetKBEAGMAGFPD().getMap().containsKey(key); + return internalGetLELGNGJOJAI().getMap().containsKey(key); } /** - * Use {@link #getKBEAGMAGFPDMap()} instead. + * Use {@link #getLELGNGJOJAIMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getKBEAGMAGFPD() { - return getKBEAGMAGFPDMap(); + public java.util.Map getLELGNGJOJAI() { + return getLELGNGJOJAIMap(); } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public java.util.Map getKBEAGMAGFPDMap() { - return internalGetKBEAGMAGFPD().getMap(); + public java.util.Map getLELGNGJOJAIMap() { + return internalGetLELGNGJOJAI().getMap(); } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public int getKBEAGMAGFPDOrDefault( + public int getLELGNGJOJAIOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetKBEAGMAGFPD().getMap(); + internalGetLELGNGJOJAI().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public int getKBEAGMAGFPDOrThrow( + public int getLELGNGJOJAIOrThrow( int key) { java.util.Map map = - internalGetKBEAGMAGFPD().getMap(); + internalGetLELGNGJOJAI().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public static final int NGBJMLNHLBB_FIELD_NUMBER = 5; - private com.google.protobuf.Internal.IntList nGBJMLNHLBB_; + public static final int AOECKDLECIJ_FIELD_NUMBER = 5; + private com.google.protobuf.Internal.IntList aOECKDLECIJ_; /** - * repeated uint32 NGBJMLNHLBB = 5; - * @return A list containing the nGBJMLNHLBB. + * repeated uint32 AOECKDLECIJ = 5; + * @return A list containing the aOECKDLECIJ. */ @java.lang.Override public java.util.List - getNGBJMLNHLBBList() { - return nGBJMLNHLBB_; + getAOECKDLECIJList() { + return aOECKDLECIJ_; } /** - * repeated uint32 NGBJMLNHLBB = 5; - * @return The count of nGBJMLNHLBB. + * repeated uint32 AOECKDLECIJ = 5; + * @return The count of aOECKDLECIJ. */ - public int getNGBJMLNHLBBCount() { - return nGBJMLNHLBB_.size(); + public int getAOECKDLECIJCount() { + return aOECKDLECIJ_.size(); } /** - * repeated uint32 NGBJMLNHLBB = 5; + * repeated uint32 AOECKDLECIJ = 5; * @param index The index of the element to return. - * @return The nGBJMLNHLBB at the given index. + * @return The aOECKDLECIJ at the given index. */ - public int getNGBJMLNHLBB(int index) { - return nGBJMLNHLBB_.getInt(index); + public int getAOECKDLECIJ(int index) { + return aOECKDLECIJ_.getInt(index); } - private int nGBJMLNHLBBMemoizedSerializedSize = -1; + private int aOECKDLECIJMemoizedSerializedSize = -1; - public static final int GJBFBFOCLJL_FIELD_NUMBER = 6; - private static final class GJBFBFOCLJLDefaultEntryHolder { + public static final int ACAAJJBNCDM_FIELD_NUMBER = 6; + private static final class ACAAJJBNCDMDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_GJBFBFOCLJLEntry_descriptor, + emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_descriptor, com.google.protobuf.WireFormat.FieldType.UINT32, 0, com.google.protobuf.WireFormat.FieldType.UINT32, 0); } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> gJBFBFOCLJL_; + java.lang.Integer, java.lang.Integer> aCAAJJBNCDM_; private com.google.protobuf.MapField - internalGetGJBFBFOCLJL() { - if (gJBFBFOCLJL_ == null) { + internalGetACAAJJBNCDM() { + if (aCAAJJBNCDM_ == null) { return com.google.protobuf.MapField.emptyMapField( - GJBFBFOCLJLDefaultEntryHolder.defaultEntry); + ACAAJJBNCDMDefaultEntryHolder.defaultEntry); } - return gJBFBFOCLJL_; + return aCAAJJBNCDM_; } - public int getGJBFBFOCLJLCount() { - return internalGetGJBFBFOCLJL().getMap().size(); + public int getACAAJJBNCDMCount() { + return internalGetACAAJJBNCDM().getMap().size(); } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public boolean containsGJBFBFOCLJL( + public boolean containsACAAJJBNCDM( int key) { - return internalGetGJBFBFOCLJL().getMap().containsKey(key); + return internalGetACAAJJBNCDM().getMap().containsKey(key); } /** - * Use {@link #getGJBFBFOCLJLMap()} instead. + * Use {@link #getACAAJJBNCDMMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getGJBFBFOCLJL() { - return getGJBFBFOCLJLMap(); + public java.util.Map getACAAJJBNCDM() { + return getACAAJJBNCDMMap(); } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public java.util.Map getGJBFBFOCLJLMap() { - return internalGetGJBFBFOCLJL().getMap(); + public java.util.Map getACAAJJBNCDMMap() { + return internalGetACAAJJBNCDM().getMap(); } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public int getGJBFBFOCLJLOrDefault( + public int getACAAJJBNCDMOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetGJBFBFOCLJL().getMap(); + internalGetACAAJJBNCDM().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public int getGJBFBFOCLJLOrThrow( + public int getACAAJJBNCDMOrThrow( int key) { java.util.Map map = - internalGetGJBFBFOCLJL().getMap(); + internalGetACAAJJBNCDM().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public static final int IFLMBHBHLMC_FIELD_NUMBER = 7; - private com.google.protobuf.Internal.IntList iFLMBHBHLMC_; + public static final int LHEGFHKBMKF_FIELD_NUMBER = 7; + private com.google.protobuf.Internal.IntList lHEGFHKBMKF_; /** - * repeated uint32 IFLMBHBHLMC = 7; - * @return A list containing the iFLMBHBHLMC. + * repeated uint32 LHEGFHKBMKF = 7; + * @return A list containing the lHEGFHKBMKF. */ @java.lang.Override public java.util.List - getIFLMBHBHLMCList() { - return iFLMBHBHLMC_; + getLHEGFHKBMKFList() { + return lHEGFHKBMKF_; } /** - * repeated uint32 IFLMBHBHLMC = 7; - * @return The count of iFLMBHBHLMC. + * repeated uint32 LHEGFHKBMKF = 7; + * @return The count of lHEGFHKBMKF. */ - public int getIFLMBHBHLMCCount() { - return iFLMBHBHLMC_.size(); + public int getLHEGFHKBMKFCount() { + return lHEGFHKBMKF_.size(); } /** - * repeated uint32 IFLMBHBHLMC = 7; + * repeated uint32 LHEGFHKBMKF = 7; * @param index The index of the element to return. - * @return The iFLMBHBHLMC at the given index. + * @return The lHEGFHKBMKF at the given index. */ - public int getIFLMBHBHLMC(int index) { - return iFLMBHBHLMC_.getInt(index); + public int getLHEGFHKBMKF(int index) { + return lHEGFHKBMKF_.getInt(index); } - private int iFLMBHBHLMCMemoizedSerializedSize = -1; + private int lHEGFHKBMKFMemoizedSerializedSize = -1; - public static final int PLGICBELJNB_FIELD_NUMBER = 8; - private com.google.protobuf.Internal.IntList pLGICBELJNB_; + public static final int HIIHFCBJLDI_FIELD_NUMBER = 8; + private com.google.protobuf.Internal.IntList hIIHFCBJLDI_; /** - * repeated uint32 PLGICBELJNB = 8; - * @return A list containing the pLGICBELJNB. + * repeated uint32 HIIHFCBJLDI = 8; + * @return A list containing the hIIHFCBJLDI. */ @java.lang.Override public java.util.List - getPLGICBELJNBList() { - return pLGICBELJNB_; + getHIIHFCBJLDIList() { + return hIIHFCBJLDI_; } /** - * repeated uint32 PLGICBELJNB = 8; - * @return The count of pLGICBELJNB. + * repeated uint32 HIIHFCBJLDI = 8; + * @return The count of hIIHFCBJLDI. */ - public int getPLGICBELJNBCount() { - return pLGICBELJNB_.size(); + public int getHIIHFCBJLDICount() { + return hIIHFCBJLDI_.size(); } /** - * repeated uint32 PLGICBELJNB = 8; + * repeated uint32 HIIHFCBJLDI = 8; * @param index The index of the element to return. - * @return The pLGICBELJNB at the given index. + * @return The hIIHFCBJLDI at the given index. */ - public int getPLGICBELJNB(int index) { - return pLGICBELJNB_.getInt(index); + public int getHIIHFCBJLDI(int index) { + return hIIHFCBJLDI_.getInt(index); } - private int pLGICBELJNBMemoizedSerializedSize = -1; + private int hIIHFCBJLDIMemoizedSerializedSize = -1; - public static final int FOIHNLFBPFI_FIELD_NUMBER = 9; - private com.google.protobuf.Internal.IntList fOIHNLFBPFI_; + public static final int HCPKDCNKPGD_FIELD_NUMBER = 9; + private com.google.protobuf.Internal.IntList hCPKDCNKPGD_; /** - * repeated uint32 FOIHNLFBPFI = 9; - * @return A list containing the fOIHNLFBPFI. + * repeated uint32 HCPKDCNKPGD = 9; + * @return A list containing the hCPKDCNKPGD. */ @java.lang.Override public java.util.List - getFOIHNLFBPFIList() { - return fOIHNLFBPFI_; + getHCPKDCNKPGDList() { + return hCPKDCNKPGD_; } /** - * repeated uint32 FOIHNLFBPFI = 9; - * @return The count of fOIHNLFBPFI. + * repeated uint32 HCPKDCNKPGD = 9; + * @return The count of hCPKDCNKPGD. */ - public int getFOIHNLFBPFICount() { - return fOIHNLFBPFI_.size(); + public int getHCPKDCNKPGDCount() { + return hCPKDCNKPGD_.size(); } /** - * repeated uint32 FOIHNLFBPFI = 9; + * repeated uint32 HCPKDCNKPGD = 9; * @param index The index of the element to return. - * @return The fOIHNLFBPFI at the given index. + * @return The hCPKDCNKPGD at the given index. */ - public int getFOIHNLFBPFI(int index) { - return fOIHNLFBPFI_.getInt(index); + public int getHCPKDCNKPGD(int index) { + return hCPKDCNKPGD_.getInt(index); } - private int fOIHNLFBPFIMemoizedSerializedSize = -1; + private int hCPKDCNKPGDMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -931,65 +931,65 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getPDFBJCPKGADList().size() > 0) { + if (getJAODPKILOHDList().size() > 0) { output.writeUInt32NoTag(10); - output.writeUInt32NoTag(pDFBJCPKGADMemoizedSerializedSize); + output.writeUInt32NoTag(jAODPKILOHDMemoizedSerializedSize); } - for (int i = 0; i < pDFBJCPKGAD_.size(); i++) { - output.writeUInt32NoTag(pDFBJCPKGAD_.getInt(i)); + for (int i = 0; i < jAODPKILOHD_.size(); i++) { + output.writeUInt32NoTag(jAODPKILOHD_.getInt(i)); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, - internalGetJHOJDJGELLK(), - JHOJDJGELLKDefaultEntryHolder.defaultEntry, + internalGetIGIDHGKOODO(), + IGIDHGKOODODefaultEntryHolder.defaultEntry, 2); - if (getGEPBOPLIEMBList().size() > 0) { + if (getOBAKLGMMOEOList().size() > 0) { output.writeUInt32NoTag(26); - output.writeUInt32NoTag(gEPBOPLIEMBMemoizedSerializedSize); + output.writeUInt32NoTag(oBAKLGMMOEOMemoizedSerializedSize); } - for (int i = 0; i < gEPBOPLIEMB_.size(); i++) { - output.writeUInt32NoTag(gEPBOPLIEMB_.getInt(i)); + for (int i = 0; i < oBAKLGMMOEO_.size(); i++) { + output.writeUInt32NoTag(oBAKLGMMOEO_.getInt(i)); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, - internalGetKBEAGMAGFPD(), - KBEAGMAGFPDDefaultEntryHolder.defaultEntry, + internalGetLELGNGJOJAI(), + LELGNGJOJAIDefaultEntryHolder.defaultEntry, 4); - if (getNGBJMLNHLBBList().size() > 0) { + if (getAOECKDLECIJList().size() > 0) { output.writeUInt32NoTag(42); - output.writeUInt32NoTag(nGBJMLNHLBBMemoizedSerializedSize); + output.writeUInt32NoTag(aOECKDLECIJMemoizedSerializedSize); } - for (int i = 0; i < nGBJMLNHLBB_.size(); i++) { - output.writeUInt32NoTag(nGBJMLNHLBB_.getInt(i)); + for (int i = 0; i < aOECKDLECIJ_.size(); i++) { + output.writeUInt32NoTag(aOECKDLECIJ_.getInt(i)); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, - internalGetGJBFBFOCLJL(), - GJBFBFOCLJLDefaultEntryHolder.defaultEntry, + internalGetACAAJJBNCDM(), + ACAAJJBNCDMDefaultEntryHolder.defaultEntry, 6); - if (getIFLMBHBHLMCList().size() > 0) { + if (getLHEGFHKBMKFList().size() > 0) { output.writeUInt32NoTag(58); - output.writeUInt32NoTag(iFLMBHBHLMCMemoizedSerializedSize); + output.writeUInt32NoTag(lHEGFHKBMKFMemoizedSerializedSize); } - for (int i = 0; i < iFLMBHBHLMC_.size(); i++) { - output.writeUInt32NoTag(iFLMBHBHLMC_.getInt(i)); + for (int i = 0; i < lHEGFHKBMKF_.size(); i++) { + output.writeUInt32NoTag(lHEGFHKBMKF_.getInt(i)); } - if (getPLGICBELJNBList().size() > 0) { + if (getHIIHFCBJLDIList().size() > 0) { output.writeUInt32NoTag(66); - output.writeUInt32NoTag(pLGICBELJNBMemoizedSerializedSize); + output.writeUInt32NoTag(hIIHFCBJLDIMemoizedSerializedSize); } - for (int i = 0; i < pLGICBELJNB_.size(); i++) { - output.writeUInt32NoTag(pLGICBELJNB_.getInt(i)); + for (int i = 0; i < hIIHFCBJLDI_.size(); i++) { + output.writeUInt32NoTag(hIIHFCBJLDI_.getInt(i)); } - if (getFOIHNLFBPFIList().size() > 0) { + if (getHCPKDCNKPGDList().size() > 0) { output.writeUInt32NoTag(74); - output.writeUInt32NoTag(fOIHNLFBPFIMemoizedSerializedSize); + output.writeUInt32NoTag(hCPKDCNKPGDMemoizedSerializedSize); } - for (int i = 0; i < fOIHNLFBPFI_.size(); i++) { - output.writeUInt32NoTag(fOIHNLFBPFI_.getInt(i)); + for (int i = 0; i < hCPKDCNKPGD_.size(); i++) { + output.writeUInt32NoTag(hCPKDCNKPGD_.getInt(i)); } unknownFields.writeTo(output); } @@ -1002,117 +1002,117 @@ public int getSerializedSize() { size = 0; { int dataSize = 0; - for (int i = 0; i < pDFBJCPKGAD_.size(); i++) { + for (int i = 0; i < jAODPKILOHD_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(pDFBJCPKGAD_.getInt(i)); + .computeUInt32SizeNoTag(jAODPKILOHD_.getInt(i)); } size += dataSize; - if (!getPDFBJCPKGADList().isEmpty()) { + if (!getJAODPKILOHDList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - pDFBJCPKGADMemoizedSerializedSize = dataSize; + jAODPKILOHDMemoizedSerializedSize = dataSize; } for (java.util.Map.Entry entry - : internalGetJHOJDJGELLK().getMap().entrySet()) { + : internalGetIGIDHGKOODO().getMap().entrySet()) { com.google.protobuf.MapEntry - jHOJDJGELLK__ = JHOJDJGELLKDefaultEntryHolder.defaultEntry.newBuilderForType() + iGIDHGKOODO__ = IGIDHGKOODODefaultEntryHolder.defaultEntry.newBuilderForType() .setKey(entry.getKey()) .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, jHOJDJGELLK__); + .computeMessageSize(2, iGIDHGKOODO__); } { int dataSize = 0; - for (int i = 0; i < gEPBOPLIEMB_.size(); i++) { + for (int i = 0; i < oBAKLGMMOEO_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(gEPBOPLIEMB_.getInt(i)); + .computeUInt32SizeNoTag(oBAKLGMMOEO_.getInt(i)); } size += dataSize; - if (!getGEPBOPLIEMBList().isEmpty()) { + if (!getOBAKLGMMOEOList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - gEPBOPLIEMBMemoizedSerializedSize = dataSize; + oBAKLGMMOEOMemoizedSerializedSize = dataSize; } for (java.util.Map.Entry entry - : internalGetKBEAGMAGFPD().getMap().entrySet()) { + : internalGetLELGNGJOJAI().getMap().entrySet()) { com.google.protobuf.MapEntry - kBEAGMAGFPD__ = KBEAGMAGFPDDefaultEntryHolder.defaultEntry.newBuilderForType() + lELGNGJOJAI__ = LELGNGJOJAIDefaultEntryHolder.defaultEntry.newBuilderForType() .setKey(entry.getKey()) .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, kBEAGMAGFPD__); + .computeMessageSize(4, lELGNGJOJAI__); } { int dataSize = 0; - for (int i = 0; i < nGBJMLNHLBB_.size(); i++) { + for (int i = 0; i < aOECKDLECIJ_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(nGBJMLNHLBB_.getInt(i)); + .computeUInt32SizeNoTag(aOECKDLECIJ_.getInt(i)); } size += dataSize; - if (!getNGBJMLNHLBBList().isEmpty()) { + if (!getAOECKDLECIJList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - nGBJMLNHLBBMemoizedSerializedSize = dataSize; + aOECKDLECIJMemoizedSerializedSize = dataSize; } for (java.util.Map.Entry entry - : internalGetGJBFBFOCLJL().getMap().entrySet()) { + : internalGetACAAJJBNCDM().getMap().entrySet()) { com.google.protobuf.MapEntry - gJBFBFOCLJL__ = GJBFBFOCLJLDefaultEntryHolder.defaultEntry.newBuilderForType() + aCAAJJBNCDM__ = ACAAJJBNCDMDefaultEntryHolder.defaultEntry.newBuilderForType() .setKey(entry.getKey()) .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, gJBFBFOCLJL__); + .computeMessageSize(6, aCAAJJBNCDM__); } { int dataSize = 0; - for (int i = 0; i < iFLMBHBHLMC_.size(); i++) { + for (int i = 0; i < lHEGFHKBMKF_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(iFLMBHBHLMC_.getInt(i)); + .computeUInt32SizeNoTag(lHEGFHKBMKF_.getInt(i)); } size += dataSize; - if (!getIFLMBHBHLMCList().isEmpty()) { + if (!getLHEGFHKBMKFList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - iFLMBHBHLMCMemoizedSerializedSize = dataSize; + lHEGFHKBMKFMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < pLGICBELJNB_.size(); i++) { + for (int i = 0; i < hIIHFCBJLDI_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(pLGICBELJNB_.getInt(i)); + .computeUInt32SizeNoTag(hIIHFCBJLDI_.getInt(i)); } size += dataSize; - if (!getPLGICBELJNBList().isEmpty()) { + if (!getHIIHFCBJLDIList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - pLGICBELJNBMemoizedSerializedSize = dataSize; + hIIHFCBJLDIMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < fOIHNLFBPFI_.size(); i++) { + for (int i = 0; i < hCPKDCNKPGD_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(fOIHNLFBPFI_.getInt(i)); + .computeUInt32SizeNoTag(hCPKDCNKPGD_.getInt(i)); } size += dataSize; - if (!getFOIHNLFBPFIList().isEmpty()) { + if (!getHCPKDCNKPGDList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - fOIHNLFBPFIMemoizedSerializedSize = dataSize; + hCPKDCNKPGDMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -1129,24 +1129,24 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo other = (emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo) obj; - if (!getPDFBJCPKGADList() - .equals(other.getPDFBJCPKGADList())) return false; - if (!internalGetJHOJDJGELLK().equals( - other.internalGetJHOJDJGELLK())) return false; - if (!getGEPBOPLIEMBList() - .equals(other.getGEPBOPLIEMBList())) return false; - if (!internalGetKBEAGMAGFPD().equals( - other.internalGetKBEAGMAGFPD())) return false; - if (!getNGBJMLNHLBBList() - .equals(other.getNGBJMLNHLBBList())) return false; - if (!internalGetGJBFBFOCLJL().equals( - other.internalGetGJBFBFOCLJL())) return false; - if (!getIFLMBHBHLMCList() - .equals(other.getIFLMBHBHLMCList())) return false; - if (!getPLGICBELJNBList() - .equals(other.getPLGICBELJNBList())) return false; - if (!getFOIHNLFBPFIList() - .equals(other.getFOIHNLFBPFIList())) return false; + if (!getJAODPKILOHDList() + .equals(other.getJAODPKILOHDList())) return false; + if (!internalGetIGIDHGKOODO().equals( + other.internalGetIGIDHGKOODO())) return false; + if (!getOBAKLGMMOEOList() + .equals(other.getOBAKLGMMOEOList())) return false; + if (!internalGetLELGNGJOJAI().equals( + other.internalGetLELGNGJOJAI())) return false; + if (!getAOECKDLECIJList() + .equals(other.getAOECKDLECIJList())) return false; + if (!internalGetACAAJJBNCDM().equals( + other.internalGetACAAJJBNCDM())) return false; + if (!getLHEGFHKBMKFList() + .equals(other.getLHEGFHKBMKFList())) return false; + if (!getHIIHFCBJLDIList() + .equals(other.getHIIHFCBJLDIList())) return false; + if (!getHCPKDCNKPGDList() + .equals(other.getHCPKDCNKPGDList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1158,41 +1158,41 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getPDFBJCPKGADCount() > 0) { - hash = (37 * hash) + PDFBJCPKGAD_FIELD_NUMBER; - hash = (53 * hash) + getPDFBJCPKGADList().hashCode(); + if (getJAODPKILOHDCount() > 0) { + hash = (37 * hash) + JAODPKILOHD_FIELD_NUMBER; + hash = (53 * hash) + getJAODPKILOHDList().hashCode(); } - if (!internalGetJHOJDJGELLK().getMap().isEmpty()) { - hash = (37 * hash) + JHOJDJGELLK_FIELD_NUMBER; - hash = (53 * hash) + internalGetJHOJDJGELLK().hashCode(); + if (!internalGetIGIDHGKOODO().getMap().isEmpty()) { + hash = (37 * hash) + IGIDHGKOODO_FIELD_NUMBER; + hash = (53 * hash) + internalGetIGIDHGKOODO().hashCode(); } - if (getGEPBOPLIEMBCount() > 0) { - hash = (37 * hash) + GEPBOPLIEMB_FIELD_NUMBER; - hash = (53 * hash) + getGEPBOPLIEMBList().hashCode(); + if (getOBAKLGMMOEOCount() > 0) { + hash = (37 * hash) + OBAKLGMMOEO_FIELD_NUMBER; + hash = (53 * hash) + getOBAKLGMMOEOList().hashCode(); } - if (!internalGetKBEAGMAGFPD().getMap().isEmpty()) { - hash = (37 * hash) + KBEAGMAGFPD_FIELD_NUMBER; - hash = (53 * hash) + internalGetKBEAGMAGFPD().hashCode(); + if (!internalGetLELGNGJOJAI().getMap().isEmpty()) { + hash = (37 * hash) + LELGNGJOJAI_FIELD_NUMBER; + hash = (53 * hash) + internalGetLELGNGJOJAI().hashCode(); } - if (getNGBJMLNHLBBCount() > 0) { - hash = (37 * hash) + NGBJMLNHLBB_FIELD_NUMBER; - hash = (53 * hash) + getNGBJMLNHLBBList().hashCode(); + if (getAOECKDLECIJCount() > 0) { + hash = (37 * hash) + AOECKDLECIJ_FIELD_NUMBER; + hash = (53 * hash) + getAOECKDLECIJList().hashCode(); } - if (!internalGetGJBFBFOCLJL().getMap().isEmpty()) { - hash = (37 * hash) + GJBFBFOCLJL_FIELD_NUMBER; - hash = (53 * hash) + internalGetGJBFBFOCLJL().hashCode(); + if (!internalGetACAAJJBNCDM().getMap().isEmpty()) { + hash = (37 * hash) + ACAAJJBNCDM_FIELD_NUMBER; + hash = (53 * hash) + internalGetACAAJJBNCDM().hashCode(); } - if (getIFLMBHBHLMCCount() > 0) { - hash = (37 * hash) + IFLMBHBHLMC_FIELD_NUMBER; - hash = (53 * hash) + getIFLMBHBHLMCList().hashCode(); + if (getLHEGFHKBMKFCount() > 0) { + hash = (37 * hash) + LHEGFHKBMKF_FIELD_NUMBER; + hash = (53 * hash) + getLHEGFHKBMKFList().hashCode(); } - if (getPLGICBELJNBCount() > 0) { - hash = (37 * hash) + PLGICBELJNB_FIELD_NUMBER; - hash = (53 * hash) + getPLGICBELJNBList().hashCode(); + if (getHIIHFCBJLDICount() > 0) { + hash = (37 * hash) + HIIHFCBJLDI_FIELD_NUMBER; + hash = (53 * hash) + getHIIHFCBJLDIList().hashCode(); } - if (getFOIHNLFBPFICount() > 0) { - hash = (37 * hash) + FOIHNLFBPFI_FIELD_NUMBER; - hash = (53 * hash) + getFOIHNLFBPFIList().hashCode(); + if (getHCPKDCNKPGDCount() > 0) { + hash = (37 * hash) + HCPKDCNKPGD_FIELD_NUMBER; + hash = (53 * hash) + getHCPKDCNKPGDList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -1306,11 +1306,11 @@ protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { case 2: - return internalGetJHOJDJGELLK(); + return internalGetIGIDHGKOODO(); case 4: - return internalGetKBEAGMAGFPD(); + return internalGetLELGNGJOJAI(); case 6: - return internalGetGJBFBFOCLJL(); + return internalGetACAAJJBNCDM(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -1321,11 +1321,11 @@ protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { case 2: - return internalGetMutableJHOJDJGELLK(); + return internalGetMutableIGIDHGKOODO(); case 4: - return internalGetMutableKBEAGMAGFPD(); + return internalGetMutableLELGNGJOJAI(); case 6: - return internalGetMutableGJBFBFOCLJL(); + return internalGetMutableACAAJJBNCDM(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -1357,20 +1357,20 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pDFBJCPKGAD_ = emptyIntList(); + jAODPKILOHD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - internalGetMutableJHOJDJGELLK().clear(); - gEPBOPLIEMB_ = emptyIntList(); + internalGetMutableIGIDHGKOODO().clear(); + oBAKLGMMOEO_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); - internalGetMutableKBEAGMAGFPD().clear(); - nGBJMLNHLBB_ = emptyIntList(); + internalGetMutableLELGNGJOJAI().clear(); + aOECKDLECIJ_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000010); - internalGetMutableGJBFBFOCLJL().clear(); - iFLMBHBHLMC_ = emptyIntList(); + internalGetMutableACAAJJBNCDM().clear(); + lHEGFHKBMKF_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000040); - pLGICBELJNB_ = emptyIntList(); + hIIHFCBJLDI_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000080); - fOIHNLFBPFI_ = emptyIntList(); + hCPKDCNKPGD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000100); return this; } @@ -1400,41 +1400,41 @@ public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceIn emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo result = new emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - pDFBJCPKGAD_.makeImmutable(); + jAODPKILOHD_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.pDFBJCPKGAD_ = pDFBJCPKGAD_; - result.jHOJDJGELLK_ = internalGetJHOJDJGELLK(); - result.jHOJDJGELLK_.makeImmutable(); + result.jAODPKILOHD_ = jAODPKILOHD_; + result.iGIDHGKOODO_ = internalGetIGIDHGKOODO(); + result.iGIDHGKOODO_.makeImmutable(); if (((bitField0_ & 0x00000004) != 0)) { - gEPBOPLIEMB_.makeImmutable(); + oBAKLGMMOEO_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000004); } - result.gEPBOPLIEMB_ = gEPBOPLIEMB_; - result.kBEAGMAGFPD_ = internalGetKBEAGMAGFPD(); - result.kBEAGMAGFPD_.makeImmutable(); + result.oBAKLGMMOEO_ = oBAKLGMMOEO_; + result.lELGNGJOJAI_ = internalGetLELGNGJOJAI(); + result.lELGNGJOJAI_.makeImmutable(); if (((bitField0_ & 0x00000010) != 0)) { - nGBJMLNHLBB_.makeImmutable(); + aOECKDLECIJ_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000010); } - result.nGBJMLNHLBB_ = nGBJMLNHLBB_; - result.gJBFBFOCLJL_ = internalGetGJBFBFOCLJL(); - result.gJBFBFOCLJL_.makeImmutable(); + result.aOECKDLECIJ_ = aOECKDLECIJ_; + result.aCAAJJBNCDM_ = internalGetACAAJJBNCDM(); + result.aCAAJJBNCDM_.makeImmutable(); if (((bitField0_ & 0x00000040) != 0)) { - iFLMBHBHLMC_.makeImmutable(); + lHEGFHKBMKF_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000040); } - result.iFLMBHBHLMC_ = iFLMBHBHLMC_; + result.lHEGFHKBMKF_ = lHEGFHKBMKF_; if (((bitField0_ & 0x00000080) != 0)) { - pLGICBELJNB_.makeImmutable(); + hIIHFCBJLDI_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000080); } - result.pLGICBELJNB_ = pLGICBELJNB_; + result.hIIHFCBJLDI_ = hIIHFCBJLDI_; if (((bitField0_ & 0x00000100) != 0)) { - fOIHNLFBPFI_.makeImmutable(); + hCPKDCNKPGD_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000100); } - result.fOIHNLFBPFI_ = fOIHNLFBPFI_; + result.hCPKDCNKPGD_ = hCPKDCNKPGD_; onBuilt(); return result; } @@ -1483,69 +1483,69 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo other) { if (other == emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance()) return this; - if (!other.pDFBJCPKGAD_.isEmpty()) { - if (pDFBJCPKGAD_.isEmpty()) { - pDFBJCPKGAD_ = other.pDFBJCPKGAD_; + if (!other.jAODPKILOHD_.isEmpty()) { + if (jAODPKILOHD_.isEmpty()) { + jAODPKILOHD_ = other.jAODPKILOHD_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensurePDFBJCPKGADIsMutable(); - pDFBJCPKGAD_.addAll(other.pDFBJCPKGAD_); + ensureJAODPKILOHDIsMutable(); + jAODPKILOHD_.addAll(other.jAODPKILOHD_); } onChanged(); } - internalGetMutableJHOJDJGELLK().mergeFrom( - other.internalGetJHOJDJGELLK()); - if (!other.gEPBOPLIEMB_.isEmpty()) { - if (gEPBOPLIEMB_.isEmpty()) { - gEPBOPLIEMB_ = other.gEPBOPLIEMB_; + internalGetMutableIGIDHGKOODO().mergeFrom( + other.internalGetIGIDHGKOODO()); + if (!other.oBAKLGMMOEO_.isEmpty()) { + if (oBAKLGMMOEO_.isEmpty()) { + oBAKLGMMOEO_ = other.oBAKLGMMOEO_; bitField0_ = (bitField0_ & ~0x00000004); } else { - ensureGEPBOPLIEMBIsMutable(); - gEPBOPLIEMB_.addAll(other.gEPBOPLIEMB_); + ensureOBAKLGMMOEOIsMutable(); + oBAKLGMMOEO_.addAll(other.oBAKLGMMOEO_); } onChanged(); } - internalGetMutableKBEAGMAGFPD().mergeFrom( - other.internalGetKBEAGMAGFPD()); - if (!other.nGBJMLNHLBB_.isEmpty()) { - if (nGBJMLNHLBB_.isEmpty()) { - nGBJMLNHLBB_ = other.nGBJMLNHLBB_; + internalGetMutableLELGNGJOJAI().mergeFrom( + other.internalGetLELGNGJOJAI()); + if (!other.aOECKDLECIJ_.isEmpty()) { + if (aOECKDLECIJ_.isEmpty()) { + aOECKDLECIJ_ = other.aOECKDLECIJ_; bitField0_ = (bitField0_ & ~0x00000010); } else { - ensureNGBJMLNHLBBIsMutable(); - nGBJMLNHLBB_.addAll(other.nGBJMLNHLBB_); + ensureAOECKDLECIJIsMutable(); + aOECKDLECIJ_.addAll(other.aOECKDLECIJ_); } onChanged(); } - internalGetMutableGJBFBFOCLJL().mergeFrom( - other.internalGetGJBFBFOCLJL()); - if (!other.iFLMBHBHLMC_.isEmpty()) { - if (iFLMBHBHLMC_.isEmpty()) { - iFLMBHBHLMC_ = other.iFLMBHBHLMC_; + internalGetMutableACAAJJBNCDM().mergeFrom( + other.internalGetACAAJJBNCDM()); + if (!other.lHEGFHKBMKF_.isEmpty()) { + if (lHEGFHKBMKF_.isEmpty()) { + lHEGFHKBMKF_ = other.lHEGFHKBMKF_; bitField0_ = (bitField0_ & ~0x00000040); } else { - ensureIFLMBHBHLMCIsMutable(); - iFLMBHBHLMC_.addAll(other.iFLMBHBHLMC_); + ensureLHEGFHKBMKFIsMutable(); + lHEGFHKBMKF_.addAll(other.lHEGFHKBMKF_); } onChanged(); } - if (!other.pLGICBELJNB_.isEmpty()) { - if (pLGICBELJNB_.isEmpty()) { - pLGICBELJNB_ = other.pLGICBELJNB_; + if (!other.hIIHFCBJLDI_.isEmpty()) { + if (hIIHFCBJLDI_.isEmpty()) { + hIIHFCBJLDI_ = other.hIIHFCBJLDI_; bitField0_ = (bitField0_ & ~0x00000080); } else { - ensurePLGICBELJNBIsMutable(); - pLGICBELJNB_.addAll(other.pLGICBELJNB_); + ensureHIIHFCBJLDIIsMutable(); + hIIHFCBJLDI_.addAll(other.hIIHFCBJLDI_); } onChanged(); } - if (!other.fOIHNLFBPFI_.isEmpty()) { - if (fOIHNLFBPFI_.isEmpty()) { - fOIHNLFBPFI_ = other.fOIHNLFBPFI_; + if (!other.hCPKDCNKPGD_.isEmpty()) { + if (hCPKDCNKPGD_.isEmpty()) { + hCPKDCNKPGD_ = other.hCPKDCNKPGD_; bitField0_ = (bitField0_ & ~0x00000100); } else { - ensureFOIHNLFBPFIIsMutable(); - fOIHNLFBPFI_.addAll(other.fOIHNLFBPFI_); + ensureHCPKDCNKPGDIsMutable(); + hCPKDCNKPGD_.addAll(other.hCPKDCNKPGD_); } onChanged(); } @@ -1579,179 +1579,179 @@ public Builder mergeFrom( } private int bitField0_; - private com.google.protobuf.Internal.IntList pDFBJCPKGAD_ = emptyIntList(); - private void ensurePDFBJCPKGADIsMutable() { + private com.google.protobuf.Internal.IntList jAODPKILOHD_ = emptyIntList(); + private void ensureJAODPKILOHDIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - pDFBJCPKGAD_ = mutableCopy(pDFBJCPKGAD_); + jAODPKILOHD_ = mutableCopy(jAODPKILOHD_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 PDFBJCPKGAD = 1; - * @return A list containing the pDFBJCPKGAD. + * repeated uint32 JAODPKILOHD = 1; + * @return A list containing the jAODPKILOHD. */ public java.util.List - getPDFBJCPKGADList() { + getJAODPKILOHDList() { return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(pDFBJCPKGAD_) : pDFBJCPKGAD_; + java.util.Collections.unmodifiableList(jAODPKILOHD_) : jAODPKILOHD_; } /** - * repeated uint32 PDFBJCPKGAD = 1; - * @return The count of pDFBJCPKGAD. + * repeated uint32 JAODPKILOHD = 1; + * @return The count of jAODPKILOHD. */ - public int getPDFBJCPKGADCount() { - return pDFBJCPKGAD_.size(); + public int getJAODPKILOHDCount() { + return jAODPKILOHD_.size(); } /** - * repeated uint32 PDFBJCPKGAD = 1; + * repeated uint32 JAODPKILOHD = 1; * @param index The index of the element to return. - * @return The pDFBJCPKGAD at the given index. + * @return The jAODPKILOHD at the given index. */ - public int getPDFBJCPKGAD(int index) { - return pDFBJCPKGAD_.getInt(index); + public int getJAODPKILOHD(int index) { + return jAODPKILOHD_.getInt(index); } /** - * repeated uint32 PDFBJCPKGAD = 1; + * repeated uint32 JAODPKILOHD = 1; * @param index The index to set the value at. - * @param value The pDFBJCPKGAD to set. + * @param value The jAODPKILOHD to set. * @return This builder for chaining. */ - public Builder setPDFBJCPKGAD( + public Builder setJAODPKILOHD( int index, int value) { - ensurePDFBJCPKGADIsMutable(); - pDFBJCPKGAD_.setInt(index, value); + ensureJAODPKILOHDIsMutable(); + jAODPKILOHD_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 PDFBJCPKGAD = 1; - * @param value The pDFBJCPKGAD to add. + * repeated uint32 JAODPKILOHD = 1; + * @param value The jAODPKILOHD to add. * @return This builder for chaining. */ - public Builder addPDFBJCPKGAD(int value) { - ensurePDFBJCPKGADIsMutable(); - pDFBJCPKGAD_.addInt(value); + public Builder addJAODPKILOHD(int value) { + ensureJAODPKILOHDIsMutable(); + jAODPKILOHD_.addInt(value); onChanged(); return this; } /** - * repeated uint32 PDFBJCPKGAD = 1; - * @param values The pDFBJCPKGAD to add. + * repeated uint32 JAODPKILOHD = 1; + * @param values The jAODPKILOHD to add. * @return This builder for chaining. */ - public Builder addAllPDFBJCPKGAD( + public Builder addAllJAODPKILOHD( java.lang.Iterable values) { - ensurePDFBJCPKGADIsMutable(); + ensureJAODPKILOHDIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, pDFBJCPKGAD_); + values, jAODPKILOHD_); onChanged(); return this; } /** - * repeated uint32 PDFBJCPKGAD = 1; + * repeated uint32 JAODPKILOHD = 1; * @return This builder for chaining. */ - public Builder clearPDFBJCPKGAD() { - pDFBJCPKGAD_ = emptyIntList(); + public Builder clearJAODPKILOHD() { + jAODPKILOHD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> jHOJDJGELLK_; + java.lang.Integer, java.lang.Integer> iGIDHGKOODO_; private com.google.protobuf.MapField - internalGetJHOJDJGELLK() { - if (jHOJDJGELLK_ == null) { + internalGetIGIDHGKOODO() { + if (iGIDHGKOODO_ == null) { return com.google.protobuf.MapField.emptyMapField( - JHOJDJGELLKDefaultEntryHolder.defaultEntry); + IGIDHGKOODODefaultEntryHolder.defaultEntry); } - return jHOJDJGELLK_; + return iGIDHGKOODO_; } private com.google.protobuf.MapField - internalGetMutableJHOJDJGELLK() { + internalGetMutableIGIDHGKOODO() { onChanged();; - if (jHOJDJGELLK_ == null) { - jHOJDJGELLK_ = com.google.protobuf.MapField.newMapField( - JHOJDJGELLKDefaultEntryHolder.defaultEntry); + if (iGIDHGKOODO_ == null) { + iGIDHGKOODO_ = com.google.protobuf.MapField.newMapField( + IGIDHGKOODODefaultEntryHolder.defaultEntry); } - if (!jHOJDJGELLK_.isMutable()) { - jHOJDJGELLK_ = jHOJDJGELLK_.copy(); + if (!iGIDHGKOODO_.isMutable()) { + iGIDHGKOODO_ = iGIDHGKOODO_.copy(); } - return jHOJDJGELLK_; + return iGIDHGKOODO_; } - public int getJHOJDJGELLKCount() { - return internalGetJHOJDJGELLK().getMap().size(); + public int getIGIDHGKOODOCount() { + return internalGetIGIDHGKOODO().getMap().size(); } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public boolean containsJHOJDJGELLK( + public boolean containsIGIDHGKOODO( int key) { - return internalGetJHOJDJGELLK().getMap().containsKey(key); + return internalGetIGIDHGKOODO().getMap().containsKey(key); } /** - * Use {@link #getJHOJDJGELLKMap()} instead. + * Use {@link #getIGIDHGKOODOMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getJHOJDJGELLK() { - return getJHOJDJGELLKMap(); + public java.util.Map getIGIDHGKOODO() { + return getIGIDHGKOODOMap(); } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public java.util.Map getJHOJDJGELLKMap() { - return internalGetJHOJDJGELLK().getMap(); + public java.util.Map getIGIDHGKOODOMap() { + return internalGetIGIDHGKOODO().getMap(); } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public int getJHOJDJGELLKOrDefault( + public int getIGIDHGKOODOOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetJHOJDJGELLK().getMap(); + internalGetIGIDHGKOODO().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ @java.lang.Override - public int getJHOJDJGELLKOrThrow( + public int getIGIDHGKOODOOrThrow( int key) { java.util.Map map = - internalGetJHOJDJGELLK().getMap(); + internalGetIGIDHGKOODO().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearJHOJDJGELLK() { - internalGetMutableJHOJDJGELLK().getMutableMap() + public Builder clearIGIDHGKOODO() { + internalGetMutableIGIDHGKOODO().getMutableMap() .clear(); return this; } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ - public Builder removeJHOJDJGELLK( + public Builder removeIGIDHGKOODO( int key) { - internalGetMutableJHOJDJGELLK().getMutableMap() + internalGetMutableIGIDHGKOODO().getMutableMap() .remove(key); return this; } @@ -1760,205 +1760,205 @@ public Builder removeJHOJDJGELLK( */ @java.lang.Deprecated public java.util.Map - getMutableJHOJDJGELLK() { - return internalGetMutableJHOJDJGELLK().getMutableMap(); + getMutableIGIDHGKOODO() { + return internalGetMutableIGIDHGKOODO().getMutableMap(); } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ - public Builder putJHOJDJGELLK( + public Builder putIGIDHGKOODO( int key, int value) { - internalGetMutableJHOJDJGELLK().getMutableMap() + internalGetMutableIGIDHGKOODO().getMutableMap() .put(key, value); return this; } /** - * map<uint32, uint32> JHOJDJGELLK = 2; + * map<uint32, uint32> IGIDHGKOODO = 2; */ - public Builder putAllJHOJDJGELLK( + public Builder putAllIGIDHGKOODO( java.util.Map values) { - internalGetMutableJHOJDJGELLK().getMutableMap() + internalGetMutableIGIDHGKOODO().getMutableMap() .putAll(values); return this; } - private com.google.protobuf.Internal.IntList gEPBOPLIEMB_ = emptyIntList(); - private void ensureGEPBOPLIEMBIsMutable() { + private com.google.protobuf.Internal.IntList oBAKLGMMOEO_ = emptyIntList(); + private void ensureOBAKLGMMOEOIsMutable() { if (!((bitField0_ & 0x00000004) != 0)) { - gEPBOPLIEMB_ = mutableCopy(gEPBOPLIEMB_); + oBAKLGMMOEO_ = mutableCopy(oBAKLGMMOEO_); bitField0_ |= 0x00000004; } } /** - * repeated uint32 GEPBOPLIEMB = 3; - * @return A list containing the gEPBOPLIEMB. + * repeated uint32 OBAKLGMMOEO = 3; + * @return A list containing the oBAKLGMMOEO. */ public java.util.List - getGEPBOPLIEMBList() { + getOBAKLGMMOEOList() { return ((bitField0_ & 0x00000004) != 0) ? - java.util.Collections.unmodifiableList(gEPBOPLIEMB_) : gEPBOPLIEMB_; + java.util.Collections.unmodifiableList(oBAKLGMMOEO_) : oBAKLGMMOEO_; } /** - * repeated uint32 GEPBOPLIEMB = 3; - * @return The count of gEPBOPLIEMB. + * repeated uint32 OBAKLGMMOEO = 3; + * @return The count of oBAKLGMMOEO. */ - public int getGEPBOPLIEMBCount() { - return gEPBOPLIEMB_.size(); + public int getOBAKLGMMOEOCount() { + return oBAKLGMMOEO_.size(); } /** - * repeated uint32 GEPBOPLIEMB = 3; + * repeated uint32 OBAKLGMMOEO = 3; * @param index The index of the element to return. - * @return The gEPBOPLIEMB at the given index. + * @return The oBAKLGMMOEO at the given index. */ - public int getGEPBOPLIEMB(int index) { - return gEPBOPLIEMB_.getInt(index); + public int getOBAKLGMMOEO(int index) { + return oBAKLGMMOEO_.getInt(index); } /** - * repeated uint32 GEPBOPLIEMB = 3; + * repeated uint32 OBAKLGMMOEO = 3; * @param index The index to set the value at. - * @param value The gEPBOPLIEMB to set. + * @param value The oBAKLGMMOEO to set. * @return This builder for chaining. */ - public Builder setGEPBOPLIEMB( + public Builder setOBAKLGMMOEO( int index, int value) { - ensureGEPBOPLIEMBIsMutable(); - gEPBOPLIEMB_.setInt(index, value); + ensureOBAKLGMMOEOIsMutable(); + oBAKLGMMOEO_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 GEPBOPLIEMB = 3; - * @param value The gEPBOPLIEMB to add. + * repeated uint32 OBAKLGMMOEO = 3; + * @param value The oBAKLGMMOEO to add. * @return This builder for chaining. */ - public Builder addGEPBOPLIEMB(int value) { - ensureGEPBOPLIEMBIsMutable(); - gEPBOPLIEMB_.addInt(value); + public Builder addOBAKLGMMOEO(int value) { + ensureOBAKLGMMOEOIsMutable(); + oBAKLGMMOEO_.addInt(value); onChanged(); return this; } /** - * repeated uint32 GEPBOPLIEMB = 3; - * @param values The gEPBOPLIEMB to add. + * repeated uint32 OBAKLGMMOEO = 3; + * @param values The oBAKLGMMOEO to add. * @return This builder for chaining. */ - public Builder addAllGEPBOPLIEMB( + public Builder addAllOBAKLGMMOEO( java.lang.Iterable values) { - ensureGEPBOPLIEMBIsMutable(); + ensureOBAKLGMMOEOIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, gEPBOPLIEMB_); + values, oBAKLGMMOEO_); onChanged(); return this; } /** - * repeated uint32 GEPBOPLIEMB = 3; + * repeated uint32 OBAKLGMMOEO = 3; * @return This builder for chaining. */ - public Builder clearGEPBOPLIEMB() { - gEPBOPLIEMB_ = emptyIntList(); + public Builder clearOBAKLGMMOEO() { + oBAKLGMMOEO_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> kBEAGMAGFPD_; + java.lang.Integer, java.lang.Integer> lELGNGJOJAI_; private com.google.protobuf.MapField - internalGetKBEAGMAGFPD() { - if (kBEAGMAGFPD_ == null) { + internalGetLELGNGJOJAI() { + if (lELGNGJOJAI_ == null) { return com.google.protobuf.MapField.emptyMapField( - KBEAGMAGFPDDefaultEntryHolder.defaultEntry); + LELGNGJOJAIDefaultEntryHolder.defaultEntry); } - return kBEAGMAGFPD_; + return lELGNGJOJAI_; } private com.google.protobuf.MapField - internalGetMutableKBEAGMAGFPD() { + internalGetMutableLELGNGJOJAI() { onChanged();; - if (kBEAGMAGFPD_ == null) { - kBEAGMAGFPD_ = com.google.protobuf.MapField.newMapField( - KBEAGMAGFPDDefaultEntryHolder.defaultEntry); + if (lELGNGJOJAI_ == null) { + lELGNGJOJAI_ = com.google.protobuf.MapField.newMapField( + LELGNGJOJAIDefaultEntryHolder.defaultEntry); } - if (!kBEAGMAGFPD_.isMutable()) { - kBEAGMAGFPD_ = kBEAGMAGFPD_.copy(); + if (!lELGNGJOJAI_.isMutable()) { + lELGNGJOJAI_ = lELGNGJOJAI_.copy(); } - return kBEAGMAGFPD_; + return lELGNGJOJAI_; } - public int getKBEAGMAGFPDCount() { - return internalGetKBEAGMAGFPD().getMap().size(); + public int getLELGNGJOJAICount() { + return internalGetLELGNGJOJAI().getMap().size(); } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public boolean containsKBEAGMAGFPD( + public boolean containsLELGNGJOJAI( int key) { - return internalGetKBEAGMAGFPD().getMap().containsKey(key); + return internalGetLELGNGJOJAI().getMap().containsKey(key); } /** - * Use {@link #getKBEAGMAGFPDMap()} instead. + * Use {@link #getLELGNGJOJAIMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getKBEAGMAGFPD() { - return getKBEAGMAGFPDMap(); + public java.util.Map getLELGNGJOJAI() { + return getLELGNGJOJAIMap(); } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public java.util.Map getKBEAGMAGFPDMap() { - return internalGetKBEAGMAGFPD().getMap(); + public java.util.Map getLELGNGJOJAIMap() { + return internalGetLELGNGJOJAI().getMap(); } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public int getKBEAGMAGFPDOrDefault( + public int getLELGNGJOJAIOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetKBEAGMAGFPD().getMap(); + internalGetLELGNGJOJAI().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ @java.lang.Override - public int getKBEAGMAGFPDOrThrow( + public int getLELGNGJOJAIOrThrow( int key) { java.util.Map map = - internalGetKBEAGMAGFPD().getMap(); + internalGetLELGNGJOJAI().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearKBEAGMAGFPD() { - internalGetMutableKBEAGMAGFPD().getMutableMap() + public Builder clearLELGNGJOJAI() { + internalGetMutableLELGNGJOJAI().getMutableMap() .clear(); return this; } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ - public Builder removeKBEAGMAGFPD( + public Builder removeLELGNGJOJAI( int key) { - internalGetMutableKBEAGMAGFPD().getMutableMap() + internalGetMutableLELGNGJOJAI().getMutableMap() .remove(key); return this; } @@ -1967,205 +1967,205 @@ public Builder removeKBEAGMAGFPD( */ @java.lang.Deprecated public java.util.Map - getMutableKBEAGMAGFPD() { - return internalGetMutableKBEAGMAGFPD().getMutableMap(); + getMutableLELGNGJOJAI() { + return internalGetMutableLELGNGJOJAI().getMutableMap(); } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ - public Builder putKBEAGMAGFPD( + public Builder putLELGNGJOJAI( int key, int value) { - internalGetMutableKBEAGMAGFPD().getMutableMap() + internalGetMutableLELGNGJOJAI().getMutableMap() .put(key, value); return this; } /** - * map<uint32, uint32> KBEAGMAGFPD = 4; + * map<uint32, uint32> LELGNGJOJAI = 4; */ - public Builder putAllKBEAGMAGFPD( + public Builder putAllLELGNGJOJAI( java.util.Map values) { - internalGetMutableKBEAGMAGFPD().getMutableMap() + internalGetMutableLELGNGJOJAI().getMutableMap() .putAll(values); return this; } - private com.google.protobuf.Internal.IntList nGBJMLNHLBB_ = emptyIntList(); - private void ensureNGBJMLNHLBBIsMutable() { + private com.google.protobuf.Internal.IntList aOECKDLECIJ_ = emptyIntList(); + private void ensureAOECKDLECIJIsMutable() { if (!((bitField0_ & 0x00000010) != 0)) { - nGBJMLNHLBB_ = mutableCopy(nGBJMLNHLBB_); + aOECKDLECIJ_ = mutableCopy(aOECKDLECIJ_); bitField0_ |= 0x00000010; } } /** - * repeated uint32 NGBJMLNHLBB = 5; - * @return A list containing the nGBJMLNHLBB. + * repeated uint32 AOECKDLECIJ = 5; + * @return A list containing the aOECKDLECIJ. */ public java.util.List - getNGBJMLNHLBBList() { + getAOECKDLECIJList() { return ((bitField0_ & 0x00000010) != 0) ? - java.util.Collections.unmodifiableList(nGBJMLNHLBB_) : nGBJMLNHLBB_; + java.util.Collections.unmodifiableList(aOECKDLECIJ_) : aOECKDLECIJ_; } /** - * repeated uint32 NGBJMLNHLBB = 5; - * @return The count of nGBJMLNHLBB. + * repeated uint32 AOECKDLECIJ = 5; + * @return The count of aOECKDLECIJ. */ - public int getNGBJMLNHLBBCount() { - return nGBJMLNHLBB_.size(); + public int getAOECKDLECIJCount() { + return aOECKDLECIJ_.size(); } /** - * repeated uint32 NGBJMLNHLBB = 5; + * repeated uint32 AOECKDLECIJ = 5; * @param index The index of the element to return. - * @return The nGBJMLNHLBB at the given index. + * @return The aOECKDLECIJ at the given index. */ - public int getNGBJMLNHLBB(int index) { - return nGBJMLNHLBB_.getInt(index); + public int getAOECKDLECIJ(int index) { + return aOECKDLECIJ_.getInt(index); } /** - * repeated uint32 NGBJMLNHLBB = 5; + * repeated uint32 AOECKDLECIJ = 5; * @param index The index to set the value at. - * @param value The nGBJMLNHLBB to set. + * @param value The aOECKDLECIJ to set. * @return This builder for chaining. */ - public Builder setNGBJMLNHLBB( + public Builder setAOECKDLECIJ( int index, int value) { - ensureNGBJMLNHLBBIsMutable(); - nGBJMLNHLBB_.setInt(index, value); + ensureAOECKDLECIJIsMutable(); + aOECKDLECIJ_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 NGBJMLNHLBB = 5; - * @param value The nGBJMLNHLBB to add. + * repeated uint32 AOECKDLECIJ = 5; + * @param value The aOECKDLECIJ to add. * @return This builder for chaining. */ - public Builder addNGBJMLNHLBB(int value) { - ensureNGBJMLNHLBBIsMutable(); - nGBJMLNHLBB_.addInt(value); + public Builder addAOECKDLECIJ(int value) { + ensureAOECKDLECIJIsMutable(); + aOECKDLECIJ_.addInt(value); onChanged(); return this; } /** - * repeated uint32 NGBJMLNHLBB = 5; - * @param values The nGBJMLNHLBB to add. + * repeated uint32 AOECKDLECIJ = 5; + * @param values The aOECKDLECIJ to add. * @return This builder for chaining. */ - public Builder addAllNGBJMLNHLBB( + public Builder addAllAOECKDLECIJ( java.lang.Iterable values) { - ensureNGBJMLNHLBBIsMutable(); + ensureAOECKDLECIJIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, nGBJMLNHLBB_); + values, aOECKDLECIJ_); onChanged(); return this; } /** - * repeated uint32 NGBJMLNHLBB = 5; + * repeated uint32 AOECKDLECIJ = 5; * @return This builder for chaining. */ - public Builder clearNGBJMLNHLBB() { - nGBJMLNHLBB_ = emptyIntList(); + public Builder clearAOECKDLECIJ() { + aOECKDLECIJ_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> gJBFBFOCLJL_; + java.lang.Integer, java.lang.Integer> aCAAJJBNCDM_; private com.google.protobuf.MapField - internalGetGJBFBFOCLJL() { - if (gJBFBFOCLJL_ == null) { + internalGetACAAJJBNCDM() { + if (aCAAJJBNCDM_ == null) { return com.google.protobuf.MapField.emptyMapField( - GJBFBFOCLJLDefaultEntryHolder.defaultEntry); + ACAAJJBNCDMDefaultEntryHolder.defaultEntry); } - return gJBFBFOCLJL_; + return aCAAJJBNCDM_; } private com.google.protobuf.MapField - internalGetMutableGJBFBFOCLJL() { + internalGetMutableACAAJJBNCDM() { onChanged();; - if (gJBFBFOCLJL_ == null) { - gJBFBFOCLJL_ = com.google.protobuf.MapField.newMapField( - GJBFBFOCLJLDefaultEntryHolder.defaultEntry); + if (aCAAJJBNCDM_ == null) { + aCAAJJBNCDM_ = com.google.protobuf.MapField.newMapField( + ACAAJJBNCDMDefaultEntryHolder.defaultEntry); } - if (!gJBFBFOCLJL_.isMutable()) { - gJBFBFOCLJL_ = gJBFBFOCLJL_.copy(); + if (!aCAAJJBNCDM_.isMutable()) { + aCAAJJBNCDM_ = aCAAJJBNCDM_.copy(); } - return gJBFBFOCLJL_; + return aCAAJJBNCDM_; } - public int getGJBFBFOCLJLCount() { - return internalGetGJBFBFOCLJL().getMap().size(); + public int getACAAJJBNCDMCount() { + return internalGetACAAJJBNCDM().getMap().size(); } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public boolean containsGJBFBFOCLJL( + public boolean containsACAAJJBNCDM( int key) { - return internalGetGJBFBFOCLJL().getMap().containsKey(key); + return internalGetACAAJJBNCDM().getMap().containsKey(key); } /** - * Use {@link #getGJBFBFOCLJLMap()} instead. + * Use {@link #getACAAJJBNCDMMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getGJBFBFOCLJL() { - return getGJBFBFOCLJLMap(); + public java.util.Map getACAAJJBNCDM() { + return getACAAJJBNCDMMap(); } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public java.util.Map getGJBFBFOCLJLMap() { - return internalGetGJBFBFOCLJL().getMap(); + public java.util.Map getACAAJJBNCDMMap() { + return internalGetACAAJJBNCDM().getMap(); } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public int getGJBFBFOCLJLOrDefault( + public int getACAAJJBNCDMOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetGJBFBFOCLJL().getMap(); + internalGetACAAJJBNCDM().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ @java.lang.Override - public int getGJBFBFOCLJLOrThrow( + public int getACAAJJBNCDMOrThrow( int key) { java.util.Map map = - internalGetGJBFBFOCLJL().getMap(); + internalGetACAAJJBNCDM().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearGJBFBFOCLJL() { - internalGetMutableGJBFBFOCLJL().getMutableMap() + public Builder clearACAAJJBNCDM() { + internalGetMutableACAAJJBNCDM().getMutableMap() .clear(); return this; } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ - public Builder removeGJBFBFOCLJL( + public Builder removeACAAJJBNCDM( int key) { - internalGetMutableGJBFBFOCLJL().getMutableMap() + internalGetMutableACAAJJBNCDM().getMutableMap() .remove(key); return this; } @@ -2174,264 +2174,264 @@ public Builder removeGJBFBFOCLJL( */ @java.lang.Deprecated public java.util.Map - getMutableGJBFBFOCLJL() { - return internalGetMutableGJBFBFOCLJL().getMutableMap(); + getMutableACAAJJBNCDM() { + return internalGetMutableACAAJJBNCDM().getMutableMap(); } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ - public Builder putGJBFBFOCLJL( + public Builder putACAAJJBNCDM( int key, int value) { - internalGetMutableGJBFBFOCLJL().getMutableMap() + internalGetMutableACAAJJBNCDM().getMutableMap() .put(key, value); return this; } /** - * map<uint32, uint32> GJBFBFOCLJL = 6; + * map<uint32, uint32> ACAAJJBNCDM = 6; */ - public Builder putAllGJBFBFOCLJL( + public Builder putAllACAAJJBNCDM( java.util.Map values) { - internalGetMutableGJBFBFOCLJL().getMutableMap() + internalGetMutableACAAJJBNCDM().getMutableMap() .putAll(values); return this; } - private com.google.protobuf.Internal.IntList iFLMBHBHLMC_ = emptyIntList(); - private void ensureIFLMBHBHLMCIsMutable() { + private com.google.protobuf.Internal.IntList lHEGFHKBMKF_ = emptyIntList(); + private void ensureLHEGFHKBMKFIsMutable() { if (!((bitField0_ & 0x00000040) != 0)) { - iFLMBHBHLMC_ = mutableCopy(iFLMBHBHLMC_); + lHEGFHKBMKF_ = mutableCopy(lHEGFHKBMKF_); bitField0_ |= 0x00000040; } } /** - * repeated uint32 IFLMBHBHLMC = 7; - * @return A list containing the iFLMBHBHLMC. + * repeated uint32 LHEGFHKBMKF = 7; + * @return A list containing the lHEGFHKBMKF. */ public java.util.List - getIFLMBHBHLMCList() { + getLHEGFHKBMKFList() { return ((bitField0_ & 0x00000040) != 0) ? - java.util.Collections.unmodifiableList(iFLMBHBHLMC_) : iFLMBHBHLMC_; + java.util.Collections.unmodifiableList(lHEGFHKBMKF_) : lHEGFHKBMKF_; } /** - * repeated uint32 IFLMBHBHLMC = 7; - * @return The count of iFLMBHBHLMC. + * repeated uint32 LHEGFHKBMKF = 7; + * @return The count of lHEGFHKBMKF. */ - public int getIFLMBHBHLMCCount() { - return iFLMBHBHLMC_.size(); + public int getLHEGFHKBMKFCount() { + return lHEGFHKBMKF_.size(); } /** - * repeated uint32 IFLMBHBHLMC = 7; + * repeated uint32 LHEGFHKBMKF = 7; * @param index The index of the element to return. - * @return The iFLMBHBHLMC at the given index. + * @return The lHEGFHKBMKF at the given index. */ - public int getIFLMBHBHLMC(int index) { - return iFLMBHBHLMC_.getInt(index); + public int getLHEGFHKBMKF(int index) { + return lHEGFHKBMKF_.getInt(index); } /** - * repeated uint32 IFLMBHBHLMC = 7; + * repeated uint32 LHEGFHKBMKF = 7; * @param index The index to set the value at. - * @param value The iFLMBHBHLMC to set. + * @param value The lHEGFHKBMKF to set. * @return This builder for chaining. */ - public Builder setIFLMBHBHLMC( + public Builder setLHEGFHKBMKF( int index, int value) { - ensureIFLMBHBHLMCIsMutable(); - iFLMBHBHLMC_.setInt(index, value); + ensureLHEGFHKBMKFIsMutable(); + lHEGFHKBMKF_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 IFLMBHBHLMC = 7; - * @param value The iFLMBHBHLMC to add. + * repeated uint32 LHEGFHKBMKF = 7; + * @param value The lHEGFHKBMKF to add. * @return This builder for chaining. */ - public Builder addIFLMBHBHLMC(int value) { - ensureIFLMBHBHLMCIsMutable(); - iFLMBHBHLMC_.addInt(value); + public Builder addLHEGFHKBMKF(int value) { + ensureLHEGFHKBMKFIsMutable(); + lHEGFHKBMKF_.addInt(value); onChanged(); return this; } /** - * repeated uint32 IFLMBHBHLMC = 7; - * @param values The iFLMBHBHLMC to add. + * repeated uint32 LHEGFHKBMKF = 7; + * @param values The lHEGFHKBMKF to add. * @return This builder for chaining. */ - public Builder addAllIFLMBHBHLMC( + public Builder addAllLHEGFHKBMKF( java.lang.Iterable values) { - ensureIFLMBHBHLMCIsMutable(); + ensureLHEGFHKBMKFIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, iFLMBHBHLMC_); + values, lHEGFHKBMKF_); onChanged(); return this; } /** - * repeated uint32 IFLMBHBHLMC = 7; + * repeated uint32 LHEGFHKBMKF = 7; * @return This builder for chaining. */ - public Builder clearIFLMBHBHLMC() { - iFLMBHBHLMC_ = emptyIntList(); + public Builder clearLHEGFHKBMKF() { + lHEGFHKBMKF_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } - private com.google.protobuf.Internal.IntList pLGICBELJNB_ = emptyIntList(); - private void ensurePLGICBELJNBIsMutable() { + private com.google.protobuf.Internal.IntList hIIHFCBJLDI_ = emptyIntList(); + private void ensureHIIHFCBJLDIIsMutable() { if (!((bitField0_ & 0x00000080) != 0)) { - pLGICBELJNB_ = mutableCopy(pLGICBELJNB_); + hIIHFCBJLDI_ = mutableCopy(hIIHFCBJLDI_); bitField0_ |= 0x00000080; } } /** - * repeated uint32 PLGICBELJNB = 8; - * @return A list containing the pLGICBELJNB. + * repeated uint32 HIIHFCBJLDI = 8; + * @return A list containing the hIIHFCBJLDI. */ public java.util.List - getPLGICBELJNBList() { + getHIIHFCBJLDIList() { return ((bitField0_ & 0x00000080) != 0) ? - java.util.Collections.unmodifiableList(pLGICBELJNB_) : pLGICBELJNB_; + java.util.Collections.unmodifiableList(hIIHFCBJLDI_) : hIIHFCBJLDI_; } /** - * repeated uint32 PLGICBELJNB = 8; - * @return The count of pLGICBELJNB. + * repeated uint32 HIIHFCBJLDI = 8; + * @return The count of hIIHFCBJLDI. */ - public int getPLGICBELJNBCount() { - return pLGICBELJNB_.size(); + public int getHIIHFCBJLDICount() { + return hIIHFCBJLDI_.size(); } /** - * repeated uint32 PLGICBELJNB = 8; + * repeated uint32 HIIHFCBJLDI = 8; * @param index The index of the element to return. - * @return The pLGICBELJNB at the given index. + * @return The hIIHFCBJLDI at the given index. */ - public int getPLGICBELJNB(int index) { - return pLGICBELJNB_.getInt(index); + public int getHIIHFCBJLDI(int index) { + return hIIHFCBJLDI_.getInt(index); } /** - * repeated uint32 PLGICBELJNB = 8; + * repeated uint32 HIIHFCBJLDI = 8; * @param index The index to set the value at. - * @param value The pLGICBELJNB to set. + * @param value The hIIHFCBJLDI to set. * @return This builder for chaining. */ - public Builder setPLGICBELJNB( + public Builder setHIIHFCBJLDI( int index, int value) { - ensurePLGICBELJNBIsMutable(); - pLGICBELJNB_.setInt(index, value); + ensureHIIHFCBJLDIIsMutable(); + hIIHFCBJLDI_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 PLGICBELJNB = 8; - * @param value The pLGICBELJNB to add. + * repeated uint32 HIIHFCBJLDI = 8; + * @param value The hIIHFCBJLDI to add. * @return This builder for chaining. */ - public Builder addPLGICBELJNB(int value) { - ensurePLGICBELJNBIsMutable(); - pLGICBELJNB_.addInt(value); + public Builder addHIIHFCBJLDI(int value) { + ensureHIIHFCBJLDIIsMutable(); + hIIHFCBJLDI_.addInt(value); onChanged(); return this; } /** - * repeated uint32 PLGICBELJNB = 8; - * @param values The pLGICBELJNB to add. + * repeated uint32 HIIHFCBJLDI = 8; + * @param values The hIIHFCBJLDI to add. * @return This builder for chaining. */ - public Builder addAllPLGICBELJNB( + public Builder addAllHIIHFCBJLDI( java.lang.Iterable values) { - ensurePLGICBELJNBIsMutable(); + ensureHIIHFCBJLDIIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, pLGICBELJNB_); + values, hIIHFCBJLDI_); onChanged(); return this; } /** - * repeated uint32 PLGICBELJNB = 8; + * repeated uint32 HIIHFCBJLDI = 8; * @return This builder for chaining. */ - public Builder clearPLGICBELJNB() { - pLGICBELJNB_ = emptyIntList(); + public Builder clearHIIHFCBJLDI() { + hIIHFCBJLDI_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000080); onChanged(); return this; } - private com.google.protobuf.Internal.IntList fOIHNLFBPFI_ = emptyIntList(); - private void ensureFOIHNLFBPFIIsMutable() { + private com.google.protobuf.Internal.IntList hCPKDCNKPGD_ = emptyIntList(); + private void ensureHCPKDCNKPGDIsMutable() { if (!((bitField0_ & 0x00000100) != 0)) { - fOIHNLFBPFI_ = mutableCopy(fOIHNLFBPFI_); + hCPKDCNKPGD_ = mutableCopy(hCPKDCNKPGD_); bitField0_ |= 0x00000100; } } /** - * repeated uint32 FOIHNLFBPFI = 9; - * @return A list containing the fOIHNLFBPFI. + * repeated uint32 HCPKDCNKPGD = 9; + * @return A list containing the hCPKDCNKPGD. */ public java.util.List - getFOIHNLFBPFIList() { + getHCPKDCNKPGDList() { return ((bitField0_ & 0x00000100) != 0) ? - java.util.Collections.unmodifiableList(fOIHNLFBPFI_) : fOIHNLFBPFI_; + java.util.Collections.unmodifiableList(hCPKDCNKPGD_) : hCPKDCNKPGD_; } /** - * repeated uint32 FOIHNLFBPFI = 9; - * @return The count of fOIHNLFBPFI. + * repeated uint32 HCPKDCNKPGD = 9; + * @return The count of hCPKDCNKPGD. */ - public int getFOIHNLFBPFICount() { - return fOIHNLFBPFI_.size(); + public int getHCPKDCNKPGDCount() { + return hCPKDCNKPGD_.size(); } /** - * repeated uint32 FOIHNLFBPFI = 9; + * repeated uint32 HCPKDCNKPGD = 9; * @param index The index of the element to return. - * @return The fOIHNLFBPFI at the given index. + * @return The hCPKDCNKPGD at the given index. */ - public int getFOIHNLFBPFI(int index) { - return fOIHNLFBPFI_.getInt(index); + public int getHCPKDCNKPGD(int index) { + return hCPKDCNKPGD_.getInt(index); } /** - * repeated uint32 FOIHNLFBPFI = 9; + * repeated uint32 HCPKDCNKPGD = 9; * @param index The index to set the value at. - * @param value The fOIHNLFBPFI to set. + * @param value The hCPKDCNKPGD to set. * @return This builder for chaining. */ - public Builder setFOIHNLFBPFI( + public Builder setHCPKDCNKPGD( int index, int value) { - ensureFOIHNLFBPFIIsMutable(); - fOIHNLFBPFI_.setInt(index, value); + ensureHCPKDCNKPGDIsMutable(); + hCPKDCNKPGD_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 FOIHNLFBPFI = 9; - * @param value The fOIHNLFBPFI to add. + * repeated uint32 HCPKDCNKPGD = 9; + * @param value The hCPKDCNKPGD to add. * @return This builder for chaining. */ - public Builder addFOIHNLFBPFI(int value) { - ensureFOIHNLFBPFIIsMutable(); - fOIHNLFBPFI_.addInt(value); + public Builder addHCPKDCNKPGD(int value) { + ensureHCPKDCNKPGDIsMutable(); + hCPKDCNKPGD_.addInt(value); onChanged(); return this; } /** - * repeated uint32 FOIHNLFBPFI = 9; - * @param values The fOIHNLFBPFI to add. + * repeated uint32 HCPKDCNKPGD = 9; + * @param values The hCPKDCNKPGD to add. * @return This builder for chaining. */ - public Builder addAllFOIHNLFBPFI( + public Builder addAllHCPKDCNKPGD( java.lang.Iterable values) { - ensureFOIHNLFBPFIIsMutable(); + ensureHCPKDCNKPGDIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, fOIHNLFBPFI_); + values, hCPKDCNKPGD_); onChanged(); return this; } /** - * repeated uint32 FOIHNLFBPFI = 9; + * repeated uint32 HCPKDCNKPGD = 9; * @return This builder for chaining. */ - public Builder clearFOIHNLFBPFI() { - fOIHNLFBPFI_ = emptyIntList(); + public Builder clearHCPKDCNKPGD() { + hCPKDCNKPGD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000100); onChanged(); return this; @@ -2495,20 +2495,20 @@ public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceIn com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_LackingResourceInfo_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_LackingResourceInfo_JHOJDJGELLKEntry_descriptor; + internal_static_LackingResourceInfo_IGIDHGKOODOEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_LackingResourceInfo_JHOJDJGELLKEntry_fieldAccessorTable; + internal_static_LackingResourceInfo_IGIDHGKOODOEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_LackingResourceInfo_KBEAGMAGFPDEntry_descriptor; + internal_static_LackingResourceInfo_LELGNGJOJAIEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_LackingResourceInfo_KBEAGMAGFPDEntry_fieldAccessorTable; + internal_static_LackingResourceInfo_LELGNGJOJAIEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_LackingResourceInfo_GJBFBFOCLJLEntry_descriptor; + internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_LackingResourceInfo_GJBFBFOCLJLEntry_fieldAccessorTable; + internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -2519,17 +2519,17 @@ public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceIn static { java.lang.String[] descriptorData = { "\n\031LackingResourceInfo.proto\"\343\003\n\023LackingR" + - "esourceInfo\022\023\n\013PDFBJCPKGAD\030\001 \003(\r\022:\n\013JHOJ" + - "DJGELLK\030\002 \003(\0132%.LackingResourceInfo.JHOJ" + - "DJGELLKEntry\022\023\n\013GEPBOPLIEMB\030\003 \003(\r\022:\n\013KBE" + - "AGMAGFPD\030\004 \003(\0132%.LackingResourceInfo.KBE" + - "AGMAGFPDEntry\022\023\n\013NGBJMLNHLBB\030\005 \003(\r\022:\n\013GJ" + - "BFBFOCLJL\030\006 \003(\0132%.LackingResourceInfo.GJ" + - "BFBFOCLJLEntry\022\023\n\013IFLMBHBHLMC\030\007 \003(\r\022\023\n\013P" + - "LGICBELJNB\030\010 \003(\r\022\023\n\013FOIHNLFBPFI\030\t \003(\r\0322\n" + - "\020JHOJDJGELLKEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" + - "\002 \001(\r:\0028\001\0322\n\020KBEAGMAGFPDEntry\022\013\n\003key\030\001 \001" + - "(\r\022\r\n\005value\030\002 \001(\r:\0028\001\0322\n\020GJBFBFOCLJLEntr" + + "esourceInfo\022\023\n\013JAODPKILOHD\030\001 \003(\r\022:\n\013IGID" + + "HGKOODO\030\002 \003(\0132%.LackingResourceInfo.IGID" + + "HGKOODOEntry\022\023\n\013OBAKLGMMOEO\030\003 \003(\r\022:\n\013LEL" + + "GNGJOJAI\030\004 \003(\0132%.LackingResourceInfo.LEL" + + "GNGJOJAIEntry\022\023\n\013AOECKDLECIJ\030\005 \003(\r\022:\n\013AC" + + "AAJJBNCDM\030\006 \003(\0132%.LackingResourceInfo.AC" + + "AAJJBNCDMEntry\022\023\n\013LHEGFHKBMKF\030\007 \003(\r\022\023\n\013H" + + "IIHFCBJLDI\030\010 \003(\r\022\023\n\013HCPKDCNKPGD\030\t \003(\r\0322\n" + + "\020IGIDHGKOODOEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" + + "\002 \001(\r:\0028\001\0322\n\020LELGNGJOJAIEntry\022\013\n\003key\030\001 \001" + + "(\r\022\r\n\005value\030\002 \001(\r:\0028\001\0322\n\020ACAAJJBNCDMEntr" + "y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; @@ -2542,24 +2542,24 @@ public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceIn internal_static_LackingResourceInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_LackingResourceInfo_descriptor, - new java.lang.String[] { "PDFBJCPKGAD", "JHOJDJGELLK", "GEPBOPLIEMB", "KBEAGMAGFPD", "NGBJMLNHLBB", "GJBFBFOCLJL", "IFLMBHBHLMC", "PLGICBELJNB", "FOIHNLFBPFI", }); - internal_static_LackingResourceInfo_JHOJDJGELLKEntry_descriptor = + new java.lang.String[] { "JAODPKILOHD", "IGIDHGKOODO", "OBAKLGMMOEO", "LELGNGJOJAI", "AOECKDLECIJ", "ACAAJJBNCDM", "LHEGFHKBMKF", "HIIHFCBJLDI", "HCPKDCNKPGD", }); + internal_static_LackingResourceInfo_IGIDHGKOODOEntry_descriptor = internal_static_LackingResourceInfo_descriptor.getNestedTypes().get(0); - internal_static_LackingResourceInfo_JHOJDJGELLKEntry_fieldAccessorTable = new + internal_static_LackingResourceInfo_IGIDHGKOODOEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_LackingResourceInfo_JHOJDJGELLKEntry_descriptor, + internal_static_LackingResourceInfo_IGIDHGKOODOEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_LackingResourceInfo_KBEAGMAGFPDEntry_descriptor = + internal_static_LackingResourceInfo_LELGNGJOJAIEntry_descriptor = internal_static_LackingResourceInfo_descriptor.getNestedTypes().get(1); - internal_static_LackingResourceInfo_KBEAGMAGFPDEntry_fieldAccessorTable = new + internal_static_LackingResourceInfo_LELGNGJOJAIEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_LackingResourceInfo_KBEAGMAGFPDEntry_descriptor, + internal_static_LackingResourceInfo_LELGNGJOJAIEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_LackingResourceInfo_GJBFBFOCLJLEntry_descriptor = + internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_descriptor = internal_static_LackingResourceInfo_descriptor.getNestedTypes().get(2); - internal_static_LackingResourceInfo_GJBFBFOCLJLEntry_fieldAccessorTable = new + internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_LackingResourceInfo_GJBFBFOCLJLEntry_descriptor, + internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_descriptor, new java.lang.String[] { "Key", "Value", }); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java index d0963d90fca..70e830a9234 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java @@ -19,16 +19,16 @@ public interface QueryFilterOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 CBICALMIEBG = 4; - * @return The cBICALMIEBG. + * int32 MJEFLBPJBKM = 7; + * @return The mJEFLBPJBKM. */ - int getCBICALMIEBG(); + int getMJEFLBPJBKM(); /** - * int32 PGOOOMDPHAG = 7; - * @return The pGOOOMDPHAG. + * int32 NOLJBNBNLML = 9; + * @return The nOLJBNBNLML. */ - int getPGOOOMDPHAG(); + int getNOLJBNBNLML(); } /** * Protobuf type {@code QueryFilter} @@ -75,14 +75,14 @@ private QueryFilter( case 0: done = true; break; - case 32: { + case 56: { - cBICALMIEBG_ = input.readInt32(); + mJEFLBPJBKM_ = input.readInt32(); break; } - case 56: { + case 72: { - pGOOOMDPHAG_ = input.readInt32(); + nOLJBNBNLML_ = input.readInt32(); break; } default: { @@ -117,26 +117,26 @@ private QueryFilter( emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.class, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder.class); } - public static final int CBICALMIEBG_FIELD_NUMBER = 4; - private int cBICALMIEBG_; + public static final int MJEFLBPJBKM_FIELD_NUMBER = 7; + private int mJEFLBPJBKM_; /** - * int32 CBICALMIEBG = 4; - * @return The cBICALMIEBG. + * int32 MJEFLBPJBKM = 7; + * @return The mJEFLBPJBKM. */ @java.lang.Override - public int getCBICALMIEBG() { - return cBICALMIEBG_; + public int getMJEFLBPJBKM() { + return mJEFLBPJBKM_; } - public static final int PGOOOMDPHAG_FIELD_NUMBER = 7; - private int pGOOOMDPHAG_; + public static final int NOLJBNBNLML_FIELD_NUMBER = 9; + private int nOLJBNBNLML_; /** - * int32 PGOOOMDPHAG = 7; - * @return The pGOOOMDPHAG. + * int32 NOLJBNBNLML = 9; + * @return The nOLJBNBNLML. */ @java.lang.Override - public int getPGOOOMDPHAG() { - return pGOOOMDPHAG_; + public int getNOLJBNBNLML() { + return nOLJBNBNLML_; } private byte memoizedIsInitialized = -1; @@ -153,11 +153,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (cBICALMIEBG_ != 0) { - output.writeInt32(4, cBICALMIEBG_); + if (mJEFLBPJBKM_ != 0) { + output.writeInt32(7, mJEFLBPJBKM_); } - if (pGOOOMDPHAG_ != 0) { - output.writeInt32(7, pGOOOMDPHAG_); + if (nOLJBNBNLML_ != 0) { + output.writeInt32(9, nOLJBNBNLML_); } unknownFields.writeTo(output); } @@ -168,13 +168,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (cBICALMIEBG_ != 0) { + if (mJEFLBPJBKM_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, cBICALMIEBG_); + .computeInt32Size(7, mJEFLBPJBKM_); } - if (pGOOOMDPHAG_ != 0) { + if (nOLJBNBNLML_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(7, pGOOOMDPHAG_); + .computeInt32Size(9, nOLJBNBNLML_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -191,10 +191,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter other = (emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter) obj; - if (getCBICALMIEBG() - != other.getCBICALMIEBG()) return false; - if (getPGOOOMDPHAG() - != other.getPGOOOMDPHAG()) return false; + if (getMJEFLBPJBKM() + != other.getMJEFLBPJBKM()) return false; + if (getNOLJBNBNLML() + != other.getNOLJBNBNLML()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -206,10 +206,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + CBICALMIEBG_FIELD_NUMBER; - hash = (53 * hash) + getCBICALMIEBG(); - hash = (37 * hash) + PGOOOMDPHAG_FIELD_NUMBER; - hash = (53 * hash) + getPGOOOMDPHAG(); + hash = (37 * hash) + MJEFLBPJBKM_FIELD_NUMBER; + hash = (53 * hash) + getMJEFLBPJBKM(); + hash = (37 * hash) + NOLJBNBNLML_FIELD_NUMBER; + hash = (53 * hash) + getNOLJBNBNLML(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -343,9 +343,9 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - cBICALMIEBG_ = 0; + mJEFLBPJBKM_ = 0; - pGOOOMDPHAG_ = 0; + nOLJBNBNLML_ = 0; return this; } @@ -373,8 +373,8 @@ public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter build() { @java.lang.Override public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter buildPartial() { emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter result = new emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter(this); - result.cBICALMIEBG_ = cBICALMIEBG_; - result.pGOOOMDPHAG_ = pGOOOMDPHAG_; + result.mJEFLBPJBKM_ = mJEFLBPJBKM_; + result.nOLJBNBNLML_ = nOLJBNBNLML_; onBuilt(); return result; } @@ -423,11 +423,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter other) { if (other == emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance()) return this; - if (other.getCBICALMIEBG() != 0) { - setCBICALMIEBG(other.getCBICALMIEBG()); + if (other.getMJEFLBPJBKM() != 0) { + setMJEFLBPJBKM(other.getMJEFLBPJBKM()); } - if (other.getPGOOOMDPHAG() != 0) { - setPGOOOMDPHAG(other.getPGOOOMDPHAG()); + if (other.getNOLJBNBNLML() != 0) { + setNOLJBNBNLML(other.getNOLJBNBNLML()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -458,64 +458,64 @@ public Builder mergeFrom( return this; } - private int cBICALMIEBG_ ; + private int mJEFLBPJBKM_ ; /** - * int32 CBICALMIEBG = 4; - * @return The cBICALMIEBG. + * int32 MJEFLBPJBKM = 7; + * @return The mJEFLBPJBKM. */ @java.lang.Override - public int getCBICALMIEBG() { - return cBICALMIEBG_; + public int getMJEFLBPJBKM() { + return mJEFLBPJBKM_; } /** - * int32 CBICALMIEBG = 4; - * @param value The cBICALMIEBG to set. + * int32 MJEFLBPJBKM = 7; + * @param value The mJEFLBPJBKM to set. * @return This builder for chaining. */ - public Builder setCBICALMIEBG(int value) { + public Builder setMJEFLBPJBKM(int value) { - cBICALMIEBG_ = value; + mJEFLBPJBKM_ = value; onChanged(); return this; } /** - * int32 CBICALMIEBG = 4; + * int32 MJEFLBPJBKM = 7; * @return This builder for chaining. */ - public Builder clearCBICALMIEBG() { + public Builder clearMJEFLBPJBKM() { - cBICALMIEBG_ = 0; + mJEFLBPJBKM_ = 0; onChanged(); return this; } - private int pGOOOMDPHAG_ ; + private int nOLJBNBNLML_ ; /** - * int32 PGOOOMDPHAG = 7; - * @return The pGOOOMDPHAG. + * int32 NOLJBNBNLML = 9; + * @return The nOLJBNBNLML. */ @java.lang.Override - public int getPGOOOMDPHAG() { - return pGOOOMDPHAG_; + public int getNOLJBNBNLML() { + return nOLJBNBNLML_; } /** - * int32 PGOOOMDPHAG = 7; - * @param value The pGOOOMDPHAG to set. + * int32 NOLJBNBNLML = 9; + * @param value The nOLJBNBNLML to set. * @return This builder for chaining. */ - public Builder setPGOOOMDPHAG(int value) { + public Builder setNOLJBNBNLML(int value) { - pGOOOMDPHAG_ = value; + nOLJBNBNLML_ = value; onChanged(); return this; } /** - * int32 PGOOOMDPHAG = 7; + * int32 NOLJBNBNLML = 9; * @return This builder for chaining. */ - public Builder clearPGOOOMDPHAG() { + public Builder clearNOLJBNBNLML() { - pGOOOMDPHAG_ = 0; + nOLJBNBNLML_ = 0; onChanged(); return this; } @@ -586,8 +586,8 @@ public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getDefaultIns descriptor; static { java.lang.String[] descriptorData = { - "\n\021QueryFilter.proto\"7\n\013QueryFilter\022\023\n\013CB" + - "ICALMIEBG\030\004 \001(\005\022\023\n\013PGOOOMDPHAG\030\007 \001(\005B\033\n\031" + + "\n\021QueryFilter.proto\"7\n\013QueryFilter\022\023\n\013MJ" + + "EFLBPJBKM\030\007 \001(\005\022\023\n\013NOLJBNBNLML\030\t \001(\005B\033\n\031" + "emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -599,7 +599,7 @@ public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getDefaultIns internal_static_QueryFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QueryFilter_descriptor, - new java.lang.String[] { "CBICALMIEBG", "PGOOOMDPHAG", }); + new java.lang.String[] { "MJEFLBPJBKM", "NOLJBNBNLML", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java index 256800ec427..17fbeddcd2f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java @@ -19,115 +19,115 @@ public interface QueryPathReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .Vector destination_pos = 2; + * .QueryFilter filter = 14; + * @return Whether the filter field is set. + */ + boolean hasFilter(); + /** + * .QueryFilter filter = 14; + * @return The filter. + */ + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter(); + /** + * .QueryFilter filter = 14; + */ + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder(); + + /** + * repeated .Vector destination_pos = 4; */ java.util.List getDestinationPosList(); /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index); /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ int getDestinationPosCount(); /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ java.util.List getDestinationPosOrBuilderList(); /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder( int index); /** - * .QueryPathReq.OptionType query_type = 3; - * @return The enum numeric value on the wire for queryType. - */ - int getQueryTypeValue(); - /** - * .QueryPathReq.OptionType query_type = 3; - * @return The queryType. - */ - emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType(); - - /** - * uint32 scene_id = 4; - * @return The sceneId. - */ - int getSceneId(); - - /** - * .Vector source_pos = 5; - * @return Whether the sourcePos field is set. + * .Vector3Int DNFDJPHIOBD = 9; + * @return Whether the dNFDJPHIOBD field is set. */ - boolean hasSourcePos(); + boolean hasDNFDJPHIOBD(); /** - * .Vector source_pos = 5; - * @return The sourcePos. + * .Vector3Int DNFDJPHIOBD = 9; + * @return The dNFDJPHIOBD. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos(); + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getDNFDJPHIOBD(); /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder(); + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getDNFDJPHIOBDOrBuilder(); /** - * .Vector3Int ANCGPGGGOAJ = 8; - * @return Whether the aNCGPGGGOAJ field is set. + * .Vector3Int ODFIFCKDODJ = 5; + * @return Whether the oDFIFCKDODJ field is set. */ - boolean hasANCGPGGGOAJ(); + boolean hasODFIFCKDODJ(); /** - * .Vector3Int ANCGPGGGOAJ = 8; - * @return The aNCGPGGGOAJ. + * .Vector3Int ODFIFCKDODJ = 5; + * @return The oDFIFCKDODJ. */ - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getANCGPGGGOAJ(); + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getODFIFCKDODJ(); /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getANCGPGGGOAJOrBuilder(); + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getODFIFCKDODJOrBuilder(); /** - * .Vector3Int IFMLKJBFKDK = 9; - * @return Whether the iFMLKJBFKDK field is set. + * .Vector source_pos = 12; + * @return Whether the sourcePos field is set. */ - boolean hasIFMLKJBFKDK(); + boolean hasSourcePos(); /** - * .Vector3Int IFMLKJBFKDK = 9; - * @return The iFMLKJBFKDK. + * .Vector source_pos = 12; + * @return The sourcePos. */ - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getIFMLKJBFKDK(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos(); /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getIFMLKJBFKDKOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder(); /** - * int32 query_id = 14; + * int32 query_id = 3; * @return The queryId. */ int getQueryId(); /** - * .QueryFilter filter = 15; - * @return Whether the filter field is set. + * uint32 scene_id = 13; + * @return The sceneId. */ - boolean hasFilter(); + int getSceneId(); + /** - * .QueryFilter filter = 15; - * @return The filter. + * .QueryPathReq.OptionType query_type = 7; + * @return The enum numeric value on the wire for queryType. */ - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter(); + int getQueryTypeValue(); /** - * .QueryFilter filter = 15; + * .QueryPathReq.OptionType query_type = 7; + * @return The queryType. */ - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder(); + emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType(); } /** * 
-   * CmdId: 2337
+   * CmdId: 2339
    *
* * Protobuf type {@code QueryPathReq} @@ -177,7 +177,12 @@ private QueryPathReq( case 0: done = true; break; - case 18: { + case 24: { + + queryId_ = input.readInt32(); + break; + } + case 34: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { destinationPos_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -186,62 +191,57 @@ private QueryPathReq( input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry)); break; } - case 24: { - int rawValue = input.readEnum(); - - queryType_ = rawValue; - break; - } - case 32: { - - sceneId_ = input.readUInt32(); - break; - } case 42: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (sourcePos_ != null) { - subBuilder = sourcePos_.toBuilder(); + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null; + if (oDFIFCKDODJ_ != null) { + subBuilder = oDFIFCKDODJ_.toBuilder(); } - sourcePos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + oDFIFCKDODJ_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(sourcePos_); - sourcePos_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(oDFIFCKDODJ_); + oDFIFCKDODJ_ = subBuilder.buildPartial(); } break; } - case 66: { + case 56: { + int rawValue = input.readEnum(); + + queryType_ = rawValue; + break; + } + case 74: { emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null; - if (aNCGPGGGOAJ_ != null) { - subBuilder = aNCGPGGGOAJ_.toBuilder(); + if (dNFDJPHIOBD_ != null) { + subBuilder = dNFDJPHIOBD_.toBuilder(); } - aNCGPGGGOAJ_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry); + dNFDJPHIOBD_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(aNCGPGGGOAJ_); - aNCGPGGGOAJ_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(dNFDJPHIOBD_); + dNFDJPHIOBD_ = subBuilder.buildPartial(); } break; } - case 74: { - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null; - if (iFMLKJBFKDK_ != null) { - subBuilder = iFMLKJBFKDK_.toBuilder(); + case 98: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (sourcePos_ != null) { + subBuilder = sourcePos_.toBuilder(); } - iFMLKJBFKDK_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry); + sourcePos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(iFMLKJBFKDK_); - iFMLKJBFKDK_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(sourcePos_); + sourcePos_ = subBuilder.buildPartial(); } break; } - case 112: { + case 104: { - queryId_ = input.readInt32(); + sceneId_ = input.readUInt32(); break; } - case 122: { + case 114: { emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder subBuilder = null; if (filter_ != null) { subBuilder = filter_.toBuilder(); @@ -406,17 +406,43 @@ private OptionType(int value) { // @@protoc_insertion_point(enum_scope:QueryPathReq.OptionType) } - public static final int DESTINATION_POS_FIELD_NUMBER = 2; + public static final int FILTER_FIELD_NUMBER = 14; + private emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter filter_; + /** + * .QueryFilter filter = 14; + * @return Whether the filter field is set. + */ + @java.lang.Override + public boolean hasFilter() { + return filter_ != null; + } + /** + * .QueryFilter filter = 14; + * @return The filter. + */ + @java.lang.Override + public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter() { + return filter_ == null ? emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance() : filter_; + } + /** + * .QueryFilter filter = 14; + */ + @java.lang.Override + public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder() { + return getFilter(); + } + + public static final int DESTINATION_POS_FIELD_NUMBER = 4; private java.util.List destinationPos_; /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ @java.lang.Override public java.util.List getDestinationPosList() { return destinationPos_; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ @java.lang.Override public java.util.List @@ -424,21 +450,21 @@ public java.util.List getDest return destinationPos_; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ @java.lang.Override public int getDestinationPosCount() { return destinationPos_.size(); } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index) { return destinationPos_.get(index); } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder( @@ -446,118 +472,88 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestination return destinationPos_.get(index); } - public static final int QUERY_TYPE_FIELD_NUMBER = 3; - private int queryType_; - /** - * .QueryPathReq.OptionType query_type = 3; - * @return The enum numeric value on the wire for queryType. - */ - @java.lang.Override public int getQueryTypeValue() { - return queryType_; - } - /** - * .QueryPathReq.OptionType query_type = 3; - * @return The queryType. - */ - @java.lang.Override public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType result = emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.valueOf(queryType_); - return result == null ? emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.UNRECOGNIZED : result; - } - - public static final int SCENE_ID_FIELD_NUMBER = 4; - private int sceneId_; - /** - * uint32 scene_id = 4; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - - public static final int SOURCE_POS_FIELD_NUMBER = 5; - private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_; + public static final int DNFDJPHIOBD_FIELD_NUMBER = 9; + private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int dNFDJPHIOBD_; /** - * .Vector source_pos = 5; - * @return Whether the sourcePos field is set. + * .Vector3Int DNFDJPHIOBD = 9; + * @return Whether the dNFDJPHIOBD field is set. */ @java.lang.Override - public boolean hasSourcePos() { - return sourcePos_ != null; + public boolean hasDNFDJPHIOBD() { + return dNFDJPHIOBD_ != null; } /** - * .Vector source_pos = 5; - * @return The sourcePos. + * .Vector3Int DNFDJPHIOBD = 9; + * @return The dNFDJPHIOBD. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() { - return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_; + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getDNFDJPHIOBD() { + return dNFDJPHIOBD_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : dNFDJPHIOBD_; } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() { - return getSourcePos(); + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getDNFDJPHIOBDOrBuilder() { + return getDNFDJPHIOBD(); } - public static final int ANCGPGGGOAJ_FIELD_NUMBER = 8; - private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int aNCGPGGGOAJ_; + public static final int ODFIFCKDODJ_FIELD_NUMBER = 5; + private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int oDFIFCKDODJ_; /** - * .Vector3Int ANCGPGGGOAJ = 8; - * @return Whether the aNCGPGGGOAJ field is set. + * .Vector3Int ODFIFCKDODJ = 5; + * @return Whether the oDFIFCKDODJ field is set. */ @java.lang.Override - public boolean hasANCGPGGGOAJ() { - return aNCGPGGGOAJ_ != null; + public boolean hasODFIFCKDODJ() { + return oDFIFCKDODJ_ != null; } /** - * .Vector3Int ANCGPGGGOAJ = 8; - * @return The aNCGPGGGOAJ. + * .Vector3Int ODFIFCKDODJ = 5; + * @return The oDFIFCKDODJ. */ @java.lang.Override - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getANCGPGGGOAJ() { - return aNCGPGGGOAJ_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : aNCGPGGGOAJ_; + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getODFIFCKDODJ() { + return oDFIFCKDODJ_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : oDFIFCKDODJ_; } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ @java.lang.Override - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getANCGPGGGOAJOrBuilder() { - return getANCGPGGGOAJ(); + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getODFIFCKDODJOrBuilder() { + return getODFIFCKDODJ(); } - public static final int IFMLKJBFKDK_FIELD_NUMBER = 9; - private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int iFMLKJBFKDK_; + public static final int SOURCE_POS_FIELD_NUMBER = 12; + private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_; /** - * .Vector3Int IFMLKJBFKDK = 9; - * @return Whether the iFMLKJBFKDK field is set. + * .Vector source_pos = 12; + * @return Whether the sourcePos field is set. */ @java.lang.Override - public boolean hasIFMLKJBFKDK() { - return iFMLKJBFKDK_ != null; + public boolean hasSourcePos() { + return sourcePos_ != null; } /** - * .Vector3Int IFMLKJBFKDK = 9; - * @return The iFMLKJBFKDK. + * .Vector source_pos = 12; + * @return The sourcePos. */ @java.lang.Override - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getIFMLKJBFKDK() { - return iFMLKJBFKDK_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : iFMLKJBFKDK_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() { + return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_; } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ @java.lang.Override - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getIFMLKJBFKDKOrBuilder() { - return getIFMLKJBFKDK(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() { + return getSourcePos(); } - public static final int QUERY_ID_FIELD_NUMBER = 14; + public static final int QUERY_ID_FIELD_NUMBER = 3; private int queryId_; /** - * int32 query_id = 14; + * int32 query_id = 3; * @return The queryId. */ @java.lang.Override @@ -565,30 +561,34 @@ public int getQueryId() { return queryId_; } - public static final int FILTER_FIELD_NUMBER = 15; - private emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter filter_; + public static final int SCENE_ID_FIELD_NUMBER = 13; + private int sceneId_; /** - * .QueryFilter filter = 15; - * @return Whether the filter field is set. + * uint32 scene_id = 13; + * @return The sceneId. */ @java.lang.Override - public boolean hasFilter() { - return filter_ != null; + public int getSceneId() { + return sceneId_; } + + public static final int QUERY_TYPE_FIELD_NUMBER = 7; + private int queryType_; /** - * .QueryFilter filter = 15; - * @return The filter. + * .QueryPathReq.OptionType query_type = 7; + * @return The enum numeric value on the wire for queryType. */ - @java.lang.Override - public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter() { - return filter_ == null ? emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance() : filter_; + @java.lang.Override public int getQueryTypeValue() { + return queryType_; } /** - * .QueryFilter filter = 15; + * .QueryPathReq.OptionType query_type = 7; + * @return The queryType. */ - @java.lang.Override - public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder() { - return getFilter(); + @java.lang.Override public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType result = emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.valueOf(queryType_); + return result == null ? emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.UNRECOGNIZED : result; } private byte memoizedIsInitialized = -1; @@ -605,29 +605,29 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (queryId_ != 0) { + output.writeInt32(3, queryId_); + } for (int i = 0; i < destinationPos_.size(); i++) { - output.writeMessage(2, destinationPos_.get(i)); + output.writeMessage(4, destinationPos_.get(i)); + } + if (oDFIFCKDODJ_ != null) { + output.writeMessage(5, getODFIFCKDODJ()); } if (queryType_ != emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.OptionType_OPTION_NONE.getNumber()) { - output.writeEnum(3, queryType_); + output.writeEnum(7, queryType_); } - if (sceneId_ != 0) { - output.writeUInt32(4, sceneId_); + if (dNFDJPHIOBD_ != null) { + output.writeMessage(9, getDNFDJPHIOBD()); } if (sourcePos_ != null) { - output.writeMessage(5, getSourcePos()); + output.writeMessage(12, getSourcePos()); } - if (aNCGPGGGOAJ_ != null) { - output.writeMessage(8, getANCGPGGGOAJ()); - } - if (iFMLKJBFKDK_ != null) { - output.writeMessage(9, getIFMLKJBFKDK()); - } - if (queryId_ != 0) { - output.writeInt32(14, queryId_); + if (sceneId_ != 0) { + output.writeUInt32(13, sceneId_); } if (filter_ != null) { - output.writeMessage(15, getFilter()); + output.writeMessage(14, getFilter()); } unknownFields.writeTo(output); } @@ -638,37 +638,37 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < destinationPos_.size(); i++) { + if (queryId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, destinationPos_.get(i)); + .computeInt32Size(3, queryId_); } - if (queryType_ != emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.OptionType_OPTION_NONE.getNumber()) { + for (int i = 0; i < destinationPos_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(3, queryType_); + .computeMessageSize(4, destinationPos_.get(i)); } - if (sceneId_ != 0) { + if (oDFIFCKDODJ_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, sceneId_); + .computeMessageSize(5, getODFIFCKDODJ()); } - if (sourcePos_ != null) { + if (queryType_ != emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.OptionType_OPTION_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getSourcePos()); + .computeEnumSize(7, queryType_); } - if (aNCGPGGGOAJ_ != null) { + if (dNFDJPHIOBD_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, getANCGPGGGOAJ()); + .computeMessageSize(9, getDNFDJPHIOBD()); } - if (iFMLKJBFKDK_ != null) { + if (sourcePos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, getIFMLKJBFKDK()); + .computeMessageSize(12, getSourcePos()); } - if (queryId_ != 0) { + if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, queryId_); + .computeUInt32Size(13, sceneId_); } if (filter_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getFilter()); + .computeMessageSize(14, getFilter()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -685,33 +685,33 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq other = (emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq) obj; + if (hasFilter() != other.hasFilter()) return false; + if (hasFilter()) { + if (!getFilter() + .equals(other.getFilter())) return false; + } if (!getDestinationPosList() .equals(other.getDestinationPosList())) return false; - if (queryType_ != other.queryType_) return false; - if (getSceneId() - != other.getSceneId()) return false; + if (hasDNFDJPHIOBD() != other.hasDNFDJPHIOBD()) return false; + if (hasDNFDJPHIOBD()) { + if (!getDNFDJPHIOBD() + .equals(other.getDNFDJPHIOBD())) return false; + } + if (hasODFIFCKDODJ() != other.hasODFIFCKDODJ()) return false; + if (hasODFIFCKDODJ()) { + if (!getODFIFCKDODJ() + .equals(other.getODFIFCKDODJ())) return false; + } if (hasSourcePos() != other.hasSourcePos()) return false; if (hasSourcePos()) { if (!getSourcePos() .equals(other.getSourcePos())) return false; } - if (hasANCGPGGGOAJ() != other.hasANCGPGGGOAJ()) return false; - if (hasANCGPGGGOAJ()) { - if (!getANCGPGGGOAJ() - .equals(other.getANCGPGGGOAJ())) return false; - } - if (hasIFMLKJBFKDK() != other.hasIFMLKJBFKDK()) return false; - if (hasIFMLKJBFKDK()) { - if (!getIFMLKJBFKDK() - .equals(other.getIFMLKJBFKDK())) return false; - } if (getQueryId() != other.getQueryId()) return false; - if (hasFilter() != other.hasFilter()) return false; - if (hasFilter()) { - if (!getFilter() - .equals(other.getFilter())) return false; - } + if (getSceneId() + != other.getSceneId()) return false; + if (queryType_ != other.queryType_) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -723,32 +723,32 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasFilter()) { + hash = (37 * hash) + FILTER_FIELD_NUMBER; + hash = (53 * hash) + getFilter().hashCode(); + } if (getDestinationPosCount() > 0) { hash = (37 * hash) + DESTINATION_POS_FIELD_NUMBER; hash = (53 * hash) + getDestinationPosList().hashCode(); } - hash = (37 * hash) + QUERY_TYPE_FIELD_NUMBER; - hash = (53 * hash) + queryType_; - hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getSceneId(); + if (hasDNFDJPHIOBD()) { + hash = (37 * hash) + DNFDJPHIOBD_FIELD_NUMBER; + hash = (53 * hash) + getDNFDJPHIOBD().hashCode(); + } + if (hasODFIFCKDODJ()) { + hash = (37 * hash) + ODFIFCKDODJ_FIELD_NUMBER; + hash = (53 * hash) + getODFIFCKDODJ().hashCode(); + } if (hasSourcePos()) { hash = (37 * hash) + SOURCE_POS_FIELD_NUMBER; hash = (53 * hash) + getSourcePos().hashCode(); } - if (hasANCGPGGGOAJ()) { - hash = (37 * hash) + ANCGPGGGOAJ_FIELD_NUMBER; - hash = (53 * hash) + getANCGPGGGOAJ().hashCode(); - } - if (hasIFMLKJBFKDK()) { - hash = (37 * hash) + IFMLKJBFKDK_FIELD_NUMBER; - hash = (53 * hash) + getIFMLKJBFKDK().hashCode(); - } hash = (37 * hash) + QUERY_ID_FIELD_NUMBER; hash = (53 * hash) + getQueryId(); - if (hasFilter()) { - hash = (37 * hash) + FILTER_FIELD_NUMBER; - hash = (53 * hash) + getFilter().hashCode(); - } + hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + QUERY_TYPE_FIELD_NUMBER; + hash = (53 * hash) + queryType_; hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -846,7 +846,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2337
+     * CmdId: 2339
      *
* * Protobuf type {@code QueryPathReq} @@ -887,42 +887,42 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + if (filterBuilder_ == null) { + filter_ = null; + } else { + filter_ = null; + filterBuilder_ = null; + } if (destinationPosBuilder_ == null) { destinationPos_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { destinationPosBuilder_.clear(); } - queryType_ = 0; - - sceneId_ = 0; - - if (sourcePosBuilder_ == null) { - sourcePos_ = null; + if (dNFDJPHIOBDBuilder_ == null) { + dNFDJPHIOBD_ = null; } else { - sourcePos_ = null; - sourcePosBuilder_ = null; + dNFDJPHIOBD_ = null; + dNFDJPHIOBDBuilder_ = null; } - if (aNCGPGGGOAJBuilder_ == null) { - aNCGPGGGOAJ_ = null; + if (oDFIFCKDODJBuilder_ == null) { + oDFIFCKDODJ_ = null; } else { - aNCGPGGGOAJ_ = null; - aNCGPGGGOAJBuilder_ = null; + oDFIFCKDODJ_ = null; + oDFIFCKDODJBuilder_ = null; } - if (iFMLKJBFKDKBuilder_ == null) { - iFMLKJBFKDK_ = null; + if (sourcePosBuilder_ == null) { + sourcePos_ = null; } else { - iFMLKJBFKDK_ = null; - iFMLKJBFKDKBuilder_ = null; + sourcePos_ = null; + sourcePosBuilder_ = null; } queryId_ = 0; - if (filterBuilder_ == null) { - filter_ = null; - } else { - filter_ = null; - filterBuilder_ = null; - } + sceneId_ = 0; + + queryType_ = 0; + return this; } @@ -950,6 +950,11 @@ public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq build() { public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq buildPartial() { emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq result = new emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq(this); int from_bitField0_ = bitField0_; + if (filterBuilder_ == null) { + result.filter_ = filter_; + } else { + result.filter_ = filterBuilder_.build(); + } if (destinationPosBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { destinationPos_ = java.util.Collections.unmodifiableList(destinationPos_); @@ -959,29 +964,24 @@ public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq buildPartia } else { result.destinationPos_ = destinationPosBuilder_.build(); } - result.queryType_ = queryType_; - result.sceneId_ = sceneId_; - if (sourcePosBuilder_ == null) { - result.sourcePos_ = sourcePos_; + if (dNFDJPHIOBDBuilder_ == null) { + result.dNFDJPHIOBD_ = dNFDJPHIOBD_; } else { - result.sourcePos_ = sourcePosBuilder_.build(); + result.dNFDJPHIOBD_ = dNFDJPHIOBDBuilder_.build(); } - if (aNCGPGGGOAJBuilder_ == null) { - result.aNCGPGGGOAJ_ = aNCGPGGGOAJ_; + if (oDFIFCKDODJBuilder_ == null) { + result.oDFIFCKDODJ_ = oDFIFCKDODJ_; } else { - result.aNCGPGGGOAJ_ = aNCGPGGGOAJBuilder_.build(); + result.oDFIFCKDODJ_ = oDFIFCKDODJBuilder_.build(); } - if (iFMLKJBFKDKBuilder_ == null) { - result.iFMLKJBFKDK_ = iFMLKJBFKDK_; + if (sourcePosBuilder_ == null) { + result.sourcePos_ = sourcePos_; } else { - result.iFMLKJBFKDK_ = iFMLKJBFKDKBuilder_.build(); + result.sourcePos_ = sourcePosBuilder_.build(); } result.queryId_ = queryId_; - if (filterBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = filterBuilder_.build(); - } + result.sceneId_ = sceneId_; + result.queryType_ = queryType_; onBuilt(); return result; } @@ -1030,6 +1030,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq other) { if (other == emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.getDefaultInstance()) return this; + if (other.hasFilter()) { + mergeFilter(other.getFilter()); + } if (destinationPosBuilder_ == null) { if (!other.destinationPos_.isEmpty()) { if (destinationPos_.isEmpty()) { @@ -1056,26 +1059,23 @@ public Builder mergeFrom(emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryP } } } - if (other.queryType_ != 0) { - setQueryTypeValue(other.getQueryTypeValue()); + if (other.hasDNFDJPHIOBD()) { + mergeDNFDJPHIOBD(other.getDNFDJPHIOBD()); } - if (other.getSceneId() != 0) { - setSceneId(other.getSceneId()); + if (other.hasODFIFCKDODJ()) { + mergeODFIFCKDODJ(other.getODFIFCKDODJ()); } if (other.hasSourcePos()) { mergeSourcePos(other.getSourcePos()); } - if (other.hasANCGPGGGOAJ()) { - mergeANCGPGGGOAJ(other.getANCGPGGGOAJ()); - } - if (other.hasIFMLKJBFKDK()) { - mergeIFMLKJBFKDK(other.getIFMLKJBFKDK()); - } if (other.getQueryId() != 0) { setQueryId(other.getQueryId()); } - if (other.hasFilter()) { - mergeFilter(other.getFilter()); + if (other.getSceneId() != 0) { + setSceneId(other.getSceneId()); + } + if (other.queryType_ != 0) { + setQueryTypeValue(other.getQueryTypeValue()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1107,6 +1107,125 @@ public Builder mergeFrom( } private int bitField0_; + private emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter filter_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder> filterBuilder_; + /** + * .QueryFilter filter = 14; + * @return Whether the filter field is set. + */ + public boolean hasFilter() { + return filterBuilder_ != null || filter_ != null; + } + /** + * .QueryFilter filter = 14; + * @return The filter. + */ + public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter() { + if (filterBuilder_ == null) { + return filter_ == null ? emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance() : filter_; + } else { + return filterBuilder_.getMessage(); + } + } + /** + * .QueryFilter filter = 14; + */ + public Builder setFilter(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter value) { + if (filterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + filter_ = value; + onChanged(); + } else { + filterBuilder_.setMessage(value); + } + + return this; + } + /** + * .QueryFilter filter = 14; + */ + public Builder setFilter( + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder builderForValue) { + if (filterBuilder_ == null) { + filter_ = builderForValue.build(); + onChanged(); + } else { + filterBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .QueryFilter filter = 14; + */ + public Builder mergeFilter(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter value) { + if (filterBuilder_ == null) { + if (filter_ != null) { + filter_ = + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.newBuilder(filter_).mergeFrom(value).buildPartial(); + } else { + filter_ = value; + } + onChanged(); + } else { + filterBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .QueryFilter filter = 14; + */ + public Builder clearFilter() { + if (filterBuilder_ == null) { + filter_ = null; + onChanged(); + } else { + filter_ = null; + filterBuilder_ = null; + } + + return this; + } + /** + * .QueryFilter filter = 14; + */ + public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder getFilterBuilder() { + + onChanged(); + return getFilterFieldBuilder().getBuilder(); + } + /** + * .QueryFilter filter = 14; + */ + public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder() { + if (filterBuilder_ != null) { + return filterBuilder_.getMessageOrBuilder(); + } else { + return filter_ == null ? + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance() : filter_; + } + } + /** + * .QueryFilter filter = 14; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder> + getFilterFieldBuilder() { + if (filterBuilder_ == null) { + filterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder>( + getFilter(), + getParentForChildren(), + isClean()); + filter_ = null; + } + return filterBuilder_; + } + private java.util.List destinationPos_ = java.util.Collections.emptyList(); private void ensureDestinationPosIsMutable() { @@ -1120,7 +1239,7 @@ private void ensureDestinationPosIsMutable() { emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> destinationPosBuilder_; /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public java.util.List getDestinationPosList() { if (destinationPosBuilder_ == null) { @@ -1130,7 +1249,7 @@ public java.util.List getDest } } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public int getDestinationPosCount() { if (destinationPosBuilder_ == null) { @@ -1140,7 +1259,7 @@ public int getDestinationPosCount() { } } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index) { if (destinationPosBuilder_ == null) { @@ -1150,7 +1269,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int i } } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder setDestinationPos( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) { @@ -1167,7 +1286,7 @@ public Builder setDestinationPos( return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder setDestinationPos( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -1181,7 +1300,7 @@ public Builder setDestinationPos( return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder addDestinationPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (destinationPosBuilder_ == null) { @@ -1197,7 +1316,7 @@ public Builder addDestinationPos(emu.grasscutter.net.proto.VectorOuterClass.Vect return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder addDestinationPos( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) { @@ -1214,7 +1333,7 @@ public Builder addDestinationPos( return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder addDestinationPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -1228,7 +1347,7 @@ public Builder addDestinationPos( return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder addDestinationPos( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -1242,7 +1361,7 @@ public Builder addDestinationPos( return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder addAllDestinationPos( java.lang.Iterable values) { @@ -1257,7 +1376,7 @@ public Builder addAllDestinationPos( return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder clearDestinationPos() { if (destinationPosBuilder_ == null) { @@ -1270,7 +1389,7 @@ public Builder clearDestinationPos() { return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public Builder removeDestinationPos(int index) { if (destinationPosBuilder_ == null) { @@ -1283,14 +1402,14 @@ public Builder removeDestinationPos(int index) { return this; } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDestinationPosBuilder( int index) { return getDestinationPosFieldBuilder().getBuilder(index); } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder( int index) { @@ -1300,7 +1419,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestination } } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public java.util.List getDestinationPosOrBuilderList() { @@ -1311,14 +1430,14 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestination } } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationPosBuilder() { return getDestinationPosFieldBuilder().addBuilder( emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance()); } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationPosBuilder( int index) { @@ -1326,7 +1445,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationP index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance()); } /** - * repeated .Vector destination_pos = 2; + * repeated .Vector destination_pos = 4; */ public java.util.List getDestinationPosBuilderList() { @@ -1347,451 +1466,366 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationP return destinationPosBuilder_; } - private int queryType_ = 0; - /** - * .QueryPathReq.OptionType query_type = 3; - * @return The enum numeric value on the wire for queryType. - */ - @java.lang.Override public int getQueryTypeValue() { - return queryType_; - } - /** - * .QueryPathReq.OptionType query_type = 3; - * @param value The enum numeric value on the wire for queryType to set. - * @return This builder for chaining. - */ - public Builder setQueryTypeValue(int value) { - - queryType_ = value; - onChanged(); - return this; - } - /** - * .QueryPathReq.OptionType query_type = 3; - * @return The queryType. - */ - @java.lang.Override - public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType result = emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.valueOf(queryType_); - return result == null ? emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.UNRECOGNIZED : result; - } - /** - * .QueryPathReq.OptionType query_type = 3; - * @param value The queryType to set. - * @return This builder for chaining. - */ - public Builder setQueryType(emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType value) { - if (value == null) { - throw new NullPointerException(); - } - - queryType_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .QueryPathReq.OptionType query_type = 3; - * @return This builder for chaining. - */ - public Builder clearQueryType() { - - queryType_ = 0; - onChanged(); - return this; - } - - private int sceneId_ ; - /** - * uint32 scene_id = 4; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - /** - * uint32 scene_id = 4; - * @param value The sceneId to set. - * @return This builder for chaining. - */ - public Builder setSceneId(int value) { - - sceneId_ = value; - onChanged(); - return this; - } - /** - * uint32 scene_id = 4; - * @return This builder for chaining. - */ - public Builder clearSceneId() { - - sceneId_ = 0; - onChanged(); - return this; - } - - private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_; + private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int dNFDJPHIOBD_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> sourcePosBuilder_; + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> dNFDJPHIOBDBuilder_; /** - * .Vector source_pos = 5; - * @return Whether the sourcePos field is set. + * .Vector3Int DNFDJPHIOBD = 9; + * @return Whether the dNFDJPHIOBD field is set. */ - public boolean hasSourcePos() { - return sourcePosBuilder_ != null || sourcePos_ != null; + public boolean hasDNFDJPHIOBD() { + return dNFDJPHIOBDBuilder_ != null || dNFDJPHIOBD_ != null; } /** - * .Vector source_pos = 5; - * @return The sourcePos. + * .Vector3Int DNFDJPHIOBD = 9; + * @return The dNFDJPHIOBD. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() { - if (sourcePosBuilder_ == null) { - return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_; + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getDNFDJPHIOBD() { + if (dNFDJPHIOBDBuilder_ == null) { + return dNFDJPHIOBD_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : dNFDJPHIOBD_; } else { - return sourcePosBuilder_.getMessage(); + return dNFDJPHIOBDBuilder_.getMessage(); } } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ - public Builder setSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (sourcePosBuilder_ == null) { + public Builder setDNFDJPHIOBD(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { + if (dNFDJPHIOBDBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - sourcePos_ = value; + dNFDJPHIOBD_ = value; onChanged(); } else { - sourcePosBuilder_.setMessage(value); + dNFDJPHIOBDBuilder_.setMessage(value); } return this; } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ - public Builder setSourcePos( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (sourcePosBuilder_ == null) { - sourcePos_ = builderForValue.build(); + public Builder setDNFDJPHIOBD( + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) { + if (dNFDJPHIOBDBuilder_ == null) { + dNFDJPHIOBD_ = builderForValue.build(); onChanged(); } else { - sourcePosBuilder_.setMessage(builderForValue.build()); + dNFDJPHIOBDBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ - public Builder mergeSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (sourcePosBuilder_ == null) { - if (sourcePos_ != null) { - sourcePos_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(sourcePos_).mergeFrom(value).buildPartial(); + public Builder mergeDNFDJPHIOBD(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { + if (dNFDJPHIOBDBuilder_ == null) { + if (dNFDJPHIOBD_ != null) { + dNFDJPHIOBD_ = + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(dNFDJPHIOBD_).mergeFrom(value).buildPartial(); } else { - sourcePos_ = value; + dNFDJPHIOBD_ = value; } onChanged(); } else { - sourcePosBuilder_.mergeFrom(value); + dNFDJPHIOBDBuilder_.mergeFrom(value); } return this; } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ - public Builder clearSourcePos() { - if (sourcePosBuilder_ == null) { - sourcePos_ = null; + public Builder clearDNFDJPHIOBD() { + if (dNFDJPHIOBDBuilder_ == null) { + dNFDJPHIOBD_ = null; onChanged(); } else { - sourcePos_ = null; - sourcePosBuilder_ = null; + dNFDJPHIOBD_ = null; + dNFDJPHIOBDBuilder_ = null; } return this; } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSourcePosBuilder() { + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getDNFDJPHIOBDBuilder() { onChanged(); - return getSourcePosFieldBuilder().getBuilder(); + return getDNFDJPHIOBDFieldBuilder().getBuilder(); } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() { - if (sourcePosBuilder_ != null) { - return sourcePosBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getDNFDJPHIOBDOrBuilder() { + if (dNFDJPHIOBDBuilder_ != null) { + return dNFDJPHIOBDBuilder_.getMessageOrBuilder(); } else { - return sourcePos_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_; + return dNFDJPHIOBD_ == null ? + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : dNFDJPHIOBD_; } } /** - * .Vector source_pos = 5; + * .Vector3Int DNFDJPHIOBD = 9; */ private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getSourcePosFieldBuilder() { - if (sourcePosBuilder_ == null) { - sourcePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getSourcePos(), + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> + getDNFDJPHIOBDFieldBuilder() { + if (dNFDJPHIOBDBuilder_ == null) { + dNFDJPHIOBDBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder>( + getDNFDJPHIOBD(), getParentForChildren(), isClean()); - sourcePos_ = null; + dNFDJPHIOBD_ = null; } - return sourcePosBuilder_; + return dNFDJPHIOBDBuilder_; } - private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int aNCGPGGGOAJ_; + private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int oDFIFCKDODJ_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> aNCGPGGGOAJBuilder_; + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> oDFIFCKDODJBuilder_; /** - * .Vector3Int ANCGPGGGOAJ = 8; - * @return Whether the aNCGPGGGOAJ field is set. + * .Vector3Int ODFIFCKDODJ = 5; + * @return Whether the oDFIFCKDODJ field is set. */ - public boolean hasANCGPGGGOAJ() { - return aNCGPGGGOAJBuilder_ != null || aNCGPGGGOAJ_ != null; + public boolean hasODFIFCKDODJ() { + return oDFIFCKDODJBuilder_ != null || oDFIFCKDODJ_ != null; } /** - * .Vector3Int ANCGPGGGOAJ = 8; - * @return The aNCGPGGGOAJ. + * .Vector3Int ODFIFCKDODJ = 5; + * @return The oDFIFCKDODJ. */ - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getANCGPGGGOAJ() { - if (aNCGPGGGOAJBuilder_ == null) { - return aNCGPGGGOAJ_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : aNCGPGGGOAJ_; + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getODFIFCKDODJ() { + if (oDFIFCKDODJBuilder_ == null) { + return oDFIFCKDODJ_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : oDFIFCKDODJ_; } else { - return aNCGPGGGOAJBuilder_.getMessage(); + return oDFIFCKDODJBuilder_.getMessage(); } } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ - public Builder setANCGPGGGOAJ(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { - if (aNCGPGGGOAJBuilder_ == null) { + public Builder setODFIFCKDODJ(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { + if (oDFIFCKDODJBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - aNCGPGGGOAJ_ = value; + oDFIFCKDODJ_ = value; onChanged(); } else { - aNCGPGGGOAJBuilder_.setMessage(value); + oDFIFCKDODJBuilder_.setMessage(value); } return this; } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ - public Builder setANCGPGGGOAJ( + public Builder setODFIFCKDODJ( emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) { - if (aNCGPGGGOAJBuilder_ == null) { - aNCGPGGGOAJ_ = builderForValue.build(); + if (oDFIFCKDODJBuilder_ == null) { + oDFIFCKDODJ_ = builderForValue.build(); onChanged(); } else { - aNCGPGGGOAJBuilder_.setMessage(builderForValue.build()); + oDFIFCKDODJBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ - public Builder mergeANCGPGGGOAJ(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { - if (aNCGPGGGOAJBuilder_ == null) { - if (aNCGPGGGOAJ_ != null) { - aNCGPGGGOAJ_ = - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(aNCGPGGGOAJ_).mergeFrom(value).buildPartial(); + public Builder mergeODFIFCKDODJ(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { + if (oDFIFCKDODJBuilder_ == null) { + if (oDFIFCKDODJ_ != null) { + oDFIFCKDODJ_ = + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(oDFIFCKDODJ_).mergeFrom(value).buildPartial(); } else { - aNCGPGGGOAJ_ = value; + oDFIFCKDODJ_ = value; } onChanged(); } else { - aNCGPGGGOAJBuilder_.mergeFrom(value); + oDFIFCKDODJBuilder_.mergeFrom(value); } return this; } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ - public Builder clearANCGPGGGOAJ() { - if (aNCGPGGGOAJBuilder_ == null) { - aNCGPGGGOAJ_ = null; + public Builder clearODFIFCKDODJ() { + if (oDFIFCKDODJBuilder_ == null) { + oDFIFCKDODJ_ = null; onChanged(); } else { - aNCGPGGGOAJ_ = null; - aNCGPGGGOAJBuilder_ = null; + oDFIFCKDODJ_ = null; + oDFIFCKDODJBuilder_ = null; } return this; } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getANCGPGGGOAJBuilder() { + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getODFIFCKDODJBuilder() { onChanged(); - return getANCGPGGGOAJFieldBuilder().getBuilder(); + return getODFIFCKDODJFieldBuilder().getBuilder(); } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getANCGPGGGOAJOrBuilder() { - if (aNCGPGGGOAJBuilder_ != null) { - return aNCGPGGGOAJBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getODFIFCKDODJOrBuilder() { + if (oDFIFCKDODJBuilder_ != null) { + return oDFIFCKDODJBuilder_.getMessageOrBuilder(); } else { - return aNCGPGGGOAJ_ == null ? - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : aNCGPGGGOAJ_; + return oDFIFCKDODJ_ == null ? + emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : oDFIFCKDODJ_; } } /** - * .Vector3Int ANCGPGGGOAJ = 8; + * .Vector3Int ODFIFCKDODJ = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> - getANCGPGGGOAJFieldBuilder() { - if (aNCGPGGGOAJBuilder_ == null) { - aNCGPGGGOAJBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getODFIFCKDODJFieldBuilder() { + if (oDFIFCKDODJBuilder_ == null) { + oDFIFCKDODJBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder>( - getANCGPGGGOAJ(), + getODFIFCKDODJ(), getParentForChildren(), isClean()); - aNCGPGGGOAJ_ = null; + oDFIFCKDODJ_ = null; } - return aNCGPGGGOAJBuilder_; + return oDFIFCKDODJBuilder_; } - private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int iFMLKJBFKDK_; + private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> iFMLKJBFKDKBuilder_; + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> sourcePosBuilder_; /** - * .Vector3Int IFMLKJBFKDK = 9; - * @return Whether the iFMLKJBFKDK field is set. + * .Vector source_pos = 12; + * @return Whether the sourcePos field is set. */ - public boolean hasIFMLKJBFKDK() { - return iFMLKJBFKDKBuilder_ != null || iFMLKJBFKDK_ != null; + public boolean hasSourcePos() { + return sourcePosBuilder_ != null || sourcePos_ != null; } /** - * .Vector3Int IFMLKJBFKDK = 9; - * @return The iFMLKJBFKDK. + * .Vector source_pos = 12; + * @return The sourcePos. */ - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getIFMLKJBFKDK() { - if (iFMLKJBFKDKBuilder_ == null) { - return iFMLKJBFKDK_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : iFMLKJBFKDK_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() { + if (sourcePosBuilder_ == null) { + return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_; } else { - return iFMLKJBFKDKBuilder_.getMessage(); + return sourcePosBuilder_.getMessage(); } } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ - public Builder setIFMLKJBFKDK(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { - if (iFMLKJBFKDKBuilder_ == null) { + public Builder setSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (sourcePosBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - iFMLKJBFKDK_ = value; + sourcePos_ = value; onChanged(); } else { - iFMLKJBFKDKBuilder_.setMessage(value); + sourcePosBuilder_.setMessage(value); } return this; } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ - public Builder setIFMLKJBFKDK( - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) { - if (iFMLKJBFKDKBuilder_ == null) { - iFMLKJBFKDK_ = builderForValue.build(); + public Builder setSourcePos( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (sourcePosBuilder_ == null) { + sourcePos_ = builderForValue.build(); onChanged(); } else { - iFMLKJBFKDKBuilder_.setMessage(builderForValue.build()); + sourcePosBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ - public Builder mergeIFMLKJBFKDK(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) { - if (iFMLKJBFKDKBuilder_ == null) { - if (iFMLKJBFKDK_ != null) { - iFMLKJBFKDK_ = - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(iFMLKJBFKDK_).mergeFrom(value).buildPartial(); + public Builder mergeSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (sourcePosBuilder_ == null) { + if (sourcePos_ != null) { + sourcePos_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(sourcePos_).mergeFrom(value).buildPartial(); } else { - iFMLKJBFKDK_ = value; + sourcePos_ = value; } onChanged(); } else { - iFMLKJBFKDKBuilder_.mergeFrom(value); + sourcePosBuilder_.mergeFrom(value); } return this; } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ - public Builder clearIFMLKJBFKDK() { - if (iFMLKJBFKDKBuilder_ == null) { - iFMLKJBFKDK_ = null; + public Builder clearSourcePos() { + if (sourcePosBuilder_ == null) { + sourcePos_ = null; onChanged(); } else { - iFMLKJBFKDK_ = null; - iFMLKJBFKDKBuilder_ = null; + sourcePos_ = null; + sourcePosBuilder_ = null; } return this; } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getIFMLKJBFKDKBuilder() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSourcePosBuilder() { onChanged(); - return getIFMLKJBFKDKFieldBuilder().getBuilder(); + return getSourcePosFieldBuilder().getBuilder(); } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ - public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getIFMLKJBFKDKOrBuilder() { - if (iFMLKJBFKDKBuilder_ != null) { - return iFMLKJBFKDKBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() { + if (sourcePosBuilder_ != null) { + return sourcePosBuilder_.getMessageOrBuilder(); } else { - return iFMLKJBFKDK_ == null ? - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : iFMLKJBFKDK_; + return sourcePos_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_; } } /** - * .Vector3Int IFMLKJBFKDK = 9; + * .Vector source_pos = 12; */ private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> - getIFMLKJBFKDKFieldBuilder() { - if (iFMLKJBFKDKBuilder_ == null) { - iFMLKJBFKDKBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder>( - getIFMLKJBFKDK(), + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getSourcePosFieldBuilder() { + if (sourcePosBuilder_ == null) { + sourcePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getSourcePos(), getParentForChildren(), isClean()); - iFMLKJBFKDK_ = null; + sourcePos_ = null; } - return iFMLKJBFKDKBuilder_; + return sourcePosBuilder_; } private int queryId_ ; /** - * int32 query_id = 14; + * int32 query_id = 3; * @return The queryId. */ @java.lang.Override @@ -1799,7 +1833,7 @@ public int getQueryId() { return queryId_; } /** - * int32 query_id = 14; + * int32 query_id = 3; * @param value The queryId to set. * @return This builder for chaining. */ @@ -1810,7 +1844,7 @@ public Builder setQueryId(int value) { return this; } /** - * int32 query_id = 14; + * int32 query_id = 3; * @return This builder for chaining. */ public Builder clearQueryId() { @@ -1820,123 +1854,89 @@ public Builder clearQueryId() { return this; } - private emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter filter_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder> filterBuilder_; - /** - * .QueryFilter filter = 15; - * @return Whether the filter field is set. - */ - public boolean hasFilter() { - return filterBuilder_ != null || filter_ != null; - } + private int sceneId_ ; /** - * .QueryFilter filter = 15; - * @return The filter. + * uint32 scene_id = 13; + * @return The sceneId. */ - public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter() { - if (filterBuilder_ == null) { - return filter_ == null ? emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance() : filter_; - } else { - return filterBuilder_.getMessage(); - } + @java.lang.Override + public int getSceneId() { + return sceneId_; } /** - * .QueryFilter filter = 15; + * uint32 scene_id = 13; + * @param value The sceneId to set. + * @return This builder for chaining. */ - public Builder setFilter(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter value) { - if (filterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - filter_ = value; - onChanged(); - } else { - filterBuilder_.setMessage(value); - } - + public Builder setSceneId(int value) { + + sceneId_ = value; + onChanged(); return this; } /** - * .QueryFilter filter = 15; + * uint32 scene_id = 13; + * @return This builder for chaining. */ - public Builder setFilter( - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder builderForValue) { - if (filterBuilder_ == null) { - filter_ = builderForValue.build(); - onChanged(); - } else { - filterBuilder_.setMessage(builderForValue.build()); - } - + public Builder clearSceneId() { + + sceneId_ = 0; + onChanged(); return this; } + + private int queryType_ = 0; /** - * .QueryFilter filter = 15; + * .QueryPathReq.OptionType query_type = 7; + * @return The enum numeric value on the wire for queryType. */ - public Builder mergeFilter(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter value) { - if (filterBuilder_ == null) { - if (filter_ != null) { - filter_ = - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.newBuilder(filter_).mergeFrom(value).buildPartial(); - } else { - filter_ = value; - } - onChanged(); - } else { - filterBuilder_.mergeFrom(value); - } - - return this; + @java.lang.Override public int getQueryTypeValue() { + return queryType_; } /** - * .QueryFilter filter = 15; + * .QueryPathReq.OptionType query_type = 7; + * @param value The enum numeric value on the wire for queryType to set. + * @return This builder for chaining. */ - public Builder clearFilter() { - if (filterBuilder_ == null) { - filter_ = null; - onChanged(); - } else { - filter_ = null; - filterBuilder_ = null; - } - + public Builder setQueryTypeValue(int value) { + + queryType_ = value; + onChanged(); return this; } /** - * .QueryFilter filter = 15; + * .QueryPathReq.OptionType query_type = 7; + * @return The queryType. */ - public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder getFilterBuilder() { - - onChanged(); - return getFilterFieldBuilder().getBuilder(); + @java.lang.Override + public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType result = emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.valueOf(queryType_); + return result == null ? emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.UNRECOGNIZED : result; } /** - * .QueryFilter filter = 15; + * .QueryPathReq.OptionType query_type = 7; + * @param value The queryType to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder() { - if (filterBuilder_ != null) { - return filterBuilder_.getMessageOrBuilder(); - } else { - return filter_ == null ? - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance() : filter_; + public Builder setQueryType(emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType value) { + if (value == null) { + throw new NullPointerException(); } + + queryType_ = value.getNumber(); + onChanged(); + return this; } /** - * .QueryFilter filter = 15; + * .QueryPathReq.OptionType query_type = 7; + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder> - getFilterFieldBuilder() { - if (filterBuilder_ == null) { - filterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder>( - getFilter(), - getParentForChildren(), - isClean()); - filter_ = null; - } - return filterBuilder_; + public Builder clearQueryType() { + + queryType_ = 0; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -2007,13 +2007,13 @@ public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq getDefaultI java.lang.String[] descriptorData = { "\n\022QueryPathReq.proto\032\020Vector3Int.proto\032\021" + "QueryFilter.proto\032\014Vector.proto\"\355\002\n\014Quer" + - "yPathReq\022 \n\017destination_pos\030\002 \003(\0132\007.Vect" + - "or\022,\n\nquery_type\030\003 \001(\0162\030.QueryPathReq.Op" + - "tionType\022\020\n\010scene_id\030\004 \001(\r\022\033\n\nsource_pos" + - "\030\005 \001(\0132\007.Vector\022 \n\013ANCGPGGGOAJ\030\010 \001(\0132\013.V" + - "ector3Int\022 \n\013IFMLKJBFKDK\030\t \001(\0132\013.Vector3" + - "Int\022\020\n\010query_id\030\016 \001(\005\022\034\n\006filter\030\017 \001(\0132\014." + - "QueryFilter\"j\n\nOptionType\022\032\n\026OptionType_" + + "yPathReq\022\034\n\006filter\030\016 \001(\0132\014.QueryFilter\022 " + + "\n\017destination_pos\030\004 \003(\0132\007.Vector\022 \n\013DNFD" + + "JPHIOBD\030\t \001(\0132\013.Vector3Int\022 \n\013ODFIFCKDOD" + + "J\030\005 \001(\0132\013.Vector3Int\022\033\n\nsource_pos\030\014 \001(\013" + + "2\007.Vector\022\020\n\010query_id\030\003 \001(\005\022\020\n\010scene_id\030" + + "\r \001(\r\022,\n\nquery_type\030\007 \001(\0162\030.QueryPathReq" + + ".OptionType\"j\n\nOptionType\022\032\n\026OptionType_" + "OPTION_NONE\020\000\022\034\n\030OptionType_OPTION_NORMA" + "L\020\001\022\"\n\036OptionType_OPTION_FIRST_CAN_GO\020\002B" + "\033\n\031emu.grasscutter.net.protob\006proto3" @@ -2030,7 +2030,7 @@ public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq getDefaultI internal_static_QueryPathReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QueryPathReq_descriptor, - new java.lang.String[] { "DestinationPos", "QueryType", "SceneId", "SourcePos", "ANCGPGGGOAJ", "IFMLKJBFKDK", "QueryId", "Filter", }); + new java.lang.String[] { "Filter", "DestinationPos", "DNFDJPHIOBD", "ODFIFCKDODJ", "SourcePos", "QueryId", "SceneId", "QueryType", }); emu.grasscutter.net.proto.Vector3IntOuterClass.getDescriptor(); emu.grasscutter.net.proto.QueryFilterOuterClass.getDescriptor(); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java index a8bfd26ce4b..9e49100e2c6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java @@ -19,55 +19,55 @@ public interface QueryPathRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .Vector corners = 2; - */ - java.util.List - getCornersList(); - /** - * repeated .Vector corners = 2; - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index); - /** - * repeated .Vector corners = 2; - */ - int getCornersCount(); - /** - * repeated .Vector corners = 2; + * .PathStatusType query_status = 8; + * @return The enum numeric value on the wire for queryStatus. */ - java.util.List - getCornersOrBuilderList(); + int getQueryStatusValue(); /** - * repeated .Vector corners = 2; + * .PathStatusType query_status = 8; + * @return The queryStatus. */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder( - int index); + emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus(); /** - * int32 query_id = 5; + * int32 query_id = 9; * @return The queryId. */ int getQueryId(); /** - * int32 retcode = 7; + * int32 retcode = 11; * @return The retcode. */ int getRetcode(); /** - * .PathStatusType query_status = 15; - * @return The enum numeric value on the wire for queryStatus. + * repeated .Vector corners = 15; */ - int getQueryStatusValue(); + java.util.List + getCornersList(); /** - * .PathStatusType query_status = 15; - * @return The queryStatus. + * repeated .Vector corners = 15; */ - emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index); + /** + * repeated .Vector corners = 15; + */ + int getCornersCount(); + /** + * repeated .Vector corners = 15; + */ + java.util.List + getCornersOrBuilderList(); + /** + * repeated .Vector corners = 15; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder( + int index); } /** * 
-   * CmdId: 2381
+   * CmdId: 2350
    *
* * Protobuf type {@code QueryPathRsp} @@ -82,8 +82,8 @@ private QueryPathRsp(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } private QueryPathRsp() { - corners_ = java.util.Collections.emptyList(); queryStatus_ = 0; + corners_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -117,29 +117,29 @@ private QueryPathRsp( case 0: done = true; break; - case 18: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - corners_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - corners_.add( - input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry)); + case 64: { + int rawValue = input.readEnum(); + + queryStatus_ = rawValue; break; } - case 40: { + case 72: { queryId_ = input.readInt32(); break; } - case 56: { + case 88: { retcode_ = input.readInt32(); break; } - case 120: { - int rawValue = input.readEnum(); - - queryStatus_ = rawValue; + case 122: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + corners_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + corners_.add( + input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry)); break; } default: { @@ -177,17 +177,58 @@ private QueryPathRsp( emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.class, emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.Builder.class); } - public static final int CORNERS_FIELD_NUMBER = 2; + public static final int QUERY_STATUS_FIELD_NUMBER = 8; + private int queryStatus_; + /** + * .PathStatusType query_status = 8; + * @return The enum numeric value on the wire for queryStatus. + */ + @java.lang.Override public int getQueryStatusValue() { + return queryStatus_; + } + /** + * .PathStatusType query_status = 8; + * @return The queryStatus. + */ + @java.lang.Override public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_); + return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result; + } + + public static final int QUERY_ID_FIELD_NUMBER = 9; + private int queryId_; + /** + * int32 query_id = 9; + * @return The queryId. + */ + @java.lang.Override + public int getQueryId() { + return queryId_; + } + + public static final int RETCODE_FIELD_NUMBER = 11; + private int retcode_; + /** + * int32 retcode = 11; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int CORNERS_FIELD_NUMBER = 15; private java.util.List corners_; /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ @java.lang.Override public java.util.List getCornersList() { return corners_; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ @java.lang.Override public java.util.List @@ -195,21 +236,21 @@ public java.util.List getCorn return corners_; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ @java.lang.Override public int getCornersCount() { return corners_.size(); } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) { return corners_.get(index); } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder( @@ -217,47 +258,6 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBu return corners_.get(index); } - public static final int QUERY_ID_FIELD_NUMBER = 5; - private int queryId_; - /** - * int32 query_id = 5; - * @return The queryId. - */ - @java.lang.Override - public int getQueryId() { - return queryId_; - } - - 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_; - } - - public static final int QUERY_STATUS_FIELD_NUMBER = 15; - private int queryStatus_; - /** - * .PathStatusType query_status = 15; - * @return The enum numeric value on the wire for queryStatus. - */ - @java.lang.Override public int getQueryStatusValue() { - return queryStatus_; - } - /** - * .PathStatusType query_status = 15; - * @return The queryStatus. - */ - @java.lang.Override public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_); - return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -272,17 +272,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < corners_.size(); i++) { - output.writeMessage(2, corners_.get(i)); + if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) { + output.writeEnum(8, queryStatus_); } if (queryId_ != 0) { - output.writeInt32(5, queryId_); + output.writeInt32(9, queryId_); } if (retcode_ != 0) { - output.writeInt32(7, retcode_); + output.writeInt32(11, retcode_); } - if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) { - output.writeEnum(15, queryStatus_); + for (int i = 0; i < corners_.size(); i++) { + output.writeMessage(15, corners_.get(i)); } unknownFields.writeTo(output); } @@ -293,21 +293,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < corners_.size(); i++) { + if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, corners_.get(i)); + .computeEnumSize(8, queryStatus_); } if (queryId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, queryId_); + .computeInt32Size(9, queryId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(7, retcode_); + .computeInt32Size(11, retcode_); } - if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) { + for (int i = 0; i < corners_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(15, queryStatus_); + .computeMessageSize(15, corners_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -324,13 +324,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp other = (emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp) obj; - if (!getCornersList() - .equals(other.getCornersList())) return false; + if (queryStatus_ != other.queryStatus_) return false; if (getQueryId() != other.getQueryId()) return false; if (getRetcode() != other.getRetcode()) return false; - if (queryStatus_ != other.queryStatus_) return false; + if (!getCornersList() + .equals(other.getCornersList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -342,16 +342,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getCornersCount() > 0) { - hash = (37 * hash) + CORNERS_FIELD_NUMBER; - hash = (53 * hash) + getCornersList().hashCode(); - } + hash = (37 * hash) + QUERY_STATUS_FIELD_NUMBER; + hash = (53 * hash) + queryStatus_; hash = (37 * hash) + QUERY_ID_FIELD_NUMBER; hash = (53 * hash) + getQueryId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + QUERY_STATUS_FIELD_NUMBER; - hash = (53 * hash) + queryStatus_; + if (getCornersCount() > 0) { + hash = (37 * hash) + CORNERS_FIELD_NUMBER; + hash = (53 * hash) + getCornersList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -449,7 +449,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2381
+     * CmdId: 2350
      *
* * Protobuf type {@code QueryPathRsp} @@ -490,18 +490,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + queryStatus_ = 0; + + queryId_ = 0; + + retcode_ = 0; + if (cornersBuilder_ == null) { corners_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { cornersBuilder_.clear(); } - queryId_ = 0; - - retcode_ = 0; - - queryStatus_ = 0; - return this; } @@ -529,6 +529,9 @@ public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp build() { public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp buildPartial() { emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp result = new emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp(this); int from_bitField0_ = bitField0_; + result.queryStatus_ = queryStatus_; + result.queryId_ = queryId_; + result.retcode_ = retcode_; if (cornersBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { corners_ = java.util.Collections.unmodifiableList(corners_); @@ -538,9 +541,6 @@ public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp buildPartia } else { result.corners_ = cornersBuilder_.build(); } - result.queryId_ = queryId_; - result.retcode_ = retcode_; - result.queryStatus_ = queryStatus_; onBuilt(); return result; } @@ -589,6 +589,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp other) { if (other == emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.getDefaultInstance()) return this; + if (other.queryStatus_ != 0) { + setQueryStatusValue(other.getQueryStatusValue()); + } + if (other.getQueryId() != 0) { + setQueryId(other.getQueryId()); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (cornersBuilder_ == null) { if (!other.corners_.isEmpty()) { if (corners_.isEmpty()) { @@ -615,15 +624,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryP } } } - if (other.getQueryId() != 0) { - setQueryId(other.getQueryId()); - } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } - if (other.queryStatus_ != 0) { - setQueryStatusValue(other.getQueryStatusValue()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -654,6 +654,122 @@ public Builder mergeFrom( } private int bitField0_; + private int queryStatus_ = 0; + /** + * .PathStatusType query_status = 8; + * @return The enum numeric value on the wire for queryStatus. + */ + @java.lang.Override public int getQueryStatusValue() { + return queryStatus_; + } + /** + * .PathStatusType query_status = 8; + * @param value The enum numeric value on the wire for queryStatus to set. + * @return This builder for chaining. + */ + public Builder setQueryStatusValue(int value) { + + queryStatus_ = value; + onChanged(); + return this; + } + /** + * .PathStatusType query_status = 8; + * @return The queryStatus. + */ + @java.lang.Override + public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_); + return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result; + } + /** + * .PathStatusType query_status = 8; + * @param value The queryStatus to set. + * @return This builder for chaining. + */ + public Builder setQueryStatus(emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType value) { + if (value == null) { + throw new NullPointerException(); + } + + queryStatus_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .PathStatusType query_status = 8; + * @return This builder for chaining. + */ + public Builder clearQueryStatus() { + + queryStatus_ = 0; + onChanged(); + return this; + } + + private int queryId_ ; + /** + * int32 query_id = 9; + * @return The queryId. + */ + @java.lang.Override + public int getQueryId() { + return queryId_; + } + /** + * int32 query_id = 9; + * @param value The queryId to set. + * @return This builder for chaining. + */ + public Builder setQueryId(int value) { + + queryId_ = value; + onChanged(); + return this; + } + /** + * int32 query_id = 9; + * @return This builder for chaining. + */ + public Builder clearQueryId() { + + queryId_ = 0; + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 11; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 11; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 11; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + private java.util.List corners_ = java.util.Collections.emptyList(); private void ensureCornersIsMutable() { @@ -667,7 +783,7 @@ private void ensureCornersIsMutable() { emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> cornersBuilder_; /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public java.util.List getCornersList() { if (cornersBuilder_ == null) { @@ -677,7 +793,7 @@ public java.util.List getCorn } } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public int getCornersCount() { if (cornersBuilder_ == null) { @@ -687,7 +803,7 @@ public int getCornersCount() { } } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) { if (cornersBuilder_ == null) { @@ -697,7 +813,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) { } } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder setCorners( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) { @@ -714,7 +830,7 @@ public Builder setCorners( return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder setCorners( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -728,7 +844,7 @@ public Builder setCorners( return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder addCorners(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (cornersBuilder_ == null) { @@ -744,7 +860,7 @@ public Builder addCorners(emu.grasscutter.net.proto.VectorOuterClass.Vector valu return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder addCorners( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) { @@ -761,7 +877,7 @@ public Builder addCorners( return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder addCorners( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -775,7 +891,7 @@ public Builder addCorners( return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder addCorners( int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -789,7 +905,7 @@ public Builder addCorners( return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder addAllCorners( java.lang.Iterable values) { @@ -804,7 +920,7 @@ public Builder addAllCorners( return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder clearCorners() { if (cornersBuilder_ == null) { @@ -817,7 +933,7 @@ public Builder clearCorners() { return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public Builder removeCorners(int index) { if (cornersBuilder_ == null) { @@ -830,14 +946,14 @@ public Builder removeCorners(int index) { return this; } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getCornersBuilder( int index) { return getCornersFieldBuilder().getBuilder(index); } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder( int index) { @@ -847,7 +963,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBu } } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public java.util.List getCornersOrBuilderList() { @@ -858,14 +974,14 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBu } } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuilder() { return getCornersFieldBuilder().addBuilder( emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance()); } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuilder( int index) { @@ -873,7 +989,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuild index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance()); } /** - * repeated .Vector corners = 2; + * repeated .Vector corners = 15; */ public java.util.List getCornersBuilderList() { @@ -893,122 +1009,6 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuild } return cornersBuilder_; } - - private int queryId_ ; - /** - * int32 query_id = 5; - * @return The queryId. - */ - @java.lang.Override - public int getQueryId() { - return queryId_; - } - /** - * int32 query_id = 5; - * @param value The queryId to set. - * @return This builder for chaining. - */ - public Builder setQueryId(int value) { - - queryId_ = value; - onChanged(); - return this; - } - /** - * int32 query_id = 5; - * @return This builder for chaining. - */ - public Builder clearQueryId() { - - queryId_ = 0; - onChanged(); - return this; - } - - 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; - } - - private int queryStatus_ = 0; - /** - * .PathStatusType query_status = 15; - * @return The enum numeric value on the wire for queryStatus. - */ - @java.lang.Override public int getQueryStatusValue() { - return queryStatus_; - } - /** - * .PathStatusType query_status = 15; - * @param value The enum numeric value on the wire for queryStatus to set. - * @return This builder for chaining. - */ - public Builder setQueryStatusValue(int value) { - - queryStatus_ = value; - onChanged(); - return this; - } - /** - * .PathStatusType query_status = 15; - * @return The queryStatus. - */ - @java.lang.Override - public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_); - return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result; - } - /** - * .PathStatusType query_status = 15; - * @param value The queryStatus to set. - * @return This builder for chaining. - */ - public Builder setQueryStatus(emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType value) { - if (value == null) { - throw new NullPointerException(); - } - - queryStatus_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .PathStatusType query_status = 15; - * @return This builder for chaining. - */ - public Builder clearQueryStatus() { - - queryStatus_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1077,10 +1077,10 @@ public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp getDefaultI static { java.lang.String[] descriptorData = { "\n\022QueryPathRsp.proto\032\014Vector.proto\032\024Path" + - "StatusType.proto\"r\n\014QueryPathRsp\022\030\n\007corn" + - "ers\030\002 \003(\0132\007.Vector\022\020\n\010query_id\030\005 \001(\005\022\017\n\007" + - "retcode\030\007 \001(\005\022%\n\014query_status\030\017 \001(\0162\017.Pa" + - "thStatusTypeB\033\n\031emu.grasscutter.net.prot" + + "StatusType.proto\"r\n\014QueryPathRsp\022%\n\014quer" + + "y_status\030\010 \001(\0162\017.PathStatusType\022\020\n\010query" + + "_id\030\t \001(\005\022\017\n\007retcode\030\013 \001(\005\022\030\n\007corners\030\017 " + + "\003(\0132\007.VectorB\033\n\031emu.grasscutter.net.prot" + "ob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1094,7 +1094,7 @@ public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp getDefaultI internal_static_QueryPathRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QueryPathRsp_descriptor, - new java.lang.String[] { "Corners", "QueryId", "Retcode", "QueryStatus", }); + new java.lang.String[] { "QueryStatus", "QueryId", "Retcode", "Corners", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java index adb34d16418..08d311cb562 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java @@ -18,21 +18,21 @@ public interface SetEquipLockStateReqOrBuilder extends // @@protoc_insertion_point(interface_extends:SetEquipLockStateReq) com.google.protobuf.MessageOrBuilder { - /** - * bool is_locked = 4; - * @return The isLocked. - */ - boolean getIsLocked(); - /** * uint64 target_equip_guid = 11; * @return The targetEquipGuid. */ long getTargetEquipGuid(); + + /** + * bool is_locked = 7; + * @return The isLocked. + */ + boolean getIsLocked(); } /** * 
-   * CmdId: 3852
+   * CmdId: 5750
    *
* * Protobuf type {@code SetEquipLockStateReq} @@ -79,7 +79,7 @@ private SetEquipLockStateReq( case 0: done = true; break; - case 32: { + case 56: { isLocked_ = input.readBool(); break; @@ -121,17 +121,6 @@ private SetEquipLockStateReq( emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.class, emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.Builder.class); } - public static final int IS_LOCKED_FIELD_NUMBER = 4; - private boolean isLocked_; - /** - * bool is_locked = 4; - * @return The isLocked. - */ - @java.lang.Override - public boolean getIsLocked() { - return isLocked_; - } - public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 11; private long targetEquipGuid_; /** @@ -143,6 +132,17 @@ public long getTargetEquipGuid() { return targetEquipGuid_; } + public static final int IS_LOCKED_FIELD_NUMBER = 7; + private boolean isLocked_; + /** + * bool is_locked = 7; + * @return The isLocked. + */ + @java.lang.Override + public boolean getIsLocked() { + return isLocked_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -158,7 +158,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (isLocked_ != false) { - output.writeBool(4, isLocked_); + output.writeBool(7, isLocked_); } if (targetEquipGuid_ != 0L) { output.writeUInt64(11, targetEquipGuid_); @@ -174,7 +174,7 @@ public int getSerializedSize() { size = 0; if (isLocked_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, isLocked_); + .computeBoolSize(7, isLocked_); } if (targetEquipGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream @@ -195,10 +195,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other = (emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq) obj; - if (getIsLocked() - != other.getIsLocked()) return false; if (getTargetEquipGuid() != other.getTargetEquipGuid()) return false; + if (getIsLocked() + != other.getIsLocked()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -210,12 +210,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsLocked()); hash = (37 * hash) + TARGET_EQUIP_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getTargetEquipGuid()); + hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsLocked()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -313,7 +313,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3852
+     * CmdId: 5750
      *
* * Protobuf type {@code SetEquipLockStateReq} @@ -353,10 +353,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isLocked_ = false; - targetEquipGuid_ = 0L; + isLocked_ = false; + return this; } @@ -383,8 +383,8 @@ public emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStat @java.lang.Override public emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq buildPartial() { emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq result = new emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq(this); - result.isLocked_ = isLocked_; result.targetEquipGuid_ = targetEquipGuid_; + result.isLocked_ = isLocked_; onBuilt(); return result; } @@ -433,12 +433,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other) { if (other == emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.getDefaultInstance()) return this; - if (other.getIsLocked() != false) { - setIsLocked(other.getIsLocked()); - } if (other.getTargetEquipGuid() != 0L) { setTargetEquipGuid(other.getTargetEquipGuid()); } + if (other.getIsLocked() != false) { + setIsLocked(other.getIsLocked()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +468,64 @@ public Builder mergeFrom( return this; } - private boolean isLocked_ ; + private long targetEquipGuid_ ; /** - * bool is_locked = 4; - * @return The isLocked. + * uint64 target_equip_guid = 11; + * @return The targetEquipGuid. */ @java.lang.Override - public boolean getIsLocked() { - return isLocked_; + public long getTargetEquipGuid() { + return targetEquipGuid_; } /** - * bool is_locked = 4; - * @param value The isLocked to set. + * uint64 target_equip_guid = 11; + * @param value The targetEquipGuid to set. * @return This builder for chaining. */ - public Builder setIsLocked(boolean value) { + public Builder setTargetEquipGuid(long value) { - isLocked_ = value; + targetEquipGuid_ = value; onChanged(); return this; } /** - * bool is_locked = 4; + * uint64 target_equip_guid = 11; * @return This builder for chaining. */ - public Builder clearIsLocked() { + public Builder clearTargetEquipGuid() { - isLocked_ = false; + targetEquipGuid_ = 0L; onChanged(); return this; } - private long targetEquipGuid_ ; + private boolean isLocked_ ; /** - * uint64 target_equip_guid = 11; - * @return The targetEquipGuid. + * bool is_locked = 7; + * @return The isLocked. */ @java.lang.Override - public long getTargetEquipGuid() { - return targetEquipGuid_; + public boolean getIsLocked() { + return isLocked_; } /** - * uint64 target_equip_guid = 11; - * @param value The targetEquipGuid to set. + * bool is_locked = 7; + * @param value The isLocked to set. * @return This builder for chaining. */ - public Builder setTargetEquipGuid(long value) { + public Builder setIsLocked(boolean value) { - targetEquipGuid_ = value; + isLocked_ = value; onChanged(); return this; } /** - * uint64 target_equip_guid = 11; + * bool is_locked = 7; * @return This builder for chaining. */ - public Builder clearTargetEquipGuid() { + public Builder clearIsLocked() { - targetEquipGuid_ = 0L; + isLocked_ = false; onChanged(); return this; } @@ -597,8 +597,8 @@ public emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStat static { java.lang.String[] descriptorData = { "\n\032SetEquipLockStateReq.proto\"D\n\024SetEquip" + - "LockStateReq\022\021\n\tis_locked\030\004 \001(\010\022\031\n\021targe" + - "t_equip_guid\030\013 \001(\004B\033\n\031emu.grasscutter.ne" + + "LockStateReq\022\031\n\021target_equip_guid\030\013 \001(\004\022" + + "\021\n\tis_locked\030\007 \001(\010B\033\n\031emu.grasscutter.ne" + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +610,7 @@ public emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStat internal_static_SetEquipLockStateReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SetEquipLockStateReq_descriptor, - new java.lang.String[] { "IsLocked", "TargetEquipGuid", }); + new java.lang.String[] { "TargetEquipGuid", "IsLocked", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java index 527db93d1a8..01cbf03182a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java @@ -19,26 +19,26 @@ public interface SetEquipLockStateRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 target_equip_guid = 9; + * bool is_locked = 10; + * @return The isLocked. + */ + boolean getIsLocked(); + + /** + * uint64 target_equip_guid = 11; * @return The targetEquipGuid. */ long getTargetEquipGuid(); /** - * int32 retcode = 11; + * int32 retcode = 15; * @return The retcode. */ int getRetcode(); - - /** - * bool is_locked = 12; - * @return The isLocked. - */ - boolean getIsLocked(); } /** * 
-   * CmdId: 23492
+   * CmdId: 26633
    *
* * Protobuf type {@code SetEquipLockStateRsp} @@ -85,19 +85,19 @@ private SetEquipLockStateRsp( case 0: done = true; break; - case 72: { + case 80: { - targetEquipGuid_ = input.readUInt64(); + isLocked_ = input.readBool(); break; } case 88: { - retcode_ = input.readInt32(); + targetEquipGuid_ = input.readUInt64(); break; } - case 96: { + case 120: { - isLocked_ = input.readBool(); + retcode_ = input.readInt32(); break; } default: { @@ -132,10 +132,21 @@ private SetEquipLockStateRsp( emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp.class, emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp.Builder.class); } - public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 9; + public static final int IS_LOCKED_FIELD_NUMBER = 10; + private boolean isLocked_; + /** + * bool is_locked = 10; + * @return The isLocked. + */ + @java.lang.Override + public boolean getIsLocked() { + return isLocked_; + } + + public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 11; private long targetEquipGuid_; /** - * uint64 target_equip_guid = 9; + * uint64 target_equip_guid = 11; * @return The targetEquipGuid. */ @java.lang.Override @@ -143,10 +154,10 @@ public long getTargetEquipGuid() { return targetEquipGuid_; } - public static final int RETCODE_FIELD_NUMBER = 11; + public static final int RETCODE_FIELD_NUMBER = 15; private int retcode_; /** - * int32 retcode = 11; + * int32 retcode = 15; * @return The retcode. */ @java.lang.Override @@ -154,17 +165,6 @@ public int getRetcode() { return retcode_; } - public static final int IS_LOCKED_FIELD_NUMBER = 12; - private boolean isLocked_; - /** - * bool is_locked = 12; - * @return The isLocked. - */ - @java.lang.Override - public boolean getIsLocked() { - return isLocked_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -179,14 +179,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (isLocked_ != false) { + output.writeBool(10, isLocked_); + } if (targetEquipGuid_ != 0L) { - output.writeUInt64(9, targetEquipGuid_); + output.writeUInt64(11, targetEquipGuid_); } if (retcode_ != 0) { - output.writeInt32(11, retcode_); - } - if (isLocked_ != false) { - output.writeBool(12, isLocked_); + output.writeInt32(15, retcode_); } unknownFields.writeTo(output); } @@ -197,17 +197,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (targetEquipGuid_ != 0L) { + if (isLocked_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(9, targetEquipGuid_); + .computeBoolSize(10, isLocked_); } - if (retcode_ != 0) { + if (targetEquipGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(11, retcode_); + .computeUInt64Size(11, targetEquipGuid_); } - if (isLocked_ != false) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(12, isLocked_); + .computeInt32Size(15, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -224,12 +224,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp other = (emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp) obj; + if (getIsLocked() + != other.getIsLocked()) return false; if (getTargetEquipGuid() != other.getTargetEquipGuid()) return false; if (getRetcode() != other.getRetcode()) return false; - if (getIsLocked() - != other.getIsLocked()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -241,14 +241,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsLocked()); hash = (37 * hash) + TARGET_EQUIP_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getTargetEquipGuid()); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsLocked()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -346,7 +346,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23492
+     * CmdId: 26633
      *
* * Protobuf type {@code SetEquipLockStateRsp} @@ -386,12 +386,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + isLocked_ = false; + targetEquipGuid_ = 0L; retcode_ = 0; - isLocked_ = false; - return this; } @@ -418,9 +418,9 @@ public emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStat @java.lang.Override public emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp buildPartial() { emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp result = new emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp(this); + result.isLocked_ = isLocked_; result.targetEquipGuid_ = targetEquipGuid_; result.retcode_ = retcode_; - result.isLocked_ = isLocked_; onBuilt(); return result; } @@ -469,15 +469,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp other) { if (other == emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp.getDefaultInstance()) return this; + if (other.getIsLocked() != false) { + setIsLocked(other.getIsLocked()); + } if (other.getTargetEquipGuid() != 0L) { setTargetEquipGuid(other.getTargetEquipGuid()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.getIsLocked() != false) { - setIsLocked(other.getIsLocked()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -507,95 +507,95 @@ public Builder mergeFrom( return this; } - private long targetEquipGuid_ ; + private boolean isLocked_ ; /** - * uint64 target_equip_guid = 9; - * @return The targetEquipGuid. + * bool is_locked = 10; + * @return The isLocked. */ @java.lang.Override - public long getTargetEquipGuid() { - return targetEquipGuid_; + public boolean getIsLocked() { + return isLocked_; } /** - * uint64 target_equip_guid = 9; - * @param value The targetEquipGuid to set. + * bool is_locked = 10; + * @param value The isLocked to set. * @return This builder for chaining. */ - public Builder setTargetEquipGuid(long value) { + public Builder setIsLocked(boolean value) { - targetEquipGuid_ = value; + isLocked_ = value; onChanged(); return this; } /** - * uint64 target_equip_guid = 9; + * bool is_locked = 10; * @return This builder for chaining. */ - public Builder clearTargetEquipGuid() { + public Builder clearIsLocked() { - targetEquipGuid_ = 0L; + isLocked_ = false; onChanged(); return this; } - private int retcode_ ; + private long targetEquipGuid_ ; /** - * int32 retcode = 11; - * @return The retcode. + * uint64 target_equip_guid = 11; + * @return The targetEquipGuid. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public long getTargetEquipGuid() { + return targetEquipGuid_; } /** - * int32 retcode = 11; - * @param value The retcode to set. + * uint64 target_equip_guid = 11; + * @param value The targetEquipGuid to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setTargetEquipGuid(long value) { - retcode_ = value; + targetEquipGuid_ = value; onChanged(); return this; } /** - * int32 retcode = 11; + * uint64 target_equip_guid = 11; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearTargetEquipGuid() { - retcode_ = 0; + targetEquipGuid_ = 0L; onChanged(); return this; } - private boolean isLocked_ ; + private int retcode_ ; /** - * bool is_locked = 12; - * @return The isLocked. + * int32 retcode = 15; + * @return The retcode. */ @java.lang.Override - public boolean getIsLocked() { - return isLocked_; + public int getRetcode() { + return retcode_; } /** - * bool is_locked = 12; - * @param value The isLocked to set. + * int32 retcode = 15; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setIsLocked(boolean value) { + public Builder setRetcode(int value) { - isLocked_ = value; + retcode_ = value; onChanged(); return this; } /** - * bool is_locked = 12; + * int32 retcode = 15; * @return This builder for chaining. */ - public Builder clearIsLocked() { + public Builder clearRetcode() { - isLocked_ = false; + retcode_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStat static { java.lang.String[] descriptorData = { "\n\032SetEquipLockStateRsp.proto\"U\n\024SetEquip" + - "LockStateRsp\022\031\n\021target_equip_guid\030\t \001(\004\022" + - "\017\n\007retcode\030\013 \001(\005\022\021\n\tis_locked\030\014 \001(\010B\033\n\031e" + + "LockStateRsp\022\021\n\tis_locked\030\n \001(\010\022\031\n\021targe" + + "t_equip_guid\030\013 \001(\004\022\017\n\007retcode\030\017 \001(\005B\033\n\031e" + "mu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStat internal_static_SetEquipLockStateRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SetEquipLockStateRsp_descriptor, - new java.lang.String[] { "TargetEquipGuid", "Retcode", "IsLocked", }); + new java.lang.String[] { "IsLocked", "TargetEquipGuid", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java index 417807cef90..7d6598e4cd3 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java @@ -19,21 +19,20 @@ public interface UnlockTransPointReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 point_id = 13; - * @return The pointId. + * uint32 scene_id = 8; + * @return The sceneId. */ - int getPointId(); + int getSceneId(); /** - * uint32 scene_id = 11; - * @return The sceneId. + * uint32 point_id = 12; + * @return The pointId. */ - int getSceneId(); + int getPointId(); } /** * 
-   * CmdId: 27465
-   * Obf: GHELOHKEPBF
+   * CmdId: 3518
    *
* * Protobuf type {@code UnlockTransPointReq} @@ -80,12 +79,12 @@ private UnlockTransPointReq( case 0: done = true; break; - case 88: { + case 64: { sceneId_ = input.readUInt32(); break; } - case 104: { + case 96: { pointId_ = input.readUInt32(); break; @@ -122,26 +121,26 @@ private UnlockTransPointReq( emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq.class, emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq.Builder.class); } - public static final int POINT_ID_FIELD_NUMBER = 13; - private int pointId_; + public static final int SCENE_ID_FIELD_NUMBER = 8; + private int sceneId_; /** - * uint32 point_id = 13; - * @return The pointId. + * uint32 scene_id = 8; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } - public static final int SCENE_ID_FIELD_NUMBER = 11; - private int sceneId_; + public static final int POINT_ID_FIELD_NUMBER = 12; + private int pointId_; /** - * uint32 scene_id = 11; - * @return The sceneId. + * uint32 point_id = 12; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } private byte memoizedIsInitialized = -1; @@ -159,10 +158,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (sceneId_ != 0) { - output.writeUInt32(11, sceneId_); + output.writeUInt32(8, sceneId_); } if (pointId_ != 0) { - output.writeUInt32(13, pointId_); + output.writeUInt32(12, pointId_); } unknownFields.writeTo(output); } @@ -175,11 +174,11 @@ public int getSerializedSize() { size = 0; if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, sceneId_); + .computeUInt32Size(8, sceneId_); } if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, pointId_); + .computeUInt32Size(12, pointId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +195,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq other = (emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq) obj; - if (getPointId() - != other.getPointId()) return false; if (getSceneId() != other.getSceneId()) return false; + if (getPointId() + != other.getPointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +210,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) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + POINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getPointId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +311,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27465
-     * Obf: GHELOHKEPBF
+     * CmdId: 3518
      *
* * Protobuf type {@code UnlockTransPointReq} @@ -353,10 +351,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pointId_ = 0; - sceneId_ = 0; + pointId_ = 0; + return this; } @@ -383,8 +381,8 @@ public emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointR @java.lang.Override public emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq buildPartial() { emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq result = new emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq(this); - result.pointId_ = pointId_; result.sceneId_ = sceneId_; + result.pointId_ = pointId_; onBuilt(); return result; } @@ -433,12 +431,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq other) { if (other == emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq.getDefaultInstance()) return this; - if (other.getPointId() != 0) { - setPointId(other.getPointId()); - } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } + if (other.getPointId() != 0) { + setPointId(other.getPointId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +466,64 @@ public Builder mergeFrom( return this; } - private int pointId_ ; + private int sceneId_ ; /** - * uint32 point_id = 13; - * @return The pointId. + * uint32 scene_id = 8; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 point_id = 13; - * @param value The pointId to set. + * uint32 scene_id = 8; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setPointId(int value) { + public Builder setSceneId(int value) { - pointId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 point_id = 13; + * uint32 scene_id = 8; * @return This builder for chaining. */ - public Builder clearPointId() { + public Builder clearSceneId() { - pointId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int sceneId_ ; + private int pointId_ ; /** - * uint32 scene_id = 11; - * @return The sceneId. + * uint32 point_id = 12; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } /** - * uint32 scene_id = 11; - * @param value The sceneId to set. + * uint32 point_id = 12; + * @param value The pointId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setPointId(int value) { - sceneId_ = value; + pointId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 11; + * uint32 point_id = 12; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearPointId() { - sceneId_ = 0; + pointId_ = 0; onChanged(); return this; } @@ -597,8 +595,8 @@ public emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointR static { java.lang.String[] descriptorData = { "\n\031UnlockTransPointReq.proto\"9\n\023UnlockTra" + - "nsPointReq\022\020\n\010point_id\030\r \001(\r\022\020\n\010scene_id" + - "\030\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + + "nsPointReq\022\020\n\010scene_id\030\010 \001(\r\022\020\n\010point_id" + + "\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +608,7 @@ public emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointR internal_static_UnlockTransPointReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_UnlockTransPointReq_descriptor, - new java.lang.String[] { "PointId", "SceneId", }); + new java.lang.String[] { "SceneId", "PointId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java index 24916b3f056..e6bfc865f7a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java @@ -25,11 +25,6 @@ public interface UnlockTransPointRspOrBuilder extends int getRetcode(); } /** - * 
-   * CmdId: 21510
-   * Obf: IBGGKMKPHOB
-   *
- * * Protobuf type {@code UnlockTransPointRsp} */ public static final class UnlockTransPointRsp extends @@ -278,11 +273,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 21510
-     * Obf: IBGGKMKPHOB
-     *
- * * Protobuf type {@code UnlockTransPointRsp} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java index 7243fe2efe3..d647a364464 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java @@ -19,55 +19,37 @@ public interface WeaponAwakenReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 target_weapon_guid = 2; - * @return The targetWeaponGuid. - */ - long getTargetWeaponGuid(); - - /** - * map<uint32, uint32> affix_level_map = 4; - */ - int getAffixLevelMapCount(); - /** - * map<uint32, uint32> affix_level_map = 4; - */ - boolean containsAffixLevelMap( - int key); - /** - * Use {@link #getAffixLevelMapMap()} instead. + * repeated uint64 affix_level_list = 3; + * @return A list containing the affixLevelList. */ - @java.lang.Deprecated - java.util.Map - getAffixLevelMap(); + java.util.List getAffixLevelListList(); /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @return The count of affixLevelList. */ - java.util.Map - getAffixLevelMapMap(); + int getAffixLevelListCount(); /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @param index The index of the element to return. + * @return The affixLevelList at the given index. */ + long getAffixLevelList(int index); - int getAffixLevelMapOrDefault( - int key, - int defaultValue); /** - * map<uint32, uint32> affix_level_map = 4; + * uint32 item_guid = 13; + * @return The itemGuid. */ - - int getAffixLevelMapOrThrow( - int key); + int getItemGuid(); /** - * uint64 item_guid = 15; - * @return The itemGuid. + * uint64 target_weapon_guid = 15; + * @return The targetWeaponGuid. */ - long getItemGuid(); + long getTargetWeaponGuid(); } /** * 
-   * CmdId: 23146
-   * Obf: AFPFPKMLIPD
+   * CmdId: 20421
    *
* * Protobuf type {@code WeaponAwakenReq} @@ -82,6 +64,7 @@ private WeaponAwakenReq(com.google.protobuf.GeneratedMessageV3.Builder builde super(builder); } private WeaponAwakenReq() { + affixLevelList_ = emptyLongList(); } @java.lang.Override @@ -115,27 +98,35 @@ private WeaponAwakenReq( case 0: done = true; break; - case 16: { - - targetWeaponGuid_ = input.readUInt64(); + case 24: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + affixLevelList_ = newLongList(); + mutable_bitField0_ |= 0x00000001; + } + affixLevelList_.addLong(input.readUInt64()); break; } - case 34: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - affixLevelMap_ = com.google.protobuf.MapField.newMapField( - AffixLevelMapDefaultEntryHolder.defaultEntry); + case 26: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + affixLevelList_ = newLongList(); mutable_bitField0_ |= 0x00000001; } - com.google.protobuf.MapEntry - affixLevelMap__ = input.readMessage( - AffixLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - affixLevelMap_.getMutableMap().put( - affixLevelMap__.getKey(), affixLevelMap__.getValue()); + while (input.getBytesUntilLimit() > 0) { + affixLevelList_.addLong(input.readUInt64()); + } + input.popLimit(limit); + break; + } + case 104: { + + itemGuid_ = input.readUInt32(); break; } case 120: { - itemGuid_ = input.readUInt64(); + targetWeaponGuid_ = input.readUInt64(); break; } default: { @@ -153,6 +144,9 @@ private WeaponAwakenReq( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + affixLevelList_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -162,18 +156,6 @@ private WeaponAwakenReq( return emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.internal_static_WeaponAwakenReq_descriptor; } - @SuppressWarnings({"rawtypes"}) - @java.lang.Override - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 4: - return internalGetAffixLevelMap(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { @@ -182,107 +164,54 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq.class, emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq.Builder.class); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 2; - private long targetWeaponGuid_; + public static final int AFFIX_LEVEL_LIST_FIELD_NUMBER = 3; + private com.google.protobuf.Internal.LongList affixLevelList_; /** - * uint64 target_weapon_guid = 2; - * @return The targetWeaponGuid. + * repeated uint64 affix_level_list = 3; + * @return A list containing the affixLevelList. */ @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - - public static final int AFFIX_LEVEL_MAP_FIELD_NUMBER = 4; - private static final class AffixLevelMapDefaultEntryHolder { - static final com.google.protobuf.MapEntry< - java.lang.Integer, java.lang.Integer> defaultEntry = - com.google.protobuf.MapEntry - .newDefaultInstance( - emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.internal_static_WeaponAwakenReq_AffixLevelMapEntry_descriptor, - com.google.protobuf.WireFormat.FieldType.UINT32, - 0, - com.google.protobuf.WireFormat.FieldType.UINT32, - 0); - } - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> affixLevelMap_; - private com.google.protobuf.MapField - internalGetAffixLevelMap() { - if (affixLevelMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - AffixLevelMapDefaultEntryHolder.defaultEntry); - } - return affixLevelMap_; - } - - public int getAffixLevelMapCount() { - return internalGetAffixLevelMap().getMap().size(); + public java.util.List + getAffixLevelListList() { + return affixLevelList_; } /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @return The count of affixLevelList. */ - - @java.lang.Override - public boolean containsAffixLevelMap( - int key) { - - return internalGetAffixLevelMap().getMap().containsKey(key); + public int getAffixLevelListCount() { + return affixLevelList_.size(); } /** - * Use {@link #getAffixLevelMapMap()} instead. + * repeated uint64 affix_level_list = 3; + * @param index The index of the element to return. + * @return The affixLevelList at the given index. */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getAffixLevelMap() { - return getAffixLevelMapMap(); - } - /** - * map<uint32, uint32> affix_level_map = 4; - */ - @java.lang.Override - - public java.util.Map getAffixLevelMapMap() { - return internalGetAffixLevelMap().getMap(); + public long getAffixLevelList(int index) { + return affixLevelList_.getLong(index); } - /** - * map<uint32, uint32> affix_level_map = 4; - */ - @java.lang.Override + private int affixLevelListMemoizedSerializedSize = -1; - public int getAffixLevelMapOrDefault( - int key, - int defaultValue) { - - java.util.Map map = - internalGetAffixLevelMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; - } + public static final int ITEM_GUID_FIELD_NUMBER = 13; + private int itemGuid_; /** - * map<uint32, uint32> affix_level_map = 4; + * uint32 item_guid = 13; + * @return The itemGuid. */ @java.lang.Override - - public int getAffixLevelMapOrThrow( - int key) { - - java.util.Map map = - internalGetAffixLevelMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); + public int getItemGuid() { + return itemGuid_; } - public static final int ITEM_GUID_FIELD_NUMBER = 15; - private long itemGuid_; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 15; + private long targetWeaponGuid_; /** - * uint64 item_guid = 15; - * @return The itemGuid. + * uint64 target_weapon_guid = 15; + * @return The targetWeaponGuid. */ @java.lang.Override - public long getItemGuid() { - return itemGuid_; + public long getTargetWeaponGuid() { + return targetWeaponGuid_; } private byte memoizedIsInitialized = -1; @@ -299,17 +228,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (targetWeaponGuid_ != 0L) { - output.writeUInt64(2, targetWeaponGuid_); + getSerializedSize(); + if (getAffixLevelListList().size() > 0) { + output.writeUInt32NoTag(26); + output.writeUInt32NoTag(affixLevelListMemoizedSerializedSize); + } + for (int i = 0; i < affixLevelList_.size(); i++) { + output.writeUInt64NoTag(affixLevelList_.getLong(i)); } - com.google.protobuf.GeneratedMessageV3 - .serializeIntegerMapTo( - output, - internalGetAffixLevelMap(), - AffixLevelMapDefaultEntryHolder.defaultEntry, - 4); - if (itemGuid_ != 0L) { - output.writeUInt64(15, itemGuid_); + if (itemGuid_ != 0) { + output.writeUInt32(13, itemGuid_); + } + if (targetWeaponGuid_ != 0L) { + output.writeUInt64(15, targetWeaponGuid_); } unknownFields.writeTo(output); } @@ -320,23 +251,27 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (targetWeaponGuid_ != 0L) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(2, targetWeaponGuid_); - } - for (java.util.Map.Entry entry - : internalGetAffixLevelMap().getMap().entrySet()) { - com.google.protobuf.MapEntry - affixLevelMap__ = AffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + { + int dataSize = 0; + for (int i = 0; i < affixLevelList_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt64SizeNoTag(affixLevelList_.getLong(i)); + } + size += dataSize; + if (!getAffixLevelListList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + affixLevelListMemoizedSerializedSize = dataSize; + } + if (itemGuid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, affixLevelMap__); + .computeUInt32Size(13, itemGuid_); } - if (itemGuid_ != 0L) { + if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(15, itemGuid_); + .computeUInt64Size(15, targetWeaponGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -353,12 +288,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq other = (emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq) obj; - if (getTargetWeaponGuid() - != other.getTargetWeaponGuid()) return false; - if (!internalGetAffixLevelMap().equals( - other.internalGetAffixLevelMap())) return false; + if (!getAffixLevelListList() + .equals(other.getAffixLevelListList())) return false; if (getItemGuid() != other.getItemGuid()) return false; + if (getTargetWeaponGuid() + != other.getTargetWeaponGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -370,16 +305,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTargetWeaponGuid()); - if (!internalGetAffixLevelMap().getMap().isEmpty()) { - hash = (37 * hash) + AFFIX_LEVEL_MAP_FIELD_NUMBER; - hash = (53 * hash) + internalGetAffixLevelMap().hashCode(); + if (getAffixLevelListCount() > 0) { + hash = (37 * hash) + AFFIX_LEVEL_LIST_FIELD_NUMBER; + hash = (53 * hash) + getAffixLevelListList().hashCode(); } hash = (37 * hash) + ITEM_GUID_FIELD_NUMBER; + hash = (53 * hash) + getItemGuid(); + hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getItemGuid()); + getTargetWeaponGuid()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -477,8 +411,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23146
-     * Obf: AFPFPKMLIPD
+     * CmdId: 20421
      *
* * Protobuf type {@code WeaponAwakenReq} @@ -492,28 +425,6 @@ public static final class Builder extends return emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.internal_static_WeaponAwakenReq_descriptor; } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 4: - return internalGetAffixLevelMap(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField( - int number) { - switch (number) { - case 4: - return internalGetMutableAffixLevelMap(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { @@ -540,10 +451,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - targetWeaponGuid_ = 0L; + affixLevelList_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000001); + itemGuid_ = 0; - internalGetMutableAffixLevelMap().clear(); - itemGuid_ = 0L; + targetWeaponGuid_ = 0L; return this; } @@ -572,10 +484,13 @@ public emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq build public emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq buildPartial() { emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq result = new emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq(this); int from_bitField0_ = bitField0_; - result.targetWeaponGuid_ = targetWeaponGuid_; - result.affixLevelMap_ = internalGetAffixLevelMap(); - result.affixLevelMap_.makeImmutable(); + if (((bitField0_ & 0x00000001) != 0)) { + affixLevelList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.affixLevelList_ = affixLevelList_; result.itemGuid_ = itemGuid_; + result.targetWeaponGuid_ = targetWeaponGuid_; onBuilt(); return result; } @@ -624,14 +539,22 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq other) { if (other == emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq.getDefaultInstance()) return this; - if (other.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); + if (!other.affixLevelList_.isEmpty()) { + if (affixLevelList_.isEmpty()) { + affixLevelList_ = other.affixLevelList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureAffixLevelListIsMutable(); + affixLevelList_.addAll(other.affixLevelList_); + } + onChanged(); } - internalGetMutableAffixLevelMap().mergeFrom( - other.internalGetAffixLevelMap()); - if (other.getItemGuid() != 0L) { + if (other.getItemGuid() != 0) { setItemGuid(other.getItemGuid()); } + if (other.getTargetWeaponGuid() != 0L) { + setTargetWeaponGuid(other.getTargetWeaponGuid()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -662,192 +585,143 @@ public Builder mergeFrom( } private int bitField0_; - private long targetWeaponGuid_ ; - /** - * uint64 target_weapon_guid = 2; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; + private com.google.protobuf.Internal.LongList affixLevelList_ = emptyLongList(); + private void ensureAffixLevelListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + affixLevelList_ = mutableCopy(affixLevelList_); + bitField0_ |= 0x00000001; + } } /** - * uint64 target_weapon_guid = 2; - * @param value The targetWeaponGuid to set. - * @return This builder for chaining. + * repeated uint64 affix_level_list = 3; + * @return A list containing the affixLevelList. */ - public Builder setTargetWeaponGuid(long value) { - - targetWeaponGuid_ = value; - onChanged(); - return this; - } - /** - * uint64 target_weapon_guid = 2; - * @return This builder for chaining. - */ - public Builder clearTargetWeaponGuid() { - - targetWeaponGuid_ = 0L; - onChanged(); - return this; - } - - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> affixLevelMap_; - private com.google.protobuf.MapField - internalGetAffixLevelMap() { - if (affixLevelMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - AffixLevelMapDefaultEntryHolder.defaultEntry); - } - return affixLevelMap_; - } - private com.google.protobuf.MapField - internalGetMutableAffixLevelMap() { - onChanged();; - if (affixLevelMap_ == null) { - affixLevelMap_ = com.google.protobuf.MapField.newMapField( - AffixLevelMapDefaultEntryHolder.defaultEntry); - } - if (!affixLevelMap_.isMutable()) { - affixLevelMap_ = affixLevelMap_.copy(); - } - return affixLevelMap_; - } - - public int getAffixLevelMapCount() { - return internalGetAffixLevelMap().getMap().size(); + public java.util.List + getAffixLevelListList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(affixLevelList_) : affixLevelList_; } /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @return The count of affixLevelList. */ - - @java.lang.Override - public boolean containsAffixLevelMap( - int key) { - - return internalGetAffixLevelMap().getMap().containsKey(key); + public int getAffixLevelListCount() { + return affixLevelList_.size(); } /** - * Use {@link #getAffixLevelMapMap()} instead. + * repeated uint64 affix_level_list = 3; + * @param index The index of the element to return. + * @return The affixLevelList at the given index. */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getAffixLevelMap() { - return getAffixLevelMapMap(); + public long getAffixLevelList(int index) { + return affixLevelList_.getLong(index); } /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @param index The index to set the value at. + * @param value The affixLevelList to set. + * @return This builder for chaining. */ - @java.lang.Override - - public java.util.Map getAffixLevelMapMap() { - return internalGetAffixLevelMap().getMap(); + public Builder setAffixLevelList( + int index, long value) { + ensureAffixLevelListIsMutable(); + affixLevelList_.setLong(index, value); + onChanged(); + return this; } /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @param value The affixLevelList to add. + * @return This builder for chaining. */ - @java.lang.Override - - public int getAffixLevelMapOrDefault( - int key, - int defaultValue) { - - java.util.Map map = - internalGetAffixLevelMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + public Builder addAffixLevelList(long value) { + ensureAffixLevelListIsMutable(); + affixLevelList_.addLong(value); + onChanged(); + return this; } /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @param values The affixLevelList to add. + * @return This builder for chaining. */ - @java.lang.Override - - public int getAffixLevelMapOrThrow( - int key) { - - java.util.Map map = - internalGetAffixLevelMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); - } - - public Builder clearAffixLevelMap() { - internalGetMutableAffixLevelMap().getMutableMap() - .clear(); + public Builder addAllAffixLevelList( + java.lang.Iterable values) { + ensureAffixLevelListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, affixLevelList_); + onChanged(); return this; } /** - * map<uint32, uint32> affix_level_map = 4; + * repeated uint64 affix_level_list = 3; + * @return This builder for chaining. */ - - public Builder removeAffixLevelMap( - int key) { - - internalGetMutableAffixLevelMap().getMutableMap() - .remove(key); + public Builder clearAffixLevelList() { + affixLevelList_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); return this; } + + private int itemGuid_ ; /** - * Use alternate mutation accessors instead. + * uint32 item_guid = 13; + * @return The itemGuid. */ - @java.lang.Deprecated - public java.util.Map - getMutableAffixLevelMap() { - return internalGetMutableAffixLevelMap().getMutableMap(); + @java.lang.Override + public int getItemGuid() { + return itemGuid_; } /** - * map<uint32, uint32> affix_level_map = 4; + * uint32 item_guid = 13; + * @param value The itemGuid to set. + * @return This builder for chaining. */ - public Builder putAffixLevelMap( - int key, - int value) { - + public Builder setItemGuid(int value) { - internalGetMutableAffixLevelMap().getMutableMap() - .put(key, value); + itemGuid_ = value; + onChanged(); return this; } /** - * map<uint32, uint32> affix_level_map = 4; + * uint32 item_guid = 13; + * @return This builder for chaining. */ - - public Builder putAllAffixLevelMap( - java.util.Map values) { - internalGetMutableAffixLevelMap().getMutableMap() - .putAll(values); + public Builder clearItemGuid() { + + itemGuid_ = 0; + onChanged(); return this; } - private long itemGuid_ ; + private long targetWeaponGuid_ ; /** - * uint64 item_guid = 15; - * @return The itemGuid. + * uint64 target_weapon_guid = 15; + * @return The targetWeaponGuid. */ @java.lang.Override - public long getItemGuid() { - return itemGuid_; + public long getTargetWeaponGuid() { + return targetWeaponGuid_; } /** - * uint64 item_guid = 15; - * @param value The itemGuid to set. + * uint64 target_weapon_guid = 15; + * @param value The targetWeaponGuid to set. * @return This builder for chaining. */ - public Builder setItemGuid(long value) { + public Builder setTargetWeaponGuid(long value) { - itemGuid_ = value; + targetWeaponGuid_ = value; onChanged(); return this; } /** - * uint64 item_guid = 15; + * uint64 target_weapon_guid = 15; * @return This builder for chaining. */ - public Builder clearItemGuid() { + public Builder clearTargetWeaponGuid() { - itemGuid_ = 0L; + targetWeaponGuid_ = 0L; onChanged(); return this; } @@ -909,11 +783,6 @@ public emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq getDe private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_WeaponAwakenReq_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_WeaponAwakenReq_AffixLevelMapEntry_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_WeaponAwakenReq_AffixLevelMapEntry_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -923,13 +792,10 @@ public emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq getDe descriptor; static { java.lang.String[] descriptorData = { - "\n\025WeaponAwakenReq.proto\"\264\001\n\017WeaponAwaken" + - "Req\022\032\n\022target_weapon_guid\030\002 \001(\004\022<\n\017affix" + - "_level_map\030\004 \003(\0132#.WeaponAwakenReq.Affix" + - "LevelMapEntry\022\021\n\titem_guid\030\017 \001(\004\0324\n\022Affi" + - "xLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001" + - "(\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006pro" + - "to3" + "\n\025WeaponAwakenReq.proto\"Z\n\017WeaponAwakenR" + + "eq\022\030\n\020affix_level_list\030\003 \003(\004\022\021\n\titem_gui" + + "d\030\r \001(\r\022\032\n\022target_weapon_guid\030\017 \001(\004B\033\n\031e" + + "mu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -940,13 +806,7 @@ public emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq getDe internal_static_WeaponAwakenReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WeaponAwakenReq_descriptor, - new java.lang.String[] { "TargetWeaponGuid", "AffixLevelMap", "ItemGuid", }); - internal_static_WeaponAwakenReq_AffixLevelMapEntry_descriptor = - internal_static_WeaponAwakenReq_descriptor.getNestedTypes().get(0); - internal_static_WeaponAwakenReq_AffixLevelMapEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_WeaponAwakenReq_AffixLevelMapEntry_descriptor, - new java.lang.String[] { "Key", "Value", }); + new java.lang.String[] { "AffixLevelList", "ItemGuid", "TargetWeaponGuid", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java index b20978ad029..f6420145da5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java @@ -19,11 +19,35 @@ public interface WeaponAwakenRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * map<uint32, uint32> old_affix_level_map = 3; + * uint32 target_weapon_awaken_level = 1; + * @return The targetWeaponAwakenLevel. + */ + int getTargetWeaponAwakenLevel(); + + /** + * int32 retcode = 5; + * @return The retcode. + */ + int getRetcode(); + + /** + * uint64 avatar_guid = 6; + * @return The avatarGuid. + */ + long getAvatarGuid(); + + /** + * uint64 target_weapon_guid = 9; + * @return The targetWeaponGuid. + */ + long getTargetWeaponGuid(); + + /** + * map<uint32, uint32> old_affix_level_map = 12; */ int getOldAffixLevelMapCount(); /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ boolean containsOldAffixLevelMap( int key); @@ -34,30 +58,30 @@ boolean containsOldAffixLevelMap( java.util.Map getOldAffixLevelMap(); /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ java.util.Map getOldAffixLevelMapMap(); /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ int getOldAffixLevelMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ int getOldAffixLevelMapOrThrow( int key); /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ int getCurAffixLevelMapCount(); /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ boolean containsCurAffixLevelMap( int key); @@ -68,49 +92,29 @@ boolean containsCurAffixLevelMap( java.util.Map getCurAffixLevelMap(); /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ java.util.Map getCurAffixLevelMapMap(); /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ int getCurAffixLevelMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ int getCurAffixLevelMapOrThrow( int key); - - /** - * int32 retcode = 10; - * @return The retcode. - */ - int getRetcode(); - - /** - * uint32 target_weapon_awaken_level = 14; - * @return The targetWeaponAwakenLevel. - */ - int getTargetWeaponAwakenLevel(); - - /** - * uint64 target_weapon_guid = 7; - * @return The targetWeaponGuid. - */ - long getTargetWeaponGuid(); - - /** - * uint64 avatar_guid = 9; - * @return The avatarGuid. - */ - long getAvatarGuid(); } /** + * 
+   * CmdId: 24076
+   *
+ * * Protobuf type {@code WeaponAwakenRsp} */ public static final class WeaponAwakenRsp extends @@ -156,35 +160,40 @@ private WeaponAwakenRsp( case 0: done = true; break; - case 26: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - oldAffixLevelMap_ = com.google.protobuf.MapField.newMapField( - OldAffixLevelMapDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry - oldAffixLevelMap__ = input.readMessage( - OldAffixLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - oldAffixLevelMap_.getMutableMap().put( - oldAffixLevelMap__.getKey(), oldAffixLevelMap__.getValue()); + case 8: { + + targetWeaponAwakenLevel_ = input.readUInt32(); break; } - case 56: { + case 40: { - targetWeaponGuid_ = input.readUInt64(); + retcode_ = input.readInt32(); break; } - case 72: { + case 48: { avatarGuid_ = input.readUInt64(); break; } - case 80: { + case 72: { - retcode_ = input.readInt32(); + targetWeaponGuid_ = input.readUInt64(); break; } case 98: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + oldAffixLevelMap_ = com.google.protobuf.MapField.newMapField( + OldAffixLevelMapDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000001; + } + com.google.protobuf.MapEntry + oldAffixLevelMap__ = input.readMessage( + OldAffixLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + oldAffixLevelMap_.getMutableMap().put( + oldAffixLevelMap__.getKey(), oldAffixLevelMap__.getValue()); + break; + } + case 122: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { curAffixLevelMap_ = com.google.protobuf.MapField.newMapField( CurAffixLevelMapDefaultEntryHolder.defaultEntry); @@ -197,11 +206,6 @@ private WeaponAwakenRsp( curAffixLevelMap__.getKey(), curAffixLevelMap__.getValue()); break; } - case 112: { - - targetWeaponAwakenLevel_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -231,9 +235,9 @@ private WeaponAwakenRsp( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 3: - return internalGetOldAffixLevelMap(); case 12: + return internalGetOldAffixLevelMap(); + case 15: return internalGetCurAffixLevelMap(); default: throw new RuntimeException( @@ -248,7 +252,51 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp.class, emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp.Builder.class); } - public static final int OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER = 3; + public static final int TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER = 1; + private int targetWeaponAwakenLevel_; + /** + * uint32 target_weapon_awaken_level = 1; + * @return The targetWeaponAwakenLevel. + */ + @java.lang.Override + public int getTargetWeaponAwakenLevel() { + return targetWeaponAwakenLevel_; + } + + public static final int RETCODE_FIELD_NUMBER = 5; + private int retcode_; + /** + * int32 retcode = 5; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int AVATAR_GUID_FIELD_NUMBER = 6; + private long avatarGuid_; + /** + * uint64 avatar_guid = 6; + * @return The avatarGuid. + */ + @java.lang.Override + public long getAvatarGuid() { + return avatarGuid_; + } + + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 9; + private long targetWeaponGuid_; + /** + * uint64 target_weapon_guid = 9; + * @return The targetWeaponGuid. + */ + @java.lang.Override + public long getTargetWeaponGuid() { + return targetWeaponGuid_; + } + + public static final int OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER = 12; private static final class OldAffixLevelMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -275,7 +323,7 @@ public int getOldAffixLevelMapCount() { return internalGetOldAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -293,7 +341,7 @@ public java.util.Map getOldAffixLevelMap() return getOldAffixLevelMapMap(); } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -301,7 +349,7 @@ public java.util.Map getOldAffixLevelMapMa return internalGetOldAffixLevelMap().getMap(); } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -314,7 +362,7 @@ public int getOldAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -329,7 +377,7 @@ public int getOldAffixLevelMapOrThrow( return map.get(key); } - public static final int CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER = 12; + public static final int CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER = 15; private static final class CurAffixLevelMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -356,7 +404,7 @@ public int getCurAffixLevelMapCount() { return internalGetCurAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -374,7 +422,7 @@ public java.util.Map getCurAffixLevelMap() return getCurAffixLevelMapMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -382,7 +430,7 @@ public java.util.Map getCurAffixLevelMapMa return internalGetCurAffixLevelMap().getMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -395,7 +443,7 @@ public int getCurAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -410,50 +458,6 @@ public int getCurAffixLevelMapOrThrow( return map.get(key); } - public static final int RETCODE_FIELD_NUMBER = 10; - private int retcode_; - /** - * int32 retcode = 10; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER = 14; - private int targetWeaponAwakenLevel_; - /** - * uint32 target_weapon_awaken_level = 14; - * @return The targetWeaponAwakenLevel. - */ - @java.lang.Override - public int getTargetWeaponAwakenLevel() { - return targetWeaponAwakenLevel_; - } - - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 7; - private long targetWeaponGuid_; - /** - * uint64 target_weapon_guid = 7; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - - public static final int AVATAR_GUID_FIELD_NUMBER = 9; - private long avatarGuid_; - /** - * uint64 avatar_guid = 9; - * @return The avatarGuid. - */ - @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -468,30 +472,30 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (targetWeaponAwakenLevel_ != 0) { + output.writeUInt32(1, targetWeaponAwakenLevel_); + } + if (retcode_ != 0) { + output.writeInt32(5, retcode_); + } + if (avatarGuid_ != 0L) { + output.writeUInt64(6, avatarGuid_); + } + if (targetWeaponGuid_ != 0L) { + output.writeUInt64(9, targetWeaponGuid_); + } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetOldAffixLevelMap(), OldAffixLevelMapDefaultEntryHolder.defaultEntry, - 3); - if (targetWeaponGuid_ != 0L) { - output.writeUInt64(7, targetWeaponGuid_); - } - if (avatarGuid_ != 0L) { - output.writeUInt64(9, avatarGuid_); - } - if (retcode_ != 0) { - output.writeInt32(10, retcode_); - } + 12); com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetCurAffixLevelMap(), CurAffixLevelMapDefaultEntryHolder.defaultEntry, - 12); - if (targetWeaponAwakenLevel_ != 0) { - output.writeUInt32(14, targetWeaponAwakenLevel_); - } + 15); unknownFields.writeTo(output); } @@ -501,41 +505,41 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (java.util.Map.Entry entry - : internalGetOldAffixLevelMap().getMap().entrySet()) { - com.google.protobuf.MapEntry - oldAffixLevelMap__ = OldAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + if (targetWeaponAwakenLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, oldAffixLevelMap__); + .computeUInt32Size(1, targetWeaponAwakenLevel_); } - if (targetWeaponGuid_ != 0L) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(7, targetWeaponGuid_); + .computeInt32Size(5, retcode_); } if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(9, avatarGuid_); + .computeUInt64Size(6, avatarGuid_); } - if (retcode_ != 0) { + if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, retcode_); + .computeUInt64Size(9, targetWeaponGuid_); } for (java.util.Map.Entry entry - : internalGetCurAffixLevelMap().getMap().entrySet()) { + : internalGetOldAffixLevelMap().getMap().entrySet()) { com.google.protobuf.MapEntry - curAffixLevelMap__ = CurAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType() + oldAffixLevelMap__ = OldAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType() .setKey(entry.getKey()) .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, curAffixLevelMap__); + .computeMessageSize(12, oldAffixLevelMap__); } - if (targetWeaponAwakenLevel_ != 0) { + for (java.util.Map.Entry entry + : internalGetCurAffixLevelMap().getMap().entrySet()) { + com.google.protobuf.MapEntry + curAffixLevelMap__ = CurAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, targetWeaponAwakenLevel_); + .computeMessageSize(15, curAffixLevelMap__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -552,18 +556,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp other = (emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp) obj; - if (!internalGetOldAffixLevelMap().equals( - other.internalGetOldAffixLevelMap())) return false; - if (!internalGetCurAffixLevelMap().equals( - other.internalGetCurAffixLevelMap())) return false; - if (getRetcode() - != other.getRetcode()) return false; if (getTargetWeaponAwakenLevel() != other.getTargetWeaponAwakenLevel()) return false; - if (getTargetWeaponGuid() - != other.getTargetWeaponGuid()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; + if (getTargetWeaponGuid() + != other.getTargetWeaponGuid()) return false; + if (!internalGetOldAffixLevelMap().equals( + other.internalGetOldAffixLevelMap())) return false; + if (!internalGetCurAffixLevelMap().equals( + other.internalGetCurAffixLevelMap())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -575,6 +579,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getTargetWeaponAwakenLevel(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getAvatarGuid()); + hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getTargetWeaponGuid()); if (!internalGetOldAffixLevelMap().getMap().isEmpty()) { hash = (37 * hash) + OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetOldAffixLevelMap().hashCode(); @@ -583,16 +597,6 @@ public int hashCode() { hash = (37 * hash) + CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetCurAffixLevelMap().hashCode(); } - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getTargetWeaponAwakenLevel(); - hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTargetWeaponGuid()); - hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getAvatarGuid()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -689,6 +693,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 24076
+     *
+ * * Protobuf type {@code WeaponAwakenRsp} */ public static final class Builder extends @@ -704,9 +712,9 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 3: - return internalGetOldAffixLevelMap(); case 12: + return internalGetOldAffixLevelMap(); + case 15: return internalGetCurAffixLevelMap(); default: throw new RuntimeException( @@ -717,9 +725,9 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 3: - return internalGetMutableOldAffixLevelMap(); case 12: + return internalGetMutableOldAffixLevelMap(); + case 15: return internalGetMutableCurAffixLevelMap(); default: throw new RuntimeException( @@ -752,16 +760,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - internalGetMutableOldAffixLevelMap().clear(); - internalGetMutableCurAffixLevelMap().clear(); - retcode_ = 0; - targetWeaponAwakenLevel_ = 0; - targetWeaponGuid_ = 0L; + retcode_ = 0; avatarGuid_ = 0L; + targetWeaponGuid_ = 0L; + + internalGetMutableOldAffixLevelMap().clear(); + internalGetMutableCurAffixLevelMap().clear(); return this; } @@ -789,14 +797,14 @@ public emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp build public emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp buildPartial() { emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp result = new emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp(this); int from_bitField0_ = bitField0_; + result.targetWeaponAwakenLevel_ = targetWeaponAwakenLevel_; + result.retcode_ = retcode_; + result.avatarGuid_ = avatarGuid_; + result.targetWeaponGuid_ = targetWeaponGuid_; result.oldAffixLevelMap_ = internalGetOldAffixLevelMap(); result.oldAffixLevelMap_.makeImmutable(); result.curAffixLevelMap_ = internalGetCurAffixLevelMap(); result.curAffixLevelMap_.makeImmutable(); - result.retcode_ = retcode_; - result.targetWeaponAwakenLevel_ = targetWeaponAwakenLevel_; - result.targetWeaponGuid_ = targetWeaponGuid_; - result.avatarGuid_ = avatarGuid_; onBuilt(); return result; } @@ -845,22 +853,22 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp other) { if (other == emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp.getDefaultInstance()) return this; - internalGetMutableOldAffixLevelMap().mergeFrom( - other.internalGetOldAffixLevelMap()); - internalGetMutableCurAffixLevelMap().mergeFrom( - other.internalGetCurAffixLevelMap()); - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.getTargetWeaponAwakenLevel() != 0) { setTargetWeaponAwakenLevel(other.getTargetWeaponAwakenLevel()); } - if (other.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } + if (other.getTargetWeaponGuid() != 0L) { + setTargetWeaponGuid(other.getTargetWeaponGuid()); + } + internalGetMutableOldAffixLevelMap().mergeFrom( + other.internalGetOldAffixLevelMap()); + internalGetMutableCurAffixLevelMap().mergeFrom( + other.internalGetCurAffixLevelMap()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -891,6 +899,130 @@ public Builder mergeFrom( } private int bitField0_; + private int targetWeaponAwakenLevel_ ; + /** + * uint32 target_weapon_awaken_level = 1; + * @return The targetWeaponAwakenLevel. + */ + @java.lang.Override + public int getTargetWeaponAwakenLevel() { + return targetWeaponAwakenLevel_; + } + /** + * uint32 target_weapon_awaken_level = 1; + * @param value The targetWeaponAwakenLevel to set. + * @return This builder for chaining. + */ + public Builder setTargetWeaponAwakenLevel(int value) { + + targetWeaponAwakenLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 target_weapon_awaken_level = 1; + * @return This builder for chaining. + */ + public Builder clearTargetWeaponAwakenLevel() { + + targetWeaponAwakenLevel_ = 0; + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 5; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 5; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 5; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + + private long avatarGuid_ ; + /** + * uint64 avatar_guid = 6; + * @return The avatarGuid. + */ + @java.lang.Override + public long getAvatarGuid() { + return avatarGuid_; + } + /** + * uint64 avatar_guid = 6; + * @param value The avatarGuid to set. + * @return This builder for chaining. + */ + public Builder setAvatarGuid(long value) { + + avatarGuid_ = value; + onChanged(); + return this; + } + /** + * uint64 avatar_guid = 6; + * @return This builder for chaining. + */ + public Builder clearAvatarGuid() { + + avatarGuid_ = 0L; + onChanged(); + return this; + } + + private long targetWeaponGuid_ ; + /** + * uint64 target_weapon_guid = 9; + * @return The targetWeaponGuid. + */ + @java.lang.Override + public long getTargetWeaponGuid() { + return targetWeaponGuid_; + } + /** + * uint64 target_weapon_guid = 9; + * @param value The targetWeaponGuid to set. + * @return This builder for chaining. + */ + public Builder setTargetWeaponGuid(long value) { + + targetWeaponGuid_ = value; + onChanged(); + return this; + } + /** + * uint64 target_weapon_guid = 9; + * @return This builder for chaining. + */ + public Builder clearTargetWeaponGuid() { + + targetWeaponGuid_ = 0L; + onChanged(); + return this; + } + private com.google.protobuf.MapField< java.lang.Integer, java.lang.Integer> oldAffixLevelMap_; private com.google.protobuf.MapField @@ -918,7 +1050,7 @@ public int getOldAffixLevelMapCount() { return internalGetOldAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -936,7 +1068,7 @@ public java.util.Map getOldAffixLevelMap() return getOldAffixLevelMapMap(); } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -944,7 +1076,7 @@ public java.util.Map getOldAffixLevelMapMa return internalGetOldAffixLevelMap().getMap(); } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -957,7 +1089,7 @@ public int getOldAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ @java.lang.Override @@ -978,7 +1110,7 @@ public Builder clearOldAffixLevelMap() { return this; } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ public Builder removeOldAffixLevelMap( @@ -997,7 +1129,7 @@ public Builder removeOldAffixLevelMap( return internalGetMutableOldAffixLevelMap().getMutableMap(); } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ public Builder putOldAffixLevelMap( int key, @@ -1009,7 +1141,7 @@ public Builder putOldAffixLevelMap( return this; } /** - * map<uint32, uint32> old_affix_level_map = 3; + * map<uint32, uint32> old_affix_level_map = 12; */ public Builder putAllOldAffixLevelMap( @@ -1046,7 +1178,7 @@ public int getCurAffixLevelMapCount() { return internalGetCurAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -1064,7 +1196,7 @@ public java.util.Map getCurAffixLevelMap() return getCurAffixLevelMapMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -1072,7 +1204,7 @@ public java.util.Map getCurAffixLevelMapMa return internalGetCurAffixLevelMap().getMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -1085,7 +1217,7 @@ public int getCurAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ @java.lang.Override @@ -1106,7 +1238,7 @@ public Builder clearCurAffixLevelMap() { return this; } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ public Builder removeCurAffixLevelMap( @@ -1125,7 +1257,7 @@ public Builder removeCurAffixLevelMap( return internalGetMutableCurAffixLevelMap().getMutableMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ public Builder putCurAffixLevelMap( int key, @@ -1137,7 +1269,7 @@ public Builder putCurAffixLevelMap( return this; } /** - * map<uint32, uint32> cur_affix_level_map = 12; + * map<uint32, uint32> cur_affix_level_map = 15; */ public Builder putAllCurAffixLevelMap( @@ -1146,130 +1278,6 @@ public Builder putAllCurAffixLevelMap( .putAll(values); return this; } - - private int retcode_ ; - /** - * int32 retcode = 10; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 10; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 10; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - - private int targetWeaponAwakenLevel_ ; - /** - * uint32 target_weapon_awaken_level = 14; - * @return The targetWeaponAwakenLevel. - */ - @java.lang.Override - public int getTargetWeaponAwakenLevel() { - return targetWeaponAwakenLevel_; - } - /** - * uint32 target_weapon_awaken_level = 14; - * @param value The targetWeaponAwakenLevel to set. - * @return This builder for chaining. - */ - public Builder setTargetWeaponAwakenLevel(int value) { - - targetWeaponAwakenLevel_ = value; - onChanged(); - return this; - } - /** - * uint32 target_weapon_awaken_level = 14; - * @return This builder for chaining. - */ - public Builder clearTargetWeaponAwakenLevel() { - - targetWeaponAwakenLevel_ = 0; - onChanged(); - return this; - } - - private long targetWeaponGuid_ ; - /** - * uint64 target_weapon_guid = 7; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - /** - * uint64 target_weapon_guid = 7; - * @param value The targetWeaponGuid to set. - * @return This builder for chaining. - */ - public Builder setTargetWeaponGuid(long value) { - - targetWeaponGuid_ = value; - onChanged(); - return this; - } - /** - * uint64 target_weapon_guid = 7; - * @return This builder for chaining. - */ - public Builder clearTargetWeaponGuid() { - - targetWeaponGuid_ = 0L; - onChanged(); - return this; - } - - private long avatarGuid_ ; - /** - * uint64 avatar_guid = 9; - * @return The avatarGuid. - */ - @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; - } - /** - * uint64 avatar_guid = 9; - * @param value The avatarGuid to set. - * @return This builder for chaining. - */ - public Builder setAvatarGuid(long value) { - - avatarGuid_ = value; - onChanged(); - return this; - } - /** - * uint64 avatar_guid = 9; - * @return This builder for chaining. - */ - public Builder clearAvatarGuid() { - - avatarGuid_ = 0L; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1348,13 +1356,13 @@ public emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp getDe static { java.lang.String[] descriptorData = { "\n\025WeaponAwakenRsp.proto\"\363\002\n\017WeaponAwaken" + - "Rsp\022C\n\023old_affix_level_map\030\003 \003(\0132&.Weapo" + - "nAwakenRsp.OldAffixLevelMapEntry\022C\n\023cur_" + - "affix_level_map\030\014 \003(\0132&.WeaponAwakenRsp." + - "CurAffixLevelMapEntry\022\017\n\007retcode\030\n \001(\005\022\"" + - "\n\032target_weapon_awaken_level\030\016 \001(\r\022\032\n\022ta" + - "rget_weapon_guid\030\007 \001(\004\022\023\n\013avatar_guid\030\t " + - "\001(\004\0327\n\025OldAffixLevelMapEntry\022\013\n\003key\030\001 \001(" + + "Rsp\022\"\n\032target_weapon_awaken_level\030\001 \001(\r\022" + + "\017\n\007retcode\030\005 \001(\005\022\023\n\013avatar_guid\030\006 \001(\004\022\032\n" + + "\022target_weapon_guid\030\t \001(\004\022C\n\023old_affix_l" + + "evel_map\030\014 \003(\0132&.WeaponAwakenRsp.OldAffi" + + "xLevelMapEntry\022C\n\023cur_affix_level_map\030\017 " + + "\003(\0132&.WeaponAwakenRsp.CurAffixLevelMapEn" + + "try\0327\n\025OldAffixLevelMapEntry\022\013\n\003key\030\001 \001(" + "\r\022\r\n\005value\030\002 \001(\r:\0028\001\0327\n\025CurAffixLevelMap" + "Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n" + "\031emu.grasscutter.net.protob\006proto3" @@ -1368,7 +1376,7 @@ public emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp getDe internal_static_WeaponAwakenRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WeaponAwakenRsp_descriptor, - new java.lang.String[] { "OldAffixLevelMap", "CurAffixLevelMap", "Retcode", "TargetWeaponAwakenLevel", "TargetWeaponGuid", "AvatarGuid", }); + new java.lang.String[] { "TargetWeaponAwakenLevel", "Retcode", "AvatarGuid", "TargetWeaponGuid", "OldAffixLevelMap", "CurAffixLevelMap", }); internal_static_WeaponAwakenRsp_OldAffixLevelMapEntry_descriptor = internal_static_WeaponAwakenRsp_descriptor.getNestedTypes().get(0); internal_static_WeaponAwakenRsp_OldAffixLevelMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java index e745438eb29..e212484d202 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java @@ -19,12 +19,16 @@ public interface WeaponPromoteReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 target_weapon_guid = 8; + * uint64 target_weapon_guid = 4; * @return The targetWeaponGuid. */ long getTargetWeaponGuid(); } /** + * 
+   * CmdId: 3230
+   *
+ * * Protobuf type {@code WeaponPromoteReq} */ public static final class WeaponPromoteReq extends @@ -69,7 +73,7 @@ private WeaponPromoteReq( case 0: done = true; break; - case 64: { + case 32: { targetWeaponGuid_ = input.readUInt64(); break; @@ -106,10 +110,10 @@ private WeaponPromoteReq( emu.grasscutter.net.proto.WeaponPromoteReqOuterClass.WeaponPromoteReq.class, emu.grasscutter.net.proto.WeaponPromoteReqOuterClass.WeaponPromoteReq.Builder.class); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 8; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 4; private long targetWeaponGuid_; /** - * uint64 target_weapon_guid = 8; + * uint64 target_weapon_guid = 4; * @return The targetWeaponGuid. */ @java.lang.Override @@ -132,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (targetWeaponGuid_ != 0L) { - output.writeUInt64(8, targetWeaponGuid_); + output.writeUInt64(4, targetWeaponGuid_); } unknownFields.writeTo(output); } @@ -145,7 +149,7 @@ public int getSerializedSize() { size = 0; if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(8, targetWeaponGuid_); + .computeUInt64Size(4, targetWeaponGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -274,6 +278,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 3230
+     *
+ * * Protobuf type {@code WeaponPromoteReq} */ public static final class Builder extends @@ -422,7 +430,7 @@ public Builder mergeFrom( private long targetWeaponGuid_ ; /** - * uint64 target_weapon_guid = 8; + * uint64 target_weapon_guid = 4; * @return The targetWeaponGuid. */ @java.lang.Override @@ -430,7 +438,7 @@ public long getTargetWeaponGuid() { return targetWeaponGuid_; } /** - * uint64 target_weapon_guid = 8; + * uint64 target_weapon_guid = 4; * @param value The targetWeaponGuid to set. * @return This builder for chaining. */ @@ -441,7 +449,7 @@ public Builder setTargetWeaponGuid(long value) { return this; } /** - * uint64 target_weapon_guid = 8; + * uint64 target_weapon_guid = 4; * @return This builder for chaining. */ public Builder clearTargetWeaponGuid() { @@ -518,7 +526,7 @@ public emu.grasscutter.net.proto.WeaponPromoteReqOuterClass.WeaponPromoteReq get static { java.lang.String[] descriptorData = { "\n\026WeaponPromoteReq.proto\".\n\020WeaponPromot" + - "eReq\022\032\n\022target_weapon_guid\030\010 \001(\004B\033\n\031emu." + + "eReq\022\032\n\022target_weapon_guid\030\004 \001(\004B\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java index c81c5876912..c57f982b448 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java @@ -19,30 +19,34 @@ public interface WeaponPromoteRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 target_weapon_guid = 13; + * uint64 target_weapon_guid = 2; * @return The targetWeaponGuid. */ long getTargetWeaponGuid(); /** - * uint32 cur_promote_level = 3; + * uint32 cur_promote_level = 5; * @return The curPromoteLevel. */ int getCurPromoteLevel(); /** - * uint32 old_promote_level = 4; - * @return The oldPromoteLevel. + * int32 retcode = 11; + * @return The retcode. */ - int getOldPromoteLevel(); + int getRetcode(); /** - * int32 retcode = 6; - * @return The retcode. + * uint32 old_promote_level = 15; + * @return The oldPromoteLevel. */ - int getRetcode(); + int getOldPromoteLevel(); } /** + * 
+   * CmdId: 25392
+   *
+ * * Protobuf type {@code WeaponPromoteRsp} */ public static final class WeaponPromoteRsp extends @@ -87,24 +91,24 @@ private WeaponPromoteRsp( case 0: done = true; break; - case 24: { + case 16: { - curPromoteLevel_ = input.readUInt32(); + targetWeaponGuid_ = input.readUInt64(); break; } - case 32: { + case 40: { - oldPromoteLevel_ = input.readUInt32(); + curPromoteLevel_ = input.readUInt32(); break; } - case 48: { + case 88: { retcode_ = input.readInt32(); break; } - case 104: { + case 120: { - targetWeaponGuid_ = input.readUInt64(); + oldPromoteLevel_ = input.readUInt32(); break; } default: { @@ -139,10 +143,10 @@ private WeaponPromoteRsp( emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.class, emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.Builder.class); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 13; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 2; private long targetWeaponGuid_; /** - * uint64 target_weapon_guid = 13; + * uint64 target_weapon_guid = 2; * @return The targetWeaponGuid. */ @java.lang.Override @@ -150,10 +154,10 @@ public long getTargetWeaponGuid() { return targetWeaponGuid_; } - public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 3; + public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 5; private int curPromoteLevel_; /** - * uint32 cur_promote_level = 3; + * uint32 cur_promote_level = 5; * @return The curPromoteLevel. */ @java.lang.Override @@ -161,26 +165,26 @@ public int getCurPromoteLevel() { return curPromoteLevel_; } - public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 4; - private int oldPromoteLevel_; + public static final int RETCODE_FIELD_NUMBER = 11; + private int retcode_; /** - * uint32 old_promote_level = 4; - * @return The oldPromoteLevel. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getOldPromoteLevel() { - return oldPromoteLevel_; + public int getRetcode() { + return retcode_; } - public static final int RETCODE_FIELD_NUMBER = 6; - private int retcode_; + public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 15; + private int oldPromoteLevel_; /** - * int32 retcode = 6; - * @return The retcode. + * uint32 old_promote_level = 15; + * @return The oldPromoteLevel. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getOldPromoteLevel() { + return oldPromoteLevel_; } private byte memoizedIsInitialized = -1; @@ -197,17 +201,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (curPromoteLevel_ != 0) { - output.writeUInt32(3, curPromoteLevel_); + if (targetWeaponGuid_ != 0L) { + output.writeUInt64(2, targetWeaponGuid_); } - if (oldPromoteLevel_ != 0) { - output.writeUInt32(4, oldPromoteLevel_); + if (curPromoteLevel_ != 0) { + output.writeUInt32(5, curPromoteLevel_); } if (retcode_ != 0) { - output.writeInt32(6, retcode_); + output.writeInt32(11, retcode_); } - if (targetWeaponGuid_ != 0L) { - output.writeUInt64(13, targetWeaponGuid_); + if (oldPromoteLevel_ != 0) { + output.writeUInt32(15, oldPromoteLevel_); } unknownFields.writeTo(output); } @@ -218,21 +222,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (curPromoteLevel_ != 0) { + if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, curPromoteLevel_); + .computeUInt64Size(2, targetWeaponGuid_); } - if (oldPromoteLevel_ != 0) { + if (curPromoteLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, oldPromoteLevel_); + .computeUInt32Size(5, curPromoteLevel_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(6, retcode_); + .computeInt32Size(11, retcode_); } - if (targetWeaponGuid_ != 0L) { + if (oldPromoteLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(13, targetWeaponGuid_); + .computeUInt32Size(15, oldPromoteLevel_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -253,10 +257,10 @@ public boolean equals(final java.lang.Object obj) { != other.getTargetWeaponGuid()) return false; if (getCurPromoteLevel() != other.getCurPromoteLevel()) return false; - if (getOldPromoteLevel() - != other.getOldPromoteLevel()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getOldPromoteLevel() + != other.getOldPromoteLevel()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -273,10 +277,10 @@ public int hashCode() { getTargetWeaponGuid()); hash = (37 * hash) + CUR_PROMOTE_LEVEL_FIELD_NUMBER; hash = (53 * hash) + getCurPromoteLevel(); - hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getOldPromoteLevel(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getOldPromoteLevel(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -373,6 +377,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 25392
+     *
+ * * Protobuf type {@code WeaponPromoteRsp} */ public static final class Builder extends @@ -414,10 +422,10 @@ public Builder clear() { curPromoteLevel_ = 0; - oldPromoteLevel_ = 0; - retcode_ = 0; + oldPromoteLevel_ = 0; + return this; } @@ -446,8 +454,8 @@ public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp bui emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp result = new emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp(this); result.targetWeaponGuid_ = targetWeaponGuid_; result.curPromoteLevel_ = curPromoteLevel_; - result.oldPromoteLevel_ = oldPromoteLevel_; result.retcode_ = retcode_; + result.oldPromoteLevel_ = oldPromoteLevel_; onBuilt(); return result; } @@ -502,12 +510,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.We if (other.getCurPromoteLevel() != 0) { setCurPromoteLevel(other.getCurPromoteLevel()); } - if (other.getOldPromoteLevel() != 0) { - setOldPromoteLevel(other.getOldPromoteLevel()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } + if (other.getOldPromoteLevel() != 0) { + setOldPromoteLevel(other.getOldPromoteLevel()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -539,7 +547,7 @@ public Builder mergeFrom( private long targetWeaponGuid_ ; /** - * uint64 target_weapon_guid = 13; + * uint64 target_weapon_guid = 2; * @return The targetWeaponGuid. */ @java.lang.Override @@ -547,7 +555,7 @@ public long getTargetWeaponGuid() { return targetWeaponGuid_; } /** - * uint64 target_weapon_guid = 13; + * uint64 target_weapon_guid = 2; * @param value The targetWeaponGuid to set. * @return This builder for chaining. */ @@ -558,7 +566,7 @@ public Builder setTargetWeaponGuid(long value) { return this; } /** - * uint64 target_weapon_guid = 13; + * uint64 target_weapon_guid = 2; * @return This builder for chaining. */ public Builder clearTargetWeaponGuid() { @@ -570,7 +578,7 @@ public Builder clearTargetWeaponGuid() { private int curPromoteLevel_ ; /** - * uint32 cur_promote_level = 3; + * uint32 cur_promote_level = 5; * @return The curPromoteLevel. */ @java.lang.Override @@ -578,7 +586,7 @@ public int getCurPromoteLevel() { return curPromoteLevel_; } /** - * uint32 cur_promote_level = 3; + * uint32 cur_promote_level = 5; * @param value The curPromoteLevel to set. * @return This builder for chaining. */ @@ -589,7 +597,7 @@ public Builder setCurPromoteLevel(int value) { return this; } /** - * uint32 cur_promote_level = 3; + * uint32 cur_promote_level = 5; * @return This builder for chaining. */ public Builder clearCurPromoteLevel() { @@ -599,64 +607,64 @@ public Builder clearCurPromoteLevel() { return this; } - private int oldPromoteLevel_ ; + private int retcode_ ; /** - * uint32 old_promote_level = 4; - * @return The oldPromoteLevel. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getOldPromoteLevel() { - return oldPromoteLevel_; + public int getRetcode() { + return retcode_; } /** - * uint32 old_promote_level = 4; - * @param value The oldPromoteLevel to set. + * int32 retcode = 11; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setOldPromoteLevel(int value) { + public Builder setRetcode(int value) { - oldPromoteLevel_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 old_promote_level = 4; + * int32 retcode = 11; * @return This builder for chaining. */ - public Builder clearOldPromoteLevel() { + public Builder clearRetcode() { - oldPromoteLevel_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int oldPromoteLevel_ ; /** - * int32 retcode = 6; - * @return The retcode. + * uint32 old_promote_level = 15; + * @return The oldPromoteLevel. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getOldPromoteLevel() { + return oldPromoteLevel_; } /** - * int32 retcode = 6; - * @param value The retcode to set. + * uint32 old_promote_level = 15; + * @param value The oldPromoteLevel to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setOldPromoteLevel(int value) { - retcode_ = value; + oldPromoteLevel_ = value; onChanged(); return this; } /** - * int32 retcode = 6; + * uint32 old_promote_level = 15; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearOldPromoteLevel() { - retcode_ = 0; + oldPromoteLevel_ = 0; onChanged(); return this; } @@ -728,9 +736,9 @@ public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp get static { java.lang.String[] descriptorData = { "\n\026WeaponPromoteRsp.proto\"u\n\020WeaponPromot" + - "eRsp\022\032\n\022target_weapon_guid\030\r \001(\004\022\031\n\021cur_" + - "promote_level\030\003 \001(\r\022\031\n\021old_promote_level" + - "\030\004 \001(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031emu.grasscutt" + + "eRsp\022\032\n\022target_weapon_guid\030\002 \001(\004\022\031\n\021cur_" + + "promote_level\030\005 \001(\r\022\017\n\007retcode\030\013 \001(\005\022\031\n\021" + + "old_promote_level\030\017 \001(\rB\033\n\031emu.grasscutt" + "er.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -742,7 +750,7 @@ public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp get internal_static_WeaponPromoteRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WeaponPromoteRsp_descriptor, - new java.lang.String[] { "TargetWeaponGuid", "CurPromoteLevel", "OldPromoteLevel", "Retcode", }); + new java.lang.String[] { "TargetWeaponGuid", "CurPromoteLevel", "Retcode", "OldPromoteLevel", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java index 3eaf79ee4e6..30625ede6c2 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java @@ -19,53 +19,57 @@ public interface WeaponUpgradeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ java.util.List getItemParamListList(); /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ int getItemParamListCount(); /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ java.util.List getItemParamListOrBuilderList(); /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index); /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @return A list containing the foodWeaponGuidList. */ java.util.List getFoodWeaponGuidListList(); /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @return The count of foodWeaponGuidList. */ int getFoodWeaponGuidListCount(); /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @param index The index of the element to return. * @return The foodWeaponGuidList at the given index. */ long getFoodWeaponGuidList(int index); /** - * uint64 target_weapon_guid = 10; + * uint64 target_weapon_guid = 4; * @return The targetWeaponGuid. */ long getTargetWeaponGuid(); } /** + * 
+   * CmdId: 7713
+   *
+ * * Protobuf type {@code WeaponUpgradeReq} */ public static final class WeaponUpgradeReq extends @@ -113,16 +117,7 @@ private WeaponUpgradeReq( case 0: done = true; break; - case 58: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - itemParamList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - itemParamList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); - break; - } - case 72: { + case 8: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { foodWeaponGuidList_ = newLongList(); mutable_bitField0_ |= 0x00000002; @@ -130,7 +125,7 @@ private WeaponUpgradeReq( foodWeaponGuidList_.addLong(input.readUInt64()); break; } - case 74: { + case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { @@ -143,11 +138,20 @@ private WeaponUpgradeReq( input.popLimit(limit); break; } - case 80: { + case 32: { targetWeaponGuid_ = input.readUInt64(); break; } + case 82: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + itemParamList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + itemParamList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -163,12 +167,12 @@ private WeaponUpgradeReq( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); - } if (((mutable_bitField0_ & 0x00000002) != 0)) { foodWeaponGuidList_.makeImmutable(); // C } + if (((mutable_bitField0_ & 0x00000001) != 0)) { + itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -186,17 +190,17 @@ private WeaponUpgradeReq( emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.class, emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.Builder.class); } - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 7; + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 10; private java.util.List itemParamList_; /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public java.util.List getItemParamListList() { return itemParamList_; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public java.util.List @@ -204,21 +208,21 @@ public java.util.List g return itemParamList_; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public int getItemParamListCount() { return itemParamList_.size(); } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { return itemParamList_.get(index); } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( @@ -226,10 +230,10 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP return itemParamList_.get(index); } - public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 9; + public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 1; private com.google.protobuf.Internal.LongList foodWeaponGuidList_; /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @return A list containing the foodWeaponGuidList. */ @java.lang.Override @@ -238,14 +242,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP return foodWeaponGuidList_; } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @return The count of foodWeaponGuidList. */ public int getFoodWeaponGuidListCount() { return foodWeaponGuidList_.size(); } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @param index The index of the element to return. * @return The foodWeaponGuidList at the given index. */ @@ -254,10 +258,10 @@ public long getFoodWeaponGuidList(int index) { } private int foodWeaponGuidListMemoizedSerializedSize = -1; - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 10; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 4; private long targetWeaponGuid_; /** - * uint64 target_weapon_guid = 10; + * uint64 target_weapon_guid = 4; * @return The targetWeaponGuid. */ @java.lang.Override @@ -280,18 +284,18 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(7, itemParamList_.get(i)); - } if (getFoodWeaponGuidListList().size() > 0) { - output.writeUInt32NoTag(74); + output.writeUInt32NoTag(10); output.writeUInt32NoTag(foodWeaponGuidListMemoizedSerializedSize); } for (int i = 0; i < foodWeaponGuidList_.size(); i++) { output.writeUInt64NoTag(foodWeaponGuidList_.getLong(i)); } if (targetWeaponGuid_ != 0L) { - output.writeUInt64(10, targetWeaponGuid_); + output.writeUInt64(4, targetWeaponGuid_); + } + for (int i = 0; i < itemParamList_.size(); i++) { + output.writeMessage(10, itemParamList_.get(i)); } unknownFields.writeTo(output); } @@ -302,10 +306,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < itemParamList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, itemParamList_.get(i)); - } { int dataSize = 0; for (int i = 0; i < foodWeaponGuidList_.size(); i++) { @@ -322,7 +322,11 @@ public int getSerializedSize() { } if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(10, targetWeaponGuid_); + .computeUInt64Size(4, targetWeaponGuid_); + } + for (int i = 0; i < itemParamList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, itemParamList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -463,6 +467,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 7713
+     *
+ * * Protobuf type {@code WeaponUpgradeReq} */ public static final class Builder extends @@ -683,7 +691,7 @@ private void ensureItemParamListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_; /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -693,7 +701,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -703,7 +711,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -713,7 +721,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -730,7 +738,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -744,7 +752,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -760,7 +768,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -777,7 +785,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -791,7 +799,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -805,7 +813,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -820,7 +828,7 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { @@ -833,7 +841,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -846,14 +854,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder( int index) { return getItemParamListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -863,7 +871,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public java.util.List getItemParamListOrBuilderList() { @@ -874,14 +882,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() { return getItemParamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -889,7 +897,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 7; + * repeated .ItemParam item_param_list = 10; */ public java.util.List getItemParamListBuilderList() { @@ -918,7 +926,7 @@ private void ensureFoodWeaponGuidListIsMutable() { } } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @return A list containing the foodWeaponGuidList. */ public java.util.List @@ -927,14 +935,14 @@ private void ensureFoodWeaponGuidListIsMutable() { java.util.Collections.unmodifiableList(foodWeaponGuidList_) : foodWeaponGuidList_; } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @return The count of foodWeaponGuidList. */ public int getFoodWeaponGuidListCount() { return foodWeaponGuidList_.size(); } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @param index The index of the element to return. * @return The foodWeaponGuidList at the given index. */ @@ -942,7 +950,7 @@ public long getFoodWeaponGuidList(int index) { return foodWeaponGuidList_.getLong(index); } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @param index The index to set the value at. * @param value The foodWeaponGuidList to set. * @return This builder for chaining. @@ -955,7 +963,7 @@ public Builder setFoodWeaponGuidList( return this; } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @param value The foodWeaponGuidList to add. * @return This builder for chaining. */ @@ -966,7 +974,7 @@ public Builder addFoodWeaponGuidList(long value) { return this; } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @param values The foodWeaponGuidList to add. * @return This builder for chaining. */ @@ -979,7 +987,7 @@ public Builder addAllFoodWeaponGuidList( return this; } /** - * repeated uint64 food_weapon_guid_list = 9; + * repeated uint64 food_weapon_guid_list = 1; * @return This builder for chaining. */ public Builder clearFoodWeaponGuidList() { @@ -991,7 +999,7 @@ public Builder clearFoodWeaponGuidList() { private long targetWeaponGuid_ ; /** - * uint64 target_weapon_guid = 10; + * uint64 target_weapon_guid = 4; * @return The targetWeaponGuid. */ @java.lang.Override @@ -999,7 +1007,7 @@ public long getTargetWeaponGuid() { return targetWeaponGuid_; } /** - * uint64 target_weapon_guid = 10; + * uint64 target_weapon_guid = 4; * @param value The targetWeaponGuid to set. * @return This builder for chaining. */ @@ -1010,7 +1018,7 @@ public Builder setTargetWeaponGuid(long value) { return this; } /** - * uint64 target_weapon_guid = 10; + * uint64 target_weapon_guid = 4; * @return This builder for chaining. */ public Builder clearTargetWeaponGuid() { @@ -1088,8 +1096,8 @@ public emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq get java.lang.String[] descriptorData = { "\n\026WeaponUpgradeReq.proto\032\017ItemParam.prot" + "o\"r\n\020WeaponUpgradeReq\022#\n\017item_param_list" + - "\030\007 \003(\0132\n.ItemParam\022\035\n\025food_weapon_guid_l" + - "ist\030\t \003(\004\022\032\n\022target_weapon_guid\030\n \001(\004B\033\n" + + "\030\n \003(\0132\n.ItemParam\022\035\n\025food_weapon_guid_l" + + "ist\030\001 \003(\004\022\032\n\022target_weapon_guid\030\004 \001(\004B\033\n" + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java index f23024df5eb..e9d680201e5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java @@ -19,35 +19,41 @@ public interface WeaponUpgradeRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ItemParam item_param_list = 1; + * uint32 old_level = 1; + * @return The oldLevel. + */ + int getOldLevel(); + + /** + * int32 retcode = 3; + * @return The retcode. + */ + int getRetcode(); + + /** + * repeated .ItemParam item_param_list = 11; */ java.util.List getItemParamListList(); /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ int getItemParamListCount(); /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ java.util.List getItemParamListOrBuilderList(); /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index); - /** - * uint64 target_weapon_guid = 6; - * @return The targetWeaponGuid. - */ - long getTargetWeaponGuid(); - /** * uint32 cur_level = 12; * @return The curLevel. @@ -55,18 +61,16 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamLis int getCurLevel(); /** - * int32 retcode = 8; - * @return The retcode. - */ - int getRetcode(); - - /** - * uint32 old_level = 3; - * @return The oldLevel. + * uint64 target_weapon_guid = 13; + * @return The targetWeaponGuid. */ - int getOldLevel(); + long getTargetWeaponGuid(); } /** + * 
+   * CmdId: 22661
+   *
+ * * Protobuf type {@code WeaponUpgradeRsp} */ public static final class WeaponUpgradeRsp extends @@ -113,7 +117,17 @@ private WeaponUpgradeRsp( case 0: done = true; break; - case 10: { + case 8: { + + oldLevel_ = input.readUInt32(); + break; + } + case 24: { + + retcode_ = input.readInt32(); + break; + } + case 90: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { itemParamList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -122,26 +136,16 @@ private WeaponUpgradeRsp( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 24: { + case 96: { - oldLevel_ = input.readUInt32(); + curLevel_ = input.readUInt32(); break; } - case 48: { + case 104: { targetWeaponGuid_ = input.readUInt64(); break; } - case 64: { - - retcode_ = input.readInt32(); - break; - } - case 96: { - - curLevel_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -177,17 +181,39 @@ private WeaponUpgradeRsp( emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.class, emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.Builder.class); } - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 1; + public static final int OLD_LEVEL_FIELD_NUMBER = 1; + private int oldLevel_; + /** + * uint32 old_level = 1; + * @return The oldLevel. + */ + @java.lang.Override + public int getOldLevel() { + return oldLevel_; + } + + public static final int RETCODE_FIELD_NUMBER = 3; + private int retcode_; + /** + * int32 retcode = 3; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 11; private java.util.List itemParamList_; /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ @java.lang.Override public java.util.List getItemParamListList() { return itemParamList_; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ @java.lang.Override public java.util.List @@ -195,21 +221,21 @@ public java.util.List g return itemParamList_; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ @java.lang.Override public int getItemParamListCount() { return itemParamList_.size(); } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { return itemParamList_.get(index); } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( @@ -217,17 +243,6 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP return itemParamList_.get(index); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 6; - private long targetWeaponGuid_; - /** - * uint64 target_weapon_guid = 6; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - public static final int CUR_LEVEL_FIELD_NUMBER = 12; private int curLevel_; /** @@ -239,26 +254,15 @@ public int getCurLevel() { return curLevel_; } - public static final int RETCODE_FIELD_NUMBER = 8; - private int retcode_; - /** - * int32 retcode = 8; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int OLD_LEVEL_FIELD_NUMBER = 3; - private int oldLevel_; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 13; + private long targetWeaponGuid_; /** - * uint32 old_level = 3; - * @return The oldLevel. + * uint64 target_weapon_guid = 13; + * @return The targetWeaponGuid. */ @java.lang.Override - public int getOldLevel() { - return oldLevel_; + public long getTargetWeaponGuid() { + return targetWeaponGuid_; } private byte memoizedIsInitialized = -1; @@ -275,21 +279,21 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(1, itemParamList_.get(i)); - } if (oldLevel_ != 0) { - output.writeUInt32(3, oldLevel_); - } - if (targetWeaponGuid_ != 0L) { - output.writeUInt64(6, targetWeaponGuid_); + output.writeUInt32(1, oldLevel_); } if (retcode_ != 0) { - output.writeInt32(8, retcode_); + output.writeInt32(3, retcode_); + } + for (int i = 0; i < itemParamList_.size(); i++) { + output.writeMessage(11, itemParamList_.get(i)); } if (curLevel_ != 0) { output.writeUInt32(12, curLevel_); } + if (targetWeaponGuid_ != 0L) { + output.writeUInt64(13, targetWeaponGuid_); + } unknownFields.writeTo(output); } @@ -299,26 +303,26 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < itemParamList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, itemParamList_.get(i)); - } if (oldLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, oldLevel_); + .computeUInt32Size(1, oldLevel_); } - if (targetWeaponGuid_ != 0L) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(6, targetWeaponGuid_); + .computeInt32Size(3, retcode_); } - if (retcode_ != 0) { + for (int i = 0; i < itemParamList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(8, retcode_); + .computeMessageSize(11, itemParamList_.get(i)); } if (curLevel_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(12, curLevel_); } + if (targetWeaponGuid_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeUInt64Size(13, targetWeaponGuid_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -334,16 +338,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp other = (emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp) obj; + if (getOldLevel() + != other.getOldLevel()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!getItemParamListList() .equals(other.getItemParamListList())) return false; - if (getTargetWeaponGuid() - != other.getTargetWeaponGuid()) return false; if (getCurLevel() != other.getCurLevel()) return false; - if (getRetcode() - != other.getRetcode()) return false; - if (getOldLevel() - != other.getOldLevel()) return false; + if (getTargetWeaponGuid() + != other.getTargetWeaponGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -355,19 +359,19 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getOldLevel(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getItemParamListCount() > 0) { hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemParamListList().hashCode(); } + hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getCurLevel(); hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getTargetWeaponGuid()); - hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getCurLevel(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getOldLevel(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -464,6 +468,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 22661
+     *
+ * * Protobuf type {@code WeaponUpgradeRsp} */ public static final class Builder extends @@ -502,19 +510,19 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + oldLevel_ = 0; + + retcode_ = 0; + if (itemParamListBuilder_ == null) { itemParamList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { itemParamListBuilder_.clear(); } - targetWeaponGuid_ = 0L; - curLevel_ = 0; - retcode_ = 0; - - oldLevel_ = 0; + targetWeaponGuid_ = 0L; return this; } @@ -543,6 +551,8 @@ public emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp bui public emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp buildPartial() { emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp result = new emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp(this); int from_bitField0_ = bitField0_; + result.oldLevel_ = oldLevel_; + result.retcode_ = retcode_; if (itemParamListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); @@ -552,10 +562,8 @@ public emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp bui } else { result.itemParamList_ = itemParamListBuilder_.build(); } - result.targetWeaponGuid_ = targetWeaponGuid_; result.curLevel_ = curLevel_; - result.retcode_ = retcode_; - result.oldLevel_ = oldLevel_; + result.targetWeaponGuid_ = targetWeaponGuid_; onBuilt(); return result; } @@ -604,6 +612,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp other) { if (other == emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.getDefaultInstance()) return this; + if (other.getOldLevel() != 0) { + setOldLevel(other.getOldLevel()); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (itemParamListBuilder_ == null) { if (!other.itemParamList_.isEmpty()) { if (itemParamList_.isEmpty()) { @@ -630,17 +644,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.We } } } - if (other.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); - } if (other.getCurLevel() != 0) { setCurLevel(other.getCurLevel()); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } - if (other.getOldLevel() != 0) { - setOldLevel(other.getOldLevel()); + if (other.getTargetWeaponGuid() != 0L) { + setTargetWeaponGuid(other.getTargetWeaponGuid()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -672,6 +680,68 @@ public Builder mergeFrom( } private int bitField0_; + private int oldLevel_ ; + /** + * uint32 old_level = 1; + * @return The oldLevel. + */ + @java.lang.Override + public int getOldLevel() { + return oldLevel_; + } + /** + * uint32 old_level = 1; + * @param value The oldLevel to set. + * @return This builder for chaining. + */ + public Builder setOldLevel(int value) { + + oldLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 old_level = 1; + * @return This builder for chaining. + */ + public Builder clearOldLevel() { + + oldLevel_ = 0; + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 3; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 3; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 3; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + private java.util.List itemParamList_ = java.util.Collections.emptyList(); private void ensureItemParamListIsMutable() { @@ -685,7 +755,7 @@ private void ensureItemParamListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_; /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -695,7 +765,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -705,7 +775,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -715,7 +785,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -732,7 +802,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -746,7 +816,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -762,7 +832,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -779,7 +849,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -793,7 +863,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -807,7 +877,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -822,7 +892,7 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { @@ -835,7 +905,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -848,14 +918,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder( int index) { return getItemParamListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -865,7 +935,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public java.util.List getItemParamListOrBuilderList() { @@ -876,14 +946,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() { return getItemParamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -891,7 +961,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 1; + * repeated .ItemParam item_param_list = 11; */ public java.util.List getItemParamListBuilderList() { @@ -912,37 +982,6 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa return itemParamListBuilder_; } - private long targetWeaponGuid_ ; - /** - * uint64 target_weapon_guid = 6; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - /** - * uint64 target_weapon_guid = 6; - * @param value The targetWeaponGuid to set. - * @return This builder for chaining. - */ - public Builder setTargetWeaponGuid(long value) { - - targetWeaponGuid_ = value; - onChanged(); - return this; - } - /** - * uint64 target_weapon_guid = 6; - * @return This builder for chaining. - */ - public Builder clearTargetWeaponGuid() { - - targetWeaponGuid_ = 0L; - onChanged(); - return this; - } - private int curLevel_ ; /** * uint32 cur_level = 12; @@ -974,64 +1013,33 @@ public Builder clearCurLevel() { return this; } - private int retcode_ ; - /** - * int32 retcode = 8; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 8; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 8; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - - private int oldLevel_ ; + private long targetWeaponGuid_ ; /** - * uint32 old_level = 3; - * @return The oldLevel. + * uint64 target_weapon_guid = 13; + * @return The targetWeaponGuid. */ @java.lang.Override - public int getOldLevel() { - return oldLevel_; + public long getTargetWeaponGuid() { + return targetWeaponGuid_; } /** - * uint32 old_level = 3; - * @param value The oldLevel to set. + * uint64 target_weapon_guid = 13; + * @param value The targetWeaponGuid to set. * @return This builder for chaining. */ - public Builder setOldLevel(int value) { + public Builder setTargetWeaponGuid(long value) { - oldLevel_ = value; + targetWeaponGuid_ = value; onChanged(); return this; } /** - * uint32 old_level = 3; + * uint64 target_weapon_guid = 13; * @return This builder for chaining. */ - public Builder clearOldLevel() { + public Builder clearTargetWeaponGuid() { - oldLevel_ = 0; + targetWeaponGuid_ = 0L; onChanged(); return this; } @@ -1103,10 +1111,10 @@ public emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp get static { java.lang.String[] descriptorData = { "\n\026WeaponUpgradeRsp.proto\032\017ItemParam.prot" + - "o\"\212\001\n\020WeaponUpgradeRsp\022#\n\017item_param_lis" + - "t\030\001 \003(\0132\n.ItemParam\022\032\n\022target_weapon_gui" + - "d\030\006 \001(\004\022\021\n\tcur_level\030\014 \001(\r\022\017\n\007retcode\030\010 " + - "\001(\005\022\021\n\told_level\030\003 \001(\rB\033\n\031emu.grasscutte" + + "o\"\212\001\n\020WeaponUpgradeRsp\022\021\n\told_level\030\001 \001(" + + "\r\022\017\n\007retcode\030\003 \001(\005\022#\n\017item_param_list\030\013 " + + "\003(\0132\n.ItemParam\022\021\n\tcur_level\030\014 \001(\r\022\032\n\022ta" + + "rget_weapon_guid\030\r \001(\004B\033\n\031emu.grasscutte" + "r.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1119,7 +1127,7 @@ public emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp get internal_static_WeaponUpgradeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WeaponUpgradeRsp_descriptor, - new java.lang.String[] { "ItemParamList", "TargetWeaponGuid", "CurLevel", "Retcode", "OldLevel", }); + new java.lang.String[] { "OldLevel", "Retcode", "ItemParamList", "CurLevel", "TargetWeaponGuid", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 80a9f00e1b5..3b0fa84d3e7 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -421,6 +421,27 @@ public class PacketOpcodes { public static final int PlayerGetForceQuitBanInfoRsp = 29159; public static final int PlayerPreEnterMpNotify = 23352; public static final int WorldPlayerInfoNotify = 23024; + public static final int WeaponAwakenReq = 20421; + public static final int WeaponAwakenRsp = 24076; + public static final int WeaponPromoteReq = 3230; + public static final int WeaponPromoteRsp = 25392; + public static final int WeaponUpgradeReq = 7713; + public static final int WeaponUpgradeRsp = 22661; + public static final int CalcWeaponUpgradeReturnItemsReq = 20908; + public static final int CalcWeaponUpgradeReturnItemsRsp = 6706; + public static final int SetEquipLockStateReq = 5750; + public static final int SetEquipLockStateRsp = 26633; + public static final int AvatarUpgradeReq = 5978; + public static final int AvatarUpgradeRsp = 1; + public static final int AvatarSkillUpgradeReq = 25062; + public static final int AvatarSkillUpgradeRsp = 7799; + public static final int AvatarUnlockTalentNotify = 28793; + public static final int HomeAvatarTalkReq = 21992; + public static final int GetQuestLackingResourceRsp = 27981; + public static final int QueryPathReq = 2339; + public static final int QueryPathRsp = 2350; + public static final int UnlockTransPointReq = 3518; + public static final int UnlockTransPointRsp = 1; // proto // Obfuscated public static final int Unk5000_GAHMPOELOAL = 24500; @@ -471,7 +492,6 @@ public class PacketOpcodes { public static final int Unk5000_DMCOGBLAMEB = 24532; public static final int Unk5000_MHIMJHAGCFK = 4296; public static final int Unk5000_DIOOOOHGFCL = 9798; - public static final int Unk5000_PBOJGDCDGAB = 24076; public static final int Unk5000_BNAGKNMHKEJ = 3881; public static final int Unk5000_HOMGFPFFCGH = 20141; public static final int Unk5000_ADEGLMGLLDB = 5870; @@ -626,7 +646,6 @@ public class PacketOpcodes { public static final int Unk5000_NHHMFLNKKHD = 8624; public static final int Unk5000_FALEKHBHJHH = 9223; public static final int Unk5000_MKNIEICFBDE = 28354; - public static final int Unk5000_FFFJDNJOABC = 22661; public static final int Unk5000_DAMMNDMMOLF = 21083; public static final int Unk5000_EBGNPMPEOAF = 22486; public static final int Unk5000_NBIMILNJPCF = 25141; @@ -735,7 +754,6 @@ public class PacketOpcodes { public static final int Unk5000_MPKAJLCOJHH = 28698; public static final int Unk5000_JFHOGFFGPDN = 29740; public static final int Unk5000_OIKFPAMBPNG = 7039; - public static final int Unk5000_GILEMAIABLN = 26633; public static final int Unk5000_JGGIOHPGLKF = 21785; public static final int Unk5000_MNELDMONHPA = 21309; public static final int Unk5000_MGPGLHIIBNH = 28690; @@ -790,7 +808,6 @@ public class PacketOpcodes { public static final int Unk5000_NPJGDCDPHIJ = 21194; public static final int Unk5000_PBJDAJJGMNH = 22638; public static final int Unk5000_HLFBEAHFPNP = 27688; - public static final int Unk5000_LAGMEAKAJFD = 5750; public static final int Unk5000_PFCPDLGGCIG = 1967; public static final int Unk5000_CLPBFAIBPHG = 23734; public static final int Unk5000_COEFPLKDEGD = 24004; @@ -837,7 +854,6 @@ public class PacketOpcodes { public static final int Unk5000_DKLHOJPAGGG = 920; public static final int Unk5000_OGFFICMJNBE = 8903; public static final int Unk5000_MBJEGOBPAIK = 27472; - public static final int Unk5000_KIBLFLPNBEN = 3230; public static final int Unk5000_PGCMDLDLPAH = 23160; public static final int Unk5000_OBLACACDKKE = 6846; public static final int Unk5000_ANPBAFOLEOI = 4152; @@ -1602,7 +1618,6 @@ public class PacketOpcodes { public static final int Unk5000_PIFJECJDGON = 3045; public static final int Unk5000_KIALANHPFBG = 28300; public static final int Unk5000_HKNFCFKIFGO = 20963; - public static final int Unk5000_FMCPPLAODNL = 25062; public static final int Unk5000_MDDHJEMINCI = 1747; public static final int Unk5000_NCOMLLOKMNK = 22669; public static final int Unk5000_FOIMICAJIMB = 22083; @@ -1758,7 +1773,6 @@ public class PacketOpcodes { public static final int Unk5000_AANGLNBIFDK = 6525; public static final int Unk5000_LPBFOIOADFD = 26587; public static final int Unk5000_CNJLKINIHCI = 22550; - public static final int Unk5000_ANDKBIBKGCG = 27981; public static final int Unk5000_KKMEDIKMHIP = 2075; public static final int Unk5000_DPFMJHIOBLH = 329; public static final int Unk5000_APOMENOMDIF = 22413; @@ -1793,7 +1807,6 @@ public class PacketOpcodes { public static final int Unk5000_FMCKLLCHFEJ = 5237; public static final int Unk5000_LDAEMPFAHIG = 23787; public static final int Unk5000_CIJGIMLAFHL = 26882; - public static final int Unk5000_PJGKEAKACJK = 7799; public static final int Unk5000_ENKOBNIHCML = 29436; public static final int Unk5000_NOJNDKFJFHM = 4226; public static final int Unk5000_IABAANILCCJ = 24839; @@ -1966,7 +1979,6 @@ public class PacketOpcodes { public static final int Unk5000_JFBFGACBOEM = 20463; public static final int Unk5000_OIHPLAEKINM = 3917; public static final int Unk5000_LNOFNLDPNIF = 27454; - public static final int Unk5000_FMAPBHLDPBD = 6706; public static final int Unk5000_EGKEPOKKAAA = 1165; public static final int Unk5000_LAFOLIACPPG = 7876; public static final int Unk5000_ANBNAKFDLHA = 5044; @@ -2340,7 +2352,6 @@ public class PacketOpcodes { public static final int Unk5000_PPCFAKHEBJF = 23720; public static final int Unk5000_BAHDFMCPJLG = 4649; public static final int Unk5000_KKJBLGDEELL = 1384; - public static final int Unk5000_NEOEIJNECEH = 21992; public static final int Unk5000_DGIKHPBMLEL = 902; public static final int Unk5000_AELAGPGEBDL = 22837; public static final int Unk5000_LBOALHPEGBF = 24250; @@ -2352,7 +2363,6 @@ public class PacketOpcodes { public static final int Unk5000_DDJADNEOLLG = 2684; public static final int Unk5000_HFDPPHKHACL = 28938; public static final int Unk5000_PCAFGAMHFOA = 29682; - public static final int Unk5000_AEPJNEHPJHP = 25392; public static final int Unk5000_BDDOCDINBPM = 26130; public static final int Unk5000_LBFNFGHKEGG = 20846; public static final int Unk5000_JFDAJGHALKK = 7130; @@ -2572,7 +2582,6 @@ public class PacketOpcodes { public static final int Unk5000_DKHMAEDALKK = 9555; public static final int Unk5000_DJNNALCNMKP = 25287; public static final int Unk5000_GFBFPKMDEDP = 26571; - public static final int Unk5000_HDCDDPLOKLC = 5978; public static final int Unk5000_IDCEGFNNCBN = 2120; public static final int Unk5000_DEFIOGBONGL = 25223; public static final int Unk5000_KPLJMNAMGKO = 23980; @@ -2583,7 +2592,6 @@ public class PacketOpcodes { public static final int Unk5000_BPKPDOADDAG = 22552; public static final int Unk5000_GCNGLODDJLN = 6833; public static final int Unk5000_GDIBHLIINCN = 7773; - public static final int Unk5000_INEHOMJJIMF = 2350; public static final int Unk5000_KCNPGGIONDN = 8424; public static final int Unk5000_MEFALJIMBDB = 21021; public static final int Unk5000_ODOHNIDKNLH = 435; @@ -2612,7 +2620,6 @@ public class PacketOpcodes { public static final int Unk5000_FLOCJFMHHLM = 22577; public static final int Unk5000_CBAEOBNLDCL = 25969; public static final int Unk5000_FCNGIOKBJMI = 2375; - public static final int Unk5000_ADAMAMEFEDJ = 7713; public static final int Unk5000_PODDHNLBPBD = 9085; public static final int Unk5000_HKPGJJFIFLB = 21184; public static final int Unk5000_DPPKOJFFMNN = 25111; @@ -2668,7 +2675,6 @@ public class PacketOpcodes { public static final int Unk5000_AALCKDHDOAP = 6773; public static final int Unk5000_OGEBHFHKGBK = 20931; public static final int Unk5000_INKIJKPKNAE = 6835; - public static final int Unk5000_BNLDBGENONP = 3518; public static final int Unk5000_FKCLFEGJFKC = 26239; public static final int Unk5000_ECFIMAIENAL = 7320; public static final int Unk5000_INBPKAEHJPC = 8065; @@ -2680,7 +2686,6 @@ public class PacketOpcodes { public static final int Unk5000_DJECDJNNCHK = 9236; public static final int Unk5000_MOAFFPHKLDK = 3391; public static final int Unk5000_LEALHMKCOJC = 4848; - public static final int Unk5000_MKKNFPDINLB = 28793; public static final int Unk5000_MBPFIKHBCHD = 3655; public static final int Unk5000_DEPMLMOFHLE = 24038; public static final int Unk5000_DNPAHCFPJML = 21263; @@ -2721,7 +2726,6 @@ public class PacketOpcodes { public static final int Unk5000_HHDKJJLBOGD = 28536; public static final int Unk5000_CDCHOIKJCDC = 27001; public static final int Unk5000_LOAJEPFPCCG = 27098; - public static final int Unk5000_BJAGGHLIDDA = 20421; public static final int Unk5000_KCFBLAGKDHE = 3225; public static final int Unk5000_JIOJPAPJIIO = 3951; public static final int Unk5000_EDIKEKJFMAO = 20453; @@ -2730,7 +2734,6 @@ public class PacketOpcodes { public static final int Unk5000_HALENNLPKNK = 20820; public static final int Unk5000_EGADPDIMNEJ = 28218; public static final int Unk5000_KLFMMCDIADF = 9524; - public static final int Unk5000_JGFJOAIHPPP = 2339; public static final int Unk5000_BLEJHAAKKLF = 29025; public static final int Unk5000_ALCMAOAEIAK = 3810; public static final int Unk5000_MMHMMDFOIMB = 2530; @@ -2903,7 +2906,6 @@ public class PacketOpcodes { public static final int Unk5000_IPBCDNBNGEP = 2195; public static final int Unk5000_JOKCCLIHDDC = 26082; public static final int Unk5000_DGAJJPBPFKC = 9533; - public static final int Unk5000_PBNELDLEALH = 20908; public static final int Unk5000_JHLCOKCMEIF = 28476; public static final int Unk5000_NJMNLOGDOIA = 226; public static final int Unk5000_IPKDKPCHGDN = 24058; @@ -3128,13 +3130,11 @@ public class PacketOpcodes { public static final int PlayerEnterChildMapLayerNotify = 1; public static final int PlayerEnterMapLayerNotify = 1; public static final int SkipPlayerGameTimeReq = 1; - public static final int HomeAvatarTalkReq = 1; public static final int GetOnlinePlayerInfoReq = 1; public static final int GetShopmallDataRsp = 1; public static final int ServerAnnounceRevokeNotify = 1; public static final int HomeSaveBlueprintToSlotReq = 1; public static final int HomeCreateBlueprintReq = 1; - public static final int GetQuestLackingResourceRsp = 1; public static final int GetHomeExchangeWoodInfoRsp = 1; public static final int PlayerChatRsp = 1; public static final int GetWidgetQuickSlotListRsp = 1; @@ -3273,11 +3273,6 @@ public class PacketOpcodes { public static final int AvatarSkillDepotChangeNotify = 1; public static final int AvatarSkillInfoNotify = 1; public static final int AvatarSkillMaxChargeCountNotify = 1; - public static final int AvatarSkillUpgradeReq = 1; - public static final int AvatarSkillUpgradeRsp = 1; - public static final int AvatarUnlockTalentNotify = 1; - public static final int AvatarUpgradeReq = 1; - public static final int AvatarUpgradeRsp = 1; public static final int BackPlayCustomDungeonOfficialReq = 1; public static final int BackPlayCustomDungeonOfficialRsp = 1; public static final int BackRebornGalleryReq = 1; @@ -3356,8 +3351,6 @@ public class PacketOpcodes { public static final int BuyGoodsRsp = 1; public static final int BuyResinReq = 1; public static final int BuyResinRsp = 1; - public static final int CalcWeaponUpgradeReturnItemsReq = 1; - public static final int CalcWeaponUpgradeReturnItemsRsp = 1; public static final int CanUseSkillNotify = 1; public static final int CancelCityReputationRequestReq = 1; public static final int CancelCityReputationRequestRsp = 1; @@ -4549,8 +4542,6 @@ public class PacketOpcodes { public static final int PushTipsChangeNotify = 1; public static final int PushTipsReadFinishReq = 1; public static final int PushTipsReadFinishRsp = 1; - public static final int QueryPathReq = 1; - public static final int QueryPathRsp = 1; public static final int QuestCreateEntityReq = 1; public static final int QuestCreateEntityRsp = 1; public static final int QuestDelNotify = 1; @@ -4771,8 +4762,6 @@ public class PacketOpcodes { public static final int SetCoopChapterViewedRsp = 1; public static final int SetCurExpeditionChallengeIdReq = 1; public static final int SetCurExpeditionChallengeIdRsp = 1; - public static final int SetEquipLockStateReq = 1; - public static final int SetEquipLockStateRsp = 1; public static final int SetFriendEnterHomeOptionRsp = 1; public static final int SetH5ActivityRedDotTimestampReq = 1; public static final int SetH5ActivityRedDotTimestampRsp = 1; @@ -5043,8 +5032,6 @@ public class PacketOpcodes { public static final int UnlockNameCardNotify = 1; public static final int UnlockPersonalLineReq = 1; public static final int UnlockPersonalLineRsp = 1; - public static final int UnlockTransPointReq = 1; - public static final int UnlockTransPointRsp = 1; public static final int UnlockedFurnitureFormulaDataNotify = 1; public static final int UnlockedFurnitureSuiteDataNotify = 1; public static final int UnmarkEntityInMinMapNotify = 1; @@ -5099,12 +5086,6 @@ public class PacketOpcodes { public static final int WatcherEventStageNotify = 1; public static final int WatcherEventTypeNotify = 1; public static final int WaterSpritePhaseFinishNotify = 1; - public static final int WeaponAwakenReq = 1; - public static final int WeaponAwakenRsp = 1; - public static final int WeaponPromoteReq = 1; - public static final int WeaponPromoteRsp = 1; - public static final int WeaponUpgradeReq = 1; - public static final int WeaponUpgradeRsp = 1; public static final int WidgetActiveChangeNotify = 1; public static final int WidgetCaptureAnimalReq = 1; public static final int WidgetCaptureAnimalRsp = 1; diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java index 220c11a51f6..6e6451859e6 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java @@ -15,8 +15,8 @@ public class PacketOpcodesUtils { PacketOpcodes.WorldPlayerRTTNotify, PacketOpcodes.UnionCmdNotify, PacketOpcodes.SceneTimeNotify, - // PacketOpcodes.QueryPathReq, - // PacketOpcodes.QueryPathRsp, + PacketOpcodes.QueryPathReq, + PacketOpcodes.QueryPathRsp, // Satiation sends these every tick PacketOpcodes.PlayerTimeNotify,