From 709f1190d2862447a5ac8f196c508c568fdc1211 Mon Sep 17 00:00:00 2001 From: WatchAndyTW Date: Wed, 17 Apr 2024 21:56:43 +0800 Subject: [PATCH] Fix dungeon teleport, weapon level up and more --- .../proto/AbilityChangeNotifyOuterClass.java | 86 +- .../net/proto/AvatarAddNotifyOuterClass.java | 178 +- .../net/proto/AvatarPropNotifyOuterClass.java | 200 ++- .../ClientAbilityChangeNotifyOuterClass.java | 244 ++- .../net/proto/DropHintNotifyOuterClass.java | 332 ++-- .../net/proto/DungeonEntryInfoOuterClass.java | 812 ++++----- .../proto/DungeonEntryInfoReqOuterClass.java | 208 ++- .../proto/DungeonEntryInfoRspOuterClass.java | 242 ++- .../DungeonEntryPointInfoOuterClass.java | 224 ++- .../net/proto/HitTreeNotifyOuterClass.java | 402 +++-- .../proto/ItemAddHintNotifyOuterClass.java | 862 +++++----- .../net/proto/ItemGivingReqOuterClass.java | 442 ++--- .../net/proto/ItemGivingRspOuterClass.java | 180 +- .../net/proto/ItemHintOuterClass.java | 240 ++- .../net/proto/MpSettingTypeOuterClass.java | 4 - .../proto/ObstacleModifyNotifyOuterClass.java | 543 +++++- .../net/proto/OnlinePlayerInfoOuterClass.java | 1498 ++++++++--------- .../proto/PlayerLocationInfoOuterClass.java | 246 ++- .../PlayerWorldLocationInfoOuterClass.java | 168 +- .../net/proto/ProfilePictureOuterClass.java | 145 +- .../ScenePlayerInfoNotifyOuterClass.java | 76 +- .../net/proto/ScenePlayerInfoOuterClass.java | 500 +++--- .../ScenePointUnlockNotifyOuterClass.java | 887 +++++----- .../SetEntityClientDataNotifyOuterClass.java | 176 +- .../net/proto/TakeoffEquipReqOuterClass.java | 58 +- .../net/proto/TakeoffEquipRspOuterClass.java | 178 +- .../net/proto/WeaponAwakenRspOuterClass.java | 396 +++-- .../net/proto/WeaponPromoteReqOuterClass.java | 30 +- .../net/proto/WeaponPromoteRspOuterClass.java | 192 +-- .../net/proto/WeaponUpgradeReqOuterClass.java | 542 +++--- .../net/proto/WeaponUpgradeRspOuterClass.java | 590 ++++--- .../WorldPlayerLocationNotifyOuterClass.java | 142 +- .../grasscutter/net/packet/PacketOpcodes.java | 73 +- .../packet/recv/HandlerGadgetInteractReq.java | 7 - .../packet/recv/HandlerItemGivingReq.java | 145 +- 35 files changed, 5472 insertions(+), 5776 deletions(-) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java index d8ea8853ae6..ab83c488ed6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java @@ -19,32 +19,27 @@ public interface AbilityChangeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; * @return Whether the abilityControlBlock field is set. */ boolean hasAbilityControlBlock(); /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; * @return The abilityControlBlock. */ emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock(); /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder(); /** - * uint32 entity_id = 8; + * uint32 entity_id = 15; * @return The entityId. */ int getEntityId(); } /** - * 
-   * CmdId: 300
-   * Obf: GEMMGPJKGAF
-   *
- * * Protobuf type {@code AbilityChangeNotify} */ public static final class AbilityChangeNotify extends @@ -89,12 +84,7 @@ private AbilityChangeNotify( case 0: done = true; break; - case 64: { - - entityId_ = input.readUInt32(); - break; - } - case 98: { + case 90: { emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null; if (abilityControlBlock_ != null) { subBuilder = abilityControlBlock_.toBuilder(); @@ -107,6 +97,11 @@ private AbilityChangeNotify( break; } + case 120: { + + entityId_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -139,10 +134,10 @@ private AbilityChangeNotify( emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.class, emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.Builder.class); } - public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 12; + public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 11; private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_; /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; * @return Whether the abilityControlBlock field is set. */ @java.lang.Override @@ -150,7 +145,7 @@ public boolean hasAbilityControlBlock() { return abilityControlBlock_ != null; } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; * @return The abilityControlBlock. */ @java.lang.Override @@ -158,17 +153,17 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_; } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() { return getAbilityControlBlock(); } - public static final int ENTITY_ID_FIELD_NUMBER = 8; + public static final int ENTITY_ID_FIELD_NUMBER = 15; private int entityId_; /** - * uint32 entity_id = 8; + * uint32 entity_id = 15; * @return The entityId. */ @java.lang.Override @@ -190,11 +185,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (entityId_ != 0) { - output.writeUInt32(8, entityId_); - } if (abilityControlBlock_ != null) { - output.writeMessage(12, getAbilityControlBlock()); + output.writeMessage(11, getAbilityControlBlock()); + } + if (entityId_ != 0) { + output.writeUInt32(15, entityId_); } unknownFields.writeTo(output); } @@ -205,13 +200,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (entityId_ != 0) { + if (abilityControlBlock_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, entityId_); + .computeMessageSize(11, getAbilityControlBlock()); } - if (abilityControlBlock_ != null) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, getAbilityControlBlock()); + .computeUInt32Size(15, entityId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -348,11 +343,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 300
-     * Obf: GEMMGPJKGAF
-     *
- * * Protobuf type {@code AbilityChangeNotify} */ public static final class Builder extends @@ -517,14 +507,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_; /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; * @return Whether the abilityControlBlock field is set. */ public boolean hasAbilityControlBlock() { return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null; } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; * @return The abilityControlBlock. */ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() { @@ -535,7 +525,7 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo } } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) { if (abilityControlBlockBuilder_ == null) { @@ -551,7 +541,7 @@ public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBl return this; } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ public Builder setAbilityControlBlock( emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) { @@ -565,7 +555,7 @@ public Builder setAbilityControlBlock( return this; } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) { if (abilityControlBlockBuilder_ == null) { @@ -583,7 +573,7 @@ public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControl return this; } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ public Builder clearAbilityControlBlock() { if (abilityControlBlockBuilder_ == null) { @@ -597,7 +587,7 @@ public Builder clearAbilityControlBlock() { return this; } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() { @@ -605,7 +595,7 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo return getAbilityControlBlockFieldBuilder().getBuilder(); } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() { if (abilityControlBlockBuilder_ != null) { @@ -616,7 +606,7 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo } } /** - * .AbilityControlBlock ability_control_block = 12; + * .AbilityControlBlock ability_control_block = 11; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> @@ -634,7 +624,7 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo private int entityId_ ; /** - * uint32 entity_id = 8; + * uint32 entity_id = 15; * @return The entityId. */ @java.lang.Override @@ -642,7 +632,7 @@ public int getEntityId() { return entityId_; } /** - * uint32 entity_id = 8; + * uint32 entity_id = 15; * @param value The entityId to set. * @return This builder for chaining. */ @@ -653,7 +643,7 @@ public Builder setEntityId(int value) { return this; } /** - * uint32 entity_id = 8; + * uint32 entity_id = 15; * @return This builder for chaining. */ public Builder clearEntityId() { @@ -731,8 +721,8 @@ public emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNoti java.lang.String[] descriptorData = { "\n\031AbilityChangeNotify.proto\032\031AbilityCont" + "rolBlock.proto\"]\n\023AbilityChangeNotify\0223\n" + - "\025ability_control_block\030\014 \001(\0132\024.AbilityCo" + - "ntrolBlock\022\021\n\tentity_id\030\010 \001(\rB\033\n\031emu.gra" + + "\025ability_control_block\030\013 \001(\0132\024.AbilityCo" + + "ntrolBlock\022\021\n\tentity_id\030\017 \001(\rB\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java index 0ee96161fb3..cfd5b99da49 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java @@ -19,32 +19,27 @@ public interface AvatarAddNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_in_team = 12; - * @return The isInTeam. - */ - boolean getIsInTeam(); - - /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; * @return Whether the avatar field is set. */ boolean hasAvatar(); /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; * @return The avatar. */ emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar(); /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder(); + + /** + * bool is_in_team = 4; + * @return The isInTeam. + */ + boolean getIsInTeam(); } /** - * 
-   * CmdId: 7458
-   * Obf: MLOIBCFBPKN
-   *
- * * Protobuf type {@code AvatarAddNotify} */ public static final class AvatarAddNotify extends @@ -89,12 +84,12 @@ private AvatarAddNotify( case 0: done = true; break; - case 96: { + case 32: { isInTeam_ = input.readBool(); break; } - case 114: { + case 42: { emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null; if (avatar_ != null) { subBuilder = avatar_.toBuilder(); @@ -139,21 +134,10 @@ private AvatarAddNotify( emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.class, emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.Builder.class); } - public static final int IS_IN_TEAM_FIELD_NUMBER = 12; - private boolean isInTeam_; - /** - * bool is_in_team = 12; - * @return The isInTeam. - */ - @java.lang.Override - public boolean getIsInTeam() { - return isInTeam_; - } - - public static final int AVATAR_FIELD_NUMBER = 14; + public static final int AVATAR_FIELD_NUMBER = 5; private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_; /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; * @return Whether the avatar field is set. */ @java.lang.Override @@ -161,7 +145,7 @@ public boolean hasAvatar() { return avatar_ != null; } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; * @return The avatar. */ @java.lang.Override @@ -169,13 +153,24 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar() { return avatar_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatar_; } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ @java.lang.Override public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() { return getAvatar(); } + public static final int IS_IN_TEAM_FIELD_NUMBER = 4; + private boolean isInTeam_; + /** + * bool is_in_team = 4; + * @return The isInTeam. + */ + @java.lang.Override + public boolean getIsInTeam() { + return isInTeam_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -191,10 +186,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (isInTeam_ != false) { - output.writeBool(12, isInTeam_); + output.writeBool(4, isInTeam_); } if (avatar_ != null) { - output.writeMessage(14, getAvatar()); + output.writeMessage(5, getAvatar()); } unknownFields.writeTo(output); } @@ -207,11 +202,11 @@ public int getSerializedSize() { size = 0; if (isInTeam_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(12, isInTeam_); + .computeBoolSize(4, isInTeam_); } if (avatar_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, getAvatar()); + .computeMessageSize(5, getAvatar()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -228,13 +223,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify other = (emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify) obj; - if (getIsInTeam() - != other.getIsInTeam()) return false; if (hasAvatar() != other.hasAvatar()) return false; if (hasAvatar()) { if (!getAvatar() .equals(other.getAvatar())) return false; } + if (getIsInTeam() + != other.getIsInTeam()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -246,13 +241,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + IS_IN_TEAM_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsInTeam()); if (hasAvatar()) { hash = (37 * hash) + AVATAR_FIELD_NUMBER; hash = (53 * hash) + getAvatar().hashCode(); } + hash = (37 * hash) + IS_IN_TEAM_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsInTeam()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -349,11 +344,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 7458
-     * Obf: MLOIBCFBPKN
-     *
- * * Protobuf type {@code AvatarAddNotify} */ public static final class Builder extends @@ -391,14 +381,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isInTeam_ = false; - if (avatarBuilder_ == null) { avatar_ = null; } else { avatar_ = null; avatarBuilder_ = null; } + isInTeam_ = false; + return this; } @@ -425,12 +415,12 @@ public emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify build @java.lang.Override public emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify buildPartial() { emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify result = new emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify(this); - result.isInTeam_ = isInTeam_; if (avatarBuilder_ == null) { result.avatar_ = avatar_; } else { result.avatar_ = avatarBuilder_.build(); } + result.isInTeam_ = isInTeam_; onBuilt(); return result; } @@ -479,12 +469,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify other) { if (other == emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.getDefaultInstance()) return this; - if (other.getIsInTeam() != false) { - setIsInTeam(other.getIsInTeam()); - } if (other.hasAvatar()) { mergeAvatar(other.getAvatar()); } + if (other.getIsInTeam() != false) { + setIsInTeam(other.getIsInTeam()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -514,49 +504,18 @@ public Builder mergeFrom( return this; } - private boolean isInTeam_ ; - /** - * bool is_in_team = 12; - * @return The isInTeam. - */ - @java.lang.Override - public boolean getIsInTeam() { - return isInTeam_; - } - /** - * bool is_in_team = 12; - * @param value The isInTeam to set. - * @return This builder for chaining. - */ - public Builder setIsInTeam(boolean value) { - - isInTeam_ = value; - onChanged(); - return this; - } - /** - * bool is_in_team = 12; - * @return This builder for chaining. - */ - public Builder clearIsInTeam() { - - isInTeam_ = false; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarBuilder_; /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; * @return Whether the avatar field is set. */ public boolean hasAvatar() { return avatarBuilder_ != null || avatar_ != null; } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; * @return The avatar. */ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar() { @@ -567,7 +526,7 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar() { } } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ public Builder setAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) { if (avatarBuilder_ == null) { @@ -583,7 +542,7 @@ public Builder setAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarIn return this; } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ public Builder setAvatar( emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) { @@ -597,7 +556,7 @@ public Builder setAvatar( return this; } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ public Builder mergeAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) { if (avatarBuilder_ == null) { @@ -615,7 +574,7 @@ public Builder mergeAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.Avatar return this; } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ public Builder clearAvatar() { if (avatarBuilder_ == null) { @@ -629,7 +588,7 @@ public Builder clearAvatar() { return this; } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarBuilder() { @@ -637,7 +596,7 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvat return getAvatarFieldBuilder().getBuilder(); } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() { if (avatarBuilder_ != null) { @@ -648,7 +607,7 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAva } } /** - * .AvatarInfo avatar = 14; + * .AvatarInfo avatar = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> @@ -663,6 +622,37 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAva } return avatarBuilder_; } + + private boolean isInTeam_ ; + /** + * bool is_in_team = 4; + * @return The isInTeam. + */ + @java.lang.Override + public boolean getIsInTeam() { + return isInTeam_; + } + /** + * bool is_in_team = 4; + * @param value The isInTeam to set. + * @return This builder for chaining. + */ + public Builder setIsInTeam(boolean value) { + + isInTeam_ = value; + onChanged(); + return this; + } + /** + * bool is_in_team = 4; + * @return This builder for chaining. + */ + public Builder clearIsInTeam() { + + isInTeam_ = false; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -731,8 +721,8 @@ public emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify getDe static { java.lang.String[] descriptorData = { "\n\025AvatarAddNotify.proto\032\020AvatarInfo.prot" + - "o\"B\n\017AvatarAddNotify\022\022\n\nis_in_team\030\014 \001(\010" + - "\022\033\n\006avatar\030\016 \001(\0132\013.AvatarInfoB\033\n\031emu.gra" + + "o\"B\n\017AvatarAddNotify\022\033\n\006avatar\030\005 \001(\0132\013.A" + + "vatarInfo\022\022\n\nis_in_team\030\004 \001(\010B\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -745,7 +735,7 @@ public emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify getDe internal_static_AvatarAddNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarAddNotify_descriptor, - new java.lang.String[] { "IsInTeam", "Avatar", }); + new java.lang.String[] { "Avatar", "IsInTeam", }); emu.grasscutter.net.proto.AvatarInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java index a29374c3ea6..626d0373a5b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java @@ -19,17 +19,11 @@ public interface AvatarPropNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 avatar_guid = 4; - * @return The avatarGuid. - */ - long getAvatarGuid(); - - /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ int getPropMapCount(); /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ boolean containsPropMap( int key); @@ -40,30 +34,31 @@ boolean containsPropMap( java.util.Map getPropMap(); /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ java.util.Map getPropMapMap(); /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ long getPropMapOrDefault( int key, long defaultValue); /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ long getPropMapOrThrow( int key); + + /** + * uint64 avatar_guid = 15; + * @return The avatarGuid. + */ + long getAvatarGuid(); } /** - * 
-   * CmdId: 5355
-   * Obf: KGKHNJBJKOJ
-   *
- * * Protobuf type {@code AvatarPropNotify} */ public static final class AvatarPropNotify extends @@ -109,12 +104,7 @@ private AvatarPropNotify( case 0: done = true; break; - case 32: { - - avatarGuid_ = input.readUInt64(); - break; - } - case 66: { + case 82: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { propMap_ = com.google.protobuf.MapField.newMapField( PropMapDefaultEntryHolder.defaultEntry); @@ -127,6 +117,11 @@ private AvatarPropNotify( propMap__.getKey(), propMap__.getValue()); break; } + case 120: { + + avatarGuid_ = input.readUInt64(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -156,7 +151,7 @@ private AvatarPropNotify( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 8: + case 10: return internalGetPropMap(); default: throw new RuntimeException( @@ -171,18 +166,7 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.class, emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.Builder.class); } - public static final int AVATAR_GUID_FIELD_NUMBER = 4; - private long avatarGuid_; - /** - * uint64 avatar_guid = 4; - * @return The avatarGuid. - */ - @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; - } - - public static final int PROP_MAP_FIELD_NUMBER = 8; + public static final int PROP_MAP_FIELD_NUMBER = 10; private static final class PropMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Long> defaultEntry = @@ -209,7 +193,7 @@ public int getPropMapCount() { return internalGetPropMap().getMap().size(); } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -227,7 +211,7 @@ public java.util.Map getPropMap() { return getPropMapMap(); } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -235,7 +219,7 @@ public java.util.Map getPropMapMap() { return internalGetPropMap().getMap(); } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -248,7 +232,7 @@ public long getPropMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -263,6 +247,17 @@ public long getPropMapOrThrow( return map.get(key); } + public static final int AVATAR_GUID_FIELD_NUMBER = 15; + private long avatarGuid_; + /** + * uint64 avatar_guid = 15; + * @return The avatarGuid. + */ + @java.lang.Override + public long getAvatarGuid() { + return avatarGuid_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -277,15 +272,15 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (avatarGuid_ != 0L) { - output.writeUInt64(4, avatarGuid_); - } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetPropMap(), PropMapDefaultEntryHolder.defaultEntry, - 8); + 10); + if (avatarGuid_ != 0L) { + output.writeUInt64(15, avatarGuid_); + } unknownFields.writeTo(output); } @@ -295,10 +290,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (avatarGuid_ != 0L) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(4, avatarGuid_); - } for (java.util.Map.Entry entry : internalGetPropMap().getMap().entrySet()) { com.google.protobuf.MapEntry @@ -307,7 +298,11 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, propMap__); + .computeMessageSize(10, propMap__); + } + if (avatarGuid_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeUInt64Size(15, avatarGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -324,10 +319,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify other = (emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify) obj; - if (getAvatarGuid() - != other.getAvatarGuid()) return false; if (!internalGetPropMap().equals( other.internalGetPropMap())) return false; + if (getAvatarGuid() + != other.getAvatarGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -339,13 +334,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getAvatarGuid()); if (!internalGetPropMap().getMap().isEmpty()) { hash = (37 * hash) + PROP_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetPropMap().hashCode(); } + 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; @@ -442,11 +437,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 5355
-     * Obf: KGKHNJBJKOJ
-     *
- * * Protobuf type {@code AvatarPropNotify} */ public static final class Builder extends @@ -462,7 +452,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 8: + case 10: return internalGetPropMap(); default: throw new RuntimeException( @@ -473,7 +463,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 8: + case 10: return internalGetMutablePropMap(); default: throw new RuntimeException( @@ -506,9 +496,9 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + internalGetMutablePropMap().clear(); avatarGuid_ = 0L; - internalGetMutablePropMap().clear(); return this; } @@ -536,9 +526,9 @@ public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify bui public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify buildPartial() { emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify result = new emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify(this); int from_bitField0_ = bitField0_; - result.avatarGuid_ = avatarGuid_; result.propMap_ = internalGetPropMap(); result.propMap_.makeImmutable(); + result.avatarGuid_ = avatarGuid_; onBuilt(); return result; } @@ -587,11 +577,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify other) { if (other == emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.getDefaultInstance()) return this; + internalGetMutablePropMap().mergeFrom( + other.internalGetPropMap()); if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } - internalGetMutablePropMap().mergeFrom( - other.internalGetPropMap()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -622,37 +612,6 @@ public Builder mergeFrom( } private int bitField0_; - private long avatarGuid_ ; - /** - * uint64 avatar_guid = 4; - * @return The avatarGuid. - */ - @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; - } - /** - * uint64 avatar_guid = 4; - * @param value The avatarGuid to set. - * @return This builder for chaining. - */ - public Builder setAvatarGuid(long value) { - - avatarGuid_ = value; - onChanged(); - return this; - } - /** - * uint64 avatar_guid = 4; - * @return This builder for chaining. - */ - public Builder clearAvatarGuid() { - - avatarGuid_ = 0L; - onChanged(); - return this; - } - private com.google.protobuf.MapField< java.lang.Integer, java.lang.Long> propMap_; private com.google.protobuf.MapField @@ -680,7 +639,7 @@ public int getPropMapCount() { return internalGetPropMap().getMap().size(); } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -698,7 +657,7 @@ public java.util.Map getPropMap() { return getPropMapMap(); } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -706,7 +665,7 @@ public java.util.Map getPropMapMap() { return internalGetPropMap().getMap(); } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -719,7 +678,7 @@ public long getPropMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ @java.lang.Override @@ -740,7 +699,7 @@ public Builder clearPropMap() { return this; } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ public Builder removePropMap( @@ -759,7 +718,7 @@ public Builder removePropMap( return internalGetMutablePropMap().getMutableMap(); } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ public Builder putPropMap( int key, @@ -771,7 +730,7 @@ public Builder putPropMap( return this; } /** - * map<uint32, int64> prop_map = 8; + * map<uint32, int64> prop_map = 10; */ public Builder putAllPropMap( @@ -780,6 +739,37 @@ public Builder putAllPropMap( .putAll(values); return this; } + + private long avatarGuid_ ; + /** + * uint64 avatar_guid = 15; + * @return The avatarGuid. + */ + @java.lang.Override + public long getAvatarGuid() { + return avatarGuid_; + } + /** + * uint64 avatar_guid = 15; + * @param value The avatarGuid to set. + * @return This builder for chaining. + */ + public Builder setAvatarGuid(long value) { + + avatarGuid_ = value; + onChanged(); + return this; + } + /** + * uint64 avatar_guid = 15; + * @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) { @@ -853,8 +843,8 @@ public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify get static { java.lang.String[] descriptorData = { "\n\026AvatarPropNotify.proto\"\211\001\n\020AvatarPropN" + - "otify\022\023\n\013avatar_guid\030\004 \001(\004\0220\n\010prop_map\030\010" + - " \003(\0132\036.AvatarPropNotify.PropMapEntry\032.\n\014" + + "otify\0220\n\010prop_map\030\n \003(\0132\036.AvatarPropNoti" + + "fy.PropMapEntry\022\023\n\013avatar_guid\030\017 \001(\004\032.\n\014" + "PropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\003" + ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" + "3" @@ -868,7 +858,7 @@ public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify get internal_static_AvatarPropNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarPropNotify_descriptor, - new java.lang.String[] { "AvatarGuid", "PropMap", }); + new java.lang.String[] { "PropMap", "AvatarGuid", }); internal_static_AvatarPropNotify_PropMapEntry_descriptor = internal_static_AvatarPropNotify_descriptor.getNestedTypes().get(0); internal_static_AvatarPropNotify_PropMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java index 0f5379ef573..920ab164a12 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java @@ -19,47 +19,42 @@ public interface ClientAbilityChangeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_init_hash = 5; - * @return The isInitHash. - */ - boolean getIsInitHash(); - - /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ java.util.List getInvokesList(); /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index); /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ int getInvokesCount(); /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ java.util.List getInvokesOrBuilderList(); /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder( int index); /** - * uint32 entity_id = 12; + * uint32 entity_id = 11; * @return The entityId. */ int getEntityId(); + + /** + * bool is_init_hash = 5; + * @return The isInitHash. + */ + boolean getIsInitHash(); } /** - * 
-   * CmdId: 8174
-   * Obf: IPNNHNHPLAK
-   *
- * * Protobuf type {@code ClientAbilityChangeNotify} */ public static final class ClientAbilityChangeNotify extends @@ -106,25 +101,25 @@ private ClientAbilityChangeNotify( case 0: done = true; break; - case 26: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - invokes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - invokes_.add( - input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.parser(), extensionRegistry)); - break; - } case 40: { isInitHash_ = input.readBool(); break; } - case 96: { + case 88: { entityId_ = input.readUInt32(); break; } + case 122: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + invokes_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + invokes_.add( + input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.parser(), extensionRegistry)); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -160,28 +155,17 @@ private ClientAbilityChangeNotify( emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.class, emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.Builder.class); } - public static final int IS_INIT_HASH_FIELD_NUMBER = 5; - private boolean isInitHash_; - /** - * bool is_init_hash = 5; - * @return The isInitHash. - */ - @java.lang.Override - public boolean getIsInitHash() { - return isInitHash_; - } - - public static final int INVOKES_FIELD_NUMBER = 3; + public static final int INVOKES_FIELD_NUMBER = 15; private java.util.List invokes_; /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ @java.lang.Override public java.util.List getInvokesList() { return invokes_; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ @java.lang.Override public java.util.List @@ -189,21 +173,21 @@ public java.util.Listrepeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ @java.lang.Override public int getInvokesCount() { return invokes_.size(); } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) { return invokes_.get(index); } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder( @@ -211,10 +195,10 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry return invokes_.get(index); } - public static final int ENTITY_ID_FIELD_NUMBER = 12; + public static final int ENTITY_ID_FIELD_NUMBER = 11; private int entityId_; /** - * uint32 entity_id = 12; + * uint32 entity_id = 11; * @return The entityId. */ @java.lang.Override @@ -222,6 +206,17 @@ public int getEntityId() { return entityId_; } + public static final int IS_INIT_HASH_FIELD_NUMBER = 5; + private boolean isInitHash_; + /** + * bool is_init_hash = 5; + * @return The isInitHash. + */ + @java.lang.Override + public boolean getIsInitHash() { + return isInitHash_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -236,14 +231,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 < invokes_.size(); i++) { - output.writeMessage(3, invokes_.get(i)); - } if (isInitHash_ != false) { output.writeBool(5, isInitHash_); } if (entityId_ != 0) { - output.writeUInt32(12, entityId_); + output.writeUInt32(11, entityId_); + } + for (int i = 0; i < invokes_.size(); i++) { + output.writeMessage(15, invokes_.get(i)); } unknownFields.writeTo(output); } @@ -254,17 +249,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < invokes_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, invokes_.get(i)); - } if (isInitHash_ != false) { size += com.google.protobuf.CodedOutputStream .computeBoolSize(5, isInitHash_); } if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, entityId_); + .computeUInt32Size(11, entityId_); + } + for (int i = 0; i < invokes_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(15, invokes_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -281,12 +276,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify other = (emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify) obj; - if (getIsInitHash() - != other.getIsInitHash()) return false; if (!getInvokesList() .equals(other.getInvokesList())) return false; if (getEntityId() != other.getEntityId()) return false; + if (getIsInitHash() + != other.getIsInitHash()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -298,15 +293,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + IS_INIT_HASH_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsInitHash()); if (getInvokesCount() > 0) { hash = (37 * hash) + INVOKES_FIELD_NUMBER; hash = (53 * hash) + getInvokesList().hashCode(); } hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; hash = (53 * hash) + getEntityId(); + hash = (37 * hash) + IS_INIT_HASH_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsInitHash()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -403,11 +398,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 8174
-     * Obf: IPNNHNHPLAK
-     *
- * * Protobuf type {@code ClientAbilityChangeNotify} */ public static final class Builder extends @@ -446,8 +436,6 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isInitHash_ = false; - if (invokesBuilder_ == null) { invokes_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); @@ -456,6 +444,8 @@ public Builder clear() { } entityId_ = 0; + isInitHash_ = false; + return this; } @@ -483,7 +473,6 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify buildPartial() { emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify result = new emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify(this); int from_bitField0_ = bitField0_; - result.isInitHash_ = isInitHash_; if (invokesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { invokes_ = java.util.Collections.unmodifiableList(invokes_); @@ -494,6 +483,7 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili result.invokes_ = invokesBuilder_.build(); } result.entityId_ = entityId_; + result.isInitHash_ = isInitHash_; onBuilt(); return result; } @@ -542,9 +532,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify other) { if (other == emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.getDefaultInstance()) return this; - if (other.getIsInitHash() != false) { - setIsInitHash(other.getIsInitHash()); - } if (invokesBuilder_ == null) { if (!other.invokes_.isEmpty()) { if (invokes_.isEmpty()) { @@ -574,6 +561,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ClientAbilityChangeNotifyOute if (other.getEntityId() != 0) { setEntityId(other.getEntityId()); } + if (other.getIsInitHash() != false) { + setIsInitHash(other.getIsInitHash()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -604,37 +594,6 @@ public Builder mergeFrom( } private int bitField0_; - private boolean isInitHash_ ; - /** - * bool is_init_hash = 5; - * @return The isInitHash. - */ - @java.lang.Override - public boolean getIsInitHash() { - return isInitHash_; - } - /** - * bool is_init_hash = 5; - * @param value The isInitHash to set. - * @return This builder for chaining. - */ - public Builder setIsInitHash(boolean value) { - - isInitHash_ = value; - onChanged(); - return this; - } - /** - * bool is_init_hash = 5; - * @return This builder for chaining. - */ - public Builder clearIsInitHash() { - - isInitHash_ = false; - onChanged(); - return this; - } - private java.util.List invokes_ = java.util.Collections.emptyList(); private void ensureInvokesIsMutable() { @@ -648,7 +607,7 @@ private void ensureInvokesIsMutable() { emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_; /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public java.util.List getInvokesList() { if (invokesBuilder_ == null) { @@ -658,7 +617,7 @@ public java.util.Listrepeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public int getInvokesCount() { if (invokesBuilder_ == null) { @@ -668,7 +627,7 @@ public int getInvokesCount() { } } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) { if (invokesBuilder_ == null) { @@ -678,7 +637,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry } } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder setInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) { @@ -695,7 +654,7 @@ public Builder setInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder setInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) { @@ -709,7 +668,7 @@ public Builder setInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) { if (invokesBuilder_ == null) { @@ -725,7 +684,7 @@ public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder addInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) { @@ -742,7 +701,7 @@ public Builder addInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder addInvokes( emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) { @@ -756,7 +715,7 @@ public Builder addInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder addInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) { @@ -770,7 +729,7 @@ public Builder addInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder addAllInvokes( java.lang.Iterable values) { @@ -785,7 +744,7 @@ public Builder addAllInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder clearInvokes() { if (invokesBuilder_ == null) { @@ -798,7 +757,7 @@ public Builder clearInvokes() { return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public Builder removeInvokes(int index) { if (invokesBuilder_ == null) { @@ -811,14 +770,14 @@ public Builder removeInvokes(int index) { return this; } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder( int index) { return getInvokesFieldBuilder().getBuilder(index); } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder( int index) { @@ -828,7 +787,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry } } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public java.util.List getInvokesOrBuilderList() { @@ -839,14 +798,14 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry } } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() { return getInvokesFieldBuilder().addBuilder( emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance()); } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder( int index) { @@ -854,7 +813,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance()); } /** - * repeated .AbilityInvokeEntry invokes = 3; + * repeated .AbilityInvokeEntry invokes = 15; */ public java.util.List getInvokesBuilderList() { @@ -877,7 +836,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry private int entityId_ ; /** - * uint32 entity_id = 12; + * uint32 entity_id = 11; * @return The entityId. */ @java.lang.Override @@ -885,7 +844,7 @@ public int getEntityId() { return entityId_; } /** - * uint32 entity_id = 12; + * uint32 entity_id = 11; * @param value The entityId to set. * @return This builder for chaining. */ @@ -896,7 +855,7 @@ public Builder setEntityId(int value) { return this; } /** - * uint32 entity_id = 12; + * uint32 entity_id = 11; * @return This builder for chaining. */ public Builder clearEntityId() { @@ -905,6 +864,37 @@ public Builder clearEntityId() { onChanged(); return this; } + + private boolean isInitHash_ ; + /** + * bool is_init_hash = 5; + * @return The isInitHash. + */ + @java.lang.Override + public boolean getIsInitHash() { + return isInitHash_; + } + /** + * bool is_init_hash = 5; + * @param value The isInitHash to set. + * @return This builder for chaining. + */ + public Builder setIsInitHash(boolean value) { + + isInitHash_ = value; + onChanged(); + return this; + } + /** + * bool is_init_hash = 5; + * @return This builder for chaining. + */ + public Builder clearIsInitHash() { + + isInitHash_ = false; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -974,9 +964,9 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili java.lang.String[] descriptorData = { "\n\037ClientAbilityChangeNotify.proto\032\030Abili" + "tyInvokeEntry.proto\"j\n\031ClientAbilityChan" + - "geNotify\022\024\n\014is_init_hash\030\005 \001(\010\022$\n\007invoke" + - "s\030\003 \003(\0132\023.AbilityInvokeEntry\022\021\n\tentity_i" + - "d\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" + + "geNotify\022$\n\007invokes\030\017 \003(\0132\023.AbilityInvok" + + "eEntry\022\021\n\tentity_id\030\013 \001(\r\022\024\n\014is_init_has" + + "h\030\005 \001(\010B\033\n\031emu.grasscutter.net.protob\006pr" + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -989,7 +979,7 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili internal_static_ClientAbilityChangeNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ClientAbilityChangeNotify_descriptor, - new java.lang.String[] { "IsInitHash", "Invokes", "EntityId", }); + new java.lang.String[] { "Invokes", "EntityId", "IsInitHash", }); emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java index fb867b424f7..e17fb2a40c9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java @@ -19,43 +19,38 @@ public interface DropHintNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector position = 3; - * @return Whether the position field is set. - */ - boolean hasPosition(); - /** - * .Vector position = 3; - * @return The position. - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition(); - /** - * .Vector position = 3; - */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder(); - - /** - * repeated uint32 item_id_list = 6; + * repeated uint32 item_id_list = 15; * @return A list containing the itemIdList. */ java.util.List getItemIdListList(); /** - * repeated uint32 item_id_list = 6; + * repeated uint32 item_id_list = 15; * @return The count of itemIdList. */ int getItemIdListCount(); /** - * repeated uint32 item_id_list = 6; + * repeated uint32 item_id_list = 15; * @param index The index of the element to return. * @return The itemIdList at the given index. */ int getItemIdList(int index); + + /** + * .Vector position = 5; + * @return Whether the position field is set. + */ + boolean hasPosition(); + /** + * .Vector position = 5; + * @return The position. + */ + emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition(); + /** + * .Vector position = 5; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder(); } /** - * 
-   * CmdId: 1884
-   * Obf: NMODMKDKNDF
-   *
- * * Protobuf type {@code DropHintNotify} */ public static final class DropHintNotify extends @@ -102,7 +97,7 @@ private DropHintNotify( case 0: done = true; break; - case 26: { + case 42: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (position_ != null) { subBuilder = position_.toBuilder(); @@ -115,7 +110,7 @@ private DropHintNotify( break; } - case 48: { + case 120: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { itemIdList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -123,7 +118,7 @@ private DropHintNotify( itemIdList_.addInt(input.readUInt32()); break; } - case 50: { + case 122: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -171,36 +166,10 @@ private DropHintNotify( emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.class, emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.Builder.class); } - public static final int POSITION_FIELD_NUMBER = 3; - private emu.grasscutter.net.proto.VectorOuterClass.Vector position_; - /** - * .Vector position = 3; - * @return Whether the position field is set. - */ - @java.lang.Override - public boolean hasPosition() { - return position_ != null; - } - /** - * .Vector position = 3; - * @return The position. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { - return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; - } - /** - * .Vector position = 3; - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() { - return getPosition(); - } - - public static final int ITEM_ID_LIST_FIELD_NUMBER = 6; + public static final int ITEM_ID_LIST_FIELD_NUMBER = 15; private com.google.protobuf.Internal.IntList itemIdList_; /** - * repeated uint32 item_id_list = 6; + * repeated uint32 item_id_list = 15; * @return A list containing the itemIdList. */ @java.lang.Override @@ -209,14 +178,14 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrB return itemIdList_; } /** - * repeated uint32 item_id_list = 6; + * repeated uint32 item_id_list = 15; * @return The count of itemIdList. */ public int getItemIdListCount() { return itemIdList_.size(); } /** - * repeated uint32 item_id_list = 6; + * repeated uint32 item_id_list = 15; * @param index The index of the element to return. * @return The itemIdList at the given index. */ @@ -225,6 +194,32 @@ public int getItemIdList(int index) { } private int itemIdListMemoizedSerializedSize = -1; + public static final int POSITION_FIELD_NUMBER = 5; + private emu.grasscutter.net.proto.VectorOuterClass.Vector position_; + /** + * .Vector position = 5; + * @return Whether the position field is set. + */ + @java.lang.Override + public boolean hasPosition() { + return position_ != null; + } + /** + * .Vector position = 5; + * @return The position. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { + return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; + } + /** + * .Vector position = 5; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() { + return getPosition(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -241,10 +236,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (position_ != null) { - output.writeMessage(3, getPosition()); + output.writeMessage(5, getPosition()); } if (getItemIdListList().size() > 0) { - output.writeUInt32NoTag(50); + output.writeUInt32NoTag(122); output.writeUInt32NoTag(itemIdListMemoizedSerializedSize); } for (int i = 0; i < itemIdList_.size(); i++) { @@ -261,7 +256,7 @@ public int getSerializedSize() { size = 0; if (position_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getPosition()); + .computeMessageSize(5, getPosition()); } { int dataSize = 0; @@ -292,13 +287,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify other = (emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify) obj; + if (!getItemIdListList() + .equals(other.getItemIdListList())) return false; if (hasPosition() != other.hasPosition()) return false; if (hasPosition()) { if (!getPosition() .equals(other.getPosition())) return false; } - if (!getItemIdListList() - .equals(other.getItemIdListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -310,14 +305,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasPosition()) { - hash = (37 * hash) + POSITION_FIELD_NUMBER; - hash = (53 * hash) + getPosition().hashCode(); - } if (getItemIdListCount() > 0) { hash = (37 * hash) + ITEM_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemIdListList().hashCode(); } + if (hasPosition()) { + hash = (37 * hash) + POSITION_FIELD_NUMBER; + hash = (53 * hash) + getPosition().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -414,11 +409,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 1884
-     * Obf: NMODMKDKNDF
-     *
- * * Protobuf type {@code DropHintNotify} */ public static final class Builder extends @@ -456,14 +446,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + itemIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); if (positionBuilder_ == null) { position_ = null; } else { position_ = null; positionBuilder_ = null; } - itemIdList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -491,16 +481,16 @@ public emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify build() public emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify buildPartial() { emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify result = new emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify(this); int from_bitField0_ = bitField0_; - if (positionBuilder_ == null) { - result.position_ = position_; - } else { - result.position_ = positionBuilder_.build(); - } if (((bitField0_ & 0x00000001) != 0)) { itemIdList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.itemIdList_ = itemIdList_; + if (positionBuilder_ == null) { + result.position_ = position_; + } else { + result.position_ = positionBuilder_.build(); + } onBuilt(); return result; } @@ -549,9 +539,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify other) { if (other == emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.getDefaultInstance()) return this; - if (other.hasPosition()) { - mergePosition(other.getPosition()); - } if (!other.itemIdList_.isEmpty()) { if (itemIdList_.isEmpty()) { itemIdList_ = other.itemIdList_; @@ -562,6 +549,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.DropHintNotifyOuterClass.Drop } onChanged(); } + if (other.hasPosition()) { + mergePosition(other.getPosition()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -592,18 +582,97 @@ public Builder mergeFrom( } private int bitField0_; + private com.google.protobuf.Internal.IntList itemIdList_ = emptyIntList(); + private void ensureItemIdListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + itemIdList_ = mutableCopy(itemIdList_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated uint32 item_id_list = 15; + * @return A list containing the itemIdList. + */ + public java.util.List + getItemIdListList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_; + } + /** + * repeated uint32 item_id_list = 15; + * @return The count of itemIdList. + */ + public int getItemIdListCount() { + return itemIdList_.size(); + } + /** + * repeated uint32 item_id_list = 15; + * @param index The index of the element to return. + * @return The itemIdList at the given index. + */ + public int getItemIdList(int index) { + return itemIdList_.getInt(index); + } + /** + * repeated uint32 item_id_list = 15; + * @param index The index to set the value at. + * @param value The itemIdList to set. + * @return This builder for chaining. + */ + public Builder setItemIdList( + int index, int value) { + ensureItemIdListIsMutable(); + itemIdList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 item_id_list = 15; + * @param value The itemIdList to add. + * @return This builder for chaining. + */ + public Builder addItemIdList(int value) { + ensureItemIdListIsMutable(); + itemIdList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 item_id_list = 15; + * @param values The itemIdList to add. + * @return This builder for chaining. + */ + public Builder addAllItemIdList( + java.lang.Iterable values) { + ensureItemIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, itemIdList_); + onChanged(); + return this; + } + /** + * repeated uint32 item_id_list = 15; + * @return This builder for chaining. + */ + public Builder clearItemIdList() { + itemIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + private emu.grasscutter.net.proto.VectorOuterClass.Vector position_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_; /** - * .Vector position = 3; + * .Vector position = 5; * @return Whether the position field is set. */ public boolean hasPosition() { return positionBuilder_ != null || position_ != null; } /** - * .Vector position = 3; + * .Vector position = 5; * @return The position. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { @@ -614,7 +683,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { } } /** - * .Vector position = 3; + * .Vector position = 5; */ public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (positionBuilder_ == null) { @@ -630,7 +699,7 @@ public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector val return this; } /** - * .Vector position = 3; + * .Vector position = 5; */ public Builder setPosition( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -644,7 +713,7 @@ public Builder setPosition( return this; } /** - * .Vector position = 3; + * .Vector position = 5; */ public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (positionBuilder_ == null) { @@ -662,7 +731,7 @@ public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector v return this; } /** - * .Vector position = 3; + * .Vector position = 5; */ public Builder clearPosition() { if (positionBuilder_ == null) { @@ -676,7 +745,7 @@ public Builder clearPosition() { return this; } /** - * .Vector position = 3; + * .Vector position = 5; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() { @@ -684,7 +753,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuil return getPositionFieldBuilder().getBuilder(); } /** - * .Vector position = 3; + * .Vector position = 5; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() { if (positionBuilder_ != null) { @@ -695,7 +764,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrB } } /** - * .Vector position = 3; + * .Vector position = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -710,85 +779,6 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrB } return positionBuilder_; } - - private com.google.protobuf.Internal.IntList itemIdList_ = emptyIntList(); - private void ensureItemIdListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - itemIdList_ = mutableCopy(itemIdList_); - bitField0_ |= 0x00000001; - } - } - /** - * repeated uint32 item_id_list = 6; - * @return A list containing the itemIdList. - */ - public java.util.List - getItemIdListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_; - } - /** - * repeated uint32 item_id_list = 6; - * @return The count of itemIdList. - */ - public int getItemIdListCount() { - return itemIdList_.size(); - } - /** - * repeated uint32 item_id_list = 6; - * @param index The index of the element to return. - * @return The itemIdList at the given index. - */ - public int getItemIdList(int index) { - return itemIdList_.getInt(index); - } - /** - * repeated uint32 item_id_list = 6; - * @param index The index to set the value at. - * @param value The itemIdList to set. - * @return This builder for chaining. - */ - public Builder setItemIdList( - int index, int value) { - ensureItemIdListIsMutable(); - itemIdList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 item_id_list = 6; - * @param value The itemIdList to add. - * @return This builder for chaining. - */ - public Builder addItemIdList(int value) { - ensureItemIdListIsMutable(); - itemIdList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 item_id_list = 6; - * @param values The itemIdList to add. - * @return This builder for chaining. - */ - public Builder addAllItemIdList( - java.lang.Iterable values) { - ensureItemIdListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, itemIdList_); - onChanged(); - return this; - } - /** - * repeated uint32 item_id_list = 6; - * @return This builder for chaining. - */ - public Builder clearItemIdList() { - itemIdList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -857,8 +847,8 @@ public emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify getDefa static { java.lang.String[] descriptorData = { "\n\024DropHintNotify.proto\032\014Vector.proto\"A\n\016" + - "DropHintNotify\022\031\n\010position\030\003 \001(\0132\007.Vecto" + - "r\022\024\n\014item_id_list\030\006 \003(\rB\033\n\031emu.grasscutt" + + "DropHintNotify\022\024\n\014item_id_list\030\017 \003(\r\022\031\n\010" + + "position\030\005 \001(\0132\007.VectorB\033\n\031emu.grasscutt" + "er.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -871,7 +861,7 @@ public emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify getDefa internal_static_DropHintNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DropHintNotify_descriptor, - new java.lang.String[] { "Position", "ItemIdList", }); + new java.lang.String[] { "ItemIdList", "Position", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java index 8964bf8375a..7908c0830e4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java @@ -19,73 +19,51 @@ public interface DungeonEntryInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 next_refresh_time = 12; - * @return The nextRefreshTime. - */ - int getNextRefreshTime(); - - /** - * uint32 CFAFALIPFEN = 9; - * @return The cFAFALIPFEN. - */ - int getCFAFALIPFEN(); - - /** - * uint32 EOLGBLICEIA = 14; - * @return The eOLGBLICEIA. - */ - int getEOLGBLICEIA(); - - /** - * uint32 max_boss_chest_num = 11; - * @return The maxBossChestNum. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + * @return Whether the weeklyBossResinDiscountInfo field is set. */ - int getMaxBossChestNum(); - + boolean hasWeeklyBossResinDiscountInfo(); /** - * uint32 dungeon_id = 13; - * @return The dungeonId. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + * @return The weeklyBossResinDiscountInfo. */ - int getDungeonId(); - + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo(); /** - * uint32 end_time = 7; - * @return The endTime. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; */ - int getEndTime(); + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder(); /** - * uint32 start_time = 2; - * @return The startTime. + * uint32 ACDENLCGGOG = 8; + * @return The aCDENLCGGOG. */ - int getStartTime(); + int getACDENLCGGOG(); /** - * bool is_passed = 5; + * bool is_passed = 12; * @return The isPassed. */ boolean getIsPassed(); /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - * @return Whether the weeklyBossResinDiscountInfo field is set. + * uint32 dungeon_id = 7; + * @return The dungeonId. */ - boolean hasWeeklyBossResinDiscountInfo(); + int getDungeonId(); + /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - * @return The weeklyBossResinDiscountInfo. + * uint32 IOLIIMALAGH = 10; + * @return The iOLIIMALAGH. */ - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo(); + int getIOLIIMALAGH(); + /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; + * uint32 BNOMBDGDKCC = 9; + * @return The bNOMBDGDKCC. */ - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder(); + int getBNOMBDGDKCC(); } /** - * 
-   * Obf: HFIHEBKHMPP
-   *
- * * Protobuf type {@code DungeonEntryInfo} */ public static final class DungeonEntryInfo extends @@ -130,17 +108,7 @@ private DungeonEntryInfo( case 0: done = true; break; - case 16: { - - startTime_ = input.readUInt32(); - break; - } - case 40: { - - isPassed_ = input.readBool(); - break; - } - case 50: { + case 42: { emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder subBuilder = null; if (weeklyBossResinDiscountInfo_ != null) { subBuilder = weeklyBossResinDiscountInfo_.toBuilder(); @@ -155,32 +123,27 @@ private DungeonEntryInfo( } case 56: { - endTime_ = input.readUInt32(); - break; - } - case 72: { - - cFAFALIPFEN_ = input.readUInt32(); + dungeonId_ = input.readUInt32(); break; } - case 88: { + case 64: { - maxBossChestNum_ = input.readUInt32(); + aCDENLCGGOG_ = input.readUInt32(); break; } - case 96: { + case 72: { - nextRefreshTime_ = input.readUInt32(); + bNOMBDGDKCC_ = input.readUInt32(); break; } - case 104: { + case 80: { - dungeonId_ = input.readUInt32(); + iOLIIMALAGH_ = input.readUInt32(); break; } - case 112: { + case 96: { - eOLGBLICEIA_ = input.readUInt32(); + isPassed_ = input.readBool(); break; } default: { @@ -215,87 +178,47 @@ private DungeonEntryInfo( emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.class, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder.class); } - public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 12; - private int nextRefreshTime_; - /** - * uint32 next_refresh_time = 12; - * @return The nextRefreshTime. - */ - @java.lang.Override - public int getNextRefreshTime() { - return nextRefreshTime_; - } - - public static final int CFAFALIPFEN_FIELD_NUMBER = 9; - private int cFAFALIPFEN_; - /** - * uint32 CFAFALIPFEN = 9; - * @return The cFAFALIPFEN. - */ - @java.lang.Override - public int getCFAFALIPFEN() { - return cFAFALIPFEN_; - } - - public static final int EOLGBLICEIA_FIELD_NUMBER = 14; - private int eOLGBLICEIA_; + public static final int WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER = 5; + private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_; /** - * uint32 EOLGBLICEIA = 14; - * @return The eOLGBLICEIA. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + * @return Whether the weeklyBossResinDiscountInfo field is set. */ @java.lang.Override - public int getEOLGBLICEIA() { - return eOLGBLICEIA_; + public boolean hasWeeklyBossResinDiscountInfo() { + return weeklyBossResinDiscountInfo_ != null; } - - public static final int MAX_BOSS_CHEST_NUM_FIELD_NUMBER = 11; - private int maxBossChestNum_; /** - * uint32 max_boss_chest_num = 11; - * @return The maxBossChestNum. - */ - @java.lang.Override - public int getMaxBossChestNum() { - return maxBossChestNum_; - } - - public static final int DUNGEON_ID_FIELD_NUMBER = 13; - private int dungeonId_; - /** - * uint32 dungeon_id = 13; - * @return The dungeonId. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + * @return The weeklyBossResinDiscountInfo. */ @java.lang.Override - public int getDungeonId() { - return dungeonId_; + public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() { + return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_; } - - public static final int END_TIME_FIELD_NUMBER = 7; - private int endTime_; /** - * uint32 end_time = 7; - * @return The endTime. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; */ @java.lang.Override - public int getEndTime() { - return endTime_; + public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() { + return getWeeklyBossResinDiscountInfo(); } - public static final int START_TIME_FIELD_NUMBER = 2; - private int startTime_; + public static final int ACDENLCGGOG_FIELD_NUMBER = 8; + private int aCDENLCGGOG_; /** - * uint32 start_time = 2; - * @return The startTime. + * uint32 ACDENLCGGOG = 8; + * @return The aCDENLCGGOG. */ @java.lang.Override - public int getStartTime() { - return startTime_; + public int getACDENLCGGOG() { + return aCDENLCGGOG_; } - public static final int IS_PASSED_FIELD_NUMBER = 5; + public static final int IS_PASSED_FIELD_NUMBER = 12; private boolean isPassed_; /** - * bool is_passed = 5; + * bool is_passed = 12; * @return The isPassed. */ @java.lang.Override @@ -303,30 +226,37 @@ public boolean getIsPassed() { return isPassed_; } - public static final int WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER = 6; - private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_; + public static final int DUNGEON_ID_FIELD_NUMBER = 7; + private int dungeonId_; /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - * @return Whether the weeklyBossResinDiscountInfo field is set. + * uint32 dungeon_id = 7; + * @return The dungeonId. */ @java.lang.Override - public boolean hasWeeklyBossResinDiscountInfo() { - return weeklyBossResinDiscountInfo_ != null; + public int getDungeonId() { + return dungeonId_; } + + public static final int IOLIIMALAGH_FIELD_NUMBER = 10; + private int iOLIIMALAGH_; /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - * @return The weeklyBossResinDiscountInfo. + * uint32 IOLIIMALAGH = 10; + * @return The iOLIIMALAGH. */ @java.lang.Override - public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() { - return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_; + public int getIOLIIMALAGH() { + return iOLIIMALAGH_; } + + public static final int BNOMBDGDKCC_FIELD_NUMBER = 9; + private int bNOMBDGDKCC_; /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; + * uint32 BNOMBDGDKCC = 9; + * @return The bNOMBDGDKCC. */ @java.lang.Override - public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() { - return getWeeklyBossResinDiscountInfo(); + public int getBNOMBDGDKCC() { + return bNOMBDGDKCC_; } private byte memoizedIsInitialized = -1; @@ -343,32 +273,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (startTime_ != 0) { - output.writeUInt32(2, startTime_); - } - if (isPassed_ != false) { - output.writeBool(5, isPassed_); - } if (weeklyBossResinDiscountInfo_ != null) { - output.writeMessage(6, getWeeklyBossResinDiscountInfo()); + output.writeMessage(5, getWeeklyBossResinDiscountInfo()); } - if (endTime_ != 0) { - output.writeUInt32(7, endTime_); - } - if (cFAFALIPFEN_ != 0) { - output.writeUInt32(9, cFAFALIPFEN_); + if (dungeonId_ != 0) { + output.writeUInt32(7, dungeonId_); } - if (maxBossChestNum_ != 0) { - output.writeUInt32(11, maxBossChestNum_); + if (aCDENLCGGOG_ != 0) { + output.writeUInt32(8, aCDENLCGGOG_); } - if (nextRefreshTime_ != 0) { - output.writeUInt32(12, nextRefreshTime_); + if (bNOMBDGDKCC_ != 0) { + output.writeUInt32(9, bNOMBDGDKCC_); } - if (dungeonId_ != 0) { - output.writeUInt32(13, dungeonId_); + if (iOLIIMALAGH_ != 0) { + output.writeUInt32(10, iOLIIMALAGH_); } - if (eOLGBLICEIA_ != 0) { - output.writeUInt32(14, eOLGBLICEIA_); + if (isPassed_ != false) { + output.writeBool(12, isPassed_); } unknownFields.writeTo(output); } @@ -379,41 +300,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (startTime_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, startTime_); - } - if (isPassed_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(5, isPassed_); - } if (weeklyBossResinDiscountInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getWeeklyBossResinDiscountInfo()); + .computeMessageSize(5, getWeeklyBossResinDiscountInfo()); } - if (endTime_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, endTime_); - } - if (cFAFALIPFEN_ != 0) { + if (dungeonId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, cFAFALIPFEN_); + .computeUInt32Size(7, dungeonId_); } - if (maxBossChestNum_ != 0) { + if (aCDENLCGGOG_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, maxBossChestNum_); + .computeUInt32Size(8, aCDENLCGGOG_); } - if (nextRefreshTime_ != 0) { + if (bNOMBDGDKCC_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, nextRefreshTime_); + .computeUInt32Size(9, bNOMBDGDKCC_); } - if (dungeonId_ != 0) { + if (iOLIIMALAGH_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, dungeonId_); + .computeUInt32Size(10, iOLIIMALAGH_); } - if (eOLGBLICEIA_ != 0) { + if (isPassed_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, eOLGBLICEIA_); + .computeBoolSize(12, isPassed_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -430,27 +339,21 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo other = (emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo) obj; - if (getNextRefreshTime() - != other.getNextRefreshTime()) return false; - if (getCFAFALIPFEN() - != other.getCFAFALIPFEN()) return false; - if (getEOLGBLICEIA() - != other.getEOLGBLICEIA()) return false; - if (getMaxBossChestNum() - != other.getMaxBossChestNum()) return false; - if (getDungeonId() - != other.getDungeonId()) return false; - if (getEndTime() - != other.getEndTime()) return false; - if (getStartTime() - != other.getStartTime()) return false; - if (getIsPassed() - != other.getIsPassed()) return false; if (hasWeeklyBossResinDiscountInfo() != other.hasWeeklyBossResinDiscountInfo()) return false; if (hasWeeklyBossResinDiscountInfo()) { if (!getWeeklyBossResinDiscountInfo() .equals(other.getWeeklyBossResinDiscountInfo())) return false; } + if (getACDENLCGGOG() + != other.getACDENLCGGOG()) return false; + if (getIsPassed() + != other.getIsPassed()) return false; + if (getDungeonId() + != other.getDungeonId()) return false; + if (getIOLIIMALAGH() + != other.getIOLIIMALAGH()) return false; + if (getBNOMBDGDKCC() + != other.getBNOMBDGDKCC()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -462,27 +365,21 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER; - hash = (53 * hash) + getNextRefreshTime(); - hash = (37 * hash) + CFAFALIPFEN_FIELD_NUMBER; - hash = (53 * hash) + getCFAFALIPFEN(); - hash = (37 * hash) + EOLGBLICEIA_FIELD_NUMBER; - hash = (53 * hash) + getEOLGBLICEIA(); - hash = (37 * hash) + MAX_BOSS_CHEST_NUM_FIELD_NUMBER; - hash = (53 * hash) + getMaxBossChestNum(); - hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER; - hash = (53 * hash) + getDungeonId(); - hash = (37 * hash) + END_TIME_FIELD_NUMBER; - hash = (53 * hash) + getEndTime(); - hash = (37 * hash) + START_TIME_FIELD_NUMBER; - hash = (53 * hash) + getStartTime(); - hash = (37 * hash) + IS_PASSED_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsPassed()); if (hasWeeklyBossResinDiscountInfo()) { hash = (37 * hash) + WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER; hash = (53 * hash) + getWeeklyBossResinDiscountInfo().hashCode(); } + hash = (37 * hash) + ACDENLCGGOG_FIELD_NUMBER; + hash = (53 * hash) + getACDENLCGGOG(); + hash = (37 * hash) + IS_PASSED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsPassed()); + hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER; + hash = (53 * hash) + getDungeonId(); + hash = (37 * hash) + IOLIIMALAGH_FIELD_NUMBER; + hash = (53 * hash) + getIOLIIMALAGH(); + hash = (37 * hash) + BNOMBDGDKCC_FIELD_NUMBER; + hash = (53 * hash) + getBNOMBDGDKCC(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -579,10 +476,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: HFIHEBKHMPP
-     *
- * * Protobuf type {@code DungeonEntryInfo} */ public static final class Builder extends @@ -620,28 +513,22 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - nextRefreshTime_ = 0; - - cFAFALIPFEN_ = 0; - - eOLGBLICEIA_ = 0; - - maxBossChestNum_ = 0; - - dungeonId_ = 0; - - endTime_ = 0; - - startTime_ = 0; - - isPassed_ = false; - if (weeklyBossResinDiscountInfoBuilder_ == null) { weeklyBossResinDiscountInfo_ = null; } else { weeklyBossResinDiscountInfo_ = null; weeklyBossResinDiscountInfoBuilder_ = null; } + aCDENLCGGOG_ = 0; + + isPassed_ = false; + + dungeonId_ = 0; + + iOLIIMALAGH_ = 0; + + bNOMBDGDKCC_ = 0; + return this; } @@ -668,19 +555,16 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo bui @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo buildPartial() { emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo result = new emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo(this); - result.nextRefreshTime_ = nextRefreshTime_; - result.cFAFALIPFEN_ = cFAFALIPFEN_; - result.eOLGBLICEIA_ = eOLGBLICEIA_; - result.maxBossChestNum_ = maxBossChestNum_; - result.dungeonId_ = dungeonId_; - result.endTime_ = endTime_; - result.startTime_ = startTime_; - result.isPassed_ = isPassed_; if (weeklyBossResinDiscountInfoBuilder_ == null) { result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfo_; } else { result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfoBuilder_.build(); } + result.aCDENLCGGOG_ = aCDENLCGGOG_; + result.isPassed_ = isPassed_; + result.dungeonId_ = dungeonId_; + result.iOLIIMALAGH_ = iOLIIMALAGH_; + result.bNOMBDGDKCC_ = bNOMBDGDKCC_; onBuilt(); return result; } @@ -729,32 +613,23 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo other) { if (other == emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance()) return this; - if (other.getNextRefreshTime() != 0) { - setNextRefreshTime(other.getNextRefreshTime()); - } - if (other.getCFAFALIPFEN() != 0) { - setCFAFALIPFEN(other.getCFAFALIPFEN()); + if (other.hasWeeklyBossResinDiscountInfo()) { + mergeWeeklyBossResinDiscountInfo(other.getWeeklyBossResinDiscountInfo()); } - if (other.getEOLGBLICEIA() != 0) { - setEOLGBLICEIA(other.getEOLGBLICEIA()); + if (other.getACDENLCGGOG() != 0) { + setACDENLCGGOG(other.getACDENLCGGOG()); } - if (other.getMaxBossChestNum() != 0) { - setMaxBossChestNum(other.getMaxBossChestNum()); + if (other.getIsPassed() != false) { + setIsPassed(other.getIsPassed()); } if (other.getDungeonId() != 0) { setDungeonId(other.getDungeonId()); } - if (other.getEndTime() != 0) { - setEndTime(other.getEndTime()); + if (other.getIOLIIMALAGH() != 0) { + setIOLIIMALAGH(other.getIOLIIMALAGH()); } - if (other.getStartTime() != 0) { - setStartTime(other.getStartTime()); - } - if (other.getIsPassed() != false) { - setIsPassed(other.getIsPassed()); - } - if (other.hasWeeklyBossResinDiscountInfo()) { - mergeWeeklyBossResinDiscountInfo(other.getWeeklyBossResinDiscountInfo()); + if (other.getBNOMBDGDKCC() != 0) { + setBNOMBDGDKCC(other.getBNOMBDGDKCC()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -785,133 +660,190 @@ public Builder mergeFrom( return this; } - private int nextRefreshTime_ ; + private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> weeklyBossResinDiscountInfoBuilder_; /** - * uint32 next_refresh_time = 12; - * @return The nextRefreshTime. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + * @return Whether the weeklyBossResinDiscountInfo field is set. */ - @java.lang.Override - public int getNextRefreshTime() { - return nextRefreshTime_; + public boolean hasWeeklyBossResinDiscountInfo() { + return weeklyBossResinDiscountInfoBuilder_ != null || weeklyBossResinDiscountInfo_ != null; } /** - * uint32 next_refresh_time = 12; - * @param value The nextRefreshTime to set. - * @return This builder for chaining. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + * @return The weeklyBossResinDiscountInfo. */ - public Builder setNextRefreshTime(int value) { - - nextRefreshTime_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() { + if (weeklyBossResinDiscountInfoBuilder_ == null) { + return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_; + } else { + return weeklyBossResinDiscountInfoBuilder_.getMessage(); + } } /** - * uint32 next_refresh_time = 12; - * @return This builder for chaining. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; */ - public Builder clearNextRefreshTime() { - - nextRefreshTime_ = 0; - onChanged(); + public Builder setWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) { + if (weeklyBossResinDiscountInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + weeklyBossResinDiscountInfo_ = value; + onChanged(); + } else { + weeklyBossResinDiscountInfoBuilder_.setMessage(value); + } + return this; } + /** + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + */ + public Builder setWeeklyBossResinDiscountInfo( + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder builderForValue) { + if (weeklyBossResinDiscountInfoBuilder_ == null) { + weeklyBossResinDiscountInfo_ = builderForValue.build(); + onChanged(); + } else { + weeklyBossResinDiscountInfoBuilder_.setMessage(builderForValue.build()); + } - private int cFAFALIPFEN_ ; + return this; + } /** - * uint32 CFAFALIPFEN = 9; - * @return The cFAFALIPFEN. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; */ - @java.lang.Override - public int getCFAFALIPFEN() { - return cFAFALIPFEN_; + public Builder mergeWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) { + if (weeklyBossResinDiscountInfoBuilder_ == null) { + if (weeklyBossResinDiscountInfo_ != null) { + weeklyBossResinDiscountInfo_ = + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.newBuilder(weeklyBossResinDiscountInfo_).mergeFrom(value).buildPartial(); + } else { + weeklyBossResinDiscountInfo_ = value; + } + onChanged(); + } else { + weeklyBossResinDiscountInfoBuilder_.mergeFrom(value); + } + + return this; } /** - * uint32 CFAFALIPFEN = 9; - * @param value The cFAFALIPFEN to set. - * @return This builder for chaining. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; */ - public Builder setCFAFALIPFEN(int value) { - - cFAFALIPFEN_ = value; - onChanged(); + public Builder clearWeeklyBossResinDiscountInfo() { + if (weeklyBossResinDiscountInfoBuilder_ == null) { + weeklyBossResinDiscountInfo_ = null; + onChanged(); + } else { + weeklyBossResinDiscountInfo_ = null; + weeklyBossResinDiscountInfoBuilder_ = null; + } + return this; } /** - * uint32 CFAFALIPFEN = 9; - * @return This builder for chaining. + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; */ - public Builder clearCFAFALIPFEN() { + public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder getWeeklyBossResinDiscountInfoBuilder() { - cFAFALIPFEN_ = 0; onChanged(); - return this; + return getWeeklyBossResinDiscountInfoFieldBuilder().getBuilder(); + } + /** + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + */ + public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() { + if (weeklyBossResinDiscountInfoBuilder_ != null) { + return weeklyBossResinDiscountInfoBuilder_.getMessageOrBuilder(); + } else { + return weeklyBossResinDiscountInfo_ == null ? + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_; + } + } + /** + * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> + getWeeklyBossResinDiscountInfoFieldBuilder() { + if (weeklyBossResinDiscountInfoBuilder_ == null) { + weeklyBossResinDiscountInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder>( + getWeeklyBossResinDiscountInfo(), + getParentForChildren(), + isClean()); + weeklyBossResinDiscountInfo_ = null; + } + return weeklyBossResinDiscountInfoBuilder_; } - private int eOLGBLICEIA_ ; + private int aCDENLCGGOG_ ; /** - * uint32 EOLGBLICEIA = 14; - * @return The eOLGBLICEIA. + * uint32 ACDENLCGGOG = 8; + * @return The aCDENLCGGOG. */ @java.lang.Override - public int getEOLGBLICEIA() { - return eOLGBLICEIA_; + public int getACDENLCGGOG() { + return aCDENLCGGOG_; } /** - * uint32 EOLGBLICEIA = 14; - * @param value The eOLGBLICEIA to set. + * uint32 ACDENLCGGOG = 8; + * @param value The aCDENLCGGOG to set. * @return This builder for chaining. */ - public Builder setEOLGBLICEIA(int value) { + public Builder setACDENLCGGOG(int value) { - eOLGBLICEIA_ = value; + aCDENLCGGOG_ = value; onChanged(); return this; } /** - * uint32 EOLGBLICEIA = 14; + * uint32 ACDENLCGGOG = 8; * @return This builder for chaining. */ - public Builder clearEOLGBLICEIA() { + public Builder clearACDENLCGGOG() { - eOLGBLICEIA_ = 0; + aCDENLCGGOG_ = 0; onChanged(); return this; } - private int maxBossChestNum_ ; + private boolean isPassed_ ; /** - * uint32 max_boss_chest_num = 11; - * @return The maxBossChestNum. + * bool is_passed = 12; + * @return The isPassed. */ @java.lang.Override - public int getMaxBossChestNum() { - return maxBossChestNum_; + public boolean getIsPassed() { + return isPassed_; } /** - * uint32 max_boss_chest_num = 11; - * @param value The maxBossChestNum to set. + * bool is_passed = 12; + * @param value The isPassed to set. * @return This builder for chaining. */ - public Builder setMaxBossChestNum(int value) { + public Builder setIsPassed(boolean value) { - maxBossChestNum_ = value; + isPassed_ = value; onChanged(); return this; } /** - * uint32 max_boss_chest_num = 11; + * bool is_passed = 12; * @return This builder for chaining. */ - public Builder clearMaxBossChestNum() { + public Builder clearIsPassed() { - maxBossChestNum_ = 0; + isPassed_ = false; onChanged(); return this; } private int dungeonId_ ; /** - * uint32 dungeon_id = 13; + * uint32 dungeon_id = 7; * @return The dungeonId. */ @java.lang.Override @@ -919,7 +851,7 @@ public int getDungeonId() { return dungeonId_; } /** - * uint32 dungeon_id = 13; + * uint32 dungeon_id = 7; * @param value The dungeonId to set. * @return This builder for chaining. */ @@ -930,7 +862,7 @@ public Builder setDungeonId(int value) { return this; } /** - * uint32 dungeon_id = 13; + * uint32 dungeon_id = 7; * @return This builder for chaining. */ public Builder clearDungeonId() { @@ -940,217 +872,67 @@ public Builder clearDungeonId() { return this; } - private int endTime_ ; - /** - * uint32 end_time = 7; - * @return The endTime. - */ - @java.lang.Override - public int getEndTime() { - return endTime_; - } - /** - * uint32 end_time = 7; - * @param value The endTime to set. - * @return This builder for chaining. - */ - public Builder setEndTime(int value) { - - endTime_ = value; - onChanged(); - return this; - } - /** - * uint32 end_time = 7; - * @return This builder for chaining. - */ - public Builder clearEndTime() { - - endTime_ = 0; - onChanged(); - return this; - } - - private int startTime_ ; + private int iOLIIMALAGH_ ; /** - * uint32 start_time = 2; - * @return The startTime. + * uint32 IOLIIMALAGH = 10; + * @return The iOLIIMALAGH. */ @java.lang.Override - public int getStartTime() { - return startTime_; + public int getIOLIIMALAGH() { + return iOLIIMALAGH_; } /** - * uint32 start_time = 2; - * @param value The startTime to set. + * uint32 IOLIIMALAGH = 10; + * @param value The iOLIIMALAGH to set. * @return This builder for chaining. */ - public Builder setStartTime(int value) { + public Builder setIOLIIMALAGH(int value) { - startTime_ = value; + iOLIIMALAGH_ = value; onChanged(); return this; } /** - * uint32 start_time = 2; + * uint32 IOLIIMALAGH = 10; * @return This builder for chaining. */ - public Builder clearStartTime() { + public Builder clearIOLIIMALAGH() { - startTime_ = 0; + iOLIIMALAGH_ = 0; onChanged(); return this; } - private boolean isPassed_ ; + private int bNOMBDGDKCC_ ; /** - * bool is_passed = 5; - * @return The isPassed. + * uint32 BNOMBDGDKCC = 9; + * @return The bNOMBDGDKCC. */ @java.lang.Override - public boolean getIsPassed() { - return isPassed_; + public int getBNOMBDGDKCC() { + return bNOMBDGDKCC_; } /** - * bool is_passed = 5; - * @param value The isPassed to set. + * uint32 BNOMBDGDKCC = 9; + * @param value The bNOMBDGDKCC to set. * @return This builder for chaining. */ - public Builder setIsPassed(boolean value) { + public Builder setBNOMBDGDKCC(int value) { - isPassed_ = value; + bNOMBDGDKCC_ = value; onChanged(); return this; } /** - * bool is_passed = 5; + * uint32 BNOMBDGDKCC = 9; * @return This builder for chaining. */ - public Builder clearIsPassed() { + public Builder clearBNOMBDGDKCC() { - isPassed_ = false; + bNOMBDGDKCC_ = 0; onChanged(); return this; } - - private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> weeklyBossResinDiscountInfoBuilder_; - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - * @return Whether the weeklyBossResinDiscountInfo field is set. - */ - public boolean hasWeeklyBossResinDiscountInfo() { - return weeklyBossResinDiscountInfoBuilder_ != null || weeklyBossResinDiscountInfo_ != null; - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - * @return The weeklyBossResinDiscountInfo. - */ - public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() { - if (weeklyBossResinDiscountInfoBuilder_ == null) { - return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_; - } else { - return weeklyBossResinDiscountInfoBuilder_.getMessage(); - } - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - */ - public Builder setWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) { - if (weeklyBossResinDiscountInfoBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - weeklyBossResinDiscountInfo_ = value; - onChanged(); - } else { - weeklyBossResinDiscountInfoBuilder_.setMessage(value); - } - - return this; - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - */ - public Builder setWeeklyBossResinDiscountInfo( - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder builderForValue) { - if (weeklyBossResinDiscountInfoBuilder_ == null) { - weeklyBossResinDiscountInfo_ = builderForValue.build(); - onChanged(); - } else { - weeklyBossResinDiscountInfoBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - */ - public Builder mergeWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) { - if (weeklyBossResinDiscountInfoBuilder_ == null) { - if (weeklyBossResinDiscountInfo_ != null) { - weeklyBossResinDiscountInfo_ = - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.newBuilder(weeklyBossResinDiscountInfo_).mergeFrom(value).buildPartial(); - } else { - weeklyBossResinDiscountInfo_ = value; - } - onChanged(); - } else { - weeklyBossResinDiscountInfoBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - */ - public Builder clearWeeklyBossResinDiscountInfo() { - if (weeklyBossResinDiscountInfoBuilder_ == null) { - weeklyBossResinDiscountInfo_ = null; - onChanged(); - } else { - weeklyBossResinDiscountInfo_ = null; - weeklyBossResinDiscountInfoBuilder_ = null; - } - - return this; - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - */ - public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder getWeeklyBossResinDiscountInfoBuilder() { - - onChanged(); - return getWeeklyBossResinDiscountInfoFieldBuilder().getBuilder(); - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - */ - public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() { - if (weeklyBossResinDiscountInfoBuilder_ != null) { - return weeklyBossResinDiscountInfoBuilder_.getMessageOrBuilder(); - } else { - return weeklyBossResinDiscountInfo_ == null ? - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_; - } - } - /** - * .WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> - getWeeklyBossResinDiscountInfoFieldBuilder() { - if (weeklyBossResinDiscountInfoBuilder_ == null) { - weeklyBossResinDiscountInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder>( - getWeeklyBossResinDiscountInfo(), - getParentForChildren(), - isClean()); - weeklyBossResinDiscountInfo_ = null; - } - return weeklyBossResinDiscountInfoBuilder_; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1219,15 +1001,13 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo get static { java.lang.String[] descriptorData = { "\n\026DungeonEntryInfo.proto\032!WeeklyBossResi" + - "nDiscountInfo.proto\"\207\002\n\020DungeonEntryInfo" + - "\022\031\n\021next_refresh_time\030\014 \001(\r\022\023\n\013CFAFALIPF" + - "EN\030\t \001(\r\022\023\n\013EOLGBLICEIA\030\016 \001(\r\022\032\n\022max_bos" + - "s_chest_num\030\013 \001(\r\022\022\n\ndungeon_id\030\r \001(\r\022\020\n" + - "\010end_time\030\007 \001(\r\022\022\n\nstart_time\030\002 \001(\r\022\021\n\ti" + - "s_passed\030\005 \001(\010\022E\n\037weekly_boss_resin_disc" + - "ount_info\030\006 \001(\0132\034.WeeklyBossResinDiscoun" + - "tInfoB\033\n\031emu.grasscutter.net.protob\006prot" + - "o3" + "nDiscountInfo.proto\"\277\001\n\020DungeonEntryInfo" + + "\022E\n\037weekly_boss_resin_discount_info\030\005 \001(" + + "\0132\034.WeeklyBossResinDiscountInfo\022\023\n\013ACDEN" + + "LCGGOG\030\010 \001(\r\022\021\n\tis_passed\030\014 \001(\010\022\022\n\ndunge" + + "on_id\030\007 \001(\r\022\023\n\013IOLIIMALAGH\030\n \001(\r\022\023\n\013BNOM" + + "BDGDKCC\030\t \001(\rB\033\n\031emu.grasscutter.net.pro" + + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1239,7 +1019,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo get internal_static_DungeonEntryInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonEntryInfo_descriptor, - new java.lang.String[] { "NextRefreshTime", "CFAFALIPFEN", "EOLGBLICEIA", "MaxBossChestNum", "DungeonId", "EndTime", "StartTime", "IsPassed", "WeeklyBossResinDiscountInfo", }); + new java.lang.String[] { "WeeklyBossResinDiscountInfo", "ACDENLCGGOG", "IsPassed", "DungeonId", "IOLIIMALAGH", "BNOMBDGDKCC", }); emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java index 79fabd85c68..5715246d3d6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java @@ -19,47 +19,42 @@ public interface DungeonEntryInfoReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ java.util.List getScenePointIdListList(); /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getScenePointIdList(int index); /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ int getScenePointIdListCount(); /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ java.util.List getScenePointIdListOrBuilderList(); /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getScenePointIdListOrBuilder( int index); /** - * uint32 point_id = 11; - * @return The pointId. + * uint32 scene_id = 7; + * @return The sceneId. */ - int getPointId(); + int getSceneId(); /** - * uint32 scene_id = 3; - * @return The sceneId. + * uint32 point_id = 4; + * @return The pointId. */ - int getSceneId(); + int getPointId(); } /** - * 
-   * CmdId: 782
-   * Obf: JJMKBALLDNB
-   *
- * * Protobuf type {@code DungeonEntryInfoReq} */ public static final class DungeonEntryInfoReq extends @@ -106,12 +101,12 @@ private DungeonEntryInfoReq( case 0: done = true; break; - case 24: { + case 32: { - sceneId_ = input.readUInt32(); + pointId_ = input.readUInt32(); break; } - case 66: { + case 50: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { scenePointIdList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -120,9 +115,9 @@ private DungeonEntryInfoReq( input.readMessage(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.parser(), extensionRegistry)); break; } - case 88: { + case 56: { - pointId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } default: { @@ -160,17 +155,17 @@ private DungeonEntryInfoReq( emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoReq.class, emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoReq.Builder.class); } - public static final int SCENE_POINT_ID_LIST_FIELD_NUMBER = 8; + public static final int SCENE_POINT_ID_LIST_FIELD_NUMBER = 6; private java.util.List scenePointIdList_; /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ @java.lang.Override public java.util.List getScenePointIdListList() { return scenePointIdList_; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ @java.lang.Override public java.util.List @@ -178,21 +173,21 @@ public java.util.List return scenePointIdList_; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ @java.lang.Override public int getScenePointIdListCount() { return scenePointIdList_.size(); } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getScenePointIdList(int index) { return scenePointIdList_.get(index); } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getScenePointIdListOrBuilder( @@ -200,26 +195,26 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getSce return scenePointIdList_.get(index); } - public static final int POINT_ID_FIELD_NUMBER = 11; - private int pointId_; + public static final int SCENE_ID_FIELD_NUMBER = 7; + private int sceneId_; /** - * uint32 point_id = 11; - * @return The pointId. + * uint32 scene_id = 7; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } - public static final int SCENE_ID_FIELD_NUMBER = 3; - private int sceneId_; + public static final int POINT_ID_FIELD_NUMBER = 4; + private int pointId_; /** - * uint32 scene_id = 3; - * @return The sceneId. + * uint32 point_id = 4; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } private byte memoizedIsInitialized = -1; @@ -236,14 +231,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (sceneId_ != 0) { - output.writeUInt32(3, sceneId_); + if (pointId_ != 0) { + output.writeUInt32(4, pointId_); } for (int i = 0; i < scenePointIdList_.size(); i++) { - output.writeMessage(8, scenePointIdList_.get(i)); + output.writeMessage(6, scenePointIdList_.get(i)); } - if (pointId_ != 0) { - output.writeUInt32(11, pointId_); + if (sceneId_ != 0) { + output.writeUInt32(7, sceneId_); } unknownFields.writeTo(output); } @@ -254,17 +249,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (sceneId_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, sceneId_); + .computeUInt32Size(4, pointId_); } for (int i = 0; i < scenePointIdList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, scenePointIdList_.get(i)); + .computeMessageSize(6, scenePointIdList_.get(i)); } - if (pointId_ != 0) { + if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, pointId_); + .computeUInt32Size(7, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -283,10 +278,10 @@ public boolean equals(final java.lang.Object obj) { if (!getScenePointIdListList() .equals(other.getScenePointIdListList())) return false; - 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; } @@ -302,10 +297,10 @@ public int hashCode() { hash = (37 * hash) + SCENE_POINT_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getScenePointIdListList().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; @@ -402,11 +397,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 782
-     * Obf: JJMKBALLDNB
-     *
- * * Protobuf type {@code DungeonEntryInfoReq} */ public static final class Builder extends @@ -451,10 +441,10 @@ public Builder clear() { } else { scenePointIdListBuilder_.clear(); } - pointId_ = 0; - sceneId_ = 0; + pointId_ = 0; + return this; } @@ -491,8 +481,8 @@ public emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoR } else { result.scenePointIdList_ = scenePointIdListBuilder_.build(); } - result.pointId_ = pointId_; result.sceneId_ = sceneId_; + result.pointId_ = pointId_; onBuilt(); return result; } @@ -567,12 +557,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass } } } - 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; @@ -616,7 +606,7 @@ private void ensureScenePointIdListIsMutable() { emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> scenePointIdListBuilder_; /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public java.util.List getScenePointIdListList() { if (scenePointIdListBuilder_ == null) { @@ -626,7 +616,7 @@ public java.util.List } } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public int getScenePointIdListCount() { if (scenePointIdListBuilder_ == null) { @@ -636,7 +626,7 @@ public int getScenePointIdListCount() { } } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getScenePointIdList(int index) { if (scenePointIdListBuilder_ == null) { @@ -646,7 +636,7 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getScenePointId } } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder setScenePointIdList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) { @@ -663,7 +653,7 @@ public Builder setScenePointIdList( return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder setScenePointIdList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) { @@ -677,7 +667,7 @@ public Builder setScenePointIdList( return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder addScenePointIdList(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) { if (scenePointIdListBuilder_ == null) { @@ -693,7 +683,7 @@ public Builder addScenePointIdList(emu.grasscutter.net.proto.Uint32PairOuterClas return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder addScenePointIdList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) { @@ -710,7 +700,7 @@ public Builder addScenePointIdList( return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder addScenePointIdList( emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) { @@ -724,7 +714,7 @@ public Builder addScenePointIdList( return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder addScenePointIdList( int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) { @@ -738,7 +728,7 @@ public Builder addScenePointIdList( return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder addAllScenePointIdList( java.lang.Iterable values) { @@ -753,7 +743,7 @@ public Builder addAllScenePointIdList( return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder clearScenePointIdList() { if (scenePointIdListBuilder_ == null) { @@ -766,7 +756,7 @@ public Builder clearScenePointIdList() { return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public Builder removeScenePointIdList(int index) { if (scenePointIdListBuilder_ == null) { @@ -779,14 +769,14 @@ public Builder removeScenePointIdList(int index) { return this; } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder getScenePointIdListBuilder( int index) { return getScenePointIdListFieldBuilder().getBuilder(index); } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getScenePointIdListOrBuilder( int index) { @@ -796,7 +786,7 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getSce } } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public java.util.List getScenePointIdListOrBuilderList() { @@ -807,14 +797,14 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getSce } } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addScenePointIdListBuilder() { return getScenePointIdListFieldBuilder().addBuilder( emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance()); } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addScenePointIdListBuilder( int index) { @@ -822,7 +812,7 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addScen index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance()); } /** - * repeated .Uint32Pair scene_point_id_list = 8; + * repeated .Uint32Pair scene_point_id_list = 6; */ public java.util.List getScenePointIdListBuilderList() { @@ -843,64 +833,64 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addScen return scenePointIdListBuilder_; } - private int pointId_ ; + private int sceneId_ ; /** - * uint32 point_id = 11; - * @return The pointId. + * uint32 scene_id = 7; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 point_id = 11; - * @param value The pointId to set. + * uint32 scene_id = 7; + * @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 = 11; + * uint32 scene_id = 7; * @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 = 3; - * @return The sceneId. + * uint32 point_id = 4; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } /** - * uint32 scene_id = 3; - * @param value The sceneId to set. + * uint32 point_id = 4; + * @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 = 3; + * uint32 point_id = 4; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearPointId() { - sceneId_ = 0; + pointId_ = 0; onChanged(); return this; } @@ -973,8 +963,8 @@ public emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoR java.lang.String[] descriptorData = { "\n\031DungeonEntryInfoReq.proto\032\020Uint32Pair." + "proto\"c\n\023DungeonEntryInfoReq\022(\n\023scene_po" + - "int_id_list\030\010 \003(\0132\013.Uint32Pair\022\020\n\010point_" + - "id\030\013 \001(\r\022\020\n\010scene_id\030\003 \001(\rB\033\n\031emu.grassc" + + "int_id_list\030\006 \003(\0132\013.Uint32Pair\022\020\n\010scene_" + + "id\030\007 \001(\r\022\020\n\010point_id\030\004 \001(\rB\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -987,7 +977,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoR internal_static_DungeonEntryInfoReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonEntryInfoReq_descriptor, - new java.lang.String[] { "ScenePointIdList", "PointId", "SceneId", }); + new java.lang.String[] { "ScenePointIdList", "SceneId", "PointId", }); emu.grasscutter.net.proto.Uint32PairOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java index 6aedf752355..bd50b7e9b51 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java @@ -19,77 +19,72 @@ public interface DungeonEntryInfoRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ java.util.List getDungeonEntryListList(); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ int getDungeonEntryListCount(); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ java.util.List getDungeonEntryListOrBuilderList(); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder( int index); /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ java.util.List getDungeonEntryPointListList(); /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo getDungeonEntryPointList(int index); /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ int getDungeonEntryPointListCount(); /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ java.util.List getDungeonEntryPointListOrBuilderList(); /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder getDungeonEntryPointListOrBuilder( int index); /** - * int32 retcode = 13; + * int32 retcode = 6; * @return The retcode. */ int getRetcode(); /** - * uint32 point_id = 5; + * uint32 point_id = 1; * @return The pointId. */ int getPointId(); /** - * uint32 recommend_dungeon_id = 2; + * uint32 recommend_dungeon_id = 4; * @return The recommendDungeonId. */ int getRecommendDungeonId(); } /** - * 
-   * CmdId: 28381
-   * Obf: FJKAAALHLDG
-   *
- * * Protobuf type {@code DungeonEntryInfoRsp} */ public static final class DungeonEntryInfoRsp extends @@ -137,26 +132,22 @@ private DungeonEntryInfoRsp( case 0: done = true; break; - case 16: { + case 8: { - recommendDungeonId_ = input.readUInt32(); + pointId_ = input.readUInt32(); break; } - case 34: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dungeonEntryList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dungeonEntryList_.add( - input.readMessage(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.parser(), extensionRegistry)); + case 32: { + + recommendDungeonId_ = input.readUInt32(); break; } - case 40: { + case 48: { - pointId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 90: { + case 66: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { dungeonEntryPointList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -165,9 +156,13 @@ private DungeonEntryInfoRsp( input.readMessage(emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.parser(), extensionRegistry)); break; } - case 104: { - - retcode_ = input.readInt32(); + case 90: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + dungeonEntryList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + dungeonEntryList_.add( + input.readMessage(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.parser(), extensionRegistry)); break; } default: { @@ -185,12 +180,12 @@ private DungeonEntryInfoRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dungeonEntryList_ = java.util.Collections.unmodifiableList(dungeonEntryList_); - } if (((mutable_bitField0_ & 0x00000002) != 0)) { dungeonEntryPointList_ = java.util.Collections.unmodifiableList(dungeonEntryPointList_); } + if (((mutable_bitField0_ & 0x00000001) != 0)) { + dungeonEntryList_ = java.util.Collections.unmodifiableList(dungeonEntryList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -208,17 +203,17 @@ private DungeonEntryInfoRsp( emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp.class, emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp.Builder.class); } - public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 4; + public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 11; private java.util.List dungeonEntryList_; /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ @java.lang.Override public java.util.List getDungeonEntryListList() { return dungeonEntryList_; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ @java.lang.Override public java.util.List @@ -226,21 +221,21 @@ public java.util.Listrepeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ @java.lang.Override public int getDungeonEntryListCount() { return dungeonEntryList_.size(); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) { return dungeonEntryList_.get(index); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder( @@ -248,17 +243,17 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBu return dungeonEntryList_.get(index); } - public static final int DUNGEON_ENTRY_POINT_LIST_FIELD_NUMBER = 11; + public static final int DUNGEON_ENTRY_POINT_LIST_FIELD_NUMBER = 8; private java.util.List dungeonEntryPointList_; /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ @java.lang.Override public java.util.List getDungeonEntryPointListList() { return dungeonEntryPointList_; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ @java.lang.Override public java.util.List @@ -266,21 +261,21 @@ public java.util.Listrepeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ @java.lang.Override public int getDungeonEntryPointListCount() { return dungeonEntryPointList_.size(); } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo getDungeonEntryPointList(int index) { return dungeonEntryPointList_.get(index); } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder getDungeonEntryPointListOrBuilder( @@ -288,10 +283,10 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi return dungeonEntryPointList_.get(index); } - public static final int RETCODE_FIELD_NUMBER = 13; + public static final int RETCODE_FIELD_NUMBER = 6; private int retcode_; /** - * int32 retcode = 13; + * int32 retcode = 6; * @return The retcode. */ @java.lang.Override @@ -299,10 +294,10 @@ public int getRetcode() { return retcode_; } - public static final int POINT_ID_FIELD_NUMBER = 5; + public static final int POINT_ID_FIELD_NUMBER = 1; private int pointId_; /** - * uint32 point_id = 5; + * uint32 point_id = 1; * @return The pointId. */ @java.lang.Override @@ -310,10 +305,10 @@ public int getPointId() { return pointId_; } - public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 2; + public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 4; private int recommendDungeonId_; /** - * uint32 recommend_dungeon_id = 2; + * uint32 recommend_dungeon_id = 4; * @return The recommendDungeonId. */ @java.lang.Override @@ -335,20 +330,20 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (recommendDungeonId_ != 0) { - output.writeUInt32(2, recommendDungeonId_); + if (pointId_ != 0) { + output.writeUInt32(1, pointId_); } - for (int i = 0; i < dungeonEntryList_.size(); i++) { - output.writeMessage(4, dungeonEntryList_.get(i)); + if (recommendDungeonId_ != 0) { + output.writeUInt32(4, recommendDungeonId_); } - if (pointId_ != 0) { - output.writeUInt32(5, pointId_); + if (retcode_ != 0) { + output.writeInt32(6, retcode_); } for (int i = 0; i < dungeonEntryPointList_.size(); i++) { - output.writeMessage(11, dungeonEntryPointList_.get(i)); + output.writeMessage(8, dungeonEntryPointList_.get(i)); } - if (retcode_ != 0) { - output.writeInt32(13, retcode_); + for (int i = 0; i < dungeonEntryList_.size(); i++) { + output.writeMessage(11, dungeonEntryList_.get(i)); } unknownFields.writeTo(output); } @@ -359,25 +354,25 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (recommendDungeonId_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, recommendDungeonId_); + .computeUInt32Size(1, pointId_); } - for (int i = 0; i < dungeonEntryList_.size(); i++) { + if (recommendDungeonId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, dungeonEntryList_.get(i)); + .computeUInt32Size(4, recommendDungeonId_); } - if (pointId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, pointId_); + .computeInt32Size(6, retcode_); } for (int i = 0; i < dungeonEntryPointList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, dungeonEntryPointList_.get(i)); + .computeMessageSize(8, dungeonEntryPointList_.get(i)); } - if (retcode_ != 0) { + for (int i = 0; i < dungeonEntryList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(13, retcode_); + .computeMessageSize(11, dungeonEntryList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -525,11 +520,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 28381
-     * Obf: FJKAAALHLDG
-     *
- * * Protobuf type {@code DungeonEntryInfoRsp} */ public static final class Builder extends @@ -787,7 +777,7 @@ private void ensureDungeonEntryListIsMutable() { emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> dungeonEntryListBuilder_; /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public java.util.List getDungeonEntryListList() { if (dungeonEntryListBuilder_ == null) { @@ -797,7 +787,7 @@ public java.util.Listrepeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public int getDungeonEntryListCount() { if (dungeonEntryListBuilder_ == null) { @@ -807,7 +797,7 @@ public int getDungeonEntryListCount() { } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) { if (dungeonEntryListBuilder_ == null) { @@ -817,7 +807,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo get } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder setDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) { @@ -834,7 +824,7 @@ public Builder setDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder setDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) { @@ -848,7 +838,7 @@ public Builder setDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder addDungeonEntryList(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) { if (dungeonEntryListBuilder_ == null) { @@ -864,7 +854,7 @@ public Builder addDungeonEntryList(emu.grasscutter.net.proto.DungeonEntryInfoOut return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder addDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) { @@ -881,7 +871,7 @@ public Builder addDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder addDungeonEntryList( emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) { @@ -895,7 +885,7 @@ public Builder addDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder addDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) { @@ -909,7 +899,7 @@ public Builder addDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder addAllDungeonEntryList( java.lang.Iterable values) { @@ -924,7 +914,7 @@ public Builder addAllDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder clearDungeonEntryList() { if (dungeonEntryListBuilder_ == null) { @@ -937,7 +927,7 @@ public Builder clearDungeonEntryList() { return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public Builder removeDungeonEntryList(int index) { if (dungeonEntryListBuilder_ == null) { @@ -950,14 +940,14 @@ public Builder removeDungeonEntryList(int index) { return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder getDungeonEntryListBuilder( int index) { return getDungeonEntryListFieldBuilder().getBuilder(index); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder( int index) { @@ -967,7 +957,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBu } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public java.util.List getDungeonEntryListOrBuilderList() { @@ -978,14 +968,14 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBu } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder() { return getDungeonEntryListFieldBuilder().addBuilder( emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance()); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder( int index) { @@ -993,7 +983,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Bui index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance()); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 4; + * repeated .DungeonEntryInfo dungeon_entry_list = 11; */ public java.util.List getDungeonEntryListBuilderList() { @@ -1027,7 +1017,7 @@ private void ensureDungeonEntryPointListIsMutable() { emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder> dungeonEntryPointListBuilder_; /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public java.util.List getDungeonEntryPointListList() { if (dungeonEntryPointListBuilder_ == null) { @@ -1037,7 +1027,7 @@ public java.util.Listrepeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public int getDungeonEntryPointListCount() { if (dungeonEntryPointListBuilder_ == null) { @@ -1047,7 +1037,7 @@ public int getDungeonEntryPointListCount() { } } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo getDungeonEntryPointList(int index) { if (dungeonEntryPointListBuilder_ == null) { @@ -1057,7 +1047,7 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi } } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder setDungeonEntryPointList( int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo value) { @@ -1074,7 +1064,7 @@ public Builder setDungeonEntryPointList( return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder setDungeonEntryPointList( int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder builderForValue) { @@ -1088,7 +1078,7 @@ public Builder setDungeonEntryPointList( return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder addDungeonEntryPointList(emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo value) { if (dungeonEntryPointListBuilder_ == null) { @@ -1104,7 +1094,7 @@ public Builder addDungeonEntryPointList(emu.grasscutter.net.proto.DungeonEntryPo return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder addDungeonEntryPointList( int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo value) { @@ -1121,7 +1111,7 @@ public Builder addDungeonEntryPointList( return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder addDungeonEntryPointList( emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder builderForValue) { @@ -1135,7 +1125,7 @@ public Builder addDungeonEntryPointList( return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder addDungeonEntryPointList( int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder builderForValue) { @@ -1149,7 +1139,7 @@ public Builder addDungeonEntryPointList( return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder addAllDungeonEntryPointList( java.lang.Iterable values) { @@ -1164,7 +1154,7 @@ public Builder addAllDungeonEntryPointList( return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder clearDungeonEntryPointList() { if (dungeonEntryPointListBuilder_ == null) { @@ -1177,7 +1167,7 @@ public Builder clearDungeonEntryPointList() { return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public Builder removeDungeonEntryPointList(int index) { if (dungeonEntryPointListBuilder_ == null) { @@ -1190,14 +1180,14 @@ public Builder removeDungeonEntryPointList(int index) { return this; } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder getDungeonEntryPointListBuilder( int index) { return getDungeonEntryPointListFieldBuilder().getBuilder(index); } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder getDungeonEntryPointListOrBuilder( int index) { @@ -1207,7 +1197,7 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi } } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public java.util.List getDungeonEntryPointListOrBuilderList() { @@ -1218,14 +1208,14 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi } } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder addDungeonEntryPointListBuilder() { return getDungeonEntryPointListFieldBuilder().addBuilder( emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.getDefaultInstance()); } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder addDungeonEntryPointListBuilder( int index) { @@ -1233,7 +1223,7 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.getDefaultInstance()); } /** - * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11; + * repeated .DungeonEntryPointInfo dungeon_entry_point_list = 8; */ public java.util.List getDungeonEntryPointListBuilderList() { @@ -1256,7 +1246,7 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi private int retcode_ ; /** - * int32 retcode = 13; + * int32 retcode = 6; * @return The retcode. */ @java.lang.Override @@ -1264,7 +1254,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 13; + * int32 retcode = 6; * @param value The retcode to set. * @return This builder for chaining. */ @@ -1275,7 +1265,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 13; + * int32 retcode = 6; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -1287,7 +1277,7 @@ public Builder clearRetcode() { private int pointId_ ; /** - * uint32 point_id = 5; + * uint32 point_id = 1; * @return The pointId. */ @java.lang.Override @@ -1295,7 +1285,7 @@ public int getPointId() { return pointId_; } /** - * uint32 point_id = 5; + * uint32 point_id = 1; * @param value The pointId to set. * @return This builder for chaining. */ @@ -1306,7 +1296,7 @@ public Builder setPointId(int value) { return this; } /** - * uint32 point_id = 5; + * uint32 point_id = 1; * @return This builder for chaining. */ public Builder clearPointId() { @@ -1318,7 +1308,7 @@ public Builder clearPointId() { private int recommendDungeonId_ ; /** - * uint32 recommend_dungeon_id = 2; + * uint32 recommend_dungeon_id = 4; * @return The recommendDungeonId. */ @java.lang.Override @@ -1326,7 +1316,7 @@ public int getRecommendDungeonId() { return recommendDungeonId_; } /** - * uint32 recommend_dungeon_id = 2; + * uint32 recommend_dungeon_id = 4; * @param value The recommendDungeonId to set. * @return This builder for chaining. */ @@ -1337,7 +1327,7 @@ public Builder setRecommendDungeonId(int value) { return this; } /** - * uint32 recommend_dungeon_id = 2; + * uint32 recommend_dungeon_id = 4; * @return This builder for chaining. */ public Builder clearRecommendDungeonId() { @@ -1416,10 +1406,10 @@ public emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoR "\n\031DungeonEntryInfoRsp.proto\032\026DungeonEntr" + "yInfo.proto\032\033DungeonEntryPointInfo.proto" + "\"\277\001\n\023DungeonEntryInfoRsp\022-\n\022dungeon_entr" + - "y_list\030\004 \003(\0132\021.DungeonEntryInfo\0228\n\030dunge" + - "on_entry_point_list\030\013 \003(\0132\026.DungeonEntry" + - "PointInfo\022\017\n\007retcode\030\r \001(\005\022\020\n\010point_id\030\005" + - " \001(\r\022\034\n\024recommend_dungeon_id\030\002 \001(\rB\033\n\031em" + + "y_list\030\013 \003(\0132\021.DungeonEntryInfo\0228\n\030dunge" + + "on_entry_point_list\030\010 \003(\0132\026.DungeonEntry" + + "PointInfo\022\017\n\007retcode\030\006 \001(\005\022\020\n\010point_id\030\001" + + " \001(\r\022\034\n\024recommend_dungeon_id\030\004 \001(\rB\033\n\031em" + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java index f6e1404ba49..d4c712a1202 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java @@ -19,52 +19,48 @@ public interface DungeonEntryPointInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ java.util.List getDungeonEntryListList(); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ int getDungeonEntryListCount(); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ java.util.List getDungeonEntryListOrBuilderList(); /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder( int index); /** - * uint32 point_id = 2; + * uint32 point_id = 13; * @return The pointId. */ int getPointId(); /** - * uint32 recommend_dungeon_id = 10; - * @return The recommendDungeonId. + * uint32 scene_id = 15; + * @return The sceneId. */ - int getRecommendDungeonId(); + int getSceneId(); /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 recommend_dungeon_id = 2; + * @return The recommendDungeonId. */ - int getSceneId(); + int getRecommendDungeonId(); } /** - * 
-   * Obf: CECCCBKAFKN
-   *
- * * Protobuf type {@code DungeonEntryPointInfo} */ public static final class DungeonEntryPointInfo extends @@ -113,10 +109,10 @@ private DungeonEntryPointInfo( break; case 16: { - pointId_ = input.readUInt32(); + recommendDungeonId_ = input.readUInt32(); break; } - case 74: { + case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { dungeonEntryList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -125,12 +121,12 @@ private DungeonEntryPointInfo( input.readMessage(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.parser(), extensionRegistry)); break; } - case 80: { + case 104: { - recommendDungeonId_ = input.readUInt32(); + pointId_ = input.readUInt32(); break; } - case 96: { + case 120: { sceneId_ = input.readUInt32(); break; @@ -170,17 +166,17 @@ private DungeonEntryPointInfo( emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.class, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder.class); } - public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 9; + public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 3; private java.util.List dungeonEntryList_; /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ @java.lang.Override public java.util.List getDungeonEntryListList() { return dungeonEntryList_; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ @java.lang.Override public java.util.List @@ -188,21 +184,21 @@ public java.util.Listrepeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ @java.lang.Override public int getDungeonEntryListCount() { return dungeonEntryList_.size(); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) { return dungeonEntryList_.get(index); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder( @@ -210,10 +206,10 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBu return dungeonEntryList_.get(index); } - public static final int POINT_ID_FIELD_NUMBER = 2; + public static final int POINT_ID_FIELD_NUMBER = 13; private int pointId_; /** - * uint32 point_id = 2; + * uint32 point_id = 13; * @return The pointId. */ @java.lang.Override @@ -221,26 +217,26 @@ public int getPointId() { return pointId_; } - public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 10; - private int recommendDungeonId_; + public static final int SCENE_ID_FIELD_NUMBER = 15; + private int sceneId_; /** - * uint32 recommend_dungeon_id = 10; - * @return The recommendDungeonId. + * uint32 scene_id = 15; + * @return The sceneId. */ @java.lang.Override - public int getRecommendDungeonId() { - return recommendDungeonId_; + public int getSceneId() { + return sceneId_; } - public static final int SCENE_ID_FIELD_NUMBER = 12; - private int sceneId_; + public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 2; + private int recommendDungeonId_; /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 recommend_dungeon_id = 2; + * @return The recommendDungeonId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getRecommendDungeonId() { + return recommendDungeonId_; } private byte memoizedIsInitialized = -1; @@ -257,17 +253,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (pointId_ != 0) { - output.writeUInt32(2, pointId_); + if (recommendDungeonId_ != 0) { + output.writeUInt32(2, recommendDungeonId_); } for (int i = 0; i < dungeonEntryList_.size(); i++) { - output.writeMessage(9, dungeonEntryList_.get(i)); + output.writeMessage(3, dungeonEntryList_.get(i)); } - if (recommendDungeonId_ != 0) { - output.writeUInt32(10, recommendDungeonId_); + if (pointId_ != 0) { + output.writeUInt32(13, pointId_); } if (sceneId_ != 0) { - output.writeUInt32(12, sceneId_); + output.writeUInt32(15, sceneId_); } unknownFields.writeTo(output); } @@ -278,21 +274,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (pointId_ != 0) { + if (recommendDungeonId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, pointId_); + .computeUInt32Size(2, recommendDungeonId_); } for (int i = 0; i < dungeonEntryList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, dungeonEntryList_.get(i)); + .computeMessageSize(3, dungeonEntryList_.get(i)); } - if (recommendDungeonId_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, recommendDungeonId_); + .computeUInt32Size(13, pointId_); } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, sceneId_); + .computeUInt32Size(15, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -313,10 +309,10 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getDungeonEntryListList())) return false; if (getPointId() != other.getPointId()) return false; - if (getRecommendDungeonId() - != other.getRecommendDungeonId()) return false; if (getSceneId() != other.getSceneId()) return false; + if (getRecommendDungeonId() + != other.getRecommendDungeonId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -334,10 +330,10 @@ public int hashCode() { } hash = (37 * hash) + POINT_ID_FIELD_NUMBER; hash = (53 * hash) + getPointId(); - hash = (37 * hash) + RECOMMEND_DUNGEON_ID_FIELD_NUMBER; - hash = (53 * hash) + getRecommendDungeonId(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + RECOMMEND_DUNGEON_ID_FIELD_NUMBER; + hash = (53 * hash) + getRecommendDungeonId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -434,10 +430,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: CECCCBKAFKN
-     *
- * * Protobuf type {@code DungeonEntryPointInfo} */ public static final class Builder extends @@ -484,10 +476,10 @@ public Builder clear() { } pointId_ = 0; - recommendDungeonId_ = 0; - sceneId_ = 0; + recommendDungeonId_ = 0; + return this; } @@ -525,8 +517,8 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi result.dungeonEntryList_ = dungeonEntryListBuilder_.build(); } result.pointId_ = pointId_; - result.recommendDungeonId_ = recommendDungeonId_; result.sceneId_ = sceneId_; + result.recommendDungeonId_ = recommendDungeonId_; onBuilt(); return result; } @@ -604,12 +596,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.DungeonEntryPointInfoOuterCla if (other.getPointId() != 0) { setPointId(other.getPointId()); } - if (other.getRecommendDungeonId() != 0) { - setRecommendDungeonId(other.getRecommendDungeonId()); - } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } + if (other.getRecommendDungeonId() != 0) { + setRecommendDungeonId(other.getRecommendDungeonId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -653,7 +645,7 @@ private void ensureDungeonEntryListIsMutable() { emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> dungeonEntryListBuilder_; /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public java.util.List getDungeonEntryListList() { if (dungeonEntryListBuilder_ == null) { @@ -663,7 +655,7 @@ public java.util.Listrepeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public int getDungeonEntryListCount() { if (dungeonEntryListBuilder_ == null) { @@ -673,7 +665,7 @@ public int getDungeonEntryListCount() { } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) { if (dungeonEntryListBuilder_ == null) { @@ -683,7 +675,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo get } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder setDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) { @@ -700,7 +692,7 @@ public Builder setDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder setDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) { @@ -714,7 +706,7 @@ public Builder setDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder addDungeonEntryList(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) { if (dungeonEntryListBuilder_ == null) { @@ -730,7 +722,7 @@ public Builder addDungeonEntryList(emu.grasscutter.net.proto.DungeonEntryInfoOut return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder addDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) { @@ -747,7 +739,7 @@ public Builder addDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder addDungeonEntryList( emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) { @@ -761,7 +753,7 @@ public Builder addDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder addDungeonEntryList( int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) { @@ -775,7 +767,7 @@ public Builder addDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder addAllDungeonEntryList( java.lang.Iterable values) { @@ -790,7 +782,7 @@ public Builder addAllDungeonEntryList( return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder clearDungeonEntryList() { if (dungeonEntryListBuilder_ == null) { @@ -803,7 +795,7 @@ public Builder clearDungeonEntryList() { return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public Builder removeDungeonEntryList(int index) { if (dungeonEntryListBuilder_ == null) { @@ -816,14 +808,14 @@ public Builder removeDungeonEntryList(int index) { return this; } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder getDungeonEntryListBuilder( int index) { return getDungeonEntryListFieldBuilder().getBuilder(index); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder( int index) { @@ -833,7 +825,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBu } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public java.util.List getDungeonEntryListOrBuilderList() { @@ -844,14 +836,14 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBu } } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder() { return getDungeonEntryListFieldBuilder().addBuilder( emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance()); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder( int index) { @@ -859,7 +851,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Bui index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance()); } /** - * repeated .DungeonEntryInfo dungeon_entry_list = 9; + * repeated .DungeonEntryInfo dungeon_entry_list = 3; */ public java.util.List getDungeonEntryListBuilderList() { @@ -882,7 +874,7 @@ public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Bui private int pointId_ ; /** - * uint32 point_id = 2; + * uint32 point_id = 13; * @return The pointId. */ @java.lang.Override @@ -890,7 +882,7 @@ public int getPointId() { return pointId_; } /** - * uint32 point_id = 2; + * uint32 point_id = 13; * @param value The pointId to set. * @return This builder for chaining. */ @@ -901,7 +893,7 @@ public Builder setPointId(int value) { return this; } /** - * uint32 point_id = 2; + * uint32 point_id = 13; * @return This builder for chaining. */ public Builder clearPointId() { @@ -911,64 +903,64 @@ public Builder clearPointId() { return this; } - private int recommendDungeonId_ ; + private int sceneId_ ; /** - * uint32 recommend_dungeon_id = 10; - * @return The recommendDungeonId. + * uint32 scene_id = 15; + * @return The sceneId. */ @java.lang.Override - public int getRecommendDungeonId() { - return recommendDungeonId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 recommend_dungeon_id = 10; - * @param value The recommendDungeonId to set. + * uint32 scene_id = 15; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setRecommendDungeonId(int value) { + public Builder setSceneId(int value) { - recommendDungeonId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 recommend_dungeon_id = 10; + * uint32 scene_id = 15; * @return This builder for chaining. */ - public Builder clearRecommendDungeonId() { + public Builder clearSceneId() { - recommendDungeonId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int sceneId_ ; + private int recommendDungeonId_ ; /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 recommend_dungeon_id = 2; + * @return The recommendDungeonId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getRecommendDungeonId() { + return recommendDungeonId_; } /** - * uint32 scene_id = 12; - * @param value The sceneId to set. + * uint32 recommend_dungeon_id = 2; + * @param value The recommendDungeonId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setRecommendDungeonId(int value) { - sceneId_ = value; + recommendDungeonId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 12; + * uint32 recommend_dungeon_id = 2; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearRecommendDungeonId() { - sceneId_ = 0; + recommendDungeonId_ = 0; onChanged(); return this; } @@ -1041,9 +1033,9 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi java.lang.String[] descriptorData = { "\n\033DungeonEntryPointInfo.proto\032\026DungeonEn" + "tryInfo.proto\"\210\001\n\025DungeonEntryPointInfo\022" + - "-\n\022dungeon_entry_list\030\t \003(\0132\021.DungeonEnt" + - "ryInfo\022\020\n\010point_id\030\002 \001(\r\022\034\n\024recommend_du" + - "ngeon_id\030\n \001(\r\022\020\n\010scene_id\030\014 \001(\rB\033\n\031emu." + + "-\n\022dungeon_entry_list\030\003 \003(\0132\021.DungeonEnt" + + "ryInfo\022\020\n\010point_id\030\r \001(\r\022\020\n\010scene_id\030\017 \001" + + "(\r\022\034\n\024recommend_dungeon_id\030\002 \001(\rB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1056,7 +1048,7 @@ public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPoi internal_static_DungeonEntryPointInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonEntryPointInfo_descriptor, - new java.lang.String[] { "DungeonEntryList", "PointId", "RecommendDungeonId", "SceneId", }); + new java.lang.String[] { "DungeonEntryList", "PointId", "SceneId", "RecommendDungeonId", }); emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java index c56efac568c..a611599cacc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java @@ -19,47 +19,42 @@ public interface HitTreeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector tree_pos = 9; - * @return Whether the treePos field is set. + * .Vector drop_pos = 1; + * @return Whether the dropPos field is set. */ - boolean hasTreePos(); + boolean hasDropPos(); /** - * .Vector tree_pos = 9; - * @return The treePos. + * .Vector drop_pos = 1; + * @return The dropPos. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos(); /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder(); /** - * .Vector drop_pos = 7; - * @return Whether the dropPos field is set. + * .Vector tree_pos = 15; + * @return Whether the treePos field is set. */ - boolean hasDropPos(); + boolean hasTreePos(); /** - * .Vector drop_pos = 7; - * @return The dropPos. + * .Vector tree_pos = 15; + * @return The treePos. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos(); /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder(); /** - * uint32 tree_type = 10; + * uint32 tree_type = 12; * @return The treeType. */ int getTreeType(); } /** - * 
-   * CmdId: 8766
-   * Obf: BAGAPIFEAFI
-   *
- * * Protobuf type {@code HitTreeNotify} */ public static final class HitTreeNotify extends @@ -104,7 +99,7 @@ private HitTreeNotify( case 0: done = true; break; - case 58: { + case 10: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (dropPos_ != null) { subBuilder = dropPos_.toBuilder(); @@ -117,7 +112,12 @@ private HitTreeNotify( break; } - case 74: { + case 96: { + + treeType_ = input.readUInt32(); + break; + } + case 122: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (treePos_ != null) { subBuilder = treePos_.toBuilder(); @@ -130,11 +130,6 @@ private HitTreeNotify( break; } - case 80: { - - treeType_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -167,62 +162,62 @@ private HitTreeNotify( emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.class, emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.Builder.class); } - public static final int TREE_POS_FIELD_NUMBER = 9; - private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_; + public static final int DROP_POS_FIELD_NUMBER = 1; + private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_; /** - * .Vector tree_pos = 9; - * @return Whether the treePos field is set. + * .Vector drop_pos = 1; + * @return Whether the dropPos field is set. */ @java.lang.Override - public boolean hasTreePos() { - return treePos_ != null; + public boolean hasDropPos() { + return dropPos_ != null; } /** - * .Vector tree_pos = 9; - * @return The treePos. + * .Vector drop_pos = 1; + * @return The dropPos. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() { - return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() { + return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_; } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() { - return getTreePos(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() { + return getDropPos(); } - public static final int DROP_POS_FIELD_NUMBER = 7; - private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_; + public static final int TREE_POS_FIELD_NUMBER = 15; + private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_; /** - * .Vector drop_pos = 7; - * @return Whether the dropPos field is set. + * .Vector tree_pos = 15; + * @return Whether the treePos field is set. */ @java.lang.Override - public boolean hasDropPos() { - return dropPos_ != null; + public boolean hasTreePos() { + return treePos_ != null; } /** - * .Vector drop_pos = 7; - * @return The dropPos. + * .Vector tree_pos = 15; + * @return The treePos. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() { - return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() { + return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_; } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() { - return getDropPos(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() { + return getTreePos(); } - public static final int TREE_TYPE_FIELD_NUMBER = 10; + public static final int TREE_TYPE_FIELD_NUMBER = 12; private int treeType_; /** - * uint32 tree_type = 10; + * uint32 tree_type = 12; * @return The treeType. */ @java.lang.Override @@ -245,13 +240,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (dropPos_ != null) { - output.writeMessage(7, getDropPos()); - } - if (treePos_ != null) { - output.writeMessage(9, getTreePos()); + output.writeMessage(1, getDropPos()); } if (treeType_ != 0) { - output.writeUInt32(10, treeType_); + output.writeUInt32(12, treeType_); + } + if (treePos_ != null) { + output.writeMessage(15, getTreePos()); } unknownFields.writeTo(output); } @@ -264,15 +259,15 @@ public int getSerializedSize() { size = 0; if (dropPos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, getDropPos()); + .computeMessageSize(1, getDropPos()); } - if (treePos_ != null) { + if (treeType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, getTreePos()); + .computeUInt32Size(12, treeType_); } - if (treeType_ != 0) { + if (treePos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, treeType_); + .computeMessageSize(15, getTreePos()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -289,16 +284,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other = (emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify) obj; - if (hasTreePos() != other.hasTreePos()) return false; - if (hasTreePos()) { - if (!getTreePos() - .equals(other.getTreePos())) return false; - } if (hasDropPos() != other.hasDropPos()) return false; if (hasDropPos()) { if (!getDropPos() .equals(other.getDropPos())) return false; } + if (hasTreePos() != other.hasTreePos()) return false; + if (hasTreePos()) { + if (!getTreePos() + .equals(other.getTreePos())) return false; + } if (getTreeType() != other.getTreeType()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -312,14 +307,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasTreePos()) { - hash = (37 * hash) + TREE_POS_FIELD_NUMBER; - hash = (53 * hash) + getTreePos().hashCode(); - } if (hasDropPos()) { hash = (37 * hash) + DROP_POS_FIELD_NUMBER; hash = (53 * hash) + getDropPos().hashCode(); } + if (hasTreePos()) { + hash = (37 * hash) + TREE_POS_FIELD_NUMBER; + hash = (53 * hash) + getTreePos().hashCode(); + } hash = (37 * hash) + TREE_TYPE_FIELD_NUMBER; hash = (53 * hash) + getTreeType(); hash = (29 * hash) + unknownFields.hashCode(); @@ -418,11 +413,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 8766
-     * Obf: BAGAPIFEAFI
-     *
- * * Protobuf type {@code HitTreeNotify} */ public static final class Builder extends @@ -460,18 +450,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (treePosBuilder_ == null) { - treePos_ = null; - } else { - treePos_ = null; - treePosBuilder_ = null; - } if (dropPosBuilder_ == null) { dropPos_ = null; } else { dropPos_ = null; dropPosBuilder_ = null; } + if (treePosBuilder_ == null) { + treePos_ = null; + } else { + treePos_ = null; + treePosBuilder_ = null; + } treeType_ = 0; return this; @@ -500,16 +490,16 @@ public emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify build() { @java.lang.Override public emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify buildPartial() { emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify result = new emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify(this); - if (treePosBuilder_ == null) { - result.treePos_ = treePos_; - } else { - result.treePos_ = treePosBuilder_.build(); - } if (dropPosBuilder_ == null) { result.dropPos_ = dropPos_; } else { result.dropPos_ = dropPosBuilder_.build(); } + if (treePosBuilder_ == null) { + result.treePos_ = treePos_; + } else { + result.treePos_ = treePosBuilder_.build(); + } result.treeType_ = treeType_; onBuilt(); return result; @@ -559,12 +549,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other) { if (other == emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.getDefaultInstance()) return this; - if (other.hasTreePos()) { - mergeTreePos(other.getTreePos()); - } if (other.hasDropPos()) { mergeDropPos(other.getDropPos()); } + if (other.hasTreePos()) { + mergeTreePos(other.getTreePos()); + } if (other.getTreeType() != 0) { setTreeType(other.getTreeType()); } @@ -597,247 +587,247 @@ public Builder mergeFrom( return this; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_; + private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> treePosBuilder_; + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dropPosBuilder_; /** - * .Vector tree_pos = 9; - * @return Whether the treePos field is set. + * .Vector drop_pos = 1; + * @return Whether the dropPos field is set. */ - public boolean hasTreePos() { - return treePosBuilder_ != null || treePos_ != null; + public boolean hasDropPos() { + return dropPosBuilder_ != null || dropPos_ != null; } /** - * .Vector tree_pos = 9; - * @return The treePos. + * .Vector drop_pos = 1; + * @return The dropPos. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() { - if (treePosBuilder_ == null) { - return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() { + if (dropPosBuilder_ == null) { + return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_; } else { - return treePosBuilder_.getMessage(); + return dropPosBuilder_.getMessage(); } } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ - public Builder setTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (treePosBuilder_ == null) { + public Builder setDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (dropPosBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - treePos_ = value; + dropPos_ = value; onChanged(); } else { - treePosBuilder_.setMessage(value); + dropPosBuilder_.setMessage(value); } return this; } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ - public Builder setTreePos( + public Builder setDropPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (treePosBuilder_ == null) { - treePos_ = builderForValue.build(); + if (dropPosBuilder_ == null) { + dropPos_ = builderForValue.build(); onChanged(); } else { - treePosBuilder_.setMessage(builderForValue.build()); + dropPosBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ - public Builder mergeTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (treePosBuilder_ == null) { - if (treePos_ != null) { - treePos_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(treePos_).mergeFrom(value).buildPartial(); + public Builder mergeDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (dropPosBuilder_ == null) { + if (dropPos_ != null) { + dropPos_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(dropPos_).mergeFrom(value).buildPartial(); } else { - treePos_ = value; + dropPos_ = value; } onChanged(); } else { - treePosBuilder_.mergeFrom(value); + dropPosBuilder_.mergeFrom(value); } return this; } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ - public Builder clearTreePos() { - if (treePosBuilder_ == null) { - treePos_ = null; + public Builder clearDropPos() { + if (dropPosBuilder_ == null) { + dropPos_ = null; onChanged(); } else { - treePos_ = null; - treePosBuilder_ = null; + dropPos_ = null; + dropPosBuilder_ = null; } return this; } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTreePosBuilder() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDropPosBuilder() { onChanged(); - return getTreePosFieldBuilder().getBuilder(); + return getDropPosFieldBuilder().getBuilder(); } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() { - if (treePosBuilder_ != null) { - return treePosBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() { + if (dropPosBuilder_ != null) { + return dropPosBuilder_.getMessageOrBuilder(); } else { - return treePos_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_; + return dropPos_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_; } } /** - * .Vector tree_pos = 9; + * .Vector drop_pos = 1; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getTreePosFieldBuilder() { - if (treePosBuilder_ == null) { - treePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getDropPosFieldBuilder() { + if (dropPosBuilder_ == null) { + dropPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getTreePos(), + getDropPos(), getParentForChildren(), isClean()); - treePos_ = null; + dropPos_ = null; } - return treePosBuilder_; + return dropPosBuilder_; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_; + private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dropPosBuilder_; + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> treePosBuilder_; /** - * .Vector drop_pos = 7; - * @return Whether the dropPos field is set. + * .Vector tree_pos = 15; + * @return Whether the treePos field is set. */ - public boolean hasDropPos() { - return dropPosBuilder_ != null || dropPos_ != null; + public boolean hasTreePos() { + return treePosBuilder_ != null || treePos_ != null; } /** - * .Vector drop_pos = 7; - * @return The dropPos. + * .Vector tree_pos = 15; + * @return The treePos. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() { - if (dropPosBuilder_ == null) { - return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() { + if (treePosBuilder_ == null) { + return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_; } else { - return dropPosBuilder_.getMessage(); + return treePosBuilder_.getMessage(); } } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ - public Builder setDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (dropPosBuilder_ == null) { + public Builder setTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (treePosBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - dropPos_ = value; + treePos_ = value; onChanged(); } else { - dropPosBuilder_.setMessage(value); + treePosBuilder_.setMessage(value); } return this; } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ - public Builder setDropPos( + public Builder setTreePos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (dropPosBuilder_ == null) { - dropPos_ = builderForValue.build(); + if (treePosBuilder_ == null) { + treePos_ = builderForValue.build(); onChanged(); } else { - dropPosBuilder_.setMessage(builderForValue.build()); + treePosBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ - public Builder mergeDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (dropPosBuilder_ == null) { - if (dropPos_ != null) { - dropPos_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(dropPos_).mergeFrom(value).buildPartial(); + public Builder mergeTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (treePosBuilder_ == null) { + if (treePos_ != null) { + treePos_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(treePos_).mergeFrom(value).buildPartial(); } else { - dropPos_ = value; + treePos_ = value; } onChanged(); } else { - dropPosBuilder_.mergeFrom(value); + treePosBuilder_.mergeFrom(value); } return this; } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ - public Builder clearDropPos() { - if (dropPosBuilder_ == null) { - dropPos_ = null; + public Builder clearTreePos() { + if (treePosBuilder_ == null) { + treePos_ = null; onChanged(); } else { - dropPos_ = null; - dropPosBuilder_ = null; + treePos_ = null; + treePosBuilder_ = null; } return this; } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDropPosBuilder() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTreePosBuilder() { onChanged(); - return getDropPosFieldBuilder().getBuilder(); + return getTreePosFieldBuilder().getBuilder(); } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() { - if (dropPosBuilder_ != null) { - return dropPosBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() { + if (treePosBuilder_ != null) { + return treePosBuilder_.getMessageOrBuilder(); } else { - return dropPos_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_; + return treePos_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_; } } /** - * .Vector drop_pos = 7; + * .Vector tree_pos = 15; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getDropPosFieldBuilder() { - if (dropPosBuilder_ == null) { - dropPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getTreePosFieldBuilder() { + if (treePosBuilder_ == null) { + treePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getDropPos(), + getTreePos(), getParentForChildren(), isClean()); - dropPos_ = null; + treePos_ = null; } - return dropPosBuilder_; + return treePosBuilder_; } private int treeType_ ; /** - * uint32 tree_type = 10; + * uint32 tree_type = 12; * @return The treeType. */ @java.lang.Override @@ -845,7 +835,7 @@ public int getTreeType() { return treeType_; } /** - * uint32 tree_type = 10; + * uint32 tree_type = 12; * @param value The treeType to set. * @return This builder for chaining. */ @@ -856,7 +846,7 @@ public Builder setTreeType(int value) { return this; } /** - * uint32 tree_type = 10; + * uint32 tree_type = 12; * @return This builder for chaining. */ public Builder clearTreeType() { @@ -933,9 +923,9 @@ public emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify getDefaul static { java.lang.String[] descriptorData = { "\n\023HitTreeNotify.proto\032\014Vector.proto\"X\n\rH" + - "itTreeNotify\022\031\n\010tree_pos\030\t \001(\0132\007.Vector\022" + - "\031\n\010drop_pos\030\007 \001(\0132\007.Vector\022\021\n\ttree_type\030" + - "\n \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + + "itTreeNotify\022\031\n\010drop_pos\030\001 \001(\0132\007.Vector\022" + + "\031\n\010tree_pos\030\017 \001(\0132\007.Vector\022\021\n\ttree_type\030" + + "\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -948,7 +938,7 @@ public emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify getDefaul internal_static_HitTreeNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_HitTreeNotify_descriptor, - new java.lang.String[] { "TreePos", "DropPos", "TreeType", }); + new java.lang.String[] { "DropPos", "TreePos", "TreeType", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java index afc4662b9e0..808a08c1d18 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java @@ -19,104 +19,99 @@ public interface ItemAddHintNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool NAMDHIDNAMP = 1; - * @return The nAMDHIDNAMP. + * .Vector position = 4; + * @return Whether the position field is set. + */ + boolean hasPosition(); + /** + * .Vector position = 4; + * @return The position. + */ + emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition(); + /** + * .Vector position = 4; */ - boolean getNAMDHIDNAMP(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder(); /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ java.util.List getItemListList(); /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getItemList(int index); /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ int getItemListCount(); /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ java.util.List getItemListOrBuilderList(); /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemListOrBuilder( int index); /** - * bool OFKEJDENKLE = 10; - * @return The oFKEJDENKLE. - */ - boolean getOFKEJDENKLE(); - - /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ java.util.List getOverflowTransformedItemListList(); /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getOverflowTransformedItemList(int index); /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ int getOverflowTransformedItemListCount(); /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ java.util.List getOverflowTransformedItemListOrBuilderList(); /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflowTransformedItemListOrBuilder( int index); /** - * uint32 quest_id = 11; + * uint32 quest_id = 5; * @return The questId. */ int getQuestId(); /** - * bool DJAHPNGMNGA = 3; - * @return The dJAHPNGMNGA. + * bool PFNLIOENALO = 1; + * @return The pFNLIOENALO. */ - boolean getDJAHPNGMNGA(); + boolean getPFNLIOENALO(); /** - * uint32 reason = 8; - * @return The reason. + * bool ABOOBGNEPOC = 3; + * @return The aBOOBGNEPOC. */ - int getReason(); + boolean getABOOBGNEPOC(); /** - * .Vector position = 13; - * @return Whether the position field is set. + * bool FPLAKFLGHPL = 12; + * @return The fPLAKFLGHPL. */ - boolean hasPosition(); - /** - * .Vector position = 13; - * @return The position. - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition(); + boolean getFPLAKFLGHPL(); + /** - * .Vector position = 13; + * uint32 reason = 8; + * @return The reason. */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder(); + int getReason(); } /** - * 
-   * CmdId: 20755
-   * Obf: CNDHGNFOGNJ
-   *
- * * Protobuf type {@code ItemAddHintNotify} */ public static final class ItemAddHintNotify extends @@ -166,39 +161,33 @@ private ItemAddHintNotify( break; case 8: { - nAMDHIDNAMP_ = input.readBool(); + pFNLIOENALO_ = input.readBool(); break; } case 24: { - dJAHPNGMNGA_ = input.readBool(); + aBOOBGNEPOC_ = input.readBool(); break; } - case 42: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - itemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + case 34: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (position_ != null) { + subBuilder = position_.toBuilder(); + } + position_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(position_); + position_ = subBuilder.buildPartial(); } - itemList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.parser(), extensionRegistry)); - break; - } - case 64: { - - reason_ = input.readUInt32(); - break; - } - case 80: { - oFKEJDENKLE_ = input.readBool(); break; } - case 88: { + case 40: { questId_ = input.readUInt32(); break; } - case 98: { + case 50: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { overflowTransformedItemList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -207,17 +196,23 @@ private ItemAddHintNotify( input.readMessage(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.parser(), extensionRegistry)); break; } - case 106: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (position_ != null) { - subBuilder = position_.toBuilder(); - } - position_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(position_); - position_ = subBuilder.buildPartial(); + case 64: { + + reason_ = input.readUInt32(); + break; + } + case 74: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + itemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } + itemList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.parser(), extensionRegistry)); + break; + } + case 96: { + fPLAKFLGHPL_ = input.readBool(); break; } default: { @@ -235,12 +230,12 @@ private ItemAddHintNotify( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - itemList_ = java.util.Collections.unmodifiableList(itemList_); - } if (((mutable_bitField0_ & 0x00000002) != 0)) { overflowTransformedItemList_ = java.util.Collections.unmodifiableList(overflowTransformedItemList_); } + if (((mutable_bitField0_ & 0x00000001) != 0)) { + itemList_ = java.util.Collections.unmodifiableList(itemList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -258,28 +253,43 @@ private ItemAddHintNotify( emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify.class, emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify.Builder.class); } - public static final int NAMDHIDNAMP_FIELD_NUMBER = 1; - private boolean nAMDHIDNAMP_; + public static final int POSITION_FIELD_NUMBER = 4; + private emu.grasscutter.net.proto.VectorOuterClass.Vector position_; + /** + * .Vector position = 4; + * @return Whether the position field is set. + */ + @java.lang.Override + public boolean hasPosition() { + return position_ != null; + } + /** + * .Vector position = 4; + * @return The position. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { + return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; + } /** - * bool NAMDHIDNAMP = 1; - * @return The nAMDHIDNAMP. + * .Vector position = 4; */ @java.lang.Override - public boolean getNAMDHIDNAMP() { - return nAMDHIDNAMP_; + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() { + return getPosition(); } - public static final int ITEM_LIST_FIELD_NUMBER = 5; + public static final int ITEM_LIST_FIELD_NUMBER = 9; private java.util.List itemList_; /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ @java.lang.Override public java.util.List getItemListList() { return itemList_; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ @java.lang.Override public java.util.List @@ -287,21 +297,21 @@ public java.util.List get return itemList_; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ @java.lang.Override public int getItemListCount() { return itemList_.size(); } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ @java.lang.Override public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getItemList(int index) { return itemList_.get(index); } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ @java.lang.Override public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemListOrBuilder( @@ -309,28 +319,17 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemLis return itemList_.get(index); } - public static final int OFKEJDENKLE_FIELD_NUMBER = 10; - private boolean oFKEJDENKLE_; - /** - * bool OFKEJDENKLE = 10; - * @return The oFKEJDENKLE. - */ - @java.lang.Override - public boolean getOFKEJDENKLE() { - return oFKEJDENKLE_; - } - - public static final int OVERFLOW_TRANSFORMED_ITEM_LIST_FIELD_NUMBER = 12; + public static final int OVERFLOW_TRANSFORMED_ITEM_LIST_FIELD_NUMBER = 6; private java.util.List overflowTransformedItemList_; /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ @java.lang.Override public java.util.List getOverflowTransformedItemListList() { return overflowTransformedItemList_; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ @java.lang.Override public java.util.List @@ -338,21 +337,21 @@ public java.util.List get return overflowTransformedItemList_; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ @java.lang.Override public int getOverflowTransformedItemListCount() { return overflowTransformedItemList_.size(); } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getOverflowTransformedItemList(int index) { return overflowTransformedItemList_.get(index); } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflowTransformedItemListOrBuilder( @@ -360,10 +359,10 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflo return overflowTransformedItemList_.get(index); } - public static final int QUEST_ID_FIELD_NUMBER = 11; + public static final int QUEST_ID_FIELD_NUMBER = 5; private int questId_; /** - * uint32 quest_id = 11; + * uint32 quest_id = 5; * @return The questId. */ @java.lang.Override @@ -371,52 +370,48 @@ public int getQuestId() { return questId_; } - public static final int DJAHPNGMNGA_FIELD_NUMBER = 3; - private boolean dJAHPNGMNGA_; + public static final int PFNLIOENALO_FIELD_NUMBER = 1; + private boolean pFNLIOENALO_; /** - * bool DJAHPNGMNGA = 3; - * @return The dJAHPNGMNGA. + * bool PFNLIOENALO = 1; + * @return The pFNLIOENALO. */ @java.lang.Override - public boolean getDJAHPNGMNGA() { - return dJAHPNGMNGA_; + public boolean getPFNLIOENALO() { + return pFNLIOENALO_; } - public static final int REASON_FIELD_NUMBER = 8; - private int reason_; + public static final int ABOOBGNEPOC_FIELD_NUMBER = 3; + private boolean aBOOBGNEPOC_; /** - * uint32 reason = 8; - * @return The reason. + * bool ABOOBGNEPOC = 3; + * @return The aBOOBGNEPOC. */ @java.lang.Override - public int getReason() { - return reason_; + public boolean getABOOBGNEPOC() { + return aBOOBGNEPOC_; } - public static final int POSITION_FIELD_NUMBER = 13; - private emu.grasscutter.net.proto.VectorOuterClass.Vector position_; - /** - * .Vector position = 13; - * @return Whether the position field is set. - */ - @java.lang.Override - public boolean hasPosition() { - return position_ != null; - } + public static final int FPLAKFLGHPL_FIELD_NUMBER = 12; + private boolean fPLAKFLGHPL_; /** - * .Vector position = 13; - * @return The position. + * bool FPLAKFLGHPL = 12; + * @return The fPLAKFLGHPL. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { - return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; + public boolean getFPLAKFLGHPL() { + return fPLAKFLGHPL_; } + + public static final int REASON_FIELD_NUMBER = 8; + private int reason_; /** - * .Vector position = 13; + * uint32 reason = 8; + * @return The reason. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() { - return getPosition(); + public int getReason() { + return reason_; } private byte memoizedIsInitialized = -1; @@ -433,29 +428,29 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (nAMDHIDNAMP_ != false) { - output.writeBool(1, nAMDHIDNAMP_); - } - if (dJAHPNGMNGA_ != false) { - output.writeBool(3, dJAHPNGMNGA_); + if (pFNLIOENALO_ != false) { + output.writeBool(1, pFNLIOENALO_); } - for (int i = 0; i < itemList_.size(); i++) { - output.writeMessage(5, itemList_.get(i)); + if (aBOOBGNEPOC_ != false) { + output.writeBool(3, aBOOBGNEPOC_); } - if (reason_ != 0) { - output.writeUInt32(8, reason_); - } - if (oFKEJDENKLE_ != false) { - output.writeBool(10, oFKEJDENKLE_); + if (position_ != null) { + output.writeMessage(4, getPosition()); } if (questId_ != 0) { - output.writeUInt32(11, questId_); + output.writeUInt32(5, questId_); } for (int i = 0; i < overflowTransformedItemList_.size(); i++) { - output.writeMessage(12, overflowTransformedItemList_.get(i)); + output.writeMessage(6, overflowTransformedItemList_.get(i)); } - if (position_ != null) { - output.writeMessage(13, getPosition()); + if (reason_ != 0) { + output.writeUInt32(8, reason_); + } + for (int i = 0; i < itemList_.size(); i++) { + output.writeMessage(9, itemList_.get(i)); + } + if (fPLAKFLGHPL_ != false) { + output.writeBool(12, fPLAKFLGHPL_); } unknownFields.writeTo(output); } @@ -466,37 +461,37 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (nAMDHIDNAMP_ != false) { + if (pFNLIOENALO_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, nAMDHIDNAMP_); + .computeBoolSize(1, pFNLIOENALO_); } - if (dJAHPNGMNGA_ != false) { + if (aBOOBGNEPOC_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, dJAHPNGMNGA_); + .computeBoolSize(3, aBOOBGNEPOC_); } - for (int i = 0; i < itemList_.size(); i++) { + if (position_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, itemList_.get(i)); + .computeMessageSize(4, getPosition()); } - if (reason_ != 0) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, reason_); + .computeUInt32Size(5, questId_); } - if (oFKEJDENKLE_ != false) { + for (int i = 0; i < overflowTransformedItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(10, oFKEJDENKLE_); + .computeMessageSize(6, overflowTransformedItemList_.get(i)); } - if (questId_ != 0) { + if (reason_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, questId_); + .computeUInt32Size(8, reason_); } - for (int i = 0; i < overflowTransformedItemList_.size(); i++) { + for (int i = 0; i < itemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, overflowTransformedItemList_.get(i)); + .computeMessageSize(9, itemList_.get(i)); } - if (position_ != null) { + if (fPLAKFLGHPL_ != false) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, getPosition()); + .computeBoolSize(12, fPLAKFLGHPL_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -513,25 +508,25 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify other = (emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify) obj; - if (getNAMDHIDNAMP() - != other.getNAMDHIDNAMP()) return false; + if (hasPosition() != other.hasPosition()) return false; + if (hasPosition()) { + if (!getPosition() + .equals(other.getPosition())) return false; + } if (!getItemListList() .equals(other.getItemListList())) return false; - if (getOFKEJDENKLE() - != other.getOFKEJDENKLE()) return false; if (!getOverflowTransformedItemListList() .equals(other.getOverflowTransformedItemListList())) return false; if (getQuestId() != other.getQuestId()) return false; - if (getDJAHPNGMNGA() - != other.getDJAHPNGMNGA()) return false; + if (getPFNLIOENALO() + != other.getPFNLIOENALO()) return false; + if (getABOOBGNEPOC() + != other.getABOOBGNEPOC()) return false; + if (getFPLAKFLGHPL() + != other.getFPLAKFLGHPL()) return false; if (getReason() != other.getReason()) return false; - if (hasPosition() != other.hasPosition()) return false; - if (hasPosition()) { - if (!getPosition() - .equals(other.getPosition())) return false; - } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -543,31 +538,31 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + NAMDHIDNAMP_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getNAMDHIDNAMP()); + if (hasPosition()) { + hash = (37 * hash) + POSITION_FIELD_NUMBER; + hash = (53 * hash) + getPosition().hashCode(); + } if (getItemListCount() > 0) { hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemListList().hashCode(); } - hash = (37 * hash) + OFKEJDENKLE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getOFKEJDENKLE()); if (getOverflowTransformedItemListCount() > 0) { hash = (37 * hash) + OVERFLOW_TRANSFORMED_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getOverflowTransformedItemListList().hashCode(); } hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; hash = (53 * hash) + getQuestId(); - hash = (37 * hash) + DJAHPNGMNGA_FIELD_NUMBER; + hash = (37 * hash) + PFNLIOENALO_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getPFNLIOENALO()); + hash = (37 * hash) + ABOOBGNEPOC_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getDJAHPNGMNGA()); + getABOOBGNEPOC()); + hash = (37 * hash) + FPLAKFLGHPL_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getFPLAKFLGHPL()); hash = (37 * hash) + REASON_FIELD_NUMBER; hash = (53 * hash) + getReason(); - if (hasPosition()) { - hash = (37 * hash) + POSITION_FIELD_NUMBER; - hash = (53 * hash) + getPosition().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -664,11 +659,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 20755
-     * Obf: CNDHGNFOGNJ
-     *
- * * Protobuf type {@code ItemAddHintNotify} */ public static final class Builder extends @@ -708,16 +698,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - nAMDHIDNAMP_ = false; - + if (positionBuilder_ == null) { + position_ = null; + } else { + position_ = null; + positionBuilder_ = null; + } if (itemListBuilder_ == null) { itemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { itemListBuilder_.clear(); } - oFKEJDENKLE_ = false; - if (overflowTransformedItemListBuilder_ == null) { overflowTransformedItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); @@ -726,16 +718,14 @@ public Builder clear() { } questId_ = 0; - dJAHPNGMNGA_ = false; + pFNLIOENALO_ = false; + + aBOOBGNEPOC_ = false; + + fPLAKFLGHPL_ = false; reason_ = 0; - if (positionBuilder_ == null) { - position_ = null; - } else { - position_ = null; - positionBuilder_ = null; - } return this; } @@ -763,7 +753,11 @@ public emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify b public emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify buildPartial() { emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify result = new emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify(this); int from_bitField0_ = bitField0_; - result.nAMDHIDNAMP_ = nAMDHIDNAMP_; + if (positionBuilder_ == null) { + result.position_ = position_; + } else { + result.position_ = positionBuilder_.build(); + } if (itemListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { itemList_ = java.util.Collections.unmodifiableList(itemList_); @@ -773,7 +767,6 @@ public emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify b } else { result.itemList_ = itemListBuilder_.build(); } - result.oFKEJDENKLE_ = oFKEJDENKLE_; if (overflowTransformedItemListBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0)) { overflowTransformedItemList_ = java.util.Collections.unmodifiableList(overflowTransformedItemList_); @@ -784,13 +777,10 @@ public emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify b result.overflowTransformedItemList_ = overflowTransformedItemListBuilder_.build(); } result.questId_ = questId_; - result.dJAHPNGMNGA_ = dJAHPNGMNGA_; + result.pFNLIOENALO_ = pFNLIOENALO_; + result.aBOOBGNEPOC_ = aBOOBGNEPOC_; + result.fPLAKFLGHPL_ = fPLAKFLGHPL_; result.reason_ = reason_; - if (positionBuilder_ == null) { - result.position_ = position_; - } else { - result.position_ = positionBuilder_.build(); - } onBuilt(); return result; } @@ -839,8 +829,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify other) { if (other == emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify.getDefaultInstance()) return this; - if (other.getNAMDHIDNAMP() != false) { - setNAMDHIDNAMP(other.getNAMDHIDNAMP()); + if (other.hasPosition()) { + mergePosition(other.getPosition()); } if (itemListBuilder_ == null) { if (!other.itemList_.isEmpty()) { @@ -868,9 +858,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.I } } } - if (other.getOFKEJDENKLE() != false) { - setOFKEJDENKLE(other.getOFKEJDENKLE()); - } if (overflowTransformedItemListBuilder_ == null) { if (!other.overflowTransformedItemList_.isEmpty()) { if (overflowTransformedItemList_.isEmpty()) { @@ -900,15 +887,18 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.I if (other.getQuestId() != 0) { setQuestId(other.getQuestId()); } - if (other.getDJAHPNGMNGA() != false) { - setDJAHPNGMNGA(other.getDJAHPNGMNGA()); + if (other.getPFNLIOENALO() != false) { + setPFNLIOENALO(other.getPFNLIOENALO()); + } + if (other.getABOOBGNEPOC() != false) { + setABOOBGNEPOC(other.getABOOBGNEPOC()); + } + if (other.getFPLAKFLGHPL() != false) { + setFPLAKFLGHPL(other.getFPLAKFLGHPL()); } if (other.getReason() != 0) { setReason(other.getReason()); } - if (other.hasPosition()) { - mergePosition(other.getPosition()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -939,35 +929,123 @@ public Builder mergeFrom( } private int bitField0_; - private boolean nAMDHIDNAMP_ ; + private emu.grasscutter.net.proto.VectorOuterClass.Vector position_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_; /** - * bool NAMDHIDNAMP = 1; - * @return The nAMDHIDNAMP. + * .Vector position = 4; + * @return Whether the position field is set. */ - @java.lang.Override - public boolean getNAMDHIDNAMP() { - return nAMDHIDNAMP_; + public boolean hasPosition() { + return positionBuilder_ != null || position_ != null; } /** - * bool NAMDHIDNAMP = 1; - * @param value The nAMDHIDNAMP to set. - * @return This builder for chaining. + * .Vector position = 4; + * @return The position. */ - public Builder setNAMDHIDNAMP(boolean value) { - - nAMDHIDNAMP_ = value; - onChanged(); + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { + if (positionBuilder_ == null) { + return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; + } else { + return positionBuilder_.getMessage(); + } + } + /** + * .Vector position = 4; + */ + public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (positionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + position_ = value; + onChanged(); + } else { + positionBuilder_.setMessage(value); + } + return this; } /** - * bool NAMDHIDNAMP = 1; - * @return This builder for chaining. + * .Vector position = 4; + */ + public Builder setPosition( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (positionBuilder_ == null) { + position_ = builderForValue.build(); + onChanged(); + } else { + positionBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .Vector position = 4; + */ + public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (positionBuilder_ == null) { + if (position_ != null) { + position_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(position_).mergeFrom(value).buildPartial(); + } else { + position_ = value; + } + onChanged(); + } else { + positionBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .Vector position = 4; + */ + public Builder clearPosition() { + if (positionBuilder_ == null) { + position_ = null; + onChanged(); + } else { + position_ = null; + positionBuilder_ = null; + } + + return this; + } + /** + * .Vector position = 4; */ - public Builder clearNAMDHIDNAMP() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() { - nAMDHIDNAMP_ = false; onChanged(); - return this; + return getPositionFieldBuilder().getBuilder(); + } + /** + * .Vector position = 4; + */ + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() { + if (positionBuilder_ != null) { + return positionBuilder_.getMessageOrBuilder(); + } else { + return position_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; + } + } + /** + * .Vector position = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getPositionFieldBuilder() { + if (positionBuilder_ == null) { + positionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getPosition(), + getParentForChildren(), + isClean()); + position_ = null; + } + return positionBuilder_; } private java.util.List itemList_ = @@ -983,7 +1061,7 @@ private void ensureItemListIsMutable() { emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> itemListBuilder_; /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public java.util.List getItemListList() { if (itemListBuilder_ == null) { @@ -993,7 +1071,7 @@ public java.util.List get } } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public int getItemListCount() { if (itemListBuilder_ == null) { @@ -1003,7 +1081,7 @@ public int getItemListCount() { } } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getItemList(int index) { if (itemListBuilder_ == null) { @@ -1013,7 +1091,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getItemList(int ind } } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) { @@ -1030,7 +1108,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) { @@ -1044,7 +1122,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder addItemList(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) { if (itemListBuilder_ == null) { @@ -1060,7 +1138,7 @@ public Builder addItemList(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) { @@ -1077,7 +1155,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder addItemList( emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) { @@ -1091,7 +1169,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) { @@ -1105,7 +1183,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder addAllItemList( java.lang.Iterable values) { @@ -1120,7 +1198,7 @@ public Builder addAllItemList( return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder clearItemList() { if (itemListBuilder_ == null) { @@ -1133,7 +1211,7 @@ public Builder clearItemList() { return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public Builder removeItemList(int index) { if (itemListBuilder_ == null) { @@ -1146,14 +1224,14 @@ public Builder removeItemList(int index) { return this; } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder getItemListBuilder( int index) { return getItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemListOrBuilder( int index) { @@ -1163,7 +1241,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemLis } } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public java.util.List getItemListOrBuilderList() { @@ -1174,14 +1252,14 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemLis } } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addItemListBuilder() { return getItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance()); } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addItemListBuilder( int index) { @@ -1189,7 +1267,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addItemList index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance()); } /** - * repeated .ItemHint item_list = 5; + * repeated .ItemHint item_list = 9; */ public java.util.List getItemListBuilderList() { @@ -1210,37 +1288,6 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addItemList return itemListBuilder_; } - private boolean oFKEJDENKLE_ ; - /** - * bool OFKEJDENKLE = 10; - * @return The oFKEJDENKLE. - */ - @java.lang.Override - public boolean getOFKEJDENKLE() { - return oFKEJDENKLE_; - } - /** - * bool OFKEJDENKLE = 10; - * @param value The oFKEJDENKLE to set. - * @return This builder for chaining. - */ - public Builder setOFKEJDENKLE(boolean value) { - - oFKEJDENKLE_ = value; - onChanged(); - return this; - } - /** - * bool OFKEJDENKLE = 10; - * @return This builder for chaining. - */ - public Builder clearOFKEJDENKLE() { - - oFKEJDENKLE_ = false; - onChanged(); - return this; - } - private java.util.List overflowTransformedItemList_ = java.util.Collections.emptyList(); private void ensureOverflowTransformedItemListIsMutable() { @@ -1254,7 +1301,7 @@ private void ensureOverflowTransformedItemListIsMutable() { emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> overflowTransformedItemListBuilder_; /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public java.util.List getOverflowTransformedItemListList() { if (overflowTransformedItemListBuilder_ == null) { @@ -1264,7 +1311,7 @@ public java.util.List get } } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public int getOverflowTransformedItemListCount() { if (overflowTransformedItemListBuilder_ == null) { @@ -1274,7 +1321,7 @@ public int getOverflowTransformedItemListCount() { } } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getOverflowTransformedItemList(int index) { if (overflowTransformedItemListBuilder_ == null) { @@ -1284,7 +1331,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getOverflowTransfor } } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder setOverflowTransformedItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) { @@ -1301,7 +1348,7 @@ public Builder setOverflowTransformedItemList( return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder setOverflowTransformedItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) { @@ -1315,7 +1362,7 @@ public Builder setOverflowTransformedItemList( return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder addOverflowTransformedItemList(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) { if (overflowTransformedItemListBuilder_ == null) { @@ -1331,7 +1378,7 @@ public Builder addOverflowTransformedItemList(emu.grasscutter.net.proto.ItemHint return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder addOverflowTransformedItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) { @@ -1348,7 +1395,7 @@ public Builder addOverflowTransformedItemList( return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder addOverflowTransformedItemList( emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) { @@ -1362,7 +1409,7 @@ public Builder addOverflowTransformedItemList( return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder addOverflowTransformedItemList( int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) { @@ -1376,7 +1423,7 @@ public Builder addOverflowTransformedItemList( return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder addAllOverflowTransformedItemList( java.lang.Iterable values) { @@ -1391,7 +1438,7 @@ public Builder addAllOverflowTransformedItemList( return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder clearOverflowTransformedItemList() { if (overflowTransformedItemListBuilder_ == null) { @@ -1404,7 +1451,7 @@ public Builder clearOverflowTransformedItemList() { return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public Builder removeOverflowTransformedItemList(int index) { if (overflowTransformedItemListBuilder_ == null) { @@ -1417,14 +1464,14 @@ public Builder removeOverflowTransformedItemList(int index) { return this; } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder getOverflowTransformedItemListBuilder( int index) { return getOverflowTransformedItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflowTransformedItemListOrBuilder( int index) { @@ -1434,7 +1481,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflo } } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public java.util.List getOverflowTransformedItemListOrBuilderList() { @@ -1445,14 +1492,14 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflo } } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addOverflowTransformedItemListBuilder() { return getOverflowTransformedItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance()); } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addOverflowTransformedItemListBuilder( int index) { @@ -1460,7 +1507,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addOverflow index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance()); } /** - * repeated .ItemHint overflow_transformed_item_list = 12; + * repeated .ItemHint overflow_transformed_item_list = 6; */ public java.util.List getOverflowTransformedItemListBuilderList() { @@ -1483,7 +1530,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addOverflow private int questId_ ; /** - * uint32 quest_id = 11; + * uint32 quest_id = 5; * @return The questId. */ @java.lang.Override @@ -1491,7 +1538,7 @@ public int getQuestId() { return questId_; } /** - * uint32 quest_id = 11; + * uint32 quest_id = 5; * @param value The questId to set. * @return This builder for chaining. */ @@ -1502,7 +1549,7 @@ public Builder setQuestId(int value) { return this; } /** - * uint32 quest_id = 11; + * uint32 quest_id = 5; * @return This builder for chaining. */ public Builder clearQuestId() { @@ -1512,185 +1559,128 @@ public Builder clearQuestId() { return this; } - private boolean dJAHPNGMNGA_ ; + private boolean pFNLIOENALO_ ; /** - * bool DJAHPNGMNGA = 3; - * @return The dJAHPNGMNGA. + * bool PFNLIOENALO = 1; + * @return The pFNLIOENALO. */ @java.lang.Override - public boolean getDJAHPNGMNGA() { - return dJAHPNGMNGA_; + public boolean getPFNLIOENALO() { + return pFNLIOENALO_; } /** - * bool DJAHPNGMNGA = 3; - * @param value The dJAHPNGMNGA to set. + * bool PFNLIOENALO = 1; + * @param value The pFNLIOENALO to set. * @return This builder for chaining. */ - public Builder setDJAHPNGMNGA(boolean value) { + public Builder setPFNLIOENALO(boolean value) { - dJAHPNGMNGA_ = value; + pFNLIOENALO_ = value; onChanged(); return this; } /** - * bool DJAHPNGMNGA = 3; + * bool PFNLIOENALO = 1; * @return This builder for chaining. */ - public Builder clearDJAHPNGMNGA() { + public Builder clearPFNLIOENALO() { - dJAHPNGMNGA_ = false; + pFNLIOENALO_ = false; onChanged(); return this; } - private int reason_ ; + private boolean aBOOBGNEPOC_ ; /** - * uint32 reason = 8; - * @return The reason. + * bool ABOOBGNEPOC = 3; + * @return The aBOOBGNEPOC. */ @java.lang.Override - public int getReason() { - return reason_; + public boolean getABOOBGNEPOC() { + return aBOOBGNEPOC_; } /** - * uint32 reason = 8; - * @param value The reason to set. + * bool ABOOBGNEPOC = 3; + * @param value The aBOOBGNEPOC to set. * @return This builder for chaining. */ - public Builder setReason(int value) { + public Builder setABOOBGNEPOC(boolean value) { - reason_ = value; + aBOOBGNEPOC_ = value; onChanged(); return this; } /** - * uint32 reason = 8; + * bool ABOOBGNEPOC = 3; * @return This builder for chaining. */ - public Builder clearReason() { + public Builder clearABOOBGNEPOC() { - reason_ = 0; + aBOOBGNEPOC_ = false; onChanged(); return this; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector position_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_; - /** - * .Vector position = 13; - * @return Whether the position field is set. - */ - public boolean hasPosition() { - return positionBuilder_ != null || position_ != null; - } + private boolean fPLAKFLGHPL_ ; /** - * .Vector position = 13; - * @return The position. + * bool FPLAKFLGHPL = 12; + * @return The fPLAKFLGHPL. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() { - if (positionBuilder_ == null) { - return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; - } else { - return positionBuilder_.getMessage(); - } + @java.lang.Override + public boolean getFPLAKFLGHPL() { + return fPLAKFLGHPL_; } /** - * .Vector position = 13; + * bool FPLAKFLGHPL = 12; + * @param value The fPLAKFLGHPL to set. + * @return This builder for chaining. */ - public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (positionBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - position_ = value; - onChanged(); - } else { - positionBuilder_.setMessage(value); - } - + public Builder setFPLAKFLGHPL(boolean value) { + + fPLAKFLGHPL_ = value; + onChanged(); return this; } /** - * .Vector position = 13; + * bool FPLAKFLGHPL = 12; + * @return This builder for chaining. */ - public Builder setPosition( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (positionBuilder_ == null) { - position_ = builderForValue.build(); - onChanged(); - } else { - positionBuilder_.setMessage(builderForValue.build()); - } - + public Builder clearFPLAKFLGHPL() { + + fPLAKFLGHPL_ = false; + onChanged(); return this; } - /** - * .Vector position = 13; - */ - public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (positionBuilder_ == null) { - if (position_ != null) { - position_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(position_).mergeFrom(value).buildPartial(); - } else { - position_ = value; - } - onChanged(); - } else { - positionBuilder_.mergeFrom(value); - } - return this; - } + private int reason_ ; /** - * .Vector position = 13; + * uint32 reason = 8; + * @return The reason. */ - public Builder clearPosition() { - if (positionBuilder_ == null) { - position_ = null; - onChanged(); - } else { - position_ = null; - positionBuilder_ = null; - } - - return this; + @java.lang.Override + public int getReason() { + return reason_; } /** - * .Vector position = 13; + * uint32 reason = 8; + * @param value The reason to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() { + public Builder setReason(int value) { + reason_ = value; onChanged(); - return getPositionFieldBuilder().getBuilder(); - } - /** - * .Vector position = 13; - */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() { - if (positionBuilder_ != null) { - return positionBuilder_.getMessageOrBuilder(); - } else { - return position_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_; - } + return this; } /** - * .Vector position = 13; + * uint32 reason = 8; + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getPositionFieldBuilder() { - if (positionBuilder_ == null) { - positionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getPosition(), - getParentForChildren(), - isClean()); - position_ = null; - } - return positionBuilder_; + public Builder clearReason() { + + reason_ = 0; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -1760,13 +1750,13 @@ public emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify g static { java.lang.String[] descriptorData = { "\n\027ItemAddHintNotify.proto\032\016ItemHint.prot" + - "o\032\014Vector.proto\"\340\001\n\021ItemAddHintNotify\022\023\n" + - "\013NAMDHIDNAMP\030\001 \001(\010\022\034\n\titem_list\030\005 \003(\0132\t." + - "ItemHint\022\023\n\013OFKEJDENKLE\030\n \001(\010\0221\n\036overflo" + - "w_transformed_item_list\030\014 \003(\0132\t.ItemHint" + - "\022\020\n\010quest_id\030\013 \001(\r\022\023\n\013DJAHPNGMNGA\030\003 \001(\010\022" + - "\016\n\006reason\030\010 \001(\r\022\031\n\010position\030\r \001(\0132\007.Vect" + - "orB\033\n\031emu.grasscutter.net.protob\006proto3" + "o\032\014Vector.proto\"\340\001\n\021ItemAddHintNotify\022\031\n" + + "\010position\030\004 \001(\0132\007.Vector\022\034\n\titem_list\030\t " + + "\003(\0132\t.ItemHint\0221\n\036overflow_transformed_i" + + "tem_list\030\006 \003(\0132\t.ItemHint\022\020\n\010quest_id\030\005 " + + "\001(\r\022\023\n\013PFNLIOENALO\030\001 \001(\010\022\023\n\013ABOOBGNEPOC\030" + + "\003 \001(\010\022\023\n\013FPLAKFLGHPL\030\014 \001(\010\022\016\n\006reason\030\010 \001" + + "(\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1779,7 +1769,7 @@ public emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify g internal_static_ItemAddHintNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ItemAddHintNotify_descriptor, - new java.lang.String[] { "NAMDHIDNAMP", "ItemList", "OFKEJDENKLE", "OverflowTransformedItemList", "QuestId", "DJAHPNGMNGA", "Reason", "Position", }); + new java.lang.String[] { "Position", "ItemList", "OverflowTransformedItemList", "QuestId", "PFNLIOENALO", "ABOOBGNEPOC", "FPLAKFLGHPL", "Reason", }); emu.grasscutter.net.proto.ItemHintOuterClass.getDescriptor(); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingReqOuterClass.java index 3cd9ed9c97f..f8f19922178 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingReqOuterClass.java @@ -19,41 +19,35 @@ public interface ItemGivingReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 giving_id = 12; - * @return The givingId. - */ - int getGivingId(); - - /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ java.util.List getItemParamListList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ int getItemParamListCount(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ java.util.List getItemParamListOrBuilderList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index); /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ int getItemGuidCountMapCount(); /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ boolean containsItemGuidCountMap( long key); @@ -64,41 +58,31 @@ boolean containsItemGuidCountMap( java.util.Map getItemGuidCountMap(); /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ java.util.Map getItemGuidCountMapMap(); /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ int getItemGuidCountMapOrDefault( long key, int defaultValue); /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ int getItemGuidCountMapOrThrow( long key); /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @return The enum numeric value on the wire for itemGivingType. - */ - int getItemGivingTypeValue(); - /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @return The itemGivingType. + * uint32 giving_id = 11; + * @return The givingId. */ - emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType getItemGivingType(); + int getGivingId(); } /** - * 
-   * CmdId: 4527
-   * Obf: FEKPPCLHGIF
-   *
- * * Protobuf type {@code ItemGivingReq} */ public static final class ItemGivingReq extends @@ -112,7 +96,6 @@ private ItemGivingReq(com.google.protobuf.GeneratedMessageV3.Builder builder) } private ItemGivingReq() { itemParamList_ = java.util.Collections.emptyList(); - itemGivingType_ = 0; } @java.lang.Override @@ -146,18 +129,7 @@ private ItemGivingReq( case 0: done = true; break; - case 56: { - int rawValue = input.readEnum(); - - itemGivingType_ = rawValue; - break; - } - case 96: { - - givingId_ = input.readUInt32(); - break; - } - case 106: { + case 50: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { itemGuidCountMap_ = com.google.protobuf.MapField.newMapField( ItemGuidCountMapDefaultEntryHolder.defaultEntry); @@ -170,7 +142,7 @@ private ItemGivingReq( itemGuidCountMap__.getKey(), itemGuidCountMap__.getValue()); break; } - case 122: { + case 82: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { itemParamList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -179,6 +151,11 @@ private ItemGivingReq( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } + case 88: { + + givingId_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -211,7 +188,7 @@ private ItemGivingReq( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 13: + case 6: return internalGetItemGuidCountMap(); default: throw new RuntimeException( @@ -226,140 +203,17 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.class, emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.Builder.class); } - /** - * 
-     * Obf: HGCKAFEMAFE
-     *
- * - * Protobuf enum {@code ItemGivingReq.ItemGivingType} - */ - public enum ItemGivingType - implements com.google.protobuf.ProtocolMessageEnum { - /** - * QUEST = 0; - */ - QUEST(0), - /** - * GADGET = 1; - */ - GADGET(1), - UNRECOGNIZED(-1), - ; - - /** - * QUEST = 0; - */ - public static final int QUEST_VALUE = 0; - /** - * GADGET = 1; - */ - public static final int GADGET_VALUE = 1; - - - public final int getNumber() { - if (this == UNRECOGNIZED) { - throw new java.lang.IllegalArgumentException( - "Can't get the number of an unknown enum value."); - } - return value; - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @return The enum associated with the given numeric wire value. - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static ItemGivingType valueOf(int value) { - return forNumber(value); - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @return The enum associated with the given numeric wire value. - */ - public static ItemGivingType forNumber(int value) { - switch (value) { - case 0: return QUEST; - case 1: return GADGET; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static final com.google.protobuf.Internal.EnumLiteMap< - ItemGivingType> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public ItemGivingType findValueByNumber(int number) { - return ItemGivingType.forNumber(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - if (this == UNRECOGNIZED) { - throw new java.lang.IllegalStateException( - "Can't get the descriptor of an unrecognized enum value."); - } - return getDescriptor().getValues().get(ordinal()); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.getDescriptor().getEnumTypes().get(0); - } - - private static final ItemGivingType[] VALUES = values(); - - public static ItemGivingType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - if (desc.getIndex() == -1) { - return UNRECOGNIZED; - } - return VALUES[desc.getIndex()]; - } - - private final int value; - - private ItemGivingType(int value) { - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:ItemGivingReq.ItemGivingType) - } - - public static final int GIVING_ID_FIELD_NUMBER = 12; - private int givingId_; - /** - * uint32 giving_id = 12; - * @return The givingId. - */ - @java.lang.Override - public int getGivingId() { - return givingId_; - } - - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 15; + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 10; private java.util.List itemParamList_; /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public java.util.List getItemParamListList() { return itemParamList_; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public java.util.List @@ -367,21 +221,21 @@ public java.util.List g return itemParamList_; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public int getItemParamListCount() { return itemParamList_.size(); } /** - * repeated .ItemParam item_param_list = 15; + * 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 = 15; + * repeated .ItemParam item_param_list = 10; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( @@ -389,7 +243,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP return itemParamList_.get(index); } - public static final int ITEM_GUID_COUNT_MAP_FIELD_NUMBER = 13; + public static final int ITEM_GUID_COUNT_MAP_FIELD_NUMBER = 6; private static final class ItemGuidCountMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Long, java.lang.Integer> defaultEntry = @@ -416,7 +270,7 @@ public int getItemGuidCountMapCount() { return internalGetItemGuidCountMap().getMap().size(); } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -434,7 +288,7 @@ public java.util.Map getItemGuidCountMap() { return getItemGuidCountMapMap(); } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -442,7 +296,7 @@ public java.util.Map getItemGuidCountMapMap() return internalGetItemGuidCountMap().getMap(); } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -455,7 +309,7 @@ public int getItemGuidCountMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -470,23 +324,15 @@ public int getItemGuidCountMapOrThrow( return map.get(key); } - public static final int ITEM_GIVING_TYPE_FIELD_NUMBER = 7; - private int itemGivingType_; - /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @return The enum numeric value on the wire for itemGivingType. - */ - @java.lang.Override public int getItemGivingTypeValue() { - return itemGivingType_; - } + public static final int GIVING_ID_FIELD_NUMBER = 11; + private int givingId_; /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @return The itemGivingType. + * uint32 giving_id = 11; + * @return The givingId. */ - @java.lang.Override public emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType getItemGivingType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType result = emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType.valueOf(itemGivingType_); - return result == null ? emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType.UNRECOGNIZED : result; + @java.lang.Override + public int getGivingId() { + return givingId_; } private byte memoizedIsInitialized = -1; @@ -503,20 +349,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (itemGivingType_ != emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType.QUEST.getNumber()) { - output.writeEnum(7, itemGivingType_); - } - if (givingId_ != 0) { - output.writeUInt32(12, givingId_); - } com.google.protobuf.GeneratedMessageV3 .serializeLongMapTo( output, internalGetItemGuidCountMap(), ItemGuidCountMapDefaultEntryHolder.defaultEntry, - 13); + 6); for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(15, itemParamList_.get(i)); + output.writeMessage(10, itemParamList_.get(i)); + } + if (givingId_ != 0) { + output.writeUInt32(11, givingId_); } unknownFields.writeTo(output); } @@ -527,14 +370,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (itemGivingType_ != emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType.QUEST.getNumber()) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(7, itemGivingType_); - } - if (givingId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, givingId_); - } for (java.util.Map.Entry entry : internalGetItemGuidCountMap().getMap().entrySet()) { com.google.protobuf.MapEntry @@ -543,11 +378,15 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, itemGuidCountMap__); + .computeMessageSize(6, itemGuidCountMap__); } for (int i = 0; i < itemParamList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, itemParamList_.get(i)); + .computeMessageSize(10, itemParamList_.get(i)); + } + if (givingId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(11, givingId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -564,13 +403,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq other = (emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq) obj; - if (getGivingId() - != other.getGivingId()) return false; if (!getItemParamListList() .equals(other.getItemParamListList())) return false; if (!internalGetItemGuidCountMap().equals( other.internalGetItemGuidCountMap())) return false; - if (itemGivingType_ != other.itemGivingType_) return false; + if (getGivingId() + != other.getGivingId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -582,8 +420,6 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + GIVING_ID_FIELD_NUMBER; - hash = (53 * hash) + getGivingId(); if (getItemParamListCount() > 0) { hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemParamListList().hashCode(); @@ -592,8 +428,8 @@ public int hashCode() { hash = (37 * hash) + ITEM_GUID_COUNT_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetItemGuidCountMap().hashCode(); } - hash = (37 * hash) + ITEM_GIVING_TYPE_FIELD_NUMBER; - hash = (53 * hash) + itemGivingType_; + hash = (37 * hash) + GIVING_ID_FIELD_NUMBER; + hash = (53 * hash) + getGivingId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -690,11 +526,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 4527
-     * Obf: FEKPPCLHGIF
-     *
- * * Protobuf type {@code ItemGivingReq} */ public static final class Builder extends @@ -710,7 +541,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 13: + case 6: return internalGetItemGuidCountMap(); default: throw new RuntimeException( @@ -721,7 +552,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 13: + case 6: return internalGetMutableItemGuidCountMap(); default: throw new RuntimeException( @@ -755,8 +586,6 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - givingId_ = 0; - if (itemParamListBuilder_ == null) { itemParamList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); @@ -764,7 +593,7 @@ public Builder clear() { itemParamListBuilder_.clear(); } internalGetMutableItemGuidCountMap().clear(); - itemGivingType_ = 0; + givingId_ = 0; return this; } @@ -793,7 +622,6 @@ public emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq build() { public emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq buildPartial() { emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq result = new emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq(this); int from_bitField0_ = bitField0_; - result.givingId_ = givingId_; if (itemParamListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); @@ -805,7 +633,7 @@ public emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq buildPart } result.itemGuidCountMap_ = internalGetItemGuidCountMap(); result.itemGuidCountMap_.makeImmutable(); - result.itemGivingType_ = itemGivingType_; + result.givingId_ = givingId_; onBuilt(); return result; } @@ -854,9 +682,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq other) { if (other == emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.getDefaultInstance()) return this; - if (other.getGivingId() != 0) { - setGivingId(other.getGivingId()); - } if (itemParamListBuilder_ == null) { if (!other.itemParamList_.isEmpty()) { if (itemParamList_.isEmpty()) { @@ -885,8 +710,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemG } internalGetMutableItemGuidCountMap().mergeFrom( other.internalGetItemGuidCountMap()); - if (other.itemGivingType_ != 0) { - setItemGivingTypeValue(other.getItemGivingTypeValue()); + if (other.getGivingId() != 0) { + setGivingId(other.getGivingId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -918,37 +743,6 @@ public Builder mergeFrom( } private int bitField0_; - private int givingId_ ; - /** - * uint32 giving_id = 12; - * @return The givingId. - */ - @java.lang.Override - public int getGivingId() { - return givingId_; - } - /** - * uint32 giving_id = 12; - * @param value The givingId to set. - * @return This builder for chaining. - */ - public Builder setGivingId(int value) { - - givingId_ = value; - onChanged(); - return this; - } - /** - * uint32 giving_id = 12; - * @return This builder for chaining. - */ - public Builder clearGivingId() { - - givingId_ = 0; - onChanged(); - return this; - } - private java.util.List itemParamList_ = java.util.Collections.emptyList(); private void ensureItemParamListIsMutable() { @@ -962,7 +756,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 = 10; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -972,7 +766,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -982,7 +776,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -992,7 +786,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1009,7 +803,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1023,7 +817,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -1039,7 +833,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1056,7 +850,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1070,7 +864,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1084,7 +878,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -1099,7 +893,7 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { @@ -1112,7 +906,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -1125,14 +919,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 15; + * 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 = 15; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -1142,7 +936,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 10; */ public java.util.List getItemParamListOrBuilderList() { @@ -1153,14 +947,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * 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 = 15; + * repeated .ItemParam item_param_list = 10; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -1168,7 +962,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 = 10; */ public java.util.List getItemParamListBuilderList() { @@ -1216,7 +1010,7 @@ public int getItemGuidCountMapCount() { return internalGetItemGuidCountMap().getMap().size(); } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -1234,7 +1028,7 @@ public java.util.Map getItemGuidCountMap() { return getItemGuidCountMapMap(); } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -1242,7 +1036,7 @@ public java.util.Map getItemGuidCountMapMap() return internalGetItemGuidCountMap().getMap(); } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -1255,7 +1049,7 @@ public int getItemGuidCountMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ @java.lang.Override @@ -1276,7 +1070,7 @@ public Builder clearItemGuidCountMap() { return this; } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ public Builder removeItemGuidCountMap( @@ -1295,7 +1089,7 @@ public Builder removeItemGuidCountMap( return internalGetMutableItemGuidCountMap().getMutableMap(); } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ public Builder putItemGuidCountMap( long key, @@ -1307,7 +1101,7 @@ public Builder putItemGuidCountMap( return this; } /** - * map<uint64, uint32> item_guid_count_map = 13; + * map<uint64, uint32> item_guid_count_map = 6; */ public Builder putAllItemGuidCountMap( @@ -1317,56 +1111,33 @@ public Builder putAllItemGuidCountMap( return this; } - private int itemGivingType_ = 0; - /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @return The enum numeric value on the wire for itemGivingType. - */ - @java.lang.Override public int getItemGivingTypeValue() { - return itemGivingType_; - } - /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @param value The enum numeric value on the wire for itemGivingType to set. - * @return This builder for chaining. - */ - public Builder setItemGivingTypeValue(int value) { - - itemGivingType_ = value; - onChanged(); - return this; - } + private int givingId_ ; /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @return The itemGivingType. + * uint32 giving_id = 11; + * @return The givingId. */ @java.lang.Override - public emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType getItemGivingType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType result = emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType.valueOf(itemGivingType_); - return result == null ? emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType.UNRECOGNIZED : result; + public int getGivingId() { + return givingId_; } /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; - * @param value The itemGivingType to set. + * uint32 giving_id = 11; + * @param value The givingId to set. * @return This builder for chaining. */ - public Builder setItemGivingType(emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq.ItemGivingType value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setGivingId(int value) { - itemGivingType_ = value.getNumber(); + givingId_ = value; onChanged(); return this; } /** - * .ItemGivingReq.ItemGivingType item_giving_type = 7; + * uint32 giving_id = 11; * @return This builder for chaining. */ - public Builder clearItemGivingType() { + public Builder clearGivingId() { - itemGivingType_ = 0; + givingId_ = 0; onChanged(); return this; } @@ -1442,16 +1213,13 @@ public emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq getDefaul descriptor; static { java.lang.String[] descriptorData = { - "\n\023ItemGivingReq.proto\032\017ItemParam.proto\"\245" + - "\002\n\rItemGivingReq\022\021\n\tgiving_id\030\014 \001(\r\022#\n\017i" + - "tem_param_list\030\017 \003(\0132\n.ItemParam\022A\n\023item" + - "_guid_count_map\030\r \003(\0132$.ItemGivingReq.It" + - "emGuidCountMapEntry\0227\n\020item_giving_type\030" + - "\007 \001(\0162\035.ItemGivingReq.ItemGivingType\0327\n\025" + - "ItemGuidCountMapEntry\022\013\n\003key\030\001 \001(\004\022\r\n\005va" + - "lue\030\002 \001(\r:\0028\001\"\'\n\016ItemGivingType\022\t\n\005QUEST" + - "\020\000\022\n\n\006GADGET\020\001B\033\n\031emu.grasscutter.net.pr" + - "otob\006proto3" + "\n\023ItemGivingReq.proto\032\017ItemParam.proto\"\303" + + "\001\n\rItemGivingReq\022#\n\017item_param_list\030\n \003(" + + "\0132\n.ItemParam\022A\n\023item_guid_count_map\030\006 \003" + + "(\0132$.ItemGivingReq.ItemGuidCountMapEntry" + + "\022\021\n\tgiving_id\030\013 \001(\r\0327\n\025ItemGuidCountMapE" + + "ntry\022\013\n\003key\030\001 \001(\004\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031" + + "emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1463,7 +1231,7 @@ public emu.grasscutter.net.proto.ItemGivingReqOuterClass.ItemGivingReq getDefaul internal_static_ItemGivingReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ItemGivingReq_descriptor, - new java.lang.String[] { "GivingId", "ItemParamList", "ItemGuidCountMap", "ItemGivingType", }); + new java.lang.String[] { "ItemParamList", "ItemGuidCountMap", "GivingId", }); internal_static_ItemGivingReq_ItemGuidCountMapEntry_descriptor = internal_static_ItemGivingReq_descriptor.getNestedTypes().get(0); internal_static_ItemGivingReq_ItemGuidCountMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingRspOuterClass.java index c67cfa12ee5..465689e0a11 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemGivingRspOuterClass.java @@ -19,29 +19,24 @@ public interface ItemGivingRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 14; - * @return The retcode. + * uint32 giving_id = 6; + * @return The givingId. */ - int getRetcode(); + int getGivingId(); /** - * uint32 giving_group_id = 4; + * uint32 giving_group_id = 15; * @return The givingGroupId. */ int getGivingGroupId(); /** - * uint32 giving_id = 13; - * @return The givingId. + * int32 retcode = 10; + * @return The retcode. */ - int getGivingId(); + int getRetcode(); } /** - * 
-   * CmdId: 7103
-   * Obf: DJBCJENHGFJ
-   *
- * * Protobuf type {@code ItemGivingRsp} */ public static final class ItemGivingRsp extends @@ -86,19 +81,19 @@ private ItemGivingRsp( case 0: done = true; break; - case 32: { + case 48: { - givingGroupId_ = input.readUInt32(); + givingId_ = input.readUInt32(); break; } - case 104: { + case 80: { - givingId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 112: { + case 120: { - retcode_ = input.readInt32(); + givingGroupId_ = input.readUInt32(); break; } default: { @@ -133,21 +128,21 @@ private ItemGivingRsp( emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp.class, emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 14; - private int retcode_; + public static final int GIVING_ID_FIELD_NUMBER = 6; + private int givingId_; /** - * int32 retcode = 14; - * @return The retcode. + * uint32 giving_id = 6; + * @return The givingId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getGivingId() { + return givingId_; } - public static final int GIVING_GROUP_ID_FIELD_NUMBER = 4; + public static final int GIVING_GROUP_ID_FIELD_NUMBER = 15; private int givingGroupId_; /** - * uint32 giving_group_id = 4; + * uint32 giving_group_id = 15; * @return The givingGroupId. */ @java.lang.Override @@ -155,15 +150,15 @@ public int getGivingGroupId() { return givingGroupId_; } - public static final int GIVING_ID_FIELD_NUMBER = 13; - private int givingId_; + public static final int RETCODE_FIELD_NUMBER = 10; + private int retcode_; /** - * uint32 giving_id = 13; - * @return The givingId. + * int32 retcode = 10; + * @return The retcode. */ @java.lang.Override - public int getGivingId() { - return givingId_; + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -180,14 +175,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (givingGroupId_ != 0) { - output.writeUInt32(4, givingGroupId_); - } if (givingId_ != 0) { - output.writeUInt32(13, givingId_); + output.writeUInt32(6, givingId_); } if (retcode_ != 0) { - output.writeInt32(14, retcode_); + output.writeInt32(10, retcode_); + } + if (givingGroupId_ != 0) { + output.writeUInt32(15, givingGroupId_); } unknownFields.writeTo(output); } @@ -198,17 +193,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (givingGroupId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, givingGroupId_); - } if (givingId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, givingId_); + .computeUInt32Size(6, givingId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, retcode_); + .computeInt32Size(10, retcode_); + } + if (givingGroupId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(15, givingGroupId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +220,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp other = (emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; - if (getGivingGroupId() - != other.getGivingGroupId()) return false; if (getGivingId() != other.getGivingId()) return false; + if (getGivingGroupId() + != other.getGivingGroupId()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +237,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + GIVING_GROUP_ID_FIELD_NUMBER; - hash = (53 * hash) + getGivingGroupId(); hash = (37 * hash) + GIVING_ID_FIELD_NUMBER; hash = (53 * hash) + getGivingId(); + hash = (37 * hash) + GIVING_GROUP_ID_FIELD_NUMBER; + hash = (53 * hash) + getGivingGroupId(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -344,11 +339,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 7103
-     * Obf: DJBCJENHGFJ
-     *
- * * Protobuf type {@code ItemGivingRsp} */ public static final class Builder extends @@ -386,11 +376,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; + givingId_ = 0; givingGroupId_ = 0; - givingId_ = 0; + retcode_ = 0; return this; } @@ -418,9 +408,9 @@ public emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp build() { @java.lang.Override public emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp buildPartial() { emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp result = new emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp(this); - result.retcode_ = retcode_; - result.givingGroupId_ = givingGroupId_; result.givingId_ = givingId_; + result.givingGroupId_ = givingGroupId_; + result.retcode_ = retcode_; onBuilt(); return result; } @@ -469,14 +459,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp other) { if (other == emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); + if (other.getGivingId() != 0) { + setGivingId(other.getGivingId()); } if (other.getGivingGroupId() != 0) { setGivingGroupId(other.getGivingGroupId()); } - if (other.getGivingId() != 0) { - setGivingId(other.getGivingId()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -507,40 +497,40 @@ public Builder mergeFrom( return this; } - private int retcode_ ; + private int givingId_ ; /** - * int32 retcode = 14; - * @return The retcode. + * uint32 giving_id = 6; + * @return The givingId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getGivingId() { + return givingId_; } /** - * int32 retcode = 14; - * @param value The retcode to set. + * uint32 giving_id = 6; + * @param value The givingId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setGivingId(int value) { - retcode_ = value; + givingId_ = value; onChanged(); return this; } /** - * int32 retcode = 14; + * uint32 giving_id = 6; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearGivingId() { - retcode_ = 0; + givingId_ = 0; onChanged(); return this; } private int givingGroupId_ ; /** - * uint32 giving_group_id = 4; + * uint32 giving_group_id = 15; * @return The givingGroupId. */ @java.lang.Override @@ -548,7 +538,7 @@ public int getGivingGroupId() { return givingGroupId_; } /** - * uint32 giving_group_id = 4; + * uint32 giving_group_id = 15; * @param value The givingGroupId to set. * @return This builder for chaining. */ @@ -559,7 +549,7 @@ public Builder setGivingGroupId(int value) { return this; } /** - * uint32 giving_group_id = 4; + * uint32 giving_group_id = 15; * @return This builder for chaining. */ public Builder clearGivingGroupId() { @@ -569,33 +559,33 @@ public Builder clearGivingGroupId() { return this; } - private int givingId_ ; + private int retcode_ ; /** - * uint32 giving_id = 13; - * @return The givingId. + * int32 retcode = 10; + * @return The retcode. */ @java.lang.Override - public int getGivingId() { - return givingId_; + public int getRetcode() { + return retcode_; } /** - * uint32 giving_id = 13; - * @param value The givingId to set. + * int32 retcode = 10; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setGivingId(int value) { + public Builder setRetcode(int value) { - givingId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 giving_id = 13; + * int32 retcode = 10; * @return This builder for chaining. */ - public Builder clearGivingId() { + public Builder clearRetcode() { - givingId_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -666,9 +656,9 @@ public emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp getDefaul descriptor; static { java.lang.String[] descriptorData = { - "\n\023ItemGivingRsp.proto\"L\n\rItemGivingRsp\022\017" + - "\n\007retcode\030\016 \001(\005\022\027\n\017giving_group_id\030\004 \001(\r" + - "\022\021\n\tgiving_id\030\r \001(\rB\033\n\031emu.grasscutter.n" + + "\n\023ItemGivingRsp.proto\"L\n\rItemGivingRsp\022\021" + + "\n\tgiving_id\030\006 \001(\r\022\027\n\017giving_group_id\030\017 \001" + + "(\r\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter.n" + "et.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +670,7 @@ public emu.grasscutter.net.proto.ItemGivingRspOuterClass.ItemGivingRsp getDefaul internal_static_ItemGivingRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ItemGivingRsp_descriptor, - new java.lang.String[] { "Retcode", "GivingGroupId", "GivingId", }); + new java.lang.String[] { "GivingId", "GivingGroupId", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java index d2f725f2383..cf1647b2859 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java @@ -19,34 +19,30 @@ public interface ItemHintOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 count = 7; - * @return The count. + * uint32 item_id = 11; + * @return The itemId. */ - int getCount(); + int getItemId(); /** - * uint32 item_id = 9; - * @return The itemId. + * bool is_new = 2; + * @return The isNew. */ - int getItemId(); + boolean getIsNew(); /** - * uint64 guid = 14; + * uint64 guid = 7; * @return The guid. */ long getGuid(); /** - * bool is_new = 8; - * @return The isNew. + * uint32 count = 10; + * @return The count. */ - boolean getIsNew(); + int getCount(); } /** - * 
-   * Obf: OLBNAADPLKJ
-   *
- * * Protobuf type {@code ItemHint} */ public static final class ItemHint extends @@ -91,24 +87,24 @@ private ItemHint( case 0: done = true; break; - case 56: { + case 16: { - count_ = input.readUInt32(); + isNew_ = input.readBool(); break; } - case 64: { + case 56: { - isNew_ = input.readBool(); + guid_ = input.readUInt64(); break; } - case 72: { + case 80: { - itemId_ = input.readUInt32(); + count_ = input.readUInt32(); break; } - case 112: { + case 88: { - guid_ = input.readUInt64(); + itemId_ = input.readUInt32(); break; } default: { @@ -143,32 +139,32 @@ private ItemHint( emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.class, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder.class); } - public static final int COUNT_FIELD_NUMBER = 7; - private int count_; + public static final int ITEM_ID_FIELD_NUMBER = 11; + private int itemId_; /** - * uint32 count = 7; - * @return The count. + * uint32 item_id = 11; + * @return The itemId. */ @java.lang.Override - public int getCount() { - return count_; + public int getItemId() { + return itemId_; } - public static final int ITEM_ID_FIELD_NUMBER = 9; - private int itemId_; + public static final int IS_NEW_FIELD_NUMBER = 2; + private boolean isNew_; /** - * uint32 item_id = 9; - * @return The itemId. + * bool is_new = 2; + * @return The isNew. */ @java.lang.Override - public int getItemId() { - return itemId_; + public boolean getIsNew() { + return isNew_; } - public static final int GUID_FIELD_NUMBER = 14; + public static final int GUID_FIELD_NUMBER = 7; private long guid_; /** - * uint64 guid = 14; + * uint64 guid = 7; * @return The guid. */ @java.lang.Override @@ -176,15 +172,15 @@ public long getGuid() { return guid_; } - public static final int IS_NEW_FIELD_NUMBER = 8; - private boolean isNew_; + public static final int COUNT_FIELD_NUMBER = 10; + private int count_; /** - * bool is_new = 8; - * @return The isNew. + * uint32 count = 10; + * @return The count. */ @java.lang.Override - public boolean getIsNew() { - return isNew_; + public int getCount() { + return count_; } private byte memoizedIsInitialized = -1; @@ -201,17 +197,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (count_ != 0) { - output.writeUInt32(7, count_); - } if (isNew_ != false) { - output.writeBool(8, isNew_); - } - if (itemId_ != 0) { - output.writeUInt32(9, itemId_); + output.writeBool(2, isNew_); } if (guid_ != 0L) { - output.writeUInt64(14, guid_); + output.writeUInt64(7, guid_); + } + if (count_ != 0) { + output.writeUInt32(10, count_); + } + if (itemId_ != 0) { + output.writeUInt32(11, itemId_); } unknownFields.writeTo(output); } @@ -222,21 +218,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (count_ != 0) { + if (isNew_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, count_); + .computeBoolSize(2, isNew_); } - if (isNew_ != false) { + if (guid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(8, isNew_); + .computeUInt64Size(7, guid_); } - if (itemId_ != 0) { + if (count_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, itemId_); + .computeUInt32Size(10, count_); } - if (guid_ != 0L) { + if (itemId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(14, guid_); + .computeUInt32Size(11, itemId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -253,14 +249,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint other = (emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint) obj; - if (getCount() - != other.getCount()) return false; if (getItemId() != other.getItemId()) return false; - if (getGuid() - != other.getGuid()) return false; if (getIsNew() != other.getIsNew()) return false; + if (getGuid() + != other.getGuid()) return false; + if (getCount() + != other.getCount()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -272,16 +268,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + COUNT_FIELD_NUMBER; - hash = (53 * hash) + getCount(); hash = (37 * hash) + ITEM_ID_FIELD_NUMBER; hash = (53 * hash) + getItemId(); - hash = (37 * hash) + GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getGuid()); hash = (37 * hash) + IS_NEW_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNew()); + hash = (37 * hash) + GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getGuid()); + hash = (37 * hash) + COUNT_FIELD_NUMBER; + hash = (53 * hash) + getCount(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,10 +374,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: OLBNAADPLKJ
-     *
- * * Protobuf type {@code ItemHint} */ public static final class Builder extends @@ -419,13 +411,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - count_ = 0; - itemId_ = 0; + isNew_ = false; + guid_ = 0L; - isNew_ = false; + count_ = 0; return this; } @@ -453,10 +445,10 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint build() { @java.lang.Override public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint buildPartial() { emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint result = new emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint(this); - result.count_ = count_; result.itemId_ = itemId_; - result.guid_ = guid_; result.isNew_ = isNew_; + result.guid_ = guid_; + result.count_ = count_; onBuilt(); return result; } @@ -505,17 +497,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint other) { if (other == emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance()) return this; - if (other.getCount() != 0) { - setCount(other.getCount()); - } if (other.getItemId() != 0) { setItemId(other.getItemId()); } + if (other.getIsNew() != false) { + setIsNew(other.getIsNew()); + } if (other.getGuid() != 0L) { setGuid(other.getGuid()); } - if (other.getIsNew() != false) { - setIsNew(other.getIsNew()); + if (other.getCount() != 0) { + setCount(other.getCount()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -546,71 +538,71 @@ public Builder mergeFrom( return this; } - private int count_ ; + private int itemId_ ; /** - * uint32 count = 7; - * @return The count. + * uint32 item_id = 11; + * @return The itemId. */ @java.lang.Override - public int getCount() { - return count_; + public int getItemId() { + return itemId_; } /** - * uint32 count = 7; - * @param value The count to set. + * uint32 item_id = 11; + * @param value The itemId to set. * @return This builder for chaining. */ - public Builder setCount(int value) { + public Builder setItemId(int value) { - count_ = value; + itemId_ = value; onChanged(); return this; } /** - * uint32 count = 7; + * uint32 item_id = 11; * @return This builder for chaining. */ - public Builder clearCount() { + public Builder clearItemId() { - count_ = 0; + itemId_ = 0; onChanged(); return this; } - private int itemId_ ; + private boolean isNew_ ; /** - * uint32 item_id = 9; - * @return The itemId. + * bool is_new = 2; + * @return The isNew. */ @java.lang.Override - public int getItemId() { - return itemId_; + public boolean getIsNew() { + return isNew_; } /** - * uint32 item_id = 9; - * @param value The itemId to set. + * bool is_new = 2; + * @param value The isNew to set. * @return This builder for chaining. */ - public Builder setItemId(int value) { + public Builder setIsNew(boolean value) { - itemId_ = value; + isNew_ = value; onChanged(); return this; } /** - * uint32 item_id = 9; + * bool is_new = 2; * @return This builder for chaining. */ - public Builder clearItemId() { + public Builder clearIsNew() { - itemId_ = 0; + isNew_ = false; onChanged(); return this; } private long guid_ ; /** - * uint64 guid = 14; + * uint64 guid = 7; * @return The guid. */ @java.lang.Override @@ -618,7 +610,7 @@ public long getGuid() { return guid_; } /** - * uint64 guid = 14; + * uint64 guid = 7; * @param value The guid to set. * @return This builder for chaining. */ @@ -629,7 +621,7 @@ public Builder setGuid(long value) { return this; } /** - * uint64 guid = 14; + * uint64 guid = 7; * @return This builder for chaining. */ public Builder clearGuid() { @@ -639,33 +631,33 @@ public Builder clearGuid() { return this; } - private boolean isNew_ ; + private int count_ ; /** - * bool is_new = 8; - * @return The isNew. + * uint32 count = 10; + * @return The count. */ @java.lang.Override - public boolean getIsNew() { - return isNew_; + public int getCount() { + return count_; } /** - * bool is_new = 8; - * @param value The isNew to set. + * uint32 count = 10; + * @param value The count to set. * @return This builder for chaining. */ - public Builder setIsNew(boolean value) { + public Builder setCount(int value) { - isNew_ = value; + count_ = value; onChanged(); return this; } /** - * bool is_new = 8; + * uint32 count = 10; * @return This builder for chaining. */ - public Builder clearIsNew() { + public Builder clearCount() { - isNew_ = false; + count_ = 0; onChanged(); return this; } @@ -736,9 +728,9 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getDefaultInstanceF descriptor; static { java.lang.String[] descriptorData = { - "\n\016ItemHint.proto\"H\n\010ItemHint\022\r\n\005count\030\007 " + - "\001(\r\022\017\n\007item_id\030\t \001(\r\022\014\n\004guid\030\016 \001(\004\022\016\n\006is" + - "_new\030\010 \001(\010B\033\n\031emu.grasscutter.net.protob" + + "\n\016ItemHint.proto\"H\n\010ItemHint\022\017\n\007item_id\030" + + "\013 \001(\r\022\016\n\006is_new\030\002 \001(\010\022\014\n\004guid\030\007 \001(\004\022\r\n\005c" + + "ount\030\n \001(\rB\033\n\031emu.grasscutter.net.protob" + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -750,7 +742,7 @@ public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getDefaultInstanceF internal_static_ItemHint_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ItemHint_descriptor, - new java.lang.String[] { "Count", "ItemId", "Guid", "IsNew", }); + new java.lang.String[] { "ItemId", "IsNew", "Guid", "Count", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java index 7a409fa97de..f01156577f1 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java @@ -15,10 +15,6 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } /** - * 
-   * Obf: BICPJCKHOPA
-   *
- * * Protobuf enum {@code MpSettingType} */ public enum MpSettingType diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java index 9dc1cfe472a..ba484373442 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java @@ -18,6 +18,40 @@ public interface ObstacleModifyNotifyOrBuilder extends // @@protoc_insertion_point(interface_extends:ObstacleModifyNotify) com.google.protobuf.MessageOrBuilder { + /** + * repeated int32 HPDLPMEOMKB = 10; + * @return A list containing the hPDLPMEOMKB. + */ + java.util.List getHPDLPMEOMKBList(); + /** + * repeated int32 HPDLPMEOMKB = 10; + * @return The count of hPDLPMEOMKB. + */ + int getHPDLPMEOMKBCount(); + /** + * repeated int32 HPDLPMEOMKB = 10; + * @param index The index of the element to return. + * @return The hPDLPMEOMKB at the given index. + */ + int getHPDLPMEOMKB(int index); + + /** + * repeated int32 EGMEMAIOALB = 15; + * @return A list containing the eGMEMAIOALB. + */ + java.util.List getEGMEMAIOALBList(); + /** + * repeated int32 EGMEMAIOALB = 15; + * @return The count of eGMEMAIOALB. + */ + int getEGMEMAIOALBCount(); + /** + * repeated int32 EGMEMAIOALB = 15; + * @param index The index of the element to return. + * @return The eGMEMAIOALB at the given index. + */ + int getEGMEMAIOALB(int index); + /** * repeated int32 remove_obstacle_ids = 6; * @return A list containing the removeObstacleIds. @@ -36,41 +70,36 @@ public interface ObstacleModifyNotifyOrBuilder extends int getRemoveObstacleIds(int index); /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ java.util.List getAddObstaclesList(); /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index); /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ int getAddObstaclesCount(); /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ java.util.List getAddObstaclesOrBuilderList(); /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder( int index); /** - * uint32 scene_id = 9; + * uint32 scene_id = 7; * @return The sceneId. */ int getSceneId(); } /** - * 
-   * CmdId: 2314
-   * Obf: EOGNKGLIDKH
-   *
- * * Protobuf type {@code ObstacleModifyNotify} */ public static final class ObstacleModifyNotify extends @@ -83,6 +112,8 @@ private ObstacleModifyNotify(com.google.protobuf.GeneratedMessageV3.Builder b super(builder); } private ObstacleModifyNotify() { + hPDLPMEOMKB_ = emptyIntList(); + eGMEMAIOALB_ = emptyIntList(); removeObstacleIds_ = emptyIntList(); addObstacles_ = java.util.Collections.emptyList(); } @@ -118,10 +149,19 @@ private ObstacleModifyNotify( case 0: done = true; break; + case 42: { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { + addObstacles_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000008; + } + addObstacles_.add( + input.readMessage(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.parser(), extensionRegistry)); + break; + } case 48: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { removeObstacleIds_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000004; } removeObstacleIds_.addInt(input.readInt32()); break; @@ -129,9 +169,9 @@ private ObstacleModifyNotify( case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { removeObstacleIds_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { removeObstacleIds_.addInt(input.readInt32()); @@ -139,18 +179,51 @@ private ObstacleModifyNotify( input.popLimit(limit); break; } - case 72: { + case 56: { sceneId_ = input.readUInt32(); break; } + case 80: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + hPDLPMEOMKB_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + hPDLPMEOMKB_.addInt(input.readInt32()); + break; + } case 82: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + hPDLPMEOMKB_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + while (input.getBytesUntilLimit() > 0) { + hPDLPMEOMKB_.addInt(input.readInt32()); + } + input.popLimit(limit); + break; + } + case 120: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - addObstacles_ = new java.util.ArrayList(); + eGMEMAIOALB_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - addObstacles_.add( - input.readMessage(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.parser(), extensionRegistry)); + eGMEMAIOALB_.addInt(input.readInt32()); + break; + } + case 122: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + eGMEMAIOALB_ = newIntList(); + mutable_bitField0_ |= 0x00000002; + } + while (input.getBytesUntilLimit() > 0) { + eGMEMAIOALB_.addInt(input.readInt32()); + } + input.popLimit(limit); break; } default: { @@ -168,11 +241,17 @@ private ObstacleModifyNotify( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { + addObstacles_ = java.util.Collections.unmodifiableList(addObstacles_); + } + if (((mutable_bitField0_ & 0x00000004) != 0)) { removeObstacleIds_.makeImmutable(); // C } + if (((mutable_bitField0_ & 0x00000001) != 0)) { + hPDLPMEOMKB_.makeImmutable(); // C + } if (((mutable_bitField0_ & 0x00000002) != 0)) { - addObstacles_ = java.util.Collections.unmodifiableList(addObstacles_); + eGMEMAIOALB_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -191,6 +270,62 @@ private ObstacleModifyNotify( emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify.class, emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify.Builder.class); } + public static final int HPDLPMEOMKB_FIELD_NUMBER = 10; + private com.google.protobuf.Internal.IntList hPDLPMEOMKB_; + /** + * repeated int32 HPDLPMEOMKB = 10; + * @return A list containing the hPDLPMEOMKB. + */ + @java.lang.Override + public java.util.List + getHPDLPMEOMKBList() { + return hPDLPMEOMKB_; + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @return The count of hPDLPMEOMKB. + */ + public int getHPDLPMEOMKBCount() { + return hPDLPMEOMKB_.size(); + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @param index The index of the element to return. + * @return The hPDLPMEOMKB at the given index. + */ + public int getHPDLPMEOMKB(int index) { + return hPDLPMEOMKB_.getInt(index); + } + private int hPDLPMEOMKBMemoizedSerializedSize = -1; + + public static final int EGMEMAIOALB_FIELD_NUMBER = 15; + private com.google.protobuf.Internal.IntList eGMEMAIOALB_; + /** + * repeated int32 EGMEMAIOALB = 15; + * @return A list containing the eGMEMAIOALB. + */ + @java.lang.Override + public java.util.List + getEGMEMAIOALBList() { + return eGMEMAIOALB_; + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @return The count of eGMEMAIOALB. + */ + public int getEGMEMAIOALBCount() { + return eGMEMAIOALB_.size(); + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @param index The index of the element to return. + * @return The eGMEMAIOALB at the given index. + */ + public int getEGMEMAIOALB(int index) { + return eGMEMAIOALB_.getInt(index); + } + private int eGMEMAIOALBMemoizedSerializedSize = -1; + public static final int REMOVE_OBSTACLE_IDS_FIELD_NUMBER = 6; private com.google.protobuf.Internal.IntList removeObstacleIds_; /** @@ -219,17 +354,17 @@ public int getRemoveObstacleIds(int index) { } private int removeObstacleIdsMemoizedSerializedSize = -1; - public static final int ADD_OBSTACLES_FIELD_NUMBER = 10; + public static final int ADD_OBSTACLES_FIELD_NUMBER = 5; private java.util.List addObstacles_; /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ @java.lang.Override public java.util.List getAddObstaclesList() { return addObstacles_; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ @java.lang.Override public java.util.List @@ -237,21 +372,21 @@ public java.util.Listrepeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ @java.lang.Override public int getAddObstaclesCount() { return addObstacles_.size(); } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ @java.lang.Override public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index) { return addObstacles_.get(index); } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ @java.lang.Override public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder( @@ -259,10 +394,10 @@ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder ge return addObstacles_.get(index); } - public static final int SCENE_ID_FIELD_NUMBER = 9; + public static final int SCENE_ID_FIELD_NUMBER = 7; private int sceneId_; /** - * uint32 scene_id = 9; + * uint32 scene_id = 7; * @return The sceneId. */ @java.lang.Override @@ -285,6 +420,9 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); + for (int i = 0; i < addObstacles_.size(); i++) { + output.writeMessage(5, addObstacles_.get(i)); + } if (getRemoveObstacleIdsList().size() > 0) { output.writeUInt32NoTag(50); output.writeUInt32NoTag(removeObstacleIdsMemoizedSerializedSize); @@ -293,10 +431,21 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeInt32NoTag(removeObstacleIds_.getInt(i)); } if (sceneId_ != 0) { - output.writeUInt32(9, sceneId_); + output.writeUInt32(7, sceneId_); } - for (int i = 0; i < addObstacles_.size(); i++) { - output.writeMessage(10, addObstacles_.get(i)); + if (getHPDLPMEOMKBList().size() > 0) { + output.writeUInt32NoTag(82); + output.writeUInt32NoTag(hPDLPMEOMKBMemoizedSerializedSize); + } + for (int i = 0; i < hPDLPMEOMKB_.size(); i++) { + output.writeInt32NoTag(hPDLPMEOMKB_.getInt(i)); + } + if (getEGMEMAIOALBList().size() > 0) { + output.writeUInt32NoTag(122); + output.writeUInt32NoTag(eGMEMAIOALBMemoizedSerializedSize); + } + for (int i = 0; i < eGMEMAIOALB_.size(); i++) { + output.writeInt32NoTag(eGMEMAIOALB_.getInt(i)); } unknownFields.writeTo(output); } @@ -307,6 +456,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + for (int i = 0; i < addObstacles_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, addObstacles_.get(i)); + } { int dataSize = 0; for (int i = 0; i < removeObstacleIds_.size(); i++) { @@ -323,11 +476,35 @@ public int getSerializedSize() { } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, sceneId_); + .computeUInt32Size(7, sceneId_); } - for (int i = 0; i < addObstacles_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, addObstacles_.get(i)); + { + int dataSize = 0; + for (int i = 0; i < hPDLPMEOMKB_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(hPDLPMEOMKB_.getInt(i)); + } + size += dataSize; + if (!getHPDLPMEOMKBList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + hPDLPMEOMKBMemoizedSerializedSize = dataSize; + } + { + int dataSize = 0; + for (int i = 0; i < eGMEMAIOALB_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(eGMEMAIOALB_.getInt(i)); + } + size += dataSize; + if (!getEGMEMAIOALBList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + eGMEMAIOALBMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -344,6 +521,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify other = (emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify) obj; + if (!getHPDLPMEOMKBList() + .equals(other.getHPDLPMEOMKBList())) return false; + if (!getEGMEMAIOALBList() + .equals(other.getEGMEMAIOALBList())) return false; if (!getRemoveObstacleIdsList() .equals(other.getRemoveObstacleIdsList())) return false; if (!getAddObstaclesList() @@ -361,6 +542,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (getHPDLPMEOMKBCount() > 0) { + hash = (37 * hash) + HPDLPMEOMKB_FIELD_NUMBER; + hash = (53 * hash) + getHPDLPMEOMKBList().hashCode(); + } + if (getEGMEMAIOALBCount() > 0) { + hash = (37 * hash) + EGMEMAIOALB_FIELD_NUMBER; + hash = (53 * hash) + getEGMEMAIOALBList().hashCode(); + } if (getRemoveObstacleIdsCount() > 0) { hash = (37 * hash) + REMOVE_OBSTACLE_IDS_FIELD_NUMBER; hash = (53 * hash) + getRemoveObstacleIdsList().hashCode(); @@ -467,11 +656,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 2314
-     * Obf: EOGNKGLIDKH
-     *
- * * Protobuf type {@code ObstacleModifyNotify} */ public static final class Builder extends @@ -510,11 +694,15 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - removeObstacleIds_ = emptyIntList(); + hPDLPMEOMKB_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); + eGMEMAIOALB_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + removeObstacleIds_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000004); if (addObstaclesBuilder_ == null) { addObstacles_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); } else { addObstaclesBuilder_.clear(); } @@ -548,14 +736,24 @@ public emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNo emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify result = new emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - removeObstacleIds_.makeImmutable(); + hPDLPMEOMKB_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } + result.hPDLPMEOMKB_ = hPDLPMEOMKB_; + if (((bitField0_ & 0x00000002) != 0)) { + eGMEMAIOALB_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.eGMEMAIOALB_ = eGMEMAIOALB_; + if (((bitField0_ & 0x00000004) != 0)) { + removeObstacleIds_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000004); + } result.removeObstacleIds_ = removeObstacleIds_; if (addObstaclesBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { addObstacles_ = java.util.Collections.unmodifiableList(addObstacles_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); } result.addObstacles_ = addObstacles_; } else { @@ -610,10 +808,30 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify other) { if (other == emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify.getDefaultInstance()) return this; + if (!other.hPDLPMEOMKB_.isEmpty()) { + if (hPDLPMEOMKB_.isEmpty()) { + hPDLPMEOMKB_ = other.hPDLPMEOMKB_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureHPDLPMEOMKBIsMutable(); + hPDLPMEOMKB_.addAll(other.hPDLPMEOMKB_); + } + onChanged(); + } + if (!other.eGMEMAIOALB_.isEmpty()) { + if (eGMEMAIOALB_.isEmpty()) { + eGMEMAIOALB_ = other.eGMEMAIOALB_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureEGMEMAIOALBIsMutable(); + eGMEMAIOALB_.addAll(other.eGMEMAIOALB_); + } + onChanged(); + } if (!other.removeObstacleIds_.isEmpty()) { if (removeObstacleIds_.isEmpty()) { removeObstacleIds_ = other.removeObstacleIds_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); } else { ensureRemoveObstacleIdsIsMutable(); removeObstacleIds_.addAll(other.removeObstacleIds_); @@ -624,7 +842,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClas if (!other.addObstacles_.isEmpty()) { if (addObstacles_.isEmpty()) { addObstacles_ = other.addObstacles_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureAddObstaclesIsMutable(); addObstacles_.addAll(other.addObstacles_); @@ -637,7 +855,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClas addObstaclesBuilder_.dispose(); addObstaclesBuilder_ = null; addObstacles_ = other.addObstacles_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); addObstaclesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getAddObstaclesFieldBuilder() : null; @@ -679,11 +897,169 @@ public Builder mergeFrom( } private int bitField0_; + private com.google.protobuf.Internal.IntList hPDLPMEOMKB_ = emptyIntList(); + private void ensureHPDLPMEOMKBIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + hPDLPMEOMKB_ = mutableCopy(hPDLPMEOMKB_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @return A list containing the hPDLPMEOMKB. + */ + public java.util.List + getHPDLPMEOMKBList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(hPDLPMEOMKB_) : hPDLPMEOMKB_; + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @return The count of hPDLPMEOMKB. + */ + public int getHPDLPMEOMKBCount() { + return hPDLPMEOMKB_.size(); + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @param index The index of the element to return. + * @return The hPDLPMEOMKB at the given index. + */ + public int getHPDLPMEOMKB(int index) { + return hPDLPMEOMKB_.getInt(index); + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @param index The index to set the value at. + * @param value The hPDLPMEOMKB to set. + * @return This builder for chaining. + */ + public Builder setHPDLPMEOMKB( + int index, int value) { + ensureHPDLPMEOMKBIsMutable(); + hPDLPMEOMKB_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @param value The hPDLPMEOMKB to add. + * @return This builder for chaining. + */ + public Builder addHPDLPMEOMKB(int value) { + ensureHPDLPMEOMKBIsMutable(); + hPDLPMEOMKB_.addInt(value); + onChanged(); + return this; + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @param values The hPDLPMEOMKB to add. + * @return This builder for chaining. + */ + public Builder addAllHPDLPMEOMKB( + java.lang.Iterable values) { + ensureHPDLPMEOMKBIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, hPDLPMEOMKB_); + onChanged(); + return this; + } + /** + * repeated int32 HPDLPMEOMKB = 10; + * @return This builder for chaining. + */ + public Builder clearHPDLPMEOMKB() { + hPDLPMEOMKB_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList eGMEMAIOALB_ = emptyIntList(); + private void ensureEGMEMAIOALBIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + eGMEMAIOALB_ = mutableCopy(eGMEMAIOALB_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @return A list containing the eGMEMAIOALB. + */ + public java.util.List + getEGMEMAIOALBList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(eGMEMAIOALB_) : eGMEMAIOALB_; + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @return The count of eGMEMAIOALB. + */ + public int getEGMEMAIOALBCount() { + return eGMEMAIOALB_.size(); + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @param index The index of the element to return. + * @return The eGMEMAIOALB at the given index. + */ + public int getEGMEMAIOALB(int index) { + return eGMEMAIOALB_.getInt(index); + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @param index The index to set the value at. + * @param value The eGMEMAIOALB to set. + * @return This builder for chaining. + */ + public Builder setEGMEMAIOALB( + int index, int value) { + ensureEGMEMAIOALBIsMutable(); + eGMEMAIOALB_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @param value The eGMEMAIOALB to add. + * @return This builder for chaining. + */ + public Builder addEGMEMAIOALB(int value) { + ensureEGMEMAIOALBIsMutable(); + eGMEMAIOALB_.addInt(value); + onChanged(); + return this; + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @param values The eGMEMAIOALB to add. + * @return This builder for chaining. + */ + public Builder addAllEGMEMAIOALB( + java.lang.Iterable values) { + ensureEGMEMAIOALBIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, eGMEMAIOALB_); + onChanged(); + return this; + } + /** + * repeated int32 EGMEMAIOALB = 15; + * @return This builder for chaining. + */ + public Builder clearEGMEMAIOALB() { + eGMEMAIOALB_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + private com.google.protobuf.Internal.IntList removeObstacleIds_ = emptyIntList(); private void ensureRemoveObstacleIdsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000004) != 0)) { removeObstacleIds_ = mutableCopy(removeObstacleIds_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; } } /** @@ -692,7 +1068,7 @@ private void ensureRemoveObstacleIdsIsMutable() { */ public java.util.List getRemoveObstacleIdsList() { - return ((bitField0_ & 0x00000001) != 0) ? + return ((bitField0_ & 0x00000004) != 0) ? java.util.Collections.unmodifiableList(removeObstacleIds_) : removeObstacleIds_; } /** @@ -753,7 +1129,7 @@ public Builder addAllRemoveObstacleIds( */ public Builder clearRemoveObstacleIds() { removeObstacleIds_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -761,9 +1137,9 @@ public Builder clearRemoveObstacleIds() { private java.util.List addObstacles_ = java.util.Collections.emptyList(); private void ensureAddObstaclesIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { addObstacles_ = new java.util.ArrayList(addObstacles_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; } } @@ -771,7 +1147,7 @@ private void ensureAddObstaclesIsMutable() { emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder> addObstaclesBuilder_; /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public java.util.List getAddObstaclesList() { if (addObstaclesBuilder_ == null) { @@ -781,7 +1157,7 @@ public java.util.Listrepeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public int getAddObstaclesCount() { if (addObstaclesBuilder_ == null) { @@ -791,7 +1167,7 @@ public int getAddObstaclesCount() { } } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index) { if (addObstaclesBuilder_ == null) { @@ -801,7 +1177,7 @@ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObsta } } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder setAddObstacles( int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo value) { @@ -818,7 +1194,7 @@ public Builder setAddObstacles( return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder setAddObstacles( int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder builderForValue) { @@ -832,7 +1208,7 @@ public Builder setAddObstacles( return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder addAddObstacles(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo value) { if (addObstaclesBuilder_ == null) { @@ -848,7 +1224,7 @@ public Builder addAddObstacles(emu.grasscutter.net.proto.ObstacleInfoOuterClass. return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder addAddObstacles( int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo value) { @@ -865,7 +1241,7 @@ public Builder addAddObstacles( return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder addAddObstacles( emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder builderForValue) { @@ -879,7 +1255,7 @@ public Builder addAddObstacles( return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder addAddObstacles( int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder builderForValue) { @@ -893,7 +1269,7 @@ public Builder addAddObstacles( return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder addAllAddObstacles( java.lang.Iterable values) { @@ -908,12 +1284,12 @@ public Builder addAllAddObstacles( return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder clearAddObstacles() { if (addObstaclesBuilder_ == null) { addObstacles_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { addObstaclesBuilder_.clear(); @@ -921,7 +1297,7 @@ public Builder clearAddObstacles() { return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public Builder removeAddObstacles(int index) { if (addObstaclesBuilder_ == null) { @@ -934,14 +1310,14 @@ public Builder removeAddObstacles(int index) { return this; } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder getAddObstaclesBuilder( int index) { return getAddObstaclesFieldBuilder().getBuilder(index); } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder( int index) { @@ -951,7 +1327,7 @@ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder ge } } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public java.util.List getAddObstaclesOrBuilderList() { @@ -962,14 +1338,14 @@ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder ge } } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder addAddObstaclesBuilder() { return getAddObstaclesFieldBuilder().addBuilder( emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.getDefaultInstance()); } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder addAddObstaclesBuilder( int index) { @@ -977,7 +1353,7 @@ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder add index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.getDefaultInstance()); } /** - * repeated .ObstacleInfo add_obstacles = 10; + * repeated .ObstacleInfo add_obstacles = 5; */ public java.util.List getAddObstaclesBuilderList() { @@ -990,7 +1366,7 @@ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder add addObstaclesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder>( addObstacles_, - ((bitField0_ & 0x00000002) != 0), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); addObstacles_ = null; @@ -1000,7 +1376,7 @@ public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder add private int sceneId_ ; /** - * uint32 scene_id = 9; + * uint32 scene_id = 7; * @return The sceneId. */ @java.lang.Override @@ -1008,7 +1384,7 @@ public int getSceneId() { return sceneId_; } /** - * uint32 scene_id = 9; + * uint32 scene_id = 7; * @param value The sceneId to set. * @return This builder for chaining. */ @@ -1019,7 +1395,7 @@ public Builder setSceneId(int value) { return this; } /** - * uint32 scene_id = 9; + * uint32 scene_id = 7; * @return This builder for chaining. */ public Builder clearSceneId() { @@ -1096,10 +1472,11 @@ public emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNo static { java.lang.String[] descriptorData = { "\n\032ObstacleModifyNotify.proto\032\022ObstacleIn" + - "fo.proto\"k\n\024ObstacleModifyNotify\022\033\n\023remo" + - "ve_obstacle_ids\030\006 \003(\005\022$\n\radd_obstacles\030\n" + - " \003(\0132\r.ObstacleInfo\022\020\n\010scene_id\030\t \001(\rB\033\n" + - "\031emu.grasscutter.net.protob\006proto3" + "fo.proto\"\225\001\n\024ObstacleModifyNotify\022\023\n\013HPD" + + "LPMEOMKB\030\n \003(\005\022\023\n\013EGMEMAIOALB\030\017 \003(\005\022\033\n\023r" + + "emove_obstacle_ids\030\006 \003(\005\022$\n\radd_obstacle" + + "s\030\005 \003(\0132\r.ObstacleInfo\022\020\n\010scene_id\030\007 \001(\r" + + "B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1111,7 +1488,7 @@ public emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNo internal_static_ObstacleModifyNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ObstacleModifyNotify_descriptor, - new java.lang.String[] { "RemoveObstacleIds", "AddObstacles", "SceneId", }); + new java.lang.String[] { "HPDLPMEOMKB", "EGMEMAIOALB", "RemoveObstacleIds", "AddObstacles", "SceneId", }); emu.grasscutter.net.proto.ObstacleInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java index 83849d83371..4a28ca247c1 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java @@ -19,57 +19,48 @@ public interface OnlinePlayerInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 uid = 1; - * @return The uid. - */ - int getUid(); - - /** - * string nickname = 2; - * @return The nickname. + * string signature = 11; + * @return The signature. */ - java.lang.String getNickname(); + java.lang.String getSignature(); /** - * string nickname = 2; - * @return The bytes for nickname. + * string signature = 11; + * @return The bytes for signature. */ com.google.protobuf.ByteString - getNicknameBytes(); + getSignatureBytes(); /** - * uint32 player_level = 3; - * @return The playerLevel. + * .ProfilePicture profile_picture = 12; + * @return Whether the profilePicture field is set. */ - int getPlayerLevel(); - + boolean hasProfilePicture(); /** - * uint32 avatar_id = 4; - * @return The avatarId. + * .ProfilePicture profile_picture = 12; + * @return The profilePicture. */ - int getAvatarId(); - + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture(); /** - * .MpSettingType mp_setting_type = 5; - * @return The enum numeric value on the wire for mpSettingType. + * .ProfilePicture profile_picture = 12; */ - int getMpSettingTypeValue(); + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder(); + /** - * .MpSettingType mp_setting_type = 5; - * @return The mpSettingType. + * repeated uint32 blacklist_uid_list = 10; + * @return A list containing the blacklistUidList. */ - emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType(); - + java.util.List getBlacklistUidListList(); /** - * uint32 cur_player_num_in_world = 6; - * @return The curPlayerNumInWorld. + * repeated uint32 blacklist_uid_list = 10; + * @return The count of blacklistUidList. */ - int getCurPlayerNumInWorld(); - + int getBlacklistUidListCount(); /** - * uint32 world_level = 7; - * @return The worldLevel. + * repeated uint32 blacklist_uid_list = 10; + * @param index The index of the element to return. + * @return The blacklistUidList at the given index. */ - int getWorldLevel(); + int getBlacklistUidList(int index); /** * string online_id = 8; @@ -84,72 +75,77 @@ public interface OnlinePlayerInfoOrBuilder extends getOnlineIdBytes(); /** - * uint32 name_card_id = 9; - * @return The nameCardId. + * string nickname = 2; + * @return The nickname. */ - int getNameCardId(); + java.lang.String getNickname(); + /** + * string nickname = 2; + * @return The bytes for nickname. + */ + com.google.protobuf.ByteString + getNicknameBytes(); /** - * repeated uint32 blacklist_uid_list = 10; - * @return A list containing the blacklistUidList. + * string psn_id = 13; + * @return The psnId. */ - java.util.List getBlacklistUidListList(); + java.lang.String getPsnId(); /** - * repeated uint32 blacklist_uid_list = 10; - * @return The count of blacklistUidList. + * string psn_id = 13; + * @return The bytes for psnId. */ - int getBlacklistUidListCount(); + com.google.protobuf.ByteString + getPsnIdBytes(); + /** - * repeated uint32 blacklist_uid_list = 10; - * @param index The index of the element to return. - * @return The blacklistUidList at the given index. + * uint32 avatar_id = 4; + * @return The avatarId. */ - int getBlacklistUidList(int index); + int getAvatarId(); /** - * string signature = 11; - * @return The signature. + * uint32 name_card_id = 9; + * @return The nameCardId. */ - java.lang.String getSignature(); + int getNameCardId(); + /** - * string signature = 11; - * @return The bytes for signature. + * uint32 uid = 1; + * @return The uid. */ - com.google.protobuf.ByteString - getSignatureBytes(); + int getUid(); /** - * .ProfilePicture profile_picture = 12; - * @return Whether the profilePicture field is set. + * uint32 cur_player_num_in_world = 3; + * @return The curPlayerNumInWorld. */ - boolean hasProfilePicture(); + int getCurPlayerNumInWorld(); + /** - * .ProfilePicture profile_picture = 12; - * @return The profilePicture. + * .MpSettingType mp_setting_type = 5; + * @return The enum numeric value on the wire for mpSettingType. */ - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture(); + int getMpSettingTypeValue(); /** - * .ProfilePicture profile_picture = 12; + * .MpSettingType mp_setting_type = 5; + * @return The mpSettingType. */ - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder(); + emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType(); /** - * string psn_id = 13; - * @return The psnId. + * uint32 player_level = 6; + * @return The playerLevel. */ - java.lang.String getPsnId(); + int getPlayerLevel(); + /** - * string psn_id = 13; - * @return The bytes for psnId. + * uint32 world_level = 7; + * @return The worldLevel. */ - com.google.protobuf.ByteString - getPsnIdBytes(); + int getWorldLevel(); } /** - * 
-   * Obf: BJKIIJGIJPA
-   *
- * * Protobuf type {@code OnlinePlayerInfo} */ public static final class OnlinePlayerInfo extends @@ -162,12 +158,12 @@ private OnlinePlayerInfo(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } private OnlinePlayerInfo() { - nickname_ = ""; - mpSettingType_ = 0; - onlineId_ = ""; - blacklistUidList_ = emptyIntList(); signature_ = ""; + blacklistUidList_ = emptyIntList(); + onlineId_ = ""; + nickname_ = ""; psnId_ = ""; + mpSettingType_ = 0; } @java.lang.Override @@ -214,7 +210,7 @@ private OnlinePlayerInfo( } case 24: { - playerLevel_ = input.readUInt32(); + curPlayerNumInWorld_ = input.readUInt32(); break; } case 32: { @@ -230,7 +226,7 @@ private OnlinePlayerInfo( } case 48: { - curPlayerNumInWorld_ = input.readUInt32(); + playerLevel_ = input.readUInt32(); break; } case 56: { @@ -330,117 +326,97 @@ private OnlinePlayerInfo( emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.class, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder.class); } - public static final int UID_FIELD_NUMBER = 1; - private int uid_; - /** - * uint32 uid = 1; - * @return The uid. - */ - @java.lang.Override - public int getUid() { - return uid_; - } - - public static final int NICKNAME_FIELD_NUMBER = 2; - private volatile java.lang.Object nickname_; + public static final int SIGNATURE_FIELD_NUMBER = 11; + private volatile java.lang.Object signature_; /** - * string nickname = 2; - * @return The nickname. + * string signature = 11; + * @return The signature. */ @java.lang.Override - public java.lang.String getNickname() { - java.lang.Object ref = nickname_; + public java.lang.String getSignature() { + java.lang.Object ref = signature_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - nickname_ = s; + signature_ = s; return s; } } /** - * string nickname = 2; - * @return The bytes for nickname. + * string signature = 11; + * @return The bytes for signature. */ @java.lang.Override public com.google.protobuf.ByteString - getNicknameBytes() { - java.lang.Object ref = nickname_; + getSignatureBytes() { + java.lang.Object ref = signature_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - nickname_ = b; + signature_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int PLAYER_LEVEL_FIELD_NUMBER = 3; - private int playerLevel_; + public static final int PROFILE_PICTURE_FIELD_NUMBER = 12; + private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_; /** - * uint32 player_level = 3; - * @return The playerLevel. + * .ProfilePicture profile_picture = 12; + * @return Whether the profilePicture field is set. */ @java.lang.Override - public int getPlayerLevel() { - return playerLevel_; + public boolean hasProfilePicture() { + return profilePicture_ != null; } - - public static final int AVATAR_ID_FIELD_NUMBER = 4; - private int avatarId_; /** - * uint32 avatar_id = 4; - * @return The avatarId. + * .ProfilePicture profile_picture = 12; + * @return The profilePicture. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() { + return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_; } - - public static final int MP_SETTING_TYPE_FIELD_NUMBER = 5; - private int mpSettingType_; /** - * .MpSettingType mp_setting_type = 5; - * @return The enum numeric value on the wire for mpSettingType. + * .ProfilePicture profile_picture = 12; */ - @java.lang.Override public int getMpSettingTypeValue() { - return mpSettingType_; + @java.lang.Override + public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() { + return getProfilePicture(); } + + public static final int BLACKLIST_UID_LIST_FIELD_NUMBER = 10; + private com.google.protobuf.Internal.IntList blacklistUidList_; /** - * .MpSettingType mp_setting_type = 5; - * @return The mpSettingType. + * repeated uint32 blacklist_uid_list = 10; + * @return A list containing the blacklistUidList. */ - @java.lang.Override public emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType result = emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.valueOf(mpSettingType_); - return result == null ? emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.UNRECOGNIZED : result; + @java.lang.Override + public java.util.List + getBlacklistUidListList() { + return blacklistUidList_; } - - public static final int CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER = 6; - private int curPlayerNumInWorld_; /** - * uint32 cur_player_num_in_world = 6; - * @return The curPlayerNumInWorld. + * repeated uint32 blacklist_uid_list = 10; + * @return The count of blacklistUidList. */ - @java.lang.Override - public int getCurPlayerNumInWorld() { - return curPlayerNumInWorld_; + public int getBlacklistUidListCount() { + return blacklistUidList_.size(); } - - public static final int WORLD_LEVEL_FIELD_NUMBER = 7; - private int worldLevel_; /** - * uint32 world_level = 7; - * @return The worldLevel. + * repeated uint32 blacklist_uid_list = 10; + * @param index The index of the element to return. + * @return The blacklistUidList at the given index. */ - @java.lang.Override - public int getWorldLevel() { - return worldLevel_; + public int getBlacklistUidList(int index) { + return blacklistUidList_.getInt(index); } + private int blacklistUidListMemoizedSerializedSize = -1; public static final int ONLINE_ID_FIELD_NUMBER = 8; private volatile java.lang.Object onlineId_; @@ -480,109 +456,44 @@ public java.lang.String getOnlineId() { } } - public static final int NAME_CARD_ID_FIELD_NUMBER = 9; - private int nameCardId_; + public static final int NICKNAME_FIELD_NUMBER = 2; + private volatile java.lang.Object nickname_; /** - * uint32 name_card_id = 9; - * @return The nameCardId. - */ - @java.lang.Override - public int getNameCardId() { - return nameCardId_; - } - - public static final int BLACKLIST_UID_LIST_FIELD_NUMBER = 10; - private com.google.protobuf.Internal.IntList blacklistUidList_; - /** - * repeated uint32 blacklist_uid_list = 10; - * @return A list containing the blacklistUidList. - */ - @java.lang.Override - public java.util.List - getBlacklistUidListList() { - return blacklistUidList_; - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @return The count of blacklistUidList. - */ - public int getBlacklistUidListCount() { - return blacklistUidList_.size(); - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @param index The index of the element to return. - * @return The blacklistUidList at the given index. - */ - public int getBlacklistUidList(int index) { - return blacklistUidList_.getInt(index); - } - private int blacklistUidListMemoizedSerializedSize = -1; - - public static final int SIGNATURE_FIELD_NUMBER = 11; - private volatile java.lang.Object signature_; - /** - * string signature = 11; - * @return The signature. + * string nickname = 2; + * @return The nickname. */ @java.lang.Override - public java.lang.String getSignature() { - java.lang.Object ref = signature_; + public java.lang.String getNickname() { + java.lang.Object ref = nickname_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - signature_ = s; + nickname_ = s; return s; } } /** - * string signature = 11; - * @return The bytes for signature. + * string nickname = 2; + * @return The bytes for nickname. */ @java.lang.Override public com.google.protobuf.ByteString - getSignatureBytes() { - java.lang.Object ref = signature_; + getNicknameBytes() { + java.lang.Object ref = nickname_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - signature_ = b; + nickname_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int PROFILE_PICTURE_FIELD_NUMBER = 12; - private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_; - /** - * .ProfilePicture profile_picture = 12; - * @return Whether the profilePicture field is set. - */ - @java.lang.Override - public boolean hasProfilePicture() { - return profilePicture_ != null; - } - /** - * .ProfilePicture profile_picture = 12; - * @return The profilePicture. - */ - @java.lang.Override - public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() { - return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_; - } - /** - * .ProfilePicture profile_picture = 12; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() { - return getProfilePicture(); - } - public static final int PSN_ID_FIELD_NUMBER = 13; private volatile java.lang.Object psnId_; /** @@ -621,6 +532,91 @@ public java.lang.String getPsnId() { } } + public static final int AVATAR_ID_FIELD_NUMBER = 4; + private int avatarId_; + /** + * uint32 avatar_id = 4; + * @return The avatarId. + */ + @java.lang.Override + public int getAvatarId() { + return avatarId_; + } + + public static final int NAME_CARD_ID_FIELD_NUMBER = 9; + private int nameCardId_; + /** + * uint32 name_card_id = 9; + * @return The nameCardId. + */ + @java.lang.Override + public int getNameCardId() { + return nameCardId_; + } + + public static final int UID_FIELD_NUMBER = 1; + private int uid_; + /** + * uint32 uid = 1; + * @return The uid. + */ + @java.lang.Override + public int getUid() { + return uid_; + } + + public static final int CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER = 3; + private int curPlayerNumInWorld_; + /** + * uint32 cur_player_num_in_world = 3; + * @return The curPlayerNumInWorld. + */ + @java.lang.Override + public int getCurPlayerNumInWorld() { + return curPlayerNumInWorld_; + } + + public static final int MP_SETTING_TYPE_FIELD_NUMBER = 5; + private int mpSettingType_; + /** + * .MpSettingType mp_setting_type = 5; + * @return The enum numeric value on the wire for mpSettingType. + */ + @java.lang.Override public int getMpSettingTypeValue() { + return mpSettingType_; + } + /** + * .MpSettingType mp_setting_type = 5; + * @return The mpSettingType. + */ + @java.lang.Override public emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType result = emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.valueOf(mpSettingType_); + return result == null ? emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.UNRECOGNIZED : result; + } + + public static final int PLAYER_LEVEL_FIELD_NUMBER = 6; + private int playerLevel_; + /** + * uint32 player_level = 6; + * @return The playerLevel. + */ + @java.lang.Override + public int getPlayerLevel() { + return playerLevel_; + } + + public static final int WORLD_LEVEL_FIELD_NUMBER = 7; + private int worldLevel_; + /** + * uint32 world_level = 7; + * @return The worldLevel. + */ + @java.lang.Override + public int getWorldLevel() { + return worldLevel_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -642,8 +638,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nickname_); } - if (playerLevel_ != 0) { - output.writeUInt32(3, playerLevel_); + if (curPlayerNumInWorld_ != 0) { + output.writeUInt32(3, curPlayerNumInWorld_); } if (avatarId_ != 0) { output.writeUInt32(4, avatarId_); @@ -651,8 +647,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (mpSettingType_ != emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.MP_SETTING_TYPE_NO_ENTER.getNumber()) { output.writeEnum(5, mpSettingType_); } - if (curPlayerNumInWorld_ != 0) { - output.writeUInt32(6, curPlayerNumInWorld_); + if (playerLevel_ != 0) { + output.writeUInt32(6, playerLevel_); } if (worldLevel_ != 0) { output.writeUInt32(7, worldLevel_); @@ -695,9 +691,9 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nickname_); } - if (playerLevel_ != 0) { + if (curPlayerNumInWorld_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, playerLevel_); + .computeUInt32Size(3, curPlayerNumInWorld_); } if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -707,9 +703,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeEnumSize(5, mpSettingType_); } - if (curPlayerNumInWorld_ != 0) { + if (playerLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, curPlayerNumInWorld_); + .computeUInt32Size(6, playerLevel_); } if (worldLevel_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -761,25 +757,6 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo other = (emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo) obj; - if (getUid() - != other.getUid()) return false; - if (!getNickname() - .equals(other.getNickname())) return false; - if (getPlayerLevel() - != other.getPlayerLevel()) return false; - if (getAvatarId() - != other.getAvatarId()) return false; - if (mpSettingType_ != other.mpSettingType_) return false; - if (getCurPlayerNumInWorld() - != other.getCurPlayerNumInWorld()) return false; - if (getWorldLevel() - != other.getWorldLevel()) return false; - if (!getOnlineId() - .equals(other.getOnlineId())) return false; - if (getNameCardId() - != other.getNameCardId()) return false; - if (!getBlacklistUidListList() - .equals(other.getBlacklistUidListList())) return false; if (!getSignature() .equals(other.getSignature())) return false; if (hasProfilePicture() != other.hasProfilePicture()) return false; @@ -787,8 +764,27 @@ public boolean equals(final java.lang.Object obj) { if (!getProfilePicture() .equals(other.getProfilePicture())) return false; } + if (!getBlacklistUidListList() + .equals(other.getBlacklistUidListList())) return false; + if (!getOnlineId() + .equals(other.getOnlineId())) return false; + if (!getNickname() + .equals(other.getNickname())) return false; if (!getPsnId() .equals(other.getPsnId())) return false; + if (getAvatarId() + != other.getAvatarId()) return false; + if (getNameCardId() + != other.getNameCardId()) return false; + if (getUid() + != other.getUid()) return false; + if (getCurPlayerNumInWorld() + != other.getCurPlayerNumInWorld()) return false; + if (mpSettingType_ != other.mpSettingType_) return false; + if (getPlayerLevel() + != other.getPlayerLevel()) return false; + if (getWorldLevel() + != other.getWorldLevel()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -800,36 +796,36 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + UID_FIELD_NUMBER; - hash = (53 * hash) + getUid(); - hash = (37 * hash) + NICKNAME_FIELD_NUMBER; - hash = (53 * hash) + getNickname().hashCode(); - hash = (37 * hash) + PLAYER_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getPlayerLevel(); - hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarId(); - hash = (37 * hash) + MP_SETTING_TYPE_FIELD_NUMBER; - hash = (53 * hash) + mpSettingType_; - hash = (37 * hash) + CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER; - hash = (53 * hash) + getCurPlayerNumInWorld(); - hash = (37 * hash) + WORLD_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getWorldLevel(); - hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER; - hash = (53 * hash) + getOnlineId().hashCode(); - hash = (37 * hash) + NAME_CARD_ID_FIELD_NUMBER; - hash = (53 * hash) + getNameCardId(); - if (getBlacklistUidListCount() > 0) { - hash = (37 * hash) + BLACKLIST_UID_LIST_FIELD_NUMBER; - hash = (53 * hash) + getBlacklistUidListList().hashCode(); - } hash = (37 * hash) + SIGNATURE_FIELD_NUMBER; hash = (53 * hash) + getSignature().hashCode(); if (hasProfilePicture()) { hash = (37 * hash) + PROFILE_PICTURE_FIELD_NUMBER; hash = (53 * hash) + getProfilePicture().hashCode(); } + if (getBlacklistUidListCount() > 0) { + hash = (37 * hash) + BLACKLIST_UID_LIST_FIELD_NUMBER; + hash = (53 * hash) + getBlacklistUidListList().hashCode(); + } + hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER; + hash = (53 * hash) + getOnlineId().hashCode(); + hash = (37 * hash) + NICKNAME_FIELD_NUMBER; + hash = (53 * hash) + getNickname().hashCode(); hash = (37 * hash) + PSN_ID_FIELD_NUMBER; hash = (53 * hash) + getPsnId().hashCode(); + hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarId(); + hash = (37 * hash) + NAME_CARD_ID_FIELD_NUMBER; + hash = (53 * hash) + getNameCardId(); + hash = (37 * hash) + UID_FIELD_NUMBER; + hash = (53 * hash) + getUid(); + hash = (37 * hash) + CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER; + hash = (53 * hash) + getCurPlayerNumInWorld(); + hash = (37 * hash) + MP_SETTING_TYPE_FIELD_NUMBER; + hash = (53 * hash) + mpSettingType_; + hash = (37 * hash) + PLAYER_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getPlayerLevel(); + hash = (37 * hash) + WORLD_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getWorldLevel(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -926,10 +922,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: BJKIIJGIJPA
-     *
- * * Protobuf type {@code OnlinePlayerInfo} */ public static final class Builder extends @@ -967,35 +959,35 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - uid_ = 0; + signature_ = ""; + + if (profilePictureBuilder_ == null) { + profilePicture_ = null; + } else { + profilePicture_ = null; + profilePictureBuilder_ = null; + } + blacklistUidList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onlineId_ = ""; nickname_ = ""; - playerLevel_ = 0; + psnId_ = ""; avatarId_ = 0; - mpSettingType_ = 0; - - curPlayerNumInWorld_ = 0; + nameCardId_ = 0; - worldLevel_ = 0; + uid_ = 0; - onlineId_ = ""; + curPlayerNumInWorld_ = 0; - nameCardId_ = 0; + mpSettingType_ = 0; - blacklistUidList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - signature_ = ""; + playerLevel_ = 0; - if (profilePictureBuilder_ == null) { - profilePicture_ = null; - } else { - profilePicture_ = null; - profilePictureBuilder_ = null; - } - psnId_ = ""; + worldLevel_ = 0; return this; } @@ -1024,27 +1016,27 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo bui public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo buildPartial() { emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo result = new emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo(this); int from_bitField0_ = bitField0_; - result.uid_ = uid_; - result.nickname_ = nickname_; - result.playerLevel_ = playerLevel_; - result.avatarId_ = avatarId_; - result.mpSettingType_ = mpSettingType_; - result.curPlayerNumInWorld_ = curPlayerNumInWorld_; - result.worldLevel_ = worldLevel_; - result.onlineId_ = onlineId_; - result.nameCardId_ = nameCardId_; - if (((bitField0_ & 0x00000001) != 0)) { - blacklistUidList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.blacklistUidList_ = blacklistUidList_; result.signature_ = signature_; if (profilePictureBuilder_ == null) { result.profilePicture_ = profilePicture_; } else { result.profilePicture_ = profilePictureBuilder_.build(); } + if (((bitField0_ & 0x00000001) != 0)) { + blacklistUidList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.blacklistUidList_ = blacklistUidList_; + result.onlineId_ = onlineId_; + result.nickname_ = nickname_; result.psnId_ = psnId_; + result.avatarId_ = avatarId_; + result.nameCardId_ = nameCardId_; + result.uid_ = uid_; + result.curPlayerNumInWorld_ = curPlayerNumInWorld_; + result.mpSettingType_ = mpSettingType_; + result.playerLevel_ = playerLevel_; + result.worldLevel_ = worldLevel_; onBuilt(); return result; } @@ -1093,34 +1085,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo other) { if (other == emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance()) return this; - if (other.getUid() != 0) { - setUid(other.getUid()); - } - if (!other.getNickname().isEmpty()) { - nickname_ = other.nickname_; - onChanged(); - } - if (other.getPlayerLevel() != 0) { - setPlayerLevel(other.getPlayerLevel()); - } - if (other.getAvatarId() != 0) { - setAvatarId(other.getAvatarId()); - } - if (other.mpSettingType_ != 0) { - setMpSettingTypeValue(other.getMpSettingTypeValue()); - } - if (other.getCurPlayerNumInWorld() != 0) { - setCurPlayerNumInWorld(other.getCurPlayerNumInWorld()); - } - if (other.getWorldLevel() != 0) { - setWorldLevel(other.getWorldLevel()); - } - if (!other.getOnlineId().isEmpty()) { - onlineId_ = other.onlineId_; + if (!other.getSignature().isEmpty()) { + signature_ = other.signature_; onChanged(); } - if (other.getNameCardId() != 0) { - setNameCardId(other.getNameCardId()); + if (other.hasProfilePicture()) { + mergeProfilePicture(other.getProfilePicture()); } if (!other.blacklistUidList_.isEmpty()) { if (blacklistUidList_.isEmpty()) { @@ -1132,17 +1102,39 @@ public Builder mergeFrom(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.On } onChanged(); } - if (!other.getSignature().isEmpty()) { - signature_ = other.signature_; + if (!other.getOnlineId().isEmpty()) { + onlineId_ = other.onlineId_; onChanged(); } - if (other.hasProfilePicture()) { - mergeProfilePicture(other.getProfilePicture()); + if (!other.getNickname().isEmpty()) { + nickname_ = other.nickname_; + onChanged(); } if (!other.getPsnId().isEmpty()) { psnId_ = other.psnId_; onChanged(); } + if (other.getAvatarId() != 0) { + setAvatarId(other.getAvatarId()); + } + if (other.getNameCardId() != 0) { + setNameCardId(other.getNameCardId()); + } + if (other.getUid() != 0) { + setUid(other.getUid()); + } + if (other.getCurPlayerNumInWorld() != 0) { + setCurPlayerNumInWorld(other.getCurPlayerNumInWorld()); + } + if (other.mpSettingType_ != 0) { + setMpSettingTypeValue(other.getMpSettingTypeValue()); + } + if (other.getPlayerLevel() != 0) { + setPlayerLevel(other.getPlayerLevel()); + } + if (other.getWorldLevel() != 0) { + setWorldLevel(other.getWorldLevel()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1173,287 +1165,276 @@ public Builder mergeFrom( } private int bitField0_; - private int uid_ ; - /** - * uint32 uid = 1; - * @return The uid. - */ - @java.lang.Override - public int getUid() { - return uid_; - } - /** - * uint32 uid = 1; - * @param value The uid to set. - * @return This builder for chaining. - */ - public Builder setUid(int value) { - - uid_ = value; - onChanged(); - return this; - } - /** - * uint32 uid = 1; - * @return This builder for chaining. - */ - public Builder clearUid() { - - uid_ = 0; - onChanged(); - return this; - } - - private java.lang.Object nickname_ = ""; + private java.lang.Object signature_ = ""; /** - * string nickname = 2; - * @return The nickname. + * string signature = 11; + * @return The signature. */ - public java.lang.String getNickname() { - java.lang.Object ref = nickname_; + public java.lang.String getSignature() { + java.lang.Object ref = signature_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - nickname_ = s; + signature_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string nickname = 2; - * @return The bytes for nickname. + * string signature = 11; + * @return The bytes for signature. */ public com.google.protobuf.ByteString - getNicknameBytes() { - java.lang.Object ref = nickname_; + getSignatureBytes() { + java.lang.Object ref = signature_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - nickname_ = b; + signature_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string nickname = 2; - * @param value The nickname to set. + * string signature = 11; + * @param value The signature to set. * @return This builder for chaining. */ - public Builder setNickname( + public Builder setSignature( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nickname_ = value; + signature_ = value; onChanged(); return this; } /** - * string nickname = 2; + * string signature = 11; * @return This builder for chaining. */ - public Builder clearNickname() { + public Builder clearSignature() { - nickname_ = getDefaultInstance().getNickname(); + signature_ = getDefaultInstance().getSignature(); onChanged(); return this; } /** - * string nickname = 2; - * @param value The bytes for nickname to set. + * string signature = 11; + * @param value The bytes for signature to set. * @return This builder for chaining. */ - public Builder setNicknameBytes( + public Builder setSignatureBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nickname_ = value; + signature_ = value; onChanged(); return this; } - private int playerLevel_ ; + private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> profilePictureBuilder_; /** - * uint32 player_level = 3; - * @return The playerLevel. + * .ProfilePicture profile_picture = 12; + * @return Whether the profilePicture field is set. */ - @java.lang.Override - public int getPlayerLevel() { - return playerLevel_; + public boolean hasProfilePicture() { + return profilePictureBuilder_ != null || profilePicture_ != null; } /** - * uint32 player_level = 3; - * @param value The playerLevel to set. - * @return This builder for chaining. + * .ProfilePicture profile_picture = 12; + * @return The profilePicture. */ - public Builder setPlayerLevel(int value) { - - playerLevel_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() { + if (profilePictureBuilder_ == null) { + return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_; + } else { + return profilePictureBuilder_.getMessage(); + } } /** - * uint32 player_level = 3; - * @return This builder for chaining. + * .ProfilePicture profile_picture = 12; */ - public Builder clearPlayerLevel() { - - playerLevel_ = 0; - onChanged(); + public Builder setProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) { + if (profilePictureBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + profilePicture_ = value; + onChanged(); + } else { + profilePictureBuilder_.setMessage(value); + } + return this; } - - private int avatarId_ ; /** - * uint32 avatar_id = 4; - * @return The avatarId. + * .ProfilePicture profile_picture = 12; */ - @java.lang.Override - public int getAvatarId() { - return avatarId_; - } - /** - * uint32 avatar_id = 4; - * @param value The avatarId to set. - * @return This builder for chaining. - */ - public Builder setAvatarId(int value) { - - avatarId_ = value; - onChanged(); + public Builder setProfilePicture( + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder builderForValue) { + if (profilePictureBuilder_ == null) { + profilePicture_ = builderForValue.build(); + onChanged(); + } else { + profilePictureBuilder_.setMessage(builderForValue.build()); + } + return this; } /** - * uint32 avatar_id = 4; - * @return This builder for chaining. + * .ProfilePicture profile_picture = 12; */ - public Builder clearAvatarId() { - - avatarId_ = 0; - onChanged(); + public Builder mergeProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) { + if (profilePictureBuilder_ == null) { + if (profilePicture_ != null) { + profilePicture_ = + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.newBuilder(profilePicture_).mergeFrom(value).buildPartial(); + } else { + profilePicture_ = value; + } + onChanged(); + } else { + profilePictureBuilder_.mergeFrom(value); + } + return this; } - - private int mpSettingType_ = 0; /** - * .MpSettingType mp_setting_type = 5; - * @return The enum numeric value on the wire for mpSettingType. + * .ProfilePicture profile_picture = 12; */ - @java.lang.Override public int getMpSettingTypeValue() { - return mpSettingType_; + public Builder clearProfilePicture() { + if (profilePictureBuilder_ == null) { + profilePicture_ = null; + onChanged(); + } else { + profilePicture_ = null; + profilePictureBuilder_ = null; + } + + return this; } /** - * .MpSettingType mp_setting_type = 5; - * @param value The enum numeric value on the wire for mpSettingType to set. - * @return This builder for chaining. + * .ProfilePicture profile_picture = 12; */ - public Builder setMpSettingTypeValue(int value) { + public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder getProfilePictureBuilder() { - mpSettingType_ = value; onChanged(); - return this; + return getProfilePictureFieldBuilder().getBuilder(); } /** - * .MpSettingType mp_setting_type = 5; - * @return The mpSettingType. + * .ProfilePicture profile_picture = 12; */ - @java.lang.Override - public emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType result = emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.valueOf(mpSettingType_); - return result == null ? emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.UNRECOGNIZED : result; + public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() { + if (profilePictureBuilder_ != null) { + return profilePictureBuilder_.getMessageOrBuilder(); + } else { + return profilePicture_ == null ? + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_; + } } /** - * .MpSettingType mp_setting_type = 5; - * @param value The mpSettingType to set. - * @return This builder for chaining. + * .ProfilePicture profile_picture = 12; */ - public Builder setMpSettingType(emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType value) { - if (value == null) { - throw new NullPointerException(); + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> + getProfilePictureFieldBuilder() { + if (profilePictureBuilder_ == null) { + profilePictureBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder>( + getProfilePicture(), + getParentForChildren(), + isClean()); + profilePicture_ = null; } - - mpSettingType_ = value.getNumber(); - onChanged(); - return this; + return profilePictureBuilder_; + } + + private com.google.protobuf.Internal.IntList blacklistUidList_ = emptyIntList(); + private void ensureBlacklistUidListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + blacklistUidList_ = mutableCopy(blacklistUidList_); + bitField0_ |= 0x00000001; + } } /** - * .MpSettingType mp_setting_type = 5; - * @return This builder for chaining. + * repeated uint32 blacklist_uid_list = 10; + * @return A list containing the blacklistUidList. */ - public Builder clearMpSettingType() { - - mpSettingType_ = 0; - onChanged(); - return this; + public java.util.List + getBlacklistUidListList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(blacklistUidList_) : blacklistUidList_; } - - private int curPlayerNumInWorld_ ; /** - * uint32 cur_player_num_in_world = 6; - * @return The curPlayerNumInWorld. + * repeated uint32 blacklist_uid_list = 10; + * @return The count of blacklistUidList. */ - @java.lang.Override - public int getCurPlayerNumInWorld() { - return curPlayerNumInWorld_; + public int getBlacklistUidListCount() { + return blacklistUidList_.size(); } /** - * uint32 cur_player_num_in_world = 6; - * @param value The curPlayerNumInWorld to set. - * @return This builder for chaining. + * repeated uint32 blacklist_uid_list = 10; + * @param index The index of the element to return. + * @return The blacklistUidList at the given index. */ - public Builder setCurPlayerNumInWorld(int value) { - - curPlayerNumInWorld_ = value; - onChanged(); - return this; + public int getBlacklistUidList(int index) { + return blacklistUidList_.getInt(index); } /** - * uint32 cur_player_num_in_world = 6; + * repeated uint32 blacklist_uid_list = 10; + * @param index The index to set the value at. + * @param value The blacklistUidList to set. * @return This builder for chaining. */ - public Builder clearCurPlayerNumInWorld() { - - curPlayerNumInWorld_ = 0; + public Builder setBlacklistUidList( + int index, int value) { + ensureBlacklistUidListIsMutable(); + blacklistUidList_.setInt(index, value); onChanged(); return this; } - - private int worldLevel_ ; /** - * uint32 world_level = 7; - * @return The worldLevel. + * repeated uint32 blacklist_uid_list = 10; + * @param value The blacklistUidList to add. + * @return This builder for chaining. */ - @java.lang.Override - public int getWorldLevel() { - return worldLevel_; + public Builder addBlacklistUidList(int value) { + ensureBlacklistUidListIsMutable(); + blacklistUidList_.addInt(value); + onChanged(); + return this; } /** - * uint32 world_level = 7; - * @param value The worldLevel to set. + * repeated uint32 blacklist_uid_list = 10; + * @param values The blacklistUidList to add. * @return This builder for chaining. */ - public Builder setWorldLevel(int value) { - - worldLevel_ = value; + public Builder addAllBlacklistUidList( + java.lang.Iterable values) { + ensureBlacklistUidListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, blacklistUidList_); onChanged(); return this; } /** - * uint32 world_level = 7; + * repeated uint32 blacklist_uid_list = 10; * @return This builder for chaining. */ - public Builder clearWorldLevel() { - - worldLevel_ = 0; + public Builder clearBlacklistUidList() { + blacklistUidList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1534,383 +1515,394 @@ public Builder setOnlineIdBytes( return this; } - private int nameCardId_ ; + private java.lang.Object nickname_ = ""; /** - * uint32 name_card_id = 9; - * @return The nameCardId. + * string nickname = 2; + * @return The nickname. */ - @java.lang.Override - public int getNameCardId() { - return nameCardId_; + public java.lang.String getNickname() { + java.lang.Object ref = nickname_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + nickname_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** - * uint32 name_card_id = 9; - * @param value The nameCardId to set. + * string nickname = 2; + * @return The bytes for nickname. + */ + public com.google.protobuf.ByteString + getNicknameBytes() { + java.lang.Object ref = nickname_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + nickname_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string nickname = 2; + * @param value The nickname to set. * @return This builder for chaining. */ - public Builder setNameCardId(int value) { - - nameCardId_ = value; + public Builder setNickname( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + nickname_ = value; onChanged(); return this; } /** - * uint32 name_card_id = 9; + * string nickname = 2; * @return This builder for chaining. */ - public Builder clearNameCardId() { + public Builder clearNickname() { - nameCardId_ = 0; + nickname_ = getDefaultInstance().getNickname(); onChanged(); return this; } - - private com.google.protobuf.Internal.IntList blacklistUidList_ = emptyIntList(); - private void ensureBlacklistUidListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - blacklistUidList_ = mutableCopy(blacklistUidList_); - bitField0_ |= 0x00000001; - } - } /** - * repeated uint32 blacklist_uid_list = 10; - * @return A list containing the blacklistUidList. + * string nickname = 2; + * @param value The bytes for nickname to set. + * @return This builder for chaining. */ - public java.util.List - getBlacklistUidListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(blacklistUidList_) : blacklistUidList_; - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @return The count of blacklistUidList. - */ - public int getBlacklistUidListCount() { - return blacklistUidList_.size(); - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @param index The index of the element to return. - * @return The blacklistUidList at the given index. - */ - public int getBlacklistUidList(int index) { - return blacklistUidList_.getInt(index); - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @param index The index to set the value at. - * @param value The blacklistUidList to set. - * @return This builder for chaining. - */ - public Builder setBlacklistUidList( - int index, int value) { - ensureBlacklistUidListIsMutable(); - blacklistUidList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @param value The blacklistUidList to add. - * @return This builder for chaining. - */ - public Builder addBlacklistUidList(int value) { - ensureBlacklistUidListIsMutable(); - blacklistUidList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @param values The blacklistUidList to add. - * @return This builder for chaining. - */ - public Builder addAllBlacklistUidList( - java.lang.Iterable values) { - ensureBlacklistUidListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, blacklistUidList_); - onChanged(); - return this; - } - /** - * repeated uint32 blacklist_uid_list = 10; - * @return This builder for chaining. - */ - public Builder clearBlacklistUidList() { - blacklistUidList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setNicknameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + nickname_ = value; onChanged(); return this; } - private java.lang.Object signature_ = ""; + private java.lang.Object psnId_ = ""; /** - * string signature = 11; - * @return The signature. + * string psn_id = 13; + * @return The psnId. */ - public java.lang.String getSignature() { - java.lang.Object ref = signature_; + public java.lang.String getPsnId() { + java.lang.Object ref = psnId_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - signature_ = s; + psnId_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string signature = 11; - * @return The bytes for signature. + * string psn_id = 13; + * @return The bytes for psnId. */ public com.google.protobuf.ByteString - getSignatureBytes() { - java.lang.Object ref = signature_; + getPsnIdBytes() { + java.lang.Object ref = psnId_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - signature_ = b; + psnId_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string signature = 11; - * @param value The signature to set. + * string psn_id = 13; + * @param value The psnId to set. * @return This builder for chaining. */ - public Builder setSignature( + public Builder setPsnId( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - signature_ = value; + psnId_ = value; onChanged(); return this; } /** - * string signature = 11; + * string psn_id = 13; * @return This builder for chaining. */ - public Builder clearSignature() { + public Builder clearPsnId() { - signature_ = getDefaultInstance().getSignature(); + psnId_ = getDefaultInstance().getPsnId(); onChanged(); return this; } /** - * string signature = 11; - * @param value The bytes for signature to set. + * string psn_id = 13; + * @param value The bytes for psnId to set. * @return This builder for chaining. */ - public Builder setSignatureBytes( + public Builder setPsnIdBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - signature_ = value; + psnId_ = value; onChanged(); return this; } - private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> profilePictureBuilder_; + private int avatarId_ ; /** - * .ProfilePicture profile_picture = 12; - * @return Whether the profilePicture field is set. + * uint32 avatar_id = 4; + * @return The avatarId. */ - public boolean hasProfilePicture() { - return profilePictureBuilder_ != null || profilePicture_ != null; + @java.lang.Override + public int getAvatarId() { + return avatarId_; } /** - * .ProfilePicture profile_picture = 12; - * @return The profilePicture. + * uint32 avatar_id = 4; + * @param value The avatarId to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() { - if (profilePictureBuilder_ == null) { - return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_; - } else { - return profilePictureBuilder_.getMessage(); - } + public Builder setAvatarId(int value) { + + avatarId_ = value; + onChanged(); + return this; } /** - * .ProfilePicture profile_picture = 12; + * uint32 avatar_id = 4; + * @return This builder for chaining. */ - public Builder setProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) { - if (profilePictureBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - profilePicture_ = value; - onChanged(); - } else { - profilePictureBuilder_.setMessage(value); - } + public Builder clearAvatarId() { + + avatarId_ = 0; + onChanged(); + return this; + } + private int nameCardId_ ; + /** + * uint32 name_card_id = 9; + * @return The nameCardId. + */ + @java.lang.Override + public int getNameCardId() { + return nameCardId_; + } + /** + * uint32 name_card_id = 9; + * @param value The nameCardId to set. + * @return This builder for chaining. + */ + public Builder setNameCardId(int value) { + + nameCardId_ = value; + onChanged(); return this; } /** - * .ProfilePicture profile_picture = 12; + * uint32 name_card_id = 9; + * @return This builder for chaining. */ - public Builder setProfilePicture( - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder builderForValue) { - if (profilePictureBuilder_ == null) { - profilePicture_ = builderForValue.build(); - onChanged(); - } else { - profilePictureBuilder_.setMessage(builderForValue.build()); - } + public Builder clearNameCardId() { + + nameCardId_ = 0; + onChanged(); + return this; + } + private int uid_ ; + /** + * uint32 uid = 1; + * @return The uid. + */ + @java.lang.Override + public int getUid() { + return uid_; + } + /** + * uint32 uid = 1; + * @param value The uid to set. + * @return This builder for chaining. + */ + public Builder setUid(int value) { + + uid_ = value; + onChanged(); return this; } /** - * .ProfilePicture profile_picture = 12; + * uint32 uid = 1; + * @return This builder for chaining. */ - public Builder mergeProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) { - if (profilePictureBuilder_ == null) { - if (profilePicture_ != null) { - profilePicture_ = - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.newBuilder(profilePicture_).mergeFrom(value).buildPartial(); - } else { - profilePicture_ = value; - } - onChanged(); - } else { - profilePictureBuilder_.mergeFrom(value); - } + public Builder clearUid() { + + uid_ = 0; + onChanged(); + return this; + } + private int curPlayerNumInWorld_ ; + /** + * uint32 cur_player_num_in_world = 3; + * @return The curPlayerNumInWorld. + */ + @java.lang.Override + public int getCurPlayerNumInWorld() { + return curPlayerNumInWorld_; + } + /** + * uint32 cur_player_num_in_world = 3; + * @param value The curPlayerNumInWorld to set. + * @return This builder for chaining. + */ + public Builder setCurPlayerNumInWorld(int value) { + + curPlayerNumInWorld_ = value; + onChanged(); return this; } /** - * .ProfilePicture profile_picture = 12; + * uint32 cur_player_num_in_world = 3; + * @return This builder for chaining. */ - public Builder clearProfilePicture() { - if (profilePictureBuilder_ == null) { - profilePicture_ = null; - onChanged(); - } else { - profilePicture_ = null; - profilePictureBuilder_ = null; - } - + public Builder clearCurPlayerNumInWorld() { + + curPlayerNumInWorld_ = 0; + onChanged(); return this; } + + private int mpSettingType_ = 0; /** - * .ProfilePicture profile_picture = 12; + * .MpSettingType mp_setting_type = 5; + * @return The enum numeric value on the wire for mpSettingType. */ - public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder getProfilePictureBuilder() { + @java.lang.Override public int getMpSettingTypeValue() { + return mpSettingType_; + } + /** + * .MpSettingType mp_setting_type = 5; + * @param value The enum numeric value on the wire for mpSettingType to set. + * @return This builder for chaining. + */ + public Builder setMpSettingTypeValue(int value) { + mpSettingType_ = value; onChanged(); - return getProfilePictureFieldBuilder().getBuilder(); + return this; } /** - * .ProfilePicture profile_picture = 12; + * .MpSettingType mp_setting_type = 5; + * @return The mpSettingType. */ - public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() { - if (profilePictureBuilder_ != null) { - return profilePictureBuilder_.getMessageOrBuilder(); - } else { - return profilePicture_ == null ? - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_; - } + @java.lang.Override + public emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType result = emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.valueOf(mpSettingType_); + return result == null ? emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.UNRECOGNIZED : result; } /** - * .ProfilePicture profile_picture = 12; + * .MpSettingType mp_setting_type = 5; + * @param value The mpSettingType to set. + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> - getProfilePictureFieldBuilder() { - if (profilePictureBuilder_ == null) { - profilePictureBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder>( - getProfilePicture(), - getParentForChildren(), - isClean()); - profilePicture_ = null; + public Builder setMpSettingType(emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType value) { + if (value == null) { + throw new NullPointerException(); } - return profilePictureBuilder_; + + mpSettingType_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .MpSettingType mp_setting_type = 5; + * @return This builder for chaining. + */ + public Builder clearMpSettingType() { + + mpSettingType_ = 0; + onChanged(); + return this; } - private java.lang.Object psnId_ = ""; + private int playerLevel_ ; /** - * string psn_id = 13; - * @return The psnId. + * uint32 player_level = 6; + * @return The playerLevel. */ - public java.lang.String getPsnId() { - java.lang.Object ref = psnId_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - psnId_ = s; - return s; - } else { - return (java.lang.String) ref; - } + @java.lang.Override + public int getPlayerLevel() { + return playerLevel_; } /** - * string psn_id = 13; - * @return The bytes for psnId. + * uint32 player_level = 6; + * @param value The playerLevel to set. + * @return This builder for chaining. */ - public com.google.protobuf.ByteString - getPsnIdBytes() { - java.lang.Object ref = psnId_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - psnId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public Builder setPlayerLevel(int value) { + + playerLevel_ = value; + onChanged(); + return this; } /** - * string psn_id = 13; - * @param value The psnId to set. + * uint32 player_level = 6; * @return This builder for chaining. */ - public Builder setPsnId( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - psnId_ = value; + public Builder clearPlayerLevel() { + + playerLevel_ = 0; onChanged(); return this; } + + private int worldLevel_ ; /** - * string psn_id = 13; + * uint32 world_level = 7; + * @return The worldLevel. + */ + @java.lang.Override + public int getWorldLevel() { + return worldLevel_; + } + /** + * uint32 world_level = 7; + * @param value The worldLevel to set. * @return This builder for chaining. */ - public Builder clearPsnId() { + public Builder setWorldLevel(int value) { - psnId_ = getDefaultInstance().getPsnId(); + worldLevel_ = value; onChanged(); return this; } /** - * string psn_id = 13; - * @param value The bytes for psnId to set. + * uint32 world_level = 7; * @return This builder for chaining. */ - public Builder setPsnIdBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); + public Builder clearWorldLevel() { - psnId_ = value; + worldLevel_ = 0; onChanged(); return this; } @@ -1983,15 +1975,15 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get java.lang.String[] descriptorData = { "\n\026OnlinePlayerInfo.proto\032\023MpSettingType." + "proto\032\024ProfilePicture.proto\"\313\002\n\020OnlinePl" + - "ayerInfo\022\013\n\003uid\030\001 \001(\r\022\020\n\010nickname\030\002 \001(\t\022" + - "\024\n\014player_level\030\003 \001(\r\022\021\n\tavatar_id\030\004 \001(\r" + - "\022\'\n\017mp_setting_type\030\005 \001(\0162\016.MpSettingTyp" + - "e\022\037\n\027cur_player_num_in_world\030\006 \001(\r\022\023\n\013wo" + - "rld_level\030\007 \001(\r\022\021\n\tonline_id\030\010 \001(\t\022\024\n\014na" + - "me_card_id\030\t \001(\r\022\032\n\022blacklist_uid_list\030\n" + - " \003(\r\022\021\n\tsignature\030\013 \001(\t\022(\n\017profile_pictu" + - "re\030\014 \001(\0132\017.ProfilePicture\022\016\n\006psn_id\030\r \001(" + - "\tB\033\n\031emu.grasscutter.net.protob\006proto3" + "ayerInfo\022\021\n\tsignature\030\013 \001(\t\022(\n\017profile_p" + + "icture\030\014 \001(\0132\017.ProfilePicture\022\032\n\022blackli" + + "st_uid_list\030\n \003(\r\022\021\n\tonline_id\030\010 \001(\t\022\020\n\010" + + "nickname\030\002 \001(\t\022\016\n\006psn_id\030\r \001(\t\022\021\n\tavatar" + + "_id\030\004 \001(\r\022\024\n\014name_card_id\030\t \001(\r\022\013\n\003uid\030\001" + + " \001(\r\022\037\n\027cur_player_num_in_world\030\003 \001(\r\022\'\n" + + "\017mp_setting_type\030\005 \001(\0162\016.MpSettingType\022\024" + + "\n\014player_level\030\006 \001(\r\022\023\n\013world_level\030\007 \001(" + + "\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -2004,7 +1996,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get internal_static_OnlinePlayerInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_OnlinePlayerInfo_descriptor, - new java.lang.String[] { "Uid", "Nickname", "PlayerLevel", "AvatarId", "MpSettingType", "CurPlayerNumInWorld", "WorldLevel", "OnlineId", "NameCardId", "BlacklistUidList", "Signature", "ProfilePicture", "PsnId", }); + new java.lang.String[] { "Signature", "ProfilePicture", "BlacklistUidList", "OnlineId", "Nickname", "PsnId", "AvatarId", "NameCardId", "Uid", "CurPlayerNumInWorld", "MpSettingType", "PlayerLevel", "WorldLevel", }); emu.grasscutter.net.proto.MpSettingTypeOuterClass.getDescriptor(); emu.grasscutter.net.proto.ProfilePictureOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java index 6e4cf2bed55..4edfdafe471 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java @@ -19,46 +19,42 @@ public interface PlayerLocationInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector pos = 13; + * .Vector pos = 14; * @return Whether the pos field is set. */ boolean hasPos(); /** - * .Vector pos = 13; + * .Vector pos = 14; * @return The pos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); /** - * .Vector pos = 13; + * .Vector pos = 14; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); /** - * uint32 uid = 4; - * @return The uid. - */ - int getUid(); - - /** - * .Vector rot = 1; + * .Vector rot = 15; * @return Whether the rot field is set. */ boolean hasRot(); /** - * .Vector rot = 1; + * .Vector rot = 15; * @return The rot. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); /** - * .Vector rot = 1; + * .Vector rot = 15; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); + + /** + * uint32 uid = 5; + * @return The uid. + */ + int getUid(); } /** - * 
-   * Obf: KPGGJJGHJOP
-   *
- * * Protobuf type {@code PlayerLocationInfo} */ public static final class PlayerLocationInfo extends @@ -103,25 +99,12 @@ private PlayerLocationInfo( case 0: done = true; break; - case 10: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (rot_ != null) { - subBuilder = rot_.toBuilder(); - } - rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(rot_); - rot_ = subBuilder.buildPartial(); - } - - break; - } - case 32: { + case 40: { uid_ = input.readUInt32(); break; } - case 106: { + case 114: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (pos_ != null) { subBuilder = pos_.toBuilder(); @@ -134,6 +117,19 @@ private PlayerLocationInfo( break; } + case 122: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (rot_ != null) { + subBuilder = rot_.toBuilder(); + } + rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(rot_); + rot_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -166,10 +162,10 @@ private PlayerLocationInfo( emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.class, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder.class); } - public static final int POS_FIELD_NUMBER = 13; + public static final int POS_FIELD_NUMBER = 14; private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; /** - * .Vector pos = 13; + * .Vector pos = 14; * @return Whether the pos field is set. */ @java.lang.Override @@ -177,7 +173,7 @@ public boolean hasPos() { return pos_ != null; } /** - * .Vector pos = 13; + * .Vector pos = 14; * @return The pos. */ @java.lang.Override @@ -185,28 +181,17 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; } /** - * .Vector pos = 13; + * .Vector pos = 14; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { return getPos(); } - public static final int UID_FIELD_NUMBER = 4; - private int uid_; - /** - * uint32 uid = 4; - * @return The uid. - */ - @java.lang.Override - public int getUid() { - return uid_; - } - - public static final int ROT_FIELD_NUMBER = 1; + public static final int ROT_FIELD_NUMBER = 15; private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; /** - * .Vector rot = 1; + * .Vector rot = 15; * @return Whether the rot field is set. */ @java.lang.Override @@ -214,7 +199,7 @@ public boolean hasRot() { return rot_ != null; } /** - * .Vector rot = 1; + * .Vector rot = 15; * @return The rot. */ @java.lang.Override @@ -222,13 +207,24 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } /** - * .Vector rot = 1; + * .Vector rot = 15; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { return getRot(); } + public static final int UID_FIELD_NUMBER = 5; + private int uid_; + /** + * uint32 uid = 5; + * @return The uid. + */ + @java.lang.Override + public int getUid() { + return uid_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -243,14 +239,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (rot_ != null) { - output.writeMessage(1, getRot()); - } if (uid_ != 0) { - output.writeUInt32(4, uid_); + output.writeUInt32(5, uid_); } if (pos_ != null) { - output.writeMessage(13, getPos()); + output.writeMessage(14, getPos()); + } + if (rot_ != null) { + output.writeMessage(15, getRot()); } unknownFields.writeTo(output); } @@ -261,17 +257,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (rot_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getRot()); - } if (uid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, uid_); + .computeUInt32Size(5, uid_); } if (pos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, getPos()); + .computeMessageSize(14, getPos()); + } + if (rot_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(15, getRot()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -293,13 +289,13 @@ public boolean equals(final java.lang.Object obj) { if (!getPos() .equals(other.getPos())) return false; } - if (getUid() - != other.getUid()) return false; if (hasRot() != other.hasRot()) return false; if (hasRot()) { if (!getRot() .equals(other.getRot())) return false; } + if (getUid() + != other.getUid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -315,12 +311,12 @@ public int hashCode() { hash = (37 * hash) + POS_FIELD_NUMBER; hash = (53 * hash) + getPos().hashCode(); } - hash = (37 * hash) + UID_FIELD_NUMBER; - hash = (53 * hash) + getUid(); if (hasRot()) { hash = (37 * hash) + ROT_FIELD_NUMBER; hash = (53 * hash) + getRot().hashCode(); } + hash = (37 * hash) + UID_FIELD_NUMBER; + hash = (53 * hash) + getUid(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -417,10 +413,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: KPGGJJGHJOP
-     *
- * * Protobuf type {@code PlayerLocationInfo} */ public static final class Builder extends @@ -464,14 +456,14 @@ public Builder clear() { pos_ = null; posBuilder_ = null; } - uid_ = 0; - if (rotBuilder_ == null) { rot_ = null; } else { rot_ = null; rotBuilder_ = null; } + uid_ = 0; + return this; } @@ -503,12 +495,12 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo } else { result.pos_ = posBuilder_.build(); } - result.uid_ = uid_; if (rotBuilder_ == null) { result.rot_ = rot_; } else { result.rot_ = rotBuilder_.build(); } + result.uid_ = uid_; onBuilt(); return result; } @@ -560,12 +552,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass. if (other.hasPos()) { mergePos(other.getPos()); } - if (other.getUid() != 0) { - setUid(other.getUid()); - } if (other.hasRot()) { mergeRot(other.getRot()); } + if (other.getUid() != 0) { + setUid(other.getUid()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -599,14 +591,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; /** - * .Vector pos = 13; + * .Vector pos = 14; * @return Whether the pos field is set. */ public boolean hasPos() { return posBuilder_ != null || pos_ != null; } /** - * .Vector pos = 13; + * .Vector pos = 14; * @return The pos. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { @@ -617,7 +609,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { } } /** - * .Vector pos = 13; + * .Vector pos = 14; */ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -633,7 +625,7 @@ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { return this; } /** - * .Vector pos = 13; + * .Vector pos = 14; */ public Builder setPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -647,7 +639,7 @@ public Builder setPos( return this; } /** - * .Vector pos = 13; + * .Vector pos = 14; */ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -665,7 +657,7 @@ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) return this; } /** - * .Vector pos = 13; + * .Vector pos = 14; */ public Builder clearPos() { if (posBuilder_ == null) { @@ -679,7 +671,7 @@ public Builder clearPos() { return this; } /** - * .Vector pos = 13; + * .Vector pos = 14; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { @@ -687,7 +679,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() return getPosFieldBuilder().getBuilder(); } /** - * .Vector pos = 13; + * .Vector pos = 14; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { if (posBuilder_ != null) { @@ -698,7 +690,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde } } /** - * .Vector pos = 13; + * .Vector pos = 14; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -714,49 +706,18 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde return posBuilder_; } - private int uid_ ; - /** - * uint32 uid = 4; - * @return The uid. - */ - @java.lang.Override - public int getUid() { - return uid_; - } - /** - * uint32 uid = 4; - * @param value The uid to set. - * @return This builder for chaining. - */ - public Builder setUid(int value) { - - uid_ = value; - onChanged(); - return this; - } - /** - * uint32 uid = 4; - * @return This builder for chaining. - */ - public Builder clearUid() { - - uid_ = 0; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; /** - * .Vector rot = 1; + * .Vector rot = 15; * @return Whether the rot field is set. */ public boolean hasRot() { return rotBuilder_ != null || rot_ != null; } /** - * .Vector rot = 1; + * .Vector rot = 15; * @return The rot. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { @@ -767,7 +728,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { } } /** - * .Vector rot = 1; + * .Vector rot = 15; */ public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -783,7 +744,7 @@ public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { return this; } /** - * .Vector rot = 1; + * .Vector rot = 15; */ public Builder setRot( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -797,7 +758,7 @@ public Builder setRot( return this; } /** - * .Vector rot = 1; + * .Vector rot = 15; */ public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -815,7 +776,7 @@ public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) return this; } /** - * .Vector rot = 1; + * .Vector rot = 15; */ public Builder clearRot() { if (rotBuilder_ == null) { @@ -829,7 +790,7 @@ public Builder clearRot() { return this; } /** - * .Vector rot = 1; + * .Vector rot = 15; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { @@ -837,7 +798,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() return getRotFieldBuilder().getBuilder(); } /** - * .Vector rot = 1; + * .Vector rot = 15; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { if (rotBuilder_ != null) { @@ -848,7 +809,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilde } } /** - * .Vector rot = 1; + * .Vector rot = 15; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -863,6 +824,37 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilde } return rotBuilder_; } + + private int uid_ ; + /** + * uint32 uid = 5; + * @return The uid. + */ + @java.lang.Override + public int getUid() { + return uid_; + } + /** + * uint32 uid = 5; + * @param value The uid to set. + * @return This builder for chaining. + */ + public Builder setUid(int value) { + + uid_ = value; + onChanged(); + return this; + } + /** + * uint32 uid = 5; + * @return This builder for chaining. + */ + public Builder clearUid() { + + uid_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -931,8 +923,8 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo static { java.lang.String[] descriptorData = { "\n\030PlayerLocationInfo.proto\032\014Vector.proto" + - "\"M\n\022PlayerLocationInfo\022\024\n\003pos\030\r \001(\0132\007.Ve" + - "ctor\022\013\n\003uid\030\004 \001(\r\022\024\n\003rot\030\001 \001(\0132\007.VectorB" + + "\"M\n\022PlayerLocationInfo\022\024\n\003pos\030\016 \001(\0132\007.Ve" + + "ctor\022\024\n\003rot\030\017 \001(\0132\007.Vector\022\013\n\003uid\030\005 \001(\rB" + "\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -945,7 +937,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo internal_static_PlayerLocationInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerLocationInfo_descriptor, - new java.lang.String[] { "Pos", "Uid", "Rot", }); + new java.lang.String[] { "Pos", "Rot", "Uid", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java index 22911484586..39039e49c65 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java @@ -19,31 +19,27 @@ public interface PlayerWorldLocationInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 scene_id = 5; - * @return The sceneId. - */ - int getSceneId(); - - /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; * @return Whether the playerLoc field is set. */ boolean hasPlayerLoc(); /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; * @return The playerLoc. */ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLoc(); /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocOrBuilder(); + + /** + * uint32 scene_id = 5; + * @return The sceneId. + */ + int getSceneId(); } /** - * 
-   * Obf: JNPBJHGCCOP
-   *
- * * Protobuf type {@code PlayerWorldLocationInfo} */ public static final class PlayerWorldLocationInfo extends @@ -93,7 +89,7 @@ private PlayerWorldLocationInfo( sceneId_ = input.readUInt32(); break; } - case 98: { + case 58: { emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder subBuilder = null; if (playerLoc_ != null) { subBuilder = playerLoc_.toBuilder(); @@ -138,21 +134,10 @@ private PlayerWorldLocationInfo( emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.class, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder.class); } - public static final int SCENE_ID_FIELD_NUMBER = 5; - private int sceneId_; - /** - * uint32 scene_id = 5; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - - public static final int PLAYER_LOC_FIELD_NUMBER = 12; + public static final int PLAYER_LOC_FIELD_NUMBER = 7; private emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo playerLoc_; /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; * @return Whether the playerLoc field is set. */ @java.lang.Override @@ -160,7 +145,7 @@ public boolean hasPlayerLoc() { return playerLoc_ != null; } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; * @return The playerLoc. */ @java.lang.Override @@ -168,13 +153,24 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo return playerLoc_ == null ? emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance() : playerLoc_; } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ @java.lang.Override public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocOrBuilder() { return getPlayerLoc(); } + public static final int SCENE_ID_FIELD_NUMBER = 5; + private int sceneId_; + /** + * uint32 scene_id = 5; + * @return The sceneId. + */ + @java.lang.Override + public int getSceneId() { + return sceneId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -193,7 +189,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt32(5, sceneId_); } if (playerLoc_ != null) { - output.writeMessage(12, getPlayerLoc()); + output.writeMessage(7, getPlayerLoc()); } unknownFields.writeTo(output); } @@ -210,7 +206,7 @@ public int getSerializedSize() { } if (playerLoc_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, getPlayerLoc()); + .computeMessageSize(7, getPlayerLoc()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -227,13 +223,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo other = (emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo) obj; - if (getSceneId() - != other.getSceneId()) return false; if (hasPlayerLoc() != other.hasPlayerLoc()) return false; if (hasPlayerLoc()) { if (!getPlayerLoc() .equals(other.getPlayerLoc())) return false; } + if (getSceneId() + != other.getSceneId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -245,12 +241,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getSceneId(); if (hasPlayerLoc()) { hash = (37 * hash) + PLAYER_LOC_FIELD_NUMBER; hash = (53 * hash) + getPlayerLoc().hashCode(); } + hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSceneId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -347,10 +343,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: JNPBJHGCCOP
-     *
- * * Protobuf type {@code PlayerWorldLocationInfo} */ public static final class Builder extends @@ -388,14 +380,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - sceneId_ = 0; - if (playerLocBuilder_ == null) { playerLoc_ = null; } else { playerLoc_ = null; playerLocBuilder_ = null; } + sceneId_ = 0; + return this; } @@ -422,12 +414,12 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo @java.lang.Override public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo buildPartial() { emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo result = new emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo(this); - result.sceneId_ = sceneId_; if (playerLocBuilder_ == null) { result.playerLoc_ = playerLoc_; } else { result.playerLoc_ = playerLocBuilder_.build(); } + result.sceneId_ = sceneId_; onBuilt(); return result; } @@ -476,12 +468,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo other) { if (other == emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance()) return this; - if (other.getSceneId() != 0) { - setSceneId(other.getSceneId()); - } if (other.hasPlayerLoc()) { mergePlayerLoc(other.getPlayerLoc()); } + if (other.getSceneId() != 0) { + setSceneId(other.getSceneId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -511,49 +503,18 @@ public Builder mergeFrom( return this; } - private int sceneId_ ; - /** - * uint32 scene_id = 5; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - /** - * uint32 scene_id = 5; - * @param value The sceneId to set. - * @return This builder for chaining. - */ - public Builder setSceneId(int value) { - - sceneId_ = value; - onChanged(); - return this; - } - /** - * uint32 scene_id = 5; - * @return This builder for chaining. - */ - public Builder clearSceneId() { - - sceneId_ = 0; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo playerLoc_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> playerLocBuilder_; /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; * @return Whether the playerLoc field is set. */ public boolean hasPlayerLoc() { return playerLocBuilder_ != null || playerLoc_ != null; } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; * @return The playerLoc. */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLoc() { @@ -564,7 +525,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo } } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ public Builder setPlayerLoc(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) { if (playerLocBuilder_ == null) { @@ -580,7 +541,7 @@ public Builder setPlayerLoc(emu.grasscutter.net.proto.PlayerLocationInfoOuterCla return this; } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ public Builder setPlayerLoc( emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) { @@ -594,7 +555,7 @@ public Builder setPlayerLoc( return this; } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ public Builder mergePlayerLoc(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) { if (playerLocBuilder_ == null) { @@ -612,7 +573,7 @@ public Builder mergePlayerLoc(emu.grasscutter.net.proto.PlayerLocationInfoOuterC return this; } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ public Builder clearPlayerLoc() { if (playerLocBuilder_ == null) { @@ -626,7 +587,7 @@ public Builder clearPlayerLoc() { return this; } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder getPlayerLocBuilder() { @@ -634,7 +595,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo return getPlayerLocFieldBuilder().getBuilder(); } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocOrBuilder() { if (playerLocBuilder_ != null) { @@ -645,7 +606,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo } } /** - * .PlayerLocationInfo player_loc = 12; + * .PlayerLocationInfo player_loc = 7; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> @@ -660,6 +621,37 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo } return playerLocBuilder_; } + + private int sceneId_ ; + /** + * uint32 scene_id = 5; + * @return The sceneId. + */ + @java.lang.Override + public int getSceneId() { + return sceneId_; + } + /** + * uint32 scene_id = 5; + * @param value The sceneId to set. + * @return This builder for chaining. + */ + public Builder setSceneId(int value) { + + sceneId_ = value; + onChanged(); + return this; + } + /** + * uint32 scene_id = 5; + * @return This builder for chaining. + */ + public Builder clearSceneId() { + + sceneId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -729,8 +721,8 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo java.lang.String[] descriptorData = { "\n\035PlayerWorldLocationInfo.proto\032\030PlayerL" + "ocationInfo.proto\"T\n\027PlayerWorldLocation" + - "Info\022\020\n\010scene_id\030\005 \001(\r\022\'\n\nplayer_loc\030\014 \001" + - "(\0132\023.PlayerLocationInfoB\033\n\031emu.grasscutt" + + "Info\022\'\n\nplayer_loc\030\007 \001(\0132\023.PlayerLocatio" + + "nInfo\022\020\n\010scene_id\030\005 \001(\rB\033\n\031emu.grasscutt" + "er.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -743,7 +735,7 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo internal_static_PlayerWorldLocationInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerWorldLocationInfo_descriptor, - new java.lang.String[] { "SceneId", "PlayerLoc", }); + new java.lang.String[] { "PlayerLoc", "SceneId", }); emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java index 4d0b6ecd5b9..89f921b28c4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java @@ -19,22 +19,24 @@ public interface ProfilePictureOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 avatar_id = 1; - * @return The avatarId. + * uint32 PIFJFLMENAH = 3; + * @return The pIFJFLMENAH. */ - int getAvatarId(); + int getPIFJFLMENAH(); /** * uint32 costume_id = 2; * @return The costumeId. */ int getCostumeId(); + + /** + * uint32 avatar_id = 1; + * @return The avatarId. + */ + int getAvatarId(); } /** - * 
-   * Obf: FEKJLPEAOJI
-   *
- * * Protobuf type {@code ProfilePicture} */ public static final class ProfilePicture extends @@ -89,6 +91,11 @@ private ProfilePicture( costumeId_ = input.readUInt32(); break; } + case 24: { + + pIFJFLMENAH_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -121,15 +128,15 @@ private ProfilePicture( emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.class, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder.class); } - public static final int AVATAR_ID_FIELD_NUMBER = 1; - private int avatarId_; + public static final int PIFJFLMENAH_FIELD_NUMBER = 3; + private int pIFJFLMENAH_; /** - * uint32 avatar_id = 1; - * @return The avatarId. + * uint32 PIFJFLMENAH = 3; + * @return The pIFJFLMENAH. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public int getPIFJFLMENAH() { + return pIFJFLMENAH_; } public static final int COSTUME_ID_FIELD_NUMBER = 2; @@ -143,6 +150,17 @@ public int getCostumeId() { return costumeId_; } + public static final int AVATAR_ID_FIELD_NUMBER = 1; + private int avatarId_; + /** + * uint32 avatar_id = 1; + * @return The avatarId. + */ + @java.lang.Override + public int getAvatarId() { + return avatarId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -163,6 +181,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (costumeId_ != 0) { output.writeUInt32(2, costumeId_); } + if (pIFJFLMENAH_ != 0) { + output.writeUInt32(3, pIFJFLMENAH_); + } unknownFields.writeTo(output); } @@ -180,6 +201,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, costumeId_); } + if (pIFJFLMENAH_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(3, pIFJFLMENAH_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -195,10 +220,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture other = (emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture) obj; - if (getAvatarId() - != other.getAvatarId()) return false; + if (getPIFJFLMENAH() + != other.getPIFJFLMENAH()) return false; if (getCostumeId() != other.getCostumeId()) return false; + if (getAvatarId() + != other.getAvatarId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -210,10 +237,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarId(); + hash = (37 * hash) + PIFJFLMENAH_FIELD_NUMBER; + hash = (53 * hash) + getPIFJFLMENAH(); hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER; hash = (53 * hash) + getCostumeId(); + hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -310,10 +339,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: FEKJLPEAOJI
-     *
- * * Protobuf type {@code ProfilePicture} */ public static final class Builder extends @@ -351,10 +376,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - avatarId_ = 0; + pIFJFLMENAH_ = 0; costumeId_ = 0; + avatarId_ = 0; + return this; } @@ -381,8 +408,9 @@ public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture build() @java.lang.Override public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture buildPartial() { emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture result = new emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture(this); - result.avatarId_ = avatarId_; + result.pIFJFLMENAH_ = pIFJFLMENAH_; result.costumeId_ = costumeId_; + result.avatarId_ = avatarId_; onBuilt(); return result; } @@ -431,12 +459,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture other) { if (other == emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance()) return this; - if (other.getAvatarId() != 0) { - setAvatarId(other.getAvatarId()); + if (other.getPIFJFLMENAH() != 0) { + setPIFJFLMENAH(other.getPIFJFLMENAH()); } if (other.getCostumeId() != 0) { setCostumeId(other.getCostumeId()); } + if (other.getAvatarId() != 0) { + setAvatarId(other.getAvatarId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -466,33 +497,33 @@ public Builder mergeFrom( return this; } - private int avatarId_ ; + private int pIFJFLMENAH_ ; /** - * uint32 avatar_id = 1; - * @return The avatarId. + * uint32 PIFJFLMENAH = 3; + * @return The pIFJFLMENAH. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public int getPIFJFLMENAH() { + return pIFJFLMENAH_; } /** - * uint32 avatar_id = 1; - * @param value The avatarId to set. + * uint32 PIFJFLMENAH = 3; + * @param value The pIFJFLMENAH to set. * @return This builder for chaining. */ - public Builder setAvatarId(int value) { + public Builder setPIFJFLMENAH(int value) { - avatarId_ = value; + pIFJFLMENAH_ = value; onChanged(); return this; } /** - * uint32 avatar_id = 1; + * uint32 PIFJFLMENAH = 3; * @return This builder for chaining. */ - public Builder clearAvatarId() { + public Builder clearPIFJFLMENAH() { - avatarId_ = 0; + pIFJFLMENAH_ = 0; onChanged(); return this; } @@ -527,6 +558,37 @@ public Builder clearCostumeId() { onChanged(); return this; } + + private int avatarId_ ; + /** + * uint32 avatar_id = 1; + * @return The avatarId. + */ + @java.lang.Override + public int getAvatarId() { + return avatarId_; + } + /** + * uint32 avatar_id = 1; + * @param value The avatarId to set. + * @return This builder for chaining. + */ + public Builder setAvatarId(int value) { + + avatarId_ = value; + onChanged(); + return this; + } + /** + * uint32 avatar_id = 1; + * @return This builder for chaining. + */ + public Builder clearAvatarId() { + + avatarId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -594,9 +656,10 @@ public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getDefa descriptor; static { java.lang.String[] descriptorData = { - "\n\024ProfilePicture.proto\"7\n\016ProfilePicture" + - "\022\021\n\tavatar_id\030\001 \001(\r\022\022\n\ncostume_id\030\002 \001(\rB" + - "\033\n\031emu.grasscutter.net.protob\006proto3" + "\n\024ProfilePicture.proto\"L\n\016ProfilePicture" + + "\022\023\n\013PIFJFLMENAH\030\003 \001(\r\022\022\n\ncostume_id\030\002 \001(" + + "\r\022\021\n\tavatar_id\030\001 \001(\rB\033\n\031emu.grasscutter." + + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -607,7 +670,7 @@ public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getDefa internal_static_ProfilePicture_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ProfilePicture_descriptor, - new java.lang.String[] { "AvatarId", "CostumeId", }); + new java.lang.String[] { "PIFJFLMENAH", "CostumeId", "AvatarId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java index c52679682a0..2304c11d53f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java @@ -19,35 +19,30 @@ public interface ScenePlayerInfoNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ java.util.List getPlayerInfoListList(); /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getPlayerInfoList(int index); /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ int getPlayerInfoListCount(); /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ java.util.List getPlayerInfoListOrBuilderList(); /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder getPlayerInfoListOrBuilder( int index); } /** - * 
-   * CmdId: 23510
-   * Obf: AKPNDPFIBFH
-   *
- * * Protobuf type {@code ScenePlayerInfoNotify} */ public static final class ScenePlayerInfoNotify extends @@ -94,7 +89,7 @@ private ScenePlayerInfoNotify( case 0: done = true; break; - case 74: { + case 10: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { playerInfoList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +133,17 @@ private ScenePlayerInfoNotify( emu.grasscutter.net.proto.ScenePlayerInfoNotifyOuterClass.ScenePlayerInfoNotify.class, emu.grasscutter.net.proto.ScenePlayerInfoNotifyOuterClass.ScenePlayerInfoNotify.Builder.class); } - public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 9; + public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 1; private java.util.List playerInfoList_; /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ @java.lang.Override public java.util.List getPlayerInfoListList() { return playerInfoList_; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ @java.lang.Override public java.util.List @@ -156,21 +151,21 @@ public java.util.Listrepeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ @java.lang.Override public int getPlayerInfoListCount() { return playerInfoList_.size(); } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ @java.lang.Override public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getPlayerInfoList(int index) { return playerInfoList_.get(index); } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ @java.lang.Override public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder getPlayerInfoListOrBuilder( @@ -193,7 +188,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < playerInfoList_.size(); i++) { - output.writeMessage(9, playerInfoList_.get(i)); + output.writeMessage(1, playerInfoList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +201,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < playerInfoList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, playerInfoList_.get(i)); + .computeMessageSize(1, playerInfoList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -336,11 +331,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 23510
-     * Obf: AKPNDPFIBFH
-     *
- * * Protobuf type {@code ScenePlayerInfoNotify} */ public static final class Builder extends @@ -538,7 +528,7 @@ private void ensurePlayerInfoListIsMutable() { emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder> playerInfoListBuilder_; /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public java.util.List getPlayerInfoListList() { if (playerInfoListBuilder_ == null) { @@ -548,7 +538,7 @@ public java.util.Listrepeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public int getPlayerInfoListCount() { if (playerInfoListBuilder_ == null) { @@ -558,7 +548,7 @@ public int getPlayerInfoListCount() { } } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getPlayerInfoList(int index) { if (playerInfoListBuilder_ == null) { @@ -568,7 +558,7 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getPl } } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder setPlayerInfoList( int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo value) { @@ -585,7 +575,7 @@ public Builder setPlayerInfoList( return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder setPlayerInfoList( int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder builderForValue) { @@ -599,7 +589,7 @@ public Builder setPlayerInfoList( return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder addPlayerInfoList(emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo value) { if (playerInfoListBuilder_ == null) { @@ -615,7 +605,7 @@ public Builder addPlayerInfoList(emu.grasscutter.net.proto.ScenePlayerInfoOuterC return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder addPlayerInfoList( int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo value) { @@ -632,7 +622,7 @@ public Builder addPlayerInfoList( return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder addPlayerInfoList( emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder builderForValue) { @@ -646,7 +636,7 @@ public Builder addPlayerInfoList( return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder addPlayerInfoList( int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder builderForValue) { @@ -660,7 +650,7 @@ public Builder addPlayerInfoList( return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder addAllPlayerInfoList( java.lang.Iterable values) { @@ -675,7 +665,7 @@ public Builder addAllPlayerInfoList( return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder clearPlayerInfoList() { if (playerInfoListBuilder_ == null) { @@ -688,7 +678,7 @@ public Builder clearPlayerInfoList() { return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public Builder removePlayerInfoList(int index) { if (playerInfoListBuilder_ == null) { @@ -701,14 +691,14 @@ public Builder removePlayerInfoList(int index) { return this; } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder getPlayerInfoListBuilder( int index) { return getPlayerInfoListFieldBuilder().getBuilder(index); } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder getPlayerInfoListOrBuilder( int index) { @@ -718,7 +708,7 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuil } } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public java.util.List getPlayerInfoListOrBuilderList() { @@ -729,14 +719,14 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuil } } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder addPlayerInfoListBuilder() { return getPlayerInfoListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.getDefaultInstance()); } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder addPlayerInfoListBuilder( int index) { @@ -744,7 +734,7 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Build index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.getDefaultInstance()); } /** - * repeated .ScenePlayerInfo player_info_list = 9; + * repeated .ScenePlayerInfo player_info_list = 1; */ public java.util.List getPlayerInfoListBuilderList() { @@ -833,7 +823,7 @@ public emu.grasscutter.net.proto.ScenePlayerInfoNotifyOuterClass.ScenePlayerInfo java.lang.String[] descriptorData = { "\n\033ScenePlayerInfoNotify.proto\032\025ScenePlay" + "erInfo.proto\"C\n\025ScenePlayerInfoNotify\022*\n" + - "\020player_info_list\030\t \003(\0132\020.ScenePlayerInf" + + "\020player_info_list\030\001 \003(\0132\020.ScenePlayerInf" + "oB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java index b3d065822ea..465dd2cb22b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java @@ -19,61 +19,57 @@ public interface ScenePlayerInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 peer_id = 15; - * @return The peerId. - */ - int getPeerId(); - - /** - * bool is_connected = 14; - * @return The isConnected. - */ - boolean getIsConnected(); - - /** - * uint32 uid = 4; - * @return The uid. - */ - int getUid(); - - /** - * string name = 13; + * string name = 9; * @return The name. */ java.lang.String getName(); /** - * string name = 13; + * string name = 9; * @return The bytes for name. */ com.google.protobuf.ByteString getNameBytes(); /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; * @return Whether the onlinePlayerInfo field is set. */ boolean hasOnlinePlayerInfo(); /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; * @return The onlinePlayerInfo. */ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getOnlinePlayerInfo(); /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder(); /** - * uint32 scene_id = 1; + * uint32 scene_id = 15; * @return The sceneId. */ int getSceneId(); + + /** + * uint32 uid = 2; + * @return The uid. + */ + int getUid(); + + /** + * uint32 peer_id = 8; + * @return The peerId. + */ + int getPeerId(); + + /** + * bool is_connected = 6; + * @return The isConnected. + */ + boolean getIsConnected(); } /** - * 
-   * Obf: AADLFNACADO
-   *
- * * Protobuf type {@code ScenePlayerInfo} */ public static final class ScenePlayerInfo extends @@ -119,17 +115,12 @@ private ScenePlayerInfo( case 0: done = true; break; - case 8: { - - sceneId_ = input.readUInt32(); - break; - } - case 32: { + case 16: { uid_ = input.readUInt32(); break; } - case 98: { + case 42: { emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null; if (onlinePlayerInfo_ != null) { subBuilder = onlinePlayerInfo_.toBuilder(); @@ -142,20 +133,25 @@ private ScenePlayerInfo( break; } - case 106: { - java.lang.String s = input.readStringRequireUtf8(); + case 48: { - name_ = s; + isConnected_ = input.readBool(); break; } - case 112: { + case 64: { - isConnected_ = input.readBool(); + peerId_ = input.readUInt32(); + break; + } + case 74: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; break; } case 120: { - peerId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } default: { @@ -190,43 +186,10 @@ private ScenePlayerInfo( emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.class, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder.class); } - public static final int PEER_ID_FIELD_NUMBER = 15; - private int peerId_; - /** - * uint32 peer_id = 15; - * @return The peerId. - */ - @java.lang.Override - public int getPeerId() { - return peerId_; - } - - public static final int IS_CONNECTED_FIELD_NUMBER = 14; - private boolean isConnected_; - /** - * bool is_connected = 14; - * @return The isConnected. - */ - @java.lang.Override - public boolean getIsConnected() { - return isConnected_; - } - - public static final int UID_FIELD_NUMBER = 4; - private int uid_; - /** - * uint32 uid = 4; - * @return The uid. - */ - @java.lang.Override - public int getUid() { - return uid_; - } - - public static final int NAME_FIELD_NUMBER = 13; + public static final int NAME_FIELD_NUMBER = 9; private volatile java.lang.Object name_; /** - * string name = 13; + * string name = 9; * @return The name. */ @java.lang.Override @@ -243,7 +206,7 @@ public java.lang.String getName() { } } /** - * string name = 13; + * string name = 9; * @return The bytes for name. */ @java.lang.Override @@ -261,10 +224,10 @@ public java.lang.String getName() { } } - public static final int ONLINE_PLAYER_INFO_FIELD_NUMBER = 12; + public static final int ONLINE_PLAYER_INFO_FIELD_NUMBER = 5; private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo onlinePlayerInfo_; /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; * @return Whether the onlinePlayerInfo field is set. */ @java.lang.Override @@ -272,7 +235,7 @@ public boolean hasOnlinePlayerInfo() { return onlinePlayerInfo_ != null; } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; * @return The onlinePlayerInfo. */ @java.lang.Override @@ -280,17 +243,17 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get return onlinePlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : onlinePlayerInfo_; } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ @java.lang.Override public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder() { return getOnlinePlayerInfo(); } - public static final int SCENE_ID_FIELD_NUMBER = 1; + public static final int SCENE_ID_FIELD_NUMBER = 15; private int sceneId_; /** - * uint32 scene_id = 1; + * uint32 scene_id = 15; * @return The sceneId. */ @java.lang.Override @@ -298,6 +261,39 @@ public int getSceneId() { return sceneId_; } + public static final int UID_FIELD_NUMBER = 2; + private int uid_; + /** + * uint32 uid = 2; + * @return The uid. + */ + @java.lang.Override + public int getUid() { + return uid_; + } + + public static final int PEER_ID_FIELD_NUMBER = 8; + private int peerId_; + /** + * uint32 peer_id = 8; + * @return The peerId. + */ + @java.lang.Override + public int getPeerId() { + return peerId_; + } + + public static final int IS_CONNECTED_FIELD_NUMBER = 6; + private boolean isConnected_; + /** + * bool is_connected = 6; + * @return The isConnected. + */ + @java.lang.Override + public boolean getIsConnected() { + return isConnected_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -312,23 +308,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (sceneId_ != 0) { - output.writeUInt32(1, sceneId_); - } if (uid_ != 0) { - output.writeUInt32(4, uid_); + output.writeUInt32(2, uid_); } if (onlinePlayerInfo_ != null) { - output.writeMessage(12, getOnlinePlayerInfo()); - } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 13, name_); + output.writeMessage(5, getOnlinePlayerInfo()); } if (isConnected_ != false) { - output.writeBool(14, isConnected_); + output.writeBool(6, isConnected_); } if (peerId_ != 0) { - output.writeUInt32(15, peerId_); + output.writeUInt32(8, peerId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 9, name_); + } + if (sceneId_ != 0) { + output.writeUInt32(15, sceneId_); } unknownFields.writeTo(output); } @@ -339,28 +335,28 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (sceneId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, sceneId_); - } if (uid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, uid_); + .computeUInt32Size(2, uid_); } if (onlinePlayerInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, getOnlinePlayerInfo()); - } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, name_); + .computeMessageSize(5, getOnlinePlayerInfo()); } if (isConnected_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(14, isConnected_); + .computeBoolSize(6, isConnected_); } if (peerId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, peerId_); + .computeUInt32Size(8, peerId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, name_); + } + if (sceneId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(15, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -377,12 +373,6 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo other = (emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo) obj; - if (getPeerId() - != other.getPeerId()) return false; - if (getIsConnected() - != other.getIsConnected()) return false; - if (getUid() - != other.getUid()) return false; if (!getName() .equals(other.getName())) return false; if (hasOnlinePlayerInfo() != other.hasOnlinePlayerInfo()) return false; @@ -392,6 +382,12 @@ public boolean equals(final java.lang.Object obj) { } if (getSceneId() != other.getSceneId()) return false; + if (getUid() + != other.getUid()) return false; + if (getPeerId() + != other.getPeerId()) return false; + if (getIsConnected() + != other.getIsConnected()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -403,13 +399,6 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PEER_ID_FIELD_NUMBER; - hash = (53 * hash) + getPeerId(); - hash = (37 * hash) + IS_CONNECTED_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsConnected()); - hash = (37 * hash) + UID_FIELD_NUMBER; - hash = (53 * hash) + getUid(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); if (hasOnlinePlayerInfo()) { @@ -418,6 +407,13 @@ public int hashCode() { } hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + UID_FIELD_NUMBER; + hash = (53 * hash) + getUid(); + hash = (37 * hash) + PEER_ID_FIELD_NUMBER; + hash = (53 * hash) + getPeerId(); + hash = (37 * hash) + IS_CONNECTED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsConnected()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -514,10 +510,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: AADLFNACADO
-     *
- * * Protobuf type {@code ScenePlayerInfo} */ public static final class Builder extends @@ -555,12 +547,6 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - peerId_ = 0; - - isConnected_ = false; - - uid_ = 0; - name_ = ""; if (onlinePlayerInfoBuilder_ == null) { @@ -571,6 +557,12 @@ public Builder clear() { } sceneId_ = 0; + uid_ = 0; + + peerId_ = 0; + + isConnected_ = false; + return this; } @@ -597,9 +589,6 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo build @java.lang.Override public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo buildPartial() { emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo result = new emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo(this); - result.peerId_ = peerId_; - result.isConnected_ = isConnected_; - result.uid_ = uid_; result.name_ = name_; if (onlinePlayerInfoBuilder_ == null) { result.onlinePlayerInfo_ = onlinePlayerInfo_; @@ -607,6 +596,9 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo build result.onlinePlayerInfo_ = onlinePlayerInfoBuilder_.build(); } result.sceneId_ = sceneId_; + result.uid_ = uid_; + result.peerId_ = peerId_; + result.isConnected_ = isConnected_; onBuilt(); return result; } @@ -655,15 +647,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo other) { if (other == emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.getDefaultInstance()) return this; - if (other.getPeerId() != 0) { - setPeerId(other.getPeerId()); - } - if (other.getIsConnected() != false) { - setIsConnected(other.getIsConnected()); - } - if (other.getUid() != 0) { - setUid(other.getUid()); - } if (!other.getName().isEmpty()) { name_ = other.name_; onChanged(); @@ -674,6 +657,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.Sce if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } + if (other.getUid() != 0) { + setUid(other.getUid()); + } + if (other.getPeerId() != 0) { + setPeerId(other.getPeerId()); + } + if (other.getIsConnected() != false) { + setIsConnected(other.getIsConnected()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -703,102 +695,9 @@ public Builder mergeFrom( return this; } - private int peerId_ ; - /** - * uint32 peer_id = 15; - * @return The peerId. - */ - @java.lang.Override - public int getPeerId() { - return peerId_; - } - /** - * uint32 peer_id = 15; - * @param value The peerId to set. - * @return This builder for chaining. - */ - public Builder setPeerId(int value) { - - peerId_ = value; - onChanged(); - return this; - } - /** - * uint32 peer_id = 15; - * @return This builder for chaining. - */ - public Builder clearPeerId() { - - peerId_ = 0; - onChanged(); - return this; - } - - private boolean isConnected_ ; - /** - * bool is_connected = 14; - * @return The isConnected. - */ - @java.lang.Override - public boolean getIsConnected() { - return isConnected_; - } - /** - * bool is_connected = 14; - * @param value The isConnected to set. - * @return This builder for chaining. - */ - public Builder setIsConnected(boolean value) { - - isConnected_ = value; - onChanged(); - return this; - } - /** - * bool is_connected = 14; - * @return This builder for chaining. - */ - public Builder clearIsConnected() { - - isConnected_ = false; - onChanged(); - return this; - } - - private int uid_ ; - /** - * uint32 uid = 4; - * @return The uid. - */ - @java.lang.Override - public int getUid() { - return uid_; - } - /** - * uint32 uid = 4; - * @param value The uid to set. - * @return This builder for chaining. - */ - public Builder setUid(int value) { - - uid_ = value; - onChanged(); - return this; - } - /** - * uint32 uid = 4; - * @return This builder for chaining. - */ - public Builder clearUid() { - - uid_ = 0; - onChanged(); - return this; - } - private java.lang.Object name_ = ""; /** - * string name = 13; + * string name = 9; * @return The name. */ public java.lang.String getName() { @@ -814,7 +713,7 @@ public java.lang.String getName() { } } /** - * string name = 13; + * string name = 9; * @return The bytes for name. */ public com.google.protobuf.ByteString @@ -831,7 +730,7 @@ public java.lang.String getName() { } } /** - * string name = 13; + * string name = 9; * @param value The name to set. * @return This builder for chaining. */ @@ -846,7 +745,7 @@ public Builder setName( return this; } /** - * string name = 13; + * string name = 9; * @return This builder for chaining. */ public Builder clearName() { @@ -856,7 +755,7 @@ public Builder clearName() { return this; } /** - * string name = 13; + * string name = 9; * @param value The bytes for name to set. * @return This builder for chaining. */ @@ -876,14 +775,14 @@ public Builder setNameBytes( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> onlinePlayerInfoBuilder_; /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; * @return Whether the onlinePlayerInfo field is set. */ public boolean hasOnlinePlayerInfo() { return onlinePlayerInfoBuilder_ != null || onlinePlayerInfo_ != null; } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; * @return The onlinePlayerInfo. */ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getOnlinePlayerInfo() { @@ -894,7 +793,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get } } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ public Builder setOnlinePlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) { if (onlinePlayerInfoBuilder_ == null) { @@ -910,7 +809,7 @@ public Builder setOnlinePlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOut return this; } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ public Builder setOnlinePlayerInfo( emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) { @@ -924,7 +823,7 @@ public Builder setOnlinePlayerInfo( return this; } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ public Builder mergeOnlinePlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) { if (onlinePlayerInfoBuilder_ == null) { @@ -942,7 +841,7 @@ public Builder mergeOnlinePlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoO return this; } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ public Builder clearOnlinePlayerInfo() { if (onlinePlayerInfoBuilder_ == null) { @@ -956,7 +855,7 @@ public Builder clearOnlinePlayerInfo() { return this; } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getOnlinePlayerInfoBuilder() { @@ -964,7 +863,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Bui return getOnlinePlayerInfoFieldBuilder().getBuilder(); } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder() { if (onlinePlayerInfoBuilder_ != null) { @@ -975,7 +874,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBu } } /** - * .OnlinePlayerInfo online_player_info = 12; + * .OnlinePlayerInfo online_player_info = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> @@ -993,7 +892,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBu private int sceneId_ ; /** - * uint32 scene_id = 1; + * uint32 scene_id = 15; * @return The sceneId. */ @java.lang.Override @@ -1001,7 +900,7 @@ public int getSceneId() { return sceneId_; } /** - * uint32 scene_id = 1; + * uint32 scene_id = 15; * @param value The sceneId to set. * @return This builder for chaining. */ @@ -1012,7 +911,7 @@ public Builder setSceneId(int value) { return this; } /** - * uint32 scene_id = 1; + * uint32 scene_id = 15; * @return This builder for chaining. */ public Builder clearSceneId() { @@ -1021,6 +920,99 @@ public Builder clearSceneId() { onChanged(); return this; } + + private int uid_ ; + /** + * uint32 uid = 2; + * @return The uid. + */ + @java.lang.Override + public int getUid() { + return uid_; + } + /** + * uint32 uid = 2; + * @param value The uid to set. + * @return This builder for chaining. + */ + public Builder setUid(int value) { + + uid_ = value; + onChanged(); + return this; + } + /** + * uint32 uid = 2; + * @return This builder for chaining. + */ + public Builder clearUid() { + + uid_ = 0; + onChanged(); + return this; + } + + private int peerId_ ; + /** + * uint32 peer_id = 8; + * @return The peerId. + */ + @java.lang.Override + public int getPeerId() { + return peerId_; + } + /** + * uint32 peer_id = 8; + * @param value The peerId to set. + * @return This builder for chaining. + */ + public Builder setPeerId(int value) { + + peerId_ = value; + onChanged(); + return this; + } + /** + * uint32 peer_id = 8; + * @return This builder for chaining. + */ + public Builder clearPeerId() { + + peerId_ = 0; + onChanged(); + return this; + } + + private boolean isConnected_ ; + /** + * bool is_connected = 6; + * @return The isConnected. + */ + @java.lang.Override + public boolean getIsConnected() { + return isConnected_; + } + /** + * bool is_connected = 6; + * @param value The isConnected to set. + * @return This builder for chaining. + */ + public Builder setIsConnected(boolean value) { + + isConnected_ = value; + onChanged(); + return this; + } + /** + * bool is_connected = 6; + * @return This builder for chaining. + */ + public Builder clearIsConnected() { + + isConnected_ = false; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1089,10 +1081,10 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getDe static { java.lang.String[] descriptorData = { "\n\025ScenePlayerInfo.proto\032\026OnlinePlayerInf" + - "o.proto\"\224\001\n\017ScenePlayerInfo\022\017\n\007peer_id\030\017" + - " \001(\r\022\024\n\014is_connected\030\016 \001(\010\022\013\n\003uid\030\004 \001(\r\022" + - "\014\n\004name\030\r \001(\t\022-\n\022online_player_info\030\014 \001(" + - "\0132\021.OnlinePlayerInfo\022\020\n\010scene_id\030\001 \001(\rB\033" + + "o.proto\"\224\001\n\017ScenePlayerInfo\022\014\n\004name\030\t \001(" + + "\t\022-\n\022online_player_info\030\005 \001(\0132\021.OnlinePl" + + "ayerInfo\022\020\n\010scene_id\030\017 \001(\r\022\013\n\003uid\030\002 \001(\r\022" + + "\017\n\007peer_id\030\010 \001(\r\022\024\n\014is_connected\030\006 \001(\010B\033" + "\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1105,7 +1097,7 @@ public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getDe internal_static_ScenePlayerInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ScenePlayerInfo_descriptor, - new java.lang.String[] { "PeerId", "IsConnected", "Uid", "Name", "OnlinePlayerInfo", "SceneId", }); + new java.lang.String[] { "Name", "OnlinePlayerInfo", "SceneId", "Uid", "PeerId", "IsConnected", }); emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java index d03c79511a1..297551c499e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java @@ -19,85 +19,80 @@ public interface ScenePointUnlockNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 ELDLGKEKABI = 6; - * @return A list containing the eLDLGKEKABI. + * repeated uint32 unlocked_point_list = 11; + * @return A list containing the unlockedPointList. */ - java.util.List getELDLGKEKABIList(); + java.util.List getUnlockedPointListList(); /** - * repeated uint32 ELDLGKEKABI = 6; - * @return The count of eLDLGKEKABI. + * repeated uint32 unlocked_point_list = 11; + * @return The count of unlockedPointList. */ - int getELDLGKEKABICount(); + int getUnlockedPointListCount(); /** - * repeated uint32 ELDLGKEKABI = 6; + * repeated uint32 unlocked_point_list = 11; * @param index The index of the element to return. - * @return The eLDLGKEKABI at the given index. + * @return The unlockedPointList at the given index. */ - int getELDLGKEKABI(int index); + int getUnlockedPointList(int index); /** - * repeated uint32 KOPAHGHMECF = 4; - * @return A list containing the kOPAHGHMECF. + * repeated uint32 point_list = 13; + * @return A list containing the pointList. */ - java.util.List getKOPAHGHMECFList(); + java.util.List getPointListList(); /** - * repeated uint32 KOPAHGHMECF = 4; - * @return The count of kOPAHGHMECF. + * repeated uint32 point_list = 13; + * @return The count of pointList. */ - int getKOPAHGHMECFCount(); + int getPointListCount(); /** - * repeated uint32 KOPAHGHMECF = 4; + * repeated uint32 point_list = 13; * @param index The index of the element to return. - * @return The kOPAHGHMECF at the given index. - */ - int getKOPAHGHMECF(int index); - - /** - * uint32 scene_id = 12; - * @return The sceneId. + * @return The pointList at the given index. */ - int getSceneId(); + int getPointList(int index); /** - * repeated uint32 point_list = 2; - * @return A list containing the pointList. + * repeated uint32 DOGDPAFIMJD = 12; + * @return A list containing the dOGDPAFIMJD. */ - java.util.List getPointListList(); + java.util.List getDOGDPAFIMJDList(); /** - * repeated uint32 point_list = 2; - * @return The count of pointList. + * repeated uint32 DOGDPAFIMJD = 12; + * @return The count of dOGDPAFIMJD. */ - int getPointListCount(); + int getDOGDPAFIMJDCount(); /** - * repeated uint32 point_list = 2; + * repeated uint32 DOGDPAFIMJD = 12; * @param index The index of the element to return. - * @return The pointList at the given index. + * @return The dOGDPAFIMJD at the given index. */ - int getPointList(int index); + int getDOGDPAFIMJD(int index); /** - * repeated uint32 JCLHNODLPOH = 11; - * @return A list containing the jCLHNODLPOH. + * repeated uint32 JDNMBINKNGK = 5; + * @return A list containing the jDNMBINKNGK. */ - java.util.List getJCLHNODLPOHList(); + java.util.List getJDNMBINKNGKList(); /** - * repeated uint32 JCLHNODLPOH = 11; - * @return The count of jCLHNODLPOH. + * repeated uint32 JDNMBINKNGK = 5; + * @return The count of jDNMBINKNGK. */ - int getJCLHNODLPOHCount(); + int getJDNMBINKNGKCount(); /** - * repeated uint32 JCLHNODLPOH = 11; + * repeated uint32 JDNMBINKNGK = 5; * @param index The index of the element to return. - * @return The jCLHNODLPOH at the given index. + * @return The jDNMBINKNGK at the given index. + */ + int getJDNMBINKNGK(int index); + + /** + * uint32 scene_id = 1; + * @return The sceneId. */ - int getJCLHNODLPOH(int index); + int getSceneId(); } /** - * 
-   * CmdId: 5431
-   * Obf: CBIBGAOCEHP
-   *
- * * Protobuf type {@code ScenePointUnlockNotify} */ public static final class ScenePointUnlockNotify extends @@ -110,10 +105,10 @@ private ScenePointUnlockNotify(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } private ScenePointUnlockNotify() { - eLDLGKEKABI_ = emptyIntList(); - kOPAHGHMECF_ = emptyIntList(); + unlockedPointList_ = emptyIntList(); pointList_ = emptyIntList(); - jCLHNODLPOH_ = emptyIntList(); + dOGDPAFIMJD_ = emptyIntList(); + jDNMBINKNGK_ = emptyIntList(); } @java.lang.Override @@ -147,95 +142,95 @@ private ScenePointUnlockNotify( case 0: done = true; break; - case 16: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - pointList_ = newIntList(); - mutable_bitField0_ |= 0x00000004; + case 8: { + + sceneId_ = input.readUInt32(); + break; + } + case 40: { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { + jDNMBINKNGK_ = newIntList(); + mutable_bitField0_ |= 0x00000008; } - pointList_.addInt(input.readUInt32()); + jDNMBINKNGK_.addInt(input.readUInt32()); break; } - case 18: { + case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { - pointList_ = newIntList(); - mutable_bitField0_ |= 0x00000004; + if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) { + jDNMBINKNGK_ = newIntList(); + mutable_bitField0_ |= 0x00000008; } while (input.getBytesUntilLimit() > 0) { - pointList_.addInt(input.readUInt32()); + jDNMBINKNGK_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 32: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - kOPAHGHMECF_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + case 88: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + unlockedPointList_ = newIntList(); + mutable_bitField0_ |= 0x00000001; } - kOPAHGHMECF_.addInt(input.readUInt32()); + unlockedPointList_.addInt(input.readUInt32()); break; } - case 34: { + case 90: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - kOPAHGHMECF_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + unlockedPointList_ = newIntList(); + mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - kOPAHGHMECF_.addInt(input.readUInt32()); + unlockedPointList_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 48: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - eLDLGKEKABI_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + case 96: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + dOGDPAFIMJD_ = newIntList(); + mutable_bitField0_ |= 0x00000004; } - eLDLGKEKABI_.addInt(input.readUInt32()); + dOGDPAFIMJD_.addInt(input.readUInt32()); break; } - case 50: { + case 98: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - eLDLGKEKABI_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { + dOGDPAFIMJD_ = newIntList(); + mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { - eLDLGKEKABI_.addInt(input.readUInt32()); + dOGDPAFIMJD_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 88: { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - jCLHNODLPOH_ = newIntList(); - mutable_bitField0_ |= 0x00000008; + case 104: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + pointList_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } - jCLHNODLPOH_.addInt(input.readUInt32()); + pointList_.addInt(input.readUInt32()); break; } - case 90: { + case 106: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) { - jCLHNODLPOH_ = newIntList(); - mutable_bitField0_ |= 0x00000008; + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + pointList_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - jCLHNODLPOH_.addInt(input.readUInt32()); + pointList_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 96: { - - sceneId_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -251,17 +246,17 @@ private ScenePointUnlockNotify( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) != 0)) { - pointList_.makeImmutable(); // C - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - kOPAHGHMECF_.makeImmutable(); // C + if (((mutable_bitField0_ & 0x00000008) != 0)) { + jDNMBINKNGK_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000001) != 0)) { - eLDLGKEKABI_.makeImmutable(); // C + unlockedPointList_.makeImmutable(); // C } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - jCLHNODLPOH_.makeImmutable(); // C + if (((mutable_bitField0_ & 0x00000004) != 0)) { + dOGDPAFIMJD_.makeImmutable(); // C + } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + pointList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -280,128 +275,128 @@ private ScenePointUnlockNotify( emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify.class, emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify.Builder.class); } - public static final int ELDLGKEKABI_FIELD_NUMBER = 6; - private com.google.protobuf.Internal.IntList eLDLGKEKABI_; + public static final int UNLOCKED_POINT_LIST_FIELD_NUMBER = 11; + private com.google.protobuf.Internal.IntList unlockedPointList_; /** - * repeated uint32 ELDLGKEKABI = 6; - * @return A list containing the eLDLGKEKABI. + * repeated uint32 unlocked_point_list = 11; + * @return A list containing the unlockedPointList. */ @java.lang.Override public java.util.List - getELDLGKEKABIList() { - return eLDLGKEKABI_; + getUnlockedPointListList() { + return unlockedPointList_; } /** - * repeated uint32 ELDLGKEKABI = 6; - * @return The count of eLDLGKEKABI. + * repeated uint32 unlocked_point_list = 11; + * @return The count of unlockedPointList. */ - public int getELDLGKEKABICount() { - return eLDLGKEKABI_.size(); + public int getUnlockedPointListCount() { + return unlockedPointList_.size(); } /** - * repeated uint32 ELDLGKEKABI = 6; + * repeated uint32 unlocked_point_list = 11; * @param index The index of the element to return. - * @return The eLDLGKEKABI at the given index. + * @return The unlockedPointList at the given index. */ - public int getELDLGKEKABI(int index) { - return eLDLGKEKABI_.getInt(index); + public int getUnlockedPointList(int index) { + return unlockedPointList_.getInt(index); } - private int eLDLGKEKABIMemoizedSerializedSize = -1; + private int unlockedPointListMemoizedSerializedSize = -1; - public static final int KOPAHGHMECF_FIELD_NUMBER = 4; - private com.google.protobuf.Internal.IntList kOPAHGHMECF_; + public static final int POINT_LIST_FIELD_NUMBER = 13; + private com.google.protobuf.Internal.IntList pointList_; /** - * repeated uint32 KOPAHGHMECF = 4; - * @return A list containing the kOPAHGHMECF. + * repeated uint32 point_list = 13; + * @return A list containing the pointList. */ @java.lang.Override public java.util.List - getKOPAHGHMECFList() { - return kOPAHGHMECF_; + getPointListList() { + return pointList_; } /** - * repeated uint32 KOPAHGHMECF = 4; - * @return The count of kOPAHGHMECF. + * repeated uint32 point_list = 13; + * @return The count of pointList. */ - public int getKOPAHGHMECFCount() { - return kOPAHGHMECF_.size(); + public int getPointListCount() { + return pointList_.size(); } /** - * repeated uint32 KOPAHGHMECF = 4; + * repeated uint32 point_list = 13; * @param index The index of the element to return. - * @return The kOPAHGHMECF at the given index. - */ - public int getKOPAHGHMECF(int index) { - return kOPAHGHMECF_.getInt(index); - } - private int kOPAHGHMECFMemoizedSerializedSize = -1; - - public static final int SCENE_ID_FIELD_NUMBER = 12; - private int sceneId_; - /** - * uint32 scene_id = 12; - * @return The sceneId. + * @return The pointList at the given index. */ - @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointList(int index) { + return pointList_.getInt(index); } + private int pointListMemoizedSerializedSize = -1; - public static final int POINT_LIST_FIELD_NUMBER = 2; - private com.google.protobuf.Internal.IntList pointList_; + public static final int DOGDPAFIMJD_FIELD_NUMBER = 12; + private com.google.protobuf.Internal.IntList dOGDPAFIMJD_; /** - * repeated uint32 point_list = 2; - * @return A list containing the pointList. + * repeated uint32 DOGDPAFIMJD = 12; + * @return A list containing the dOGDPAFIMJD. */ @java.lang.Override public java.util.List - getPointListList() { - return pointList_; + getDOGDPAFIMJDList() { + return dOGDPAFIMJD_; } /** - * repeated uint32 point_list = 2; - * @return The count of pointList. + * repeated uint32 DOGDPAFIMJD = 12; + * @return The count of dOGDPAFIMJD. */ - public int getPointListCount() { - return pointList_.size(); + public int getDOGDPAFIMJDCount() { + return dOGDPAFIMJD_.size(); } /** - * repeated uint32 point_list = 2; + * repeated uint32 DOGDPAFIMJD = 12; * @param index The index of the element to return. - * @return The pointList at the given index. + * @return The dOGDPAFIMJD at the given index. */ - public int getPointList(int index) { - return pointList_.getInt(index); + public int getDOGDPAFIMJD(int index) { + return dOGDPAFIMJD_.getInt(index); } - private int pointListMemoizedSerializedSize = -1; + private int dOGDPAFIMJDMemoizedSerializedSize = -1; - public static final int JCLHNODLPOH_FIELD_NUMBER = 11; - private com.google.protobuf.Internal.IntList jCLHNODLPOH_; + public static final int JDNMBINKNGK_FIELD_NUMBER = 5; + private com.google.protobuf.Internal.IntList jDNMBINKNGK_; /** - * repeated uint32 JCLHNODLPOH = 11; - * @return A list containing the jCLHNODLPOH. + * repeated uint32 JDNMBINKNGK = 5; + * @return A list containing the jDNMBINKNGK. */ @java.lang.Override public java.util.List - getJCLHNODLPOHList() { - return jCLHNODLPOH_; + getJDNMBINKNGKList() { + return jDNMBINKNGK_; } /** - * repeated uint32 JCLHNODLPOH = 11; - * @return The count of jCLHNODLPOH. + * repeated uint32 JDNMBINKNGK = 5; + * @return The count of jDNMBINKNGK. */ - public int getJCLHNODLPOHCount() { - return jCLHNODLPOH_.size(); + public int getJDNMBINKNGKCount() { + return jDNMBINKNGK_.size(); } /** - * repeated uint32 JCLHNODLPOH = 11; + * repeated uint32 JDNMBINKNGK = 5; * @param index The index of the element to return. - * @return The jCLHNODLPOH at the given index. + * @return The jDNMBINKNGK at the given index. */ - public int getJCLHNODLPOH(int index) { - return jCLHNODLPOH_.getInt(index); + public int getJDNMBINKNGK(int index) { + return jDNMBINKNGK_.getInt(index); + } + private int jDNMBINKNGKMemoizedSerializedSize = -1; + + public static final int SCENE_ID_FIELD_NUMBER = 1; + private int sceneId_; + /** + * uint32 scene_id = 1; + * @return The sceneId. + */ + @java.lang.Override + public int getSceneId() { + return sceneId_; } - private int jCLHNODLPOHMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -418,36 +413,36 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getPointListList().size() > 0) { - output.writeUInt32NoTag(18); - output.writeUInt32NoTag(pointListMemoizedSerializedSize); + if (sceneId_ != 0) { + output.writeUInt32(1, sceneId_); } - for (int i = 0; i < pointList_.size(); i++) { - output.writeUInt32NoTag(pointList_.getInt(i)); + if (getJDNMBINKNGKList().size() > 0) { + output.writeUInt32NoTag(42); + output.writeUInt32NoTag(jDNMBINKNGKMemoizedSerializedSize); } - if (getKOPAHGHMECFList().size() > 0) { - output.writeUInt32NoTag(34); - output.writeUInt32NoTag(kOPAHGHMECFMemoizedSerializedSize); + for (int i = 0; i < jDNMBINKNGK_.size(); i++) { + output.writeUInt32NoTag(jDNMBINKNGK_.getInt(i)); } - for (int i = 0; i < kOPAHGHMECF_.size(); i++) { - output.writeUInt32NoTag(kOPAHGHMECF_.getInt(i)); + if (getUnlockedPointListList().size() > 0) { + output.writeUInt32NoTag(90); + output.writeUInt32NoTag(unlockedPointListMemoizedSerializedSize); } - if (getELDLGKEKABIList().size() > 0) { - output.writeUInt32NoTag(50); - output.writeUInt32NoTag(eLDLGKEKABIMemoizedSerializedSize); + for (int i = 0; i < unlockedPointList_.size(); i++) { + output.writeUInt32NoTag(unlockedPointList_.getInt(i)); } - for (int i = 0; i < eLDLGKEKABI_.size(); i++) { - output.writeUInt32NoTag(eLDLGKEKABI_.getInt(i)); + if (getDOGDPAFIMJDList().size() > 0) { + output.writeUInt32NoTag(98); + output.writeUInt32NoTag(dOGDPAFIMJDMemoizedSerializedSize); } - if (getJCLHNODLPOHList().size() > 0) { - output.writeUInt32NoTag(90); - output.writeUInt32NoTag(jCLHNODLPOHMemoizedSerializedSize); + for (int i = 0; i < dOGDPAFIMJD_.size(); i++) { + output.writeUInt32NoTag(dOGDPAFIMJD_.getInt(i)); } - for (int i = 0; i < jCLHNODLPOH_.size(); i++) { - output.writeUInt32NoTag(jCLHNODLPOH_.getInt(i)); + if (getPointListList().size() > 0) { + output.writeUInt32NoTag(106); + output.writeUInt32NoTag(pointListMemoizedSerializedSize); } - if (sceneId_ != 0) { - output.writeUInt32(12, sceneId_); + for (int i = 0; i < pointList_.size(); i++) { + output.writeUInt32NoTag(pointList_.getInt(i)); } unknownFields.writeTo(output); } @@ -458,65 +453,65 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (sceneId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, sceneId_); + } { int dataSize = 0; - for (int i = 0; i < pointList_.size(); i++) { + for (int i = 0; i < jDNMBINKNGK_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(pointList_.getInt(i)); + .computeUInt32SizeNoTag(jDNMBINKNGK_.getInt(i)); } size += dataSize; - if (!getPointListList().isEmpty()) { + if (!getJDNMBINKNGKList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - pointListMemoizedSerializedSize = dataSize; + jDNMBINKNGKMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < kOPAHGHMECF_.size(); i++) { + for (int i = 0; i < unlockedPointList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(kOPAHGHMECF_.getInt(i)); + .computeUInt32SizeNoTag(unlockedPointList_.getInt(i)); } size += dataSize; - if (!getKOPAHGHMECFList().isEmpty()) { + if (!getUnlockedPointListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - kOPAHGHMECFMemoizedSerializedSize = dataSize; + unlockedPointListMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < eLDLGKEKABI_.size(); i++) { + for (int i = 0; i < dOGDPAFIMJD_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(eLDLGKEKABI_.getInt(i)); + .computeUInt32SizeNoTag(dOGDPAFIMJD_.getInt(i)); } size += dataSize; - if (!getELDLGKEKABIList().isEmpty()) { + if (!getDOGDPAFIMJDList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - eLDLGKEKABIMemoizedSerializedSize = dataSize; + dOGDPAFIMJDMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < jCLHNODLPOH_.size(); i++) { + for (int i = 0; i < pointList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(jCLHNODLPOH_.getInt(i)); + .computeUInt32SizeNoTag(pointList_.getInt(i)); } size += dataSize; - if (!getJCLHNODLPOHList().isEmpty()) { + if (!getPointListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - jCLHNODLPOHMemoizedSerializedSize = dataSize; - } - if (sceneId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, sceneId_); + pointListMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -533,16 +528,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify other = (emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify) obj; - if (!getELDLGKEKABIList() - .equals(other.getELDLGKEKABIList())) return false; - if (!getKOPAHGHMECFList() - .equals(other.getKOPAHGHMECFList())) return false; - if (getSceneId() - != other.getSceneId()) return false; + if (!getUnlockedPointListList() + .equals(other.getUnlockedPointListList())) return false; if (!getPointListList() .equals(other.getPointListList())) return false; - if (!getJCLHNODLPOHList() - .equals(other.getJCLHNODLPOHList())) return false; + if (!getDOGDPAFIMJDList() + .equals(other.getDOGDPAFIMJDList())) return false; + if (!getJDNMBINKNGKList() + .equals(other.getJDNMBINKNGKList())) return false; + if (getSceneId() + != other.getSceneId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -554,24 +549,24 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getELDLGKEKABICount() > 0) { - hash = (37 * hash) + ELDLGKEKABI_FIELD_NUMBER; - hash = (53 * hash) + getELDLGKEKABIList().hashCode(); - } - if (getKOPAHGHMECFCount() > 0) { - hash = (37 * hash) + KOPAHGHMECF_FIELD_NUMBER; - hash = (53 * hash) + getKOPAHGHMECFList().hashCode(); + if (getUnlockedPointListCount() > 0) { + hash = (37 * hash) + UNLOCKED_POINT_LIST_FIELD_NUMBER; + hash = (53 * hash) + getUnlockedPointListList().hashCode(); } - hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getSceneId(); if (getPointListCount() > 0) { hash = (37 * hash) + POINT_LIST_FIELD_NUMBER; hash = (53 * hash) + getPointListList().hashCode(); } - if (getJCLHNODLPOHCount() > 0) { - hash = (37 * hash) + JCLHNODLPOH_FIELD_NUMBER; - hash = (53 * hash) + getJCLHNODLPOHList().hashCode(); + if (getDOGDPAFIMJDCount() > 0) { + hash = (37 * hash) + DOGDPAFIMJD_FIELD_NUMBER; + hash = (53 * hash) + getDOGDPAFIMJDList().hashCode(); } + if (getJDNMBINKNGKCount() > 0) { + hash = (37 * hash) + JDNMBINKNGK_FIELD_NUMBER; + hash = (53 * hash) + getJDNMBINKNGKList().hashCode(); + } + hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSceneId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -668,11 +663,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 5431
-     * Obf: CBIBGAOCEHP
-     *
- * * Protobuf type {@code ScenePointUnlockNotify} */ public static final class Builder extends @@ -710,16 +700,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - eLDLGKEKABI_ = emptyIntList(); + unlockedPointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - kOPAHGHMECF_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); - sceneId_ = 0; - pointList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + dOGDPAFIMJD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); - jCLHNODLPOH_ = emptyIntList(); + jDNMBINKNGK_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000008); + sceneId_ = 0; + return this; } @@ -748,26 +738,26 @@ public emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlo emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify result = new emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - eLDLGKEKABI_.makeImmutable(); + unlockedPointList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.eLDLGKEKABI_ = eLDLGKEKABI_; + result.unlockedPointList_ = unlockedPointList_; if (((bitField0_ & 0x00000002) != 0)) { - kOPAHGHMECF_.makeImmutable(); + pointList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.kOPAHGHMECF_ = kOPAHGHMECF_; - result.sceneId_ = sceneId_; + result.pointList_ = pointList_; if (((bitField0_ & 0x00000004) != 0)) { - pointList_.makeImmutable(); + dOGDPAFIMJD_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000004); } - result.pointList_ = pointList_; + result.dOGDPAFIMJD_ = dOGDPAFIMJD_; if (((bitField0_ & 0x00000008) != 0)) { - jCLHNODLPOH_.makeImmutable(); + jDNMBINKNGK_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000008); } - result.jCLHNODLPOH_ = jCLHNODLPOH_; + result.jDNMBINKNGK_ = jDNMBINKNGK_; + result.sceneId_ = sceneId_; onBuilt(); return result; } @@ -816,49 +806,49 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify other) { if (other == emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify.getDefaultInstance()) return this; - if (!other.eLDLGKEKABI_.isEmpty()) { - if (eLDLGKEKABI_.isEmpty()) { - eLDLGKEKABI_ = other.eLDLGKEKABI_; + if (!other.unlockedPointList_.isEmpty()) { + if (unlockedPointList_.isEmpty()) { + unlockedPointList_ = other.unlockedPointList_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureELDLGKEKABIIsMutable(); - eLDLGKEKABI_.addAll(other.eLDLGKEKABI_); + ensureUnlockedPointListIsMutable(); + unlockedPointList_.addAll(other.unlockedPointList_); } onChanged(); } - if (!other.kOPAHGHMECF_.isEmpty()) { - if (kOPAHGHMECF_.isEmpty()) { - kOPAHGHMECF_ = other.kOPAHGHMECF_; + if (!other.pointList_.isEmpty()) { + if (pointList_.isEmpty()) { + pointList_ = other.pointList_; bitField0_ = (bitField0_ & ~0x00000002); } else { - ensureKOPAHGHMECFIsMutable(); - kOPAHGHMECF_.addAll(other.kOPAHGHMECF_); + ensurePointListIsMutable(); + pointList_.addAll(other.pointList_); } onChanged(); } - if (other.getSceneId() != 0) { - setSceneId(other.getSceneId()); - } - if (!other.pointList_.isEmpty()) { - if (pointList_.isEmpty()) { - pointList_ = other.pointList_; + if (!other.dOGDPAFIMJD_.isEmpty()) { + if (dOGDPAFIMJD_.isEmpty()) { + dOGDPAFIMJD_ = other.dOGDPAFIMJD_; bitField0_ = (bitField0_ & ~0x00000004); } else { - ensurePointListIsMutable(); - pointList_.addAll(other.pointList_); + ensureDOGDPAFIMJDIsMutable(); + dOGDPAFIMJD_.addAll(other.dOGDPAFIMJD_); } onChanged(); } - if (!other.jCLHNODLPOH_.isEmpty()) { - if (jCLHNODLPOH_.isEmpty()) { - jCLHNODLPOH_ = other.jCLHNODLPOH_; + if (!other.jDNMBINKNGK_.isEmpty()) { + if (jDNMBINKNGK_.isEmpty()) { + jDNMBINKNGK_ = other.jDNMBINKNGK_; bitField0_ = (bitField0_ & ~0x00000008); } else { - ensureJCLHNODLPOHIsMutable(); - jCLHNODLPOH_.addAll(other.jCLHNODLPOH_); + ensureJDNMBINKNGKIsMutable(); + jDNMBINKNGK_.addAll(other.jDNMBINKNGK_); } onChanged(); } + if (other.getSceneId() != 0) { + setSceneId(other.getSceneId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -889,352 +879,352 @@ public Builder mergeFrom( } private int bitField0_; - private com.google.protobuf.Internal.IntList eLDLGKEKABI_ = emptyIntList(); - private void ensureELDLGKEKABIIsMutable() { + private com.google.protobuf.Internal.IntList unlockedPointList_ = emptyIntList(); + private void ensureUnlockedPointListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - eLDLGKEKABI_ = mutableCopy(eLDLGKEKABI_); + unlockedPointList_ = mutableCopy(unlockedPointList_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 ELDLGKEKABI = 6; - * @return A list containing the eLDLGKEKABI. + * repeated uint32 unlocked_point_list = 11; + * @return A list containing the unlockedPointList. */ public java.util.List - getELDLGKEKABIList() { + getUnlockedPointListList() { return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(eLDLGKEKABI_) : eLDLGKEKABI_; + java.util.Collections.unmodifiableList(unlockedPointList_) : unlockedPointList_; } /** - * repeated uint32 ELDLGKEKABI = 6; - * @return The count of eLDLGKEKABI. + * repeated uint32 unlocked_point_list = 11; + * @return The count of unlockedPointList. */ - public int getELDLGKEKABICount() { - return eLDLGKEKABI_.size(); + public int getUnlockedPointListCount() { + return unlockedPointList_.size(); } /** - * repeated uint32 ELDLGKEKABI = 6; + * repeated uint32 unlocked_point_list = 11; * @param index The index of the element to return. - * @return The eLDLGKEKABI at the given index. + * @return The unlockedPointList at the given index. */ - public int getELDLGKEKABI(int index) { - return eLDLGKEKABI_.getInt(index); + public int getUnlockedPointList(int index) { + return unlockedPointList_.getInt(index); } /** - * repeated uint32 ELDLGKEKABI = 6; + * repeated uint32 unlocked_point_list = 11; * @param index The index to set the value at. - * @param value The eLDLGKEKABI to set. + * @param value The unlockedPointList to set. * @return This builder for chaining. */ - public Builder setELDLGKEKABI( + public Builder setUnlockedPointList( int index, int value) { - ensureELDLGKEKABIIsMutable(); - eLDLGKEKABI_.setInt(index, value); + ensureUnlockedPointListIsMutable(); + unlockedPointList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 ELDLGKEKABI = 6; - * @param value The eLDLGKEKABI to add. + * repeated uint32 unlocked_point_list = 11; + * @param value The unlockedPointList to add. * @return This builder for chaining. */ - public Builder addELDLGKEKABI(int value) { - ensureELDLGKEKABIIsMutable(); - eLDLGKEKABI_.addInt(value); + public Builder addUnlockedPointList(int value) { + ensureUnlockedPointListIsMutable(); + unlockedPointList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 ELDLGKEKABI = 6; - * @param values The eLDLGKEKABI to add. + * repeated uint32 unlocked_point_list = 11; + * @param values The unlockedPointList to add. * @return This builder for chaining. */ - public Builder addAllELDLGKEKABI( + public Builder addAllUnlockedPointList( java.lang.Iterable values) { - ensureELDLGKEKABIIsMutable(); + ensureUnlockedPointListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, eLDLGKEKABI_); + values, unlockedPointList_); onChanged(); return this; } /** - * repeated uint32 ELDLGKEKABI = 6; + * repeated uint32 unlocked_point_list = 11; * @return This builder for chaining. */ - public Builder clearELDLGKEKABI() { - eLDLGKEKABI_ = emptyIntList(); + public Builder clearUnlockedPointList() { + unlockedPointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - private com.google.protobuf.Internal.IntList kOPAHGHMECF_ = emptyIntList(); - private void ensureKOPAHGHMECFIsMutable() { + private com.google.protobuf.Internal.IntList pointList_ = emptyIntList(); + private void ensurePointListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - kOPAHGHMECF_ = mutableCopy(kOPAHGHMECF_); + pointList_ = mutableCopy(pointList_); bitField0_ |= 0x00000002; } } /** - * repeated uint32 KOPAHGHMECF = 4; - * @return A list containing the kOPAHGHMECF. + * repeated uint32 point_list = 13; + * @return A list containing the pointList. */ public java.util.List - getKOPAHGHMECFList() { + getPointListList() { return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(kOPAHGHMECF_) : kOPAHGHMECF_; + java.util.Collections.unmodifiableList(pointList_) : pointList_; } /** - * repeated uint32 KOPAHGHMECF = 4; - * @return The count of kOPAHGHMECF. + * repeated uint32 point_list = 13; + * @return The count of pointList. */ - public int getKOPAHGHMECFCount() { - return kOPAHGHMECF_.size(); + public int getPointListCount() { + return pointList_.size(); } /** - * repeated uint32 KOPAHGHMECF = 4; + * repeated uint32 point_list = 13; * @param index The index of the element to return. - * @return The kOPAHGHMECF at the given index. + * @return The pointList at the given index. */ - public int getKOPAHGHMECF(int index) { - return kOPAHGHMECF_.getInt(index); + public int getPointList(int index) { + return pointList_.getInt(index); } /** - * repeated uint32 KOPAHGHMECF = 4; + * repeated uint32 point_list = 13; * @param index The index to set the value at. - * @param value The kOPAHGHMECF to set. + * @param value The pointList to set. * @return This builder for chaining. */ - public Builder setKOPAHGHMECF( + public Builder setPointList( int index, int value) { - ensureKOPAHGHMECFIsMutable(); - kOPAHGHMECF_.setInt(index, value); + ensurePointListIsMutable(); + pointList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 KOPAHGHMECF = 4; - * @param value The kOPAHGHMECF to add. + * repeated uint32 point_list = 13; + * @param value The pointList to add. * @return This builder for chaining. */ - public Builder addKOPAHGHMECF(int value) { - ensureKOPAHGHMECFIsMutable(); - kOPAHGHMECF_.addInt(value); + public Builder addPointList(int value) { + ensurePointListIsMutable(); + pointList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 KOPAHGHMECF = 4; - * @param values The kOPAHGHMECF to add. + * repeated uint32 point_list = 13; + * @param values The pointList to add. * @return This builder for chaining. */ - public Builder addAllKOPAHGHMECF( + public Builder addAllPointList( java.lang.Iterable values) { - ensureKOPAHGHMECFIsMutable(); + ensurePointListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kOPAHGHMECF_); + values, pointList_); onChanged(); return this; } /** - * repeated uint32 KOPAHGHMECF = 4; + * repeated uint32 point_list = 13; * @return This builder for chaining. */ - public Builder clearKOPAHGHMECF() { - kOPAHGHMECF_ = emptyIntList(); + public Builder clearPointList() { + pointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private int sceneId_ ; - /** - * uint32 scene_id = 12; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - /** - * uint32 scene_id = 12; - * @param value The sceneId to set. - * @return This builder for chaining. - */ - public Builder setSceneId(int value) { - - sceneId_ = value; - onChanged(); - return this; - } - /** - * uint32 scene_id = 12; - * @return This builder for chaining. - */ - public Builder clearSceneId() { - - sceneId_ = 0; - onChanged(); - return this; - } - - private com.google.protobuf.Internal.IntList pointList_ = emptyIntList(); - private void ensurePointListIsMutable() { + private com.google.protobuf.Internal.IntList dOGDPAFIMJD_ = emptyIntList(); + private void ensureDOGDPAFIMJDIsMutable() { if (!((bitField0_ & 0x00000004) != 0)) { - pointList_ = mutableCopy(pointList_); + dOGDPAFIMJD_ = mutableCopy(dOGDPAFIMJD_); bitField0_ |= 0x00000004; } } /** - * repeated uint32 point_list = 2; - * @return A list containing the pointList. + * repeated uint32 DOGDPAFIMJD = 12; + * @return A list containing the dOGDPAFIMJD. */ public java.util.List - getPointListList() { + getDOGDPAFIMJDList() { return ((bitField0_ & 0x00000004) != 0) ? - java.util.Collections.unmodifiableList(pointList_) : pointList_; + java.util.Collections.unmodifiableList(dOGDPAFIMJD_) : dOGDPAFIMJD_; } /** - * repeated uint32 point_list = 2; - * @return The count of pointList. + * repeated uint32 DOGDPAFIMJD = 12; + * @return The count of dOGDPAFIMJD. */ - public int getPointListCount() { - return pointList_.size(); + public int getDOGDPAFIMJDCount() { + return dOGDPAFIMJD_.size(); } /** - * repeated uint32 point_list = 2; + * repeated uint32 DOGDPAFIMJD = 12; * @param index The index of the element to return. - * @return The pointList at the given index. + * @return The dOGDPAFIMJD at the given index. */ - public int getPointList(int index) { - return pointList_.getInt(index); + public int getDOGDPAFIMJD(int index) { + return dOGDPAFIMJD_.getInt(index); } /** - * repeated uint32 point_list = 2; + * repeated uint32 DOGDPAFIMJD = 12; * @param index The index to set the value at. - * @param value The pointList to set. + * @param value The dOGDPAFIMJD to set. * @return This builder for chaining. */ - public Builder setPointList( + public Builder setDOGDPAFIMJD( int index, int value) { - ensurePointListIsMutable(); - pointList_.setInt(index, value); + ensureDOGDPAFIMJDIsMutable(); + dOGDPAFIMJD_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 point_list = 2; - * @param value The pointList to add. + * repeated uint32 DOGDPAFIMJD = 12; + * @param value The dOGDPAFIMJD to add. * @return This builder for chaining. */ - public Builder addPointList(int value) { - ensurePointListIsMutable(); - pointList_.addInt(value); + public Builder addDOGDPAFIMJD(int value) { + ensureDOGDPAFIMJDIsMutable(); + dOGDPAFIMJD_.addInt(value); onChanged(); return this; } /** - * repeated uint32 point_list = 2; - * @param values The pointList to add. + * repeated uint32 DOGDPAFIMJD = 12; + * @param values The dOGDPAFIMJD to add. * @return This builder for chaining. */ - public Builder addAllPointList( + public Builder addAllDOGDPAFIMJD( java.lang.Iterable values) { - ensurePointListIsMutable(); + ensureDOGDPAFIMJDIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, pointList_); + values, dOGDPAFIMJD_); onChanged(); return this; } /** - * repeated uint32 point_list = 2; + * repeated uint32 DOGDPAFIMJD = 12; * @return This builder for chaining. */ - public Builder clearPointList() { - pointList_ = emptyIntList(); + public Builder clearDOGDPAFIMJD() { + dOGDPAFIMJD_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } - private com.google.protobuf.Internal.IntList jCLHNODLPOH_ = emptyIntList(); - private void ensureJCLHNODLPOHIsMutable() { + private com.google.protobuf.Internal.IntList jDNMBINKNGK_ = emptyIntList(); + private void ensureJDNMBINKNGKIsMutable() { if (!((bitField0_ & 0x00000008) != 0)) { - jCLHNODLPOH_ = mutableCopy(jCLHNODLPOH_); + jDNMBINKNGK_ = mutableCopy(jDNMBINKNGK_); bitField0_ |= 0x00000008; } } /** - * repeated uint32 JCLHNODLPOH = 11; - * @return A list containing the jCLHNODLPOH. + * repeated uint32 JDNMBINKNGK = 5; + * @return A list containing the jDNMBINKNGK. */ public java.util.List - getJCLHNODLPOHList() { + getJDNMBINKNGKList() { return ((bitField0_ & 0x00000008) != 0) ? - java.util.Collections.unmodifiableList(jCLHNODLPOH_) : jCLHNODLPOH_; + java.util.Collections.unmodifiableList(jDNMBINKNGK_) : jDNMBINKNGK_; } /** - * repeated uint32 JCLHNODLPOH = 11; - * @return The count of jCLHNODLPOH. + * repeated uint32 JDNMBINKNGK = 5; + * @return The count of jDNMBINKNGK. */ - public int getJCLHNODLPOHCount() { - return jCLHNODLPOH_.size(); + public int getJDNMBINKNGKCount() { + return jDNMBINKNGK_.size(); } /** - * repeated uint32 JCLHNODLPOH = 11; + * repeated uint32 JDNMBINKNGK = 5; * @param index The index of the element to return. - * @return The jCLHNODLPOH at the given index. + * @return The jDNMBINKNGK at the given index. */ - public int getJCLHNODLPOH(int index) { - return jCLHNODLPOH_.getInt(index); + public int getJDNMBINKNGK(int index) { + return jDNMBINKNGK_.getInt(index); } /** - * repeated uint32 JCLHNODLPOH = 11; + * repeated uint32 JDNMBINKNGK = 5; * @param index The index to set the value at. - * @param value The jCLHNODLPOH to set. + * @param value The jDNMBINKNGK to set. * @return This builder for chaining. */ - public Builder setJCLHNODLPOH( + public Builder setJDNMBINKNGK( int index, int value) { - ensureJCLHNODLPOHIsMutable(); - jCLHNODLPOH_.setInt(index, value); + ensureJDNMBINKNGKIsMutable(); + jDNMBINKNGK_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 JCLHNODLPOH = 11; - * @param value The jCLHNODLPOH to add. + * repeated uint32 JDNMBINKNGK = 5; + * @param value The jDNMBINKNGK to add. * @return This builder for chaining. */ - public Builder addJCLHNODLPOH(int value) { - ensureJCLHNODLPOHIsMutable(); - jCLHNODLPOH_.addInt(value); + public Builder addJDNMBINKNGK(int value) { + ensureJDNMBINKNGKIsMutable(); + jDNMBINKNGK_.addInt(value); onChanged(); return this; } /** - * repeated uint32 JCLHNODLPOH = 11; - * @param values The jCLHNODLPOH to add. + * repeated uint32 JDNMBINKNGK = 5; + * @param values The jDNMBINKNGK to add. * @return This builder for chaining. */ - public Builder addAllJCLHNODLPOH( + public Builder addAllJDNMBINKNGK( java.lang.Iterable values) { - ensureJCLHNODLPOHIsMutable(); + ensureJDNMBINKNGKIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, jCLHNODLPOH_); + values, jDNMBINKNGK_); onChanged(); return this; } /** - * repeated uint32 JCLHNODLPOH = 11; + * repeated uint32 JDNMBINKNGK = 5; * @return This builder for chaining. */ - public Builder clearJCLHNODLPOH() { - jCLHNODLPOH_ = emptyIntList(); + public Builder clearJDNMBINKNGK() { + jDNMBINKNGK_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } + + private int sceneId_ ; + /** + * uint32 scene_id = 1; + * @return The sceneId. + */ + @java.lang.Override + public int getSceneId() { + return sceneId_; + } + /** + * uint32 scene_id = 1; + * @param value The sceneId to set. + * @return This builder for chaining. + */ + public Builder setSceneId(int value) { + + sceneId_ = value; + onChanged(); + return this; + } + /** + * uint32 scene_id = 1; + * @return This builder for chaining. + */ + public Builder clearSceneId() { + + sceneId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1302,11 +1292,12 @@ public emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlo descriptor; static { java.lang.String[] descriptorData = { - "\n\034ScenePointUnlockNotify.proto\"}\n\026SceneP" + - "ointUnlockNotify\022\023\n\013ELDLGKEKABI\030\006 \003(\r\022\023\n" + - "\013KOPAHGHMECF\030\004 \003(\r\022\020\n\010scene_id\030\014 \001(\r\022\022\n\n" + - "point_list\030\002 \003(\r\022\023\n\013JCLHNODLPOH\030\013 \003(\rB\033\n" + - "\031emu.grasscutter.net.protob\006proto3" + "\n\034ScenePointUnlockNotify.proto\"\205\001\n\026Scene" + + "PointUnlockNotify\022\033\n\023unlocked_point_list" + + "\030\013 \003(\r\022\022\n\npoint_list\030\r \003(\r\022\023\n\013DOGDPAFIMJ" + + "D\030\014 \003(\r\022\023\n\013JDNMBINKNGK\030\005 \003(\r\022\020\n\010scene_id" + + "\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1317,7 +1308,7 @@ public emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlo internal_static_ScenePointUnlockNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ScenePointUnlockNotify_descriptor, - new java.lang.String[] { "ELDLGKEKABI", "KOPAHGHMECF", "SceneId", "PointList", "JCLHNODLPOH", }); + new java.lang.String[] { "UnlockedPointList", "PointList", "DOGDPAFIMJD", "JDNMBINKNGK", "SceneId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java index bf1aeb7545d..d437067876f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java @@ -19,32 +19,27 @@ public interface SetEntityClientDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 entity_id = 10; - * @return The entityId. - */ - int getEntityId(); - - /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; * @return Whether the entityClientData field is set. */ boolean hasEntityClientData(); /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; * @return The entityClientData. */ emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData getEntityClientData(); /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder getEntityClientDataOrBuilder(); + + /** + * uint32 entity_id = 4; + * @return The entityId. + */ + int getEntityId(); } /** - * 
-   * CmdId: 1139
-   * Obf: ICKIGFONKFE
-   *
- * * Protobuf type {@code SetEntityClientDataNotify} */ public static final class SetEntityClientDataNotify extends @@ -89,7 +84,7 @@ private SetEntityClientDataNotify( case 0: done = true; break; - case 34: { + case 18: { emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder subBuilder = null; if (entityClientData_ != null) { subBuilder = entityClientData_.toBuilder(); @@ -102,7 +97,7 @@ private SetEntityClientDataNotify( break; } - case 80: { + case 32: { entityId_ = input.readUInt32(); break; @@ -139,21 +134,10 @@ private SetEntityClientDataNotify( emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify.class, emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify.Builder.class); } - public static final int ENTITY_ID_FIELD_NUMBER = 10; - private int entityId_; - /** - * uint32 entity_id = 10; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - - public static final int ENTITY_CLIENT_DATA_FIELD_NUMBER = 4; + public static final int ENTITY_CLIENT_DATA_FIELD_NUMBER = 2; private emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData entityClientData_; /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; * @return Whether the entityClientData field is set. */ @java.lang.Override @@ -161,7 +145,7 @@ public boolean hasEntityClientData() { return entityClientData_ != null; } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; * @return The entityClientData. */ @java.lang.Override @@ -169,13 +153,24 @@ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData get return entityClientData_ == null ? emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.getDefaultInstance() : entityClientData_; } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ @java.lang.Override public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder getEntityClientDataOrBuilder() { return getEntityClientData(); } + public static final int ENTITY_ID_FIELD_NUMBER = 4; + private int entityId_; + /** + * uint32 entity_id = 4; + * @return The entityId. + */ + @java.lang.Override + public int getEntityId() { + return entityId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -191,10 +186,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (entityClientData_ != null) { - output.writeMessage(4, getEntityClientData()); + output.writeMessage(2, getEntityClientData()); } if (entityId_ != 0) { - output.writeUInt32(10, entityId_); + output.writeUInt32(4, entityId_); } unknownFields.writeTo(output); } @@ -207,11 +202,11 @@ public int getSerializedSize() { size = 0; if (entityClientData_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getEntityClientData()); + .computeMessageSize(2, getEntityClientData()); } if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, entityId_); + .computeUInt32Size(4, entityId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -228,13 +223,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify other = (emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify) obj; - if (getEntityId() - != other.getEntityId()) return false; if (hasEntityClientData() != other.hasEntityClientData()) return false; if (hasEntityClientData()) { if (!getEntityClientData() .equals(other.getEntityClientData())) return false; } + if (getEntityId() + != other.getEntityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -246,12 +241,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); if (hasEntityClientData()) { hash = (37 * hash) + ENTITY_CLIENT_DATA_FIELD_NUMBER; hash = (53 * hash) + getEntityClientData().hashCode(); } + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -348,11 +343,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 1139
-     * Obf: ICKIGFONKFE
-     *
- * * Protobuf type {@code SetEntityClientDataNotify} */ public static final class Builder extends @@ -390,14 +380,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - entityId_ = 0; - if (entityClientDataBuilder_ == null) { entityClientData_ = null; } else { entityClientData_ = null; entityClientDataBuilder_ = null; } + entityId_ = 0; + return this; } @@ -424,12 +414,12 @@ public emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityCl @java.lang.Override public emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify buildPartial() { emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify result = new emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify(this); - result.entityId_ = entityId_; if (entityClientDataBuilder_ == null) { result.entityClientData_ = entityClientData_; } else { result.entityClientData_ = entityClientDataBuilder_.build(); } + result.entityId_ = entityId_; onBuilt(); return result; } @@ -478,12 +468,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify other) { if (other == emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify.getDefaultInstance()) return this; - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); - } if (other.hasEntityClientData()) { mergeEntityClientData(other.getEntityClientData()); } + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -513,49 +503,18 @@ public Builder mergeFrom( return this; } - private int entityId_ ; - /** - * uint32 entity_id = 10; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - /** - * uint32 entity_id = 10; - * @param value The entityId to set. - * @return This builder for chaining. - */ - public Builder setEntityId(int value) { - - entityId_ = value; - onChanged(); - return this; - } - /** - * uint32 entity_id = 10; - * @return This builder for chaining. - */ - public Builder clearEntityId() { - - entityId_ = 0; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData entityClientData_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder> entityClientDataBuilder_; /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; * @return Whether the entityClientData field is set. */ public boolean hasEntityClientData() { return entityClientDataBuilder_ != null || entityClientData_ != null; } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; * @return The entityClientData. */ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData getEntityClientData() { @@ -566,7 +525,7 @@ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData get } } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ public Builder setEntityClientData(emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData value) { if (entityClientDataBuilder_ == null) { @@ -582,7 +541,7 @@ public Builder setEntityClientData(emu.grasscutter.net.proto.EntityClientDataOut return this; } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ public Builder setEntityClientData( emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder builderForValue) { @@ -596,7 +555,7 @@ public Builder setEntityClientData( return this; } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ public Builder mergeEntityClientData(emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData value) { if (entityClientDataBuilder_ == null) { @@ -614,7 +573,7 @@ public Builder mergeEntityClientData(emu.grasscutter.net.proto.EntityClientDataO return this; } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ public Builder clearEntityClientData() { if (entityClientDataBuilder_ == null) { @@ -628,7 +587,7 @@ public Builder clearEntityClientData() { return this; } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder getEntityClientDataBuilder() { @@ -636,7 +595,7 @@ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Bui return getEntityClientDataFieldBuilder().getBuilder(); } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder getEntityClientDataOrBuilder() { if (entityClientDataBuilder_ != null) { @@ -647,7 +606,7 @@ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBu } } /** - * .EntityClientData entity_client_data = 4; + * .EntityClientData entity_client_data = 2; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder> @@ -662,6 +621,37 @@ public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBu } return entityClientDataBuilder_; } + + private int entityId_ ; + /** + * uint32 entity_id = 4; + * @return The entityId. + */ + @java.lang.Override + public int getEntityId() { + return entityId_; + } + /** + * uint32 entity_id = 4; + * @param value The entityId to set. + * @return This builder for chaining. + */ + public Builder setEntityId(int value) { + + entityId_ = value; + onChanged(); + return this; + } + /** + * uint32 entity_id = 4; + * @return This builder for chaining. + */ + public Builder clearEntityId() { + + entityId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -731,8 +721,8 @@ public emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityCl java.lang.String[] descriptorData = { "\n\037SetEntityClientDataNotify.proto\032\026Entit" + "yClientData.proto\"]\n\031SetEntityClientData" + - "Notify\022\021\n\tentity_id\030\n \001(\r\022-\n\022entity_clie" + - "nt_data\030\004 \001(\0132\021.EntityClientDataB\033\n\031emu." + + "Notify\022-\n\022entity_client_data\030\002 \001(\0132\021.Ent" + + "ityClientData\022\021\n\tentity_id\030\004 \001(\rB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -745,7 +735,7 @@ public emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityCl internal_static_SetEntityClientDataNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SetEntityClientDataNotify_descriptor, - new java.lang.String[] { "EntityId", "EntityClientData", }); + new java.lang.String[] { "EntityClientData", "EntityId", }); emu.grasscutter.net.proto.EntityClientDataOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java index b55209f749c..15700f26eb9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java @@ -19,23 +19,18 @@ public interface TakeoffEquipReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 slot = 14; + * uint32 slot = 3; * @return The slot. */ int getSlot(); /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 14; * @return The avatarGuid. */ long getAvatarGuid(); } /** - * 
-   * CmdId: 23894
-   * Obf: MGOICFILCBB
-   *
- * * Protobuf type {@code TakeoffEquipReq} */ public static final class TakeoffEquipReq extends @@ -80,14 +75,14 @@ private TakeoffEquipReq( case 0: done = true; break; - case 40: { + case 24: { - avatarGuid_ = input.readUInt64(); + slot_ = input.readUInt32(); break; } case 112: { - slot_ = input.readUInt32(); + avatarGuid_ = input.readUInt64(); break; } default: { @@ -122,10 +117,10 @@ private TakeoffEquipReq( emu.grasscutter.net.proto.TakeoffEquipReqOuterClass.TakeoffEquipReq.class, emu.grasscutter.net.proto.TakeoffEquipReqOuterClass.TakeoffEquipReq.Builder.class); } - public static final int SLOT_FIELD_NUMBER = 14; + public static final int SLOT_FIELD_NUMBER = 3; private int slot_; /** - * uint32 slot = 14; + * uint32 slot = 3; * @return The slot. */ @java.lang.Override @@ -133,10 +128,10 @@ public int getSlot() { return slot_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 5; + public static final int AVATAR_GUID_FIELD_NUMBER = 14; private long avatarGuid_; /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 14; * @return The avatarGuid. */ @java.lang.Override @@ -158,11 +153,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (avatarGuid_ != 0L) { - output.writeUInt64(5, avatarGuid_); - } if (slot_ != 0) { - output.writeUInt32(14, slot_); + output.writeUInt32(3, slot_); + } + if (avatarGuid_ != 0L) { + output.writeUInt64(14, avatarGuid_); } unknownFields.writeTo(output); } @@ -173,13 +168,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (avatarGuid_ != 0L) { + if (slot_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(5, avatarGuid_); + .computeUInt32Size(3, slot_); } - if (slot_ != 0) { + if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, slot_); + .computeUInt64Size(14, avatarGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -312,11 +307,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 23894
-     * Obf: MGOICFILCBB
-     *
- * * Protobuf type {@code TakeoffEquipReq} */ public static final class Builder extends @@ -471,7 +461,7 @@ public Builder mergeFrom( private int slot_ ; /** - * uint32 slot = 14; + * uint32 slot = 3; * @return The slot. */ @java.lang.Override @@ -479,7 +469,7 @@ public int getSlot() { return slot_; } /** - * uint32 slot = 14; + * uint32 slot = 3; * @param value The slot to set. * @return This builder for chaining. */ @@ -490,7 +480,7 @@ public Builder setSlot(int value) { return this; } /** - * uint32 slot = 14; + * uint32 slot = 3; * @return This builder for chaining. */ public Builder clearSlot() { @@ -502,7 +492,7 @@ public Builder clearSlot() { private long avatarGuid_ ; /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 14; * @return The avatarGuid. */ @java.lang.Override @@ -510,7 +500,7 @@ public long getAvatarGuid() { return avatarGuid_; } /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 14; * @param value The avatarGuid to set. * @return This builder for chaining. */ @@ -521,7 +511,7 @@ public Builder setAvatarGuid(long value) { return this; } /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 14; * @return This builder for chaining. */ public Builder clearAvatarGuid() { @@ -598,7 +588,7 @@ public emu.grasscutter.net.proto.TakeoffEquipReqOuterClass.TakeoffEquipReq getDe static { java.lang.String[] descriptorData = { "\n\025TakeoffEquipReq.proto\"4\n\017TakeoffEquipR" + - "eq\022\014\n\004slot\030\016 \001(\r\022\023\n\013avatar_guid\030\005 \001(\004B\033\n" + + "eq\022\014\n\004slot\030\003 \001(\r\022\023\n\013avatar_guid\030\016 \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/TakeoffEquipRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipRspOuterClass.java index e666a3912c7..ae131c18b3e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipRspOuterClass.java @@ -19,29 +19,24 @@ public interface TakeoffEquipRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 avatar_guid = 13; - * @return The avatarGuid. + * int32 retcode = 8; + * @return The retcode. */ - long getAvatarGuid(); + int getRetcode(); /** - * uint32 slot = 12; + * uint32 slot = 10; * @return The slot. */ int getSlot(); /** - * int32 retcode = 15; - * @return The retcode. + * uint64 avatar_guid = 4; + * @return The avatarGuid. */ - int getRetcode(); + long getAvatarGuid(); } /** - * 
-   * CmdId: 24431
-   * Obf: IPGHDPELLAL
-   *
- * * Protobuf type {@code TakeoffEquipRsp} */ public static final class TakeoffEquipRsp extends @@ -86,19 +81,19 @@ private TakeoffEquipRsp( case 0: done = true; break; - case 96: { + case 32: { - slot_ = input.readUInt32(); + avatarGuid_ = input.readUInt64(); break; } - case 104: { + case 64: { - avatarGuid_ = input.readUInt64(); + retcode_ = input.readInt32(); break; } - case 120: { + case 80: { - retcode_ = input.readInt32(); + slot_ = input.readUInt32(); break; } default: { @@ -133,21 +128,21 @@ private TakeoffEquipRsp( emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp.class, emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp.Builder.class); } - public static final int AVATAR_GUID_FIELD_NUMBER = 13; - private long avatarGuid_; + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; /** - * uint64 avatar_guid = 13; - * @return The avatarGuid. + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getRetcode() { + return retcode_; } - public static final int SLOT_FIELD_NUMBER = 12; + public static final int SLOT_FIELD_NUMBER = 10; private int slot_; /** - * uint32 slot = 12; + * uint32 slot = 10; * @return The slot. */ @java.lang.Override @@ -155,15 +150,15 @@ public int getSlot() { return slot_; } - public static final int RETCODE_FIELD_NUMBER = 15; - private int retcode_; + public static final int AVATAR_GUID_FIELD_NUMBER = 4; + private long avatarGuid_; /** - * int32 retcode = 15; - * @return The retcode. + * uint64 avatar_guid = 4; + * @return The avatarGuid. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public long getAvatarGuid() { + return avatarGuid_; } private byte memoizedIsInitialized = -1; @@ -180,14 +175,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (slot_ != 0) { - output.writeUInt32(12, slot_); - } if (avatarGuid_ != 0L) { - output.writeUInt64(13, avatarGuid_); + output.writeUInt64(4, avatarGuid_); } if (retcode_ != 0) { - output.writeInt32(15, retcode_); + output.writeInt32(8, retcode_); + } + if (slot_ != 0) { + output.writeUInt32(10, slot_); } unknownFields.writeTo(output); } @@ -198,17 +193,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (slot_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, slot_); - } if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(13, avatarGuid_); + .computeUInt64Size(4, avatarGuid_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(15, retcode_); + .computeInt32Size(8, retcode_); + } + if (slot_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(10, slot_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +220,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp other = (emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp) obj; - if (getAvatarGuid() - != other.getAvatarGuid()) return false; - if (getSlot() - != other.getSlot()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getSlot() + != other.getSlot()) return false; + if (getAvatarGuid() + != other.getAvatarGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,13 +237,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + SLOT_FIELD_NUMBER; + hash = (53 * hash) + getSlot(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); - hash = (37 * hash) + SLOT_FIELD_NUMBER; - hash = (53 * hash) + getSlot(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,11 +340,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 24431
-     * Obf: IPGHDPELLAL
-     *
- * * Protobuf type {@code TakeoffEquipRsp} */ public static final class Builder extends @@ -387,11 +377,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - avatarGuid_ = 0L; + retcode_ = 0; slot_ = 0; - retcode_ = 0; + avatarGuid_ = 0L; return this; } @@ -419,9 +409,9 @@ public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp build @java.lang.Override public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp buildPartial() { emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp result = new emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp(this); - result.avatarGuid_ = avatarGuid_; - result.slot_ = slot_; result.retcode_ = retcode_; + result.slot_ = slot_; + result.avatarGuid_ = avatarGuid_; onBuilt(); return result; } @@ -470,14 +460,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp other) { if (other == emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp.getDefaultInstance()) return this; - if (other.getAvatarGuid() != 0L) { - setAvatarGuid(other.getAvatarGuid()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } if (other.getSlot() != 0) { setSlot(other.getSlot()); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); + if (other.getAvatarGuid() != 0L) { + setAvatarGuid(other.getAvatarGuid()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -508,40 +498,40 @@ public Builder mergeFrom( return this; } - private long avatarGuid_ ; + private int retcode_ ; /** - * uint64 avatar_guid = 13; - * @return The avatarGuid. + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getRetcode() { + return retcode_; } /** - * uint64 avatar_guid = 13; - * @param value The avatarGuid to set. + * int32 retcode = 8; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setAvatarGuid(long value) { + public Builder setRetcode(int value) { - avatarGuid_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint64 avatar_guid = 13; + * int32 retcode = 8; * @return This builder for chaining. */ - public Builder clearAvatarGuid() { + public Builder clearRetcode() { - avatarGuid_ = 0L; + retcode_ = 0; onChanged(); return this; } private int slot_ ; /** - * uint32 slot = 12; + * uint32 slot = 10; * @return The slot. */ @java.lang.Override @@ -549,7 +539,7 @@ public int getSlot() { return slot_; } /** - * uint32 slot = 12; + * uint32 slot = 10; * @param value The slot to set. * @return This builder for chaining. */ @@ -560,7 +550,7 @@ public Builder setSlot(int value) { return this; } /** - * uint32 slot = 12; + * uint32 slot = 10; * @return This builder for chaining. */ public Builder clearSlot() { @@ -570,33 +560,33 @@ public Builder clearSlot() { return this; } - private int retcode_ ; + private long avatarGuid_ ; /** - * int32 retcode = 15; - * @return The retcode. + * uint64 avatar_guid = 4; + * @return The avatarGuid. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public long getAvatarGuid() { + return avatarGuid_; } /** - * int32 retcode = 15; - * @param value The retcode to set. + * uint64 avatar_guid = 4; + * @param value The avatarGuid to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setAvatarGuid(long value) { - retcode_ = value; + avatarGuid_ = value; onChanged(); return this; } /** - * int32 retcode = 15; + * uint64 avatar_guid = 4; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearAvatarGuid() { - retcode_ = 0; + avatarGuid_ = 0L; onChanged(); return this; } @@ -668,8 +658,8 @@ public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp getDe static { java.lang.String[] descriptorData = { "\n\025TakeoffEquipRsp.proto\"E\n\017TakeoffEquipR" + - "sp\022\023\n\013avatar_guid\030\r \001(\004\022\014\n\004slot\030\014 \001(\r\022\017\n" + - "\007retcode\030\017 \001(\005B\033\n\031emu.grasscutter.net.pr" + + "sp\022\017\n\007retcode\030\010 \001(\005\022\014\n\004slot\030\n \001(\r\022\023\n\013ava" + + "tar_guid\030\004 \001(\004B\033\n\031emu.grasscutter.net.pr" + "otob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +671,7 @@ public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp getDe internal_static_TakeoffEquipRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeoffEquipRsp_descriptor, - new java.lang.String[] { "AvatarGuid", "Slot", "Retcode", }); + new java.lang.String[] { "Retcode", "Slot", "AvatarGuid", }); } // @@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 915e62aa015..b20978ad029 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java @@ -19,17 +19,11 @@ public interface WeaponAwakenRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 12; - * @return The retcode. - */ - int getRetcode(); - - /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ int getOldAffixLevelMapCount(); /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ boolean containsOldAffixLevelMap( int key); @@ -40,30 +34,30 @@ boolean containsOldAffixLevelMap( java.util.Map getOldAffixLevelMap(); /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ java.util.Map getOldAffixLevelMapMap(); /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ int getOldAffixLevelMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ int getOldAffixLevelMapOrThrow( int key); /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ int getCurAffixLevelMapCount(); /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ boolean containsCurAffixLevelMap( int key); @@ -74,36 +68,42 @@ boolean containsCurAffixLevelMap( java.util.Map getCurAffixLevelMap(); /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ java.util.Map getCurAffixLevelMapMap(); /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ int getCurAffixLevelMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ int getCurAffixLevelMapOrThrow( int key); /** - * uint64 target_weapon_guid = 11; - * @return The targetWeaponGuid. + * int32 retcode = 10; + * @return The retcode. */ - long getTargetWeaponGuid(); + int getRetcode(); /** - * uint32 target_weapon_awaken_level = 1; + * 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. @@ -111,11 +111,6 @@ int getCurAffixLevelMapOrThrow( long getAvatarGuid(); } /** - * 
-   * CmdId: 26318
-   * Obf: BBBKJFJPFLK
-   *
- * * Protobuf type {@code WeaponAwakenRsp} */ public static final class WeaponAwakenRsp extends @@ -161,9 +156,22 @@ private WeaponAwakenRsp( case 0: done = true; break; - case 8: { + 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()); + break; + } + case 56: { - targetWeaponAwakenLevel_ = input.readUInt32(); + targetWeaponGuid_ = input.readUInt64(); break; } case 72: { @@ -171,7 +179,12 @@ private WeaponAwakenRsp( avatarGuid_ = input.readUInt64(); break; } - case 82: { + case 80: { + + retcode_ = input.readInt32(); + break; + } + case 98: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { curAffixLevelMap_ = com.google.protobuf.MapField.newMapField( CurAffixLevelMapDefaultEntryHolder.defaultEntry); @@ -184,27 +197,9 @@ private WeaponAwakenRsp( curAffixLevelMap__.getKey(), curAffixLevelMap__.getValue()); break; } - case 88: { - - targetWeaponGuid_ = input.readUInt64(); - break; - } - case 96: { + case 112: { - retcode_ = input.readInt32(); - break; - } - case 106: { - 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()); + targetWeaponAwakenLevel_ = input.readUInt32(); break; } default: { @@ -236,9 +231,9 @@ private WeaponAwakenRsp( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 13: + case 3: return internalGetOldAffixLevelMap(); - case 10: + case 12: return internalGetCurAffixLevelMap(); default: throw new RuntimeException( @@ -253,18 +248,7 @@ 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 RETCODE_FIELD_NUMBER = 12; - private int retcode_; - /** - * int32 retcode = 12; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER = 13; + public static final int OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER = 3; private static final class OldAffixLevelMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -291,7 +275,7 @@ public int getOldAffixLevelMapCount() { return internalGetOldAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -309,7 +293,7 @@ public java.util.Map getOldAffixLevelMap() return getOldAffixLevelMapMap(); } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -317,7 +301,7 @@ public java.util.Map getOldAffixLevelMapMa return internalGetOldAffixLevelMap().getMap(); } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -330,7 +314,7 @@ public int getOldAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -345,7 +329,7 @@ public int getOldAffixLevelMapOrThrow( return map.get(key); } - public static final int CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER = 10; + public static final int CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER = 12; private static final class CurAffixLevelMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -372,7 +356,7 @@ public int getCurAffixLevelMapCount() { return internalGetCurAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -390,7 +374,7 @@ public java.util.Map getCurAffixLevelMap() return getCurAffixLevelMapMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -398,7 +382,7 @@ public java.util.Map getCurAffixLevelMapMa return internalGetCurAffixLevelMap().getMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -411,7 +395,7 @@ public int getCurAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -426,21 +410,21 @@ public int getCurAffixLevelMapOrThrow( return map.get(key); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 11; - private long targetWeaponGuid_; + public static final int RETCODE_FIELD_NUMBER = 10; + private int retcode_; /** - * uint64 target_weapon_guid = 11; - * @return The targetWeaponGuid. + * int32 retcode = 10; + * @return The retcode. */ @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; + public int getRetcode() { + return retcode_; } - public static final int TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER = 1; + public static final int TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER = 14; private int targetWeaponAwakenLevel_; /** - * uint32 target_weapon_awaken_level = 1; + * uint32 target_weapon_awaken_level = 14; * @return The targetWeaponAwakenLevel. */ @java.lang.Override @@ -448,6 +432,17 @@ 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_; /** @@ -473,30 +468,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 (avatarGuid_ != 0L) { - output.writeUInt64(9, avatarGuid_); - } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, - internalGetCurAffixLevelMap(), - CurAffixLevelMapDefaultEntryHolder.defaultEntry, - 10); + internalGetOldAffixLevelMap(), + OldAffixLevelMapDefaultEntryHolder.defaultEntry, + 3); if (targetWeaponGuid_ != 0L) { - output.writeUInt64(11, targetWeaponGuid_); + output.writeUInt64(7, targetWeaponGuid_); + } + if (avatarGuid_ != 0L) { + output.writeUInt64(9, avatarGuid_); } if (retcode_ != 0) { - output.writeInt32(12, retcode_); + output.writeInt32(10, retcode_); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, - internalGetOldAffixLevelMap(), - OldAffixLevelMapDefaultEntryHolder.defaultEntry, - 13); + internalGetCurAffixLevelMap(), + CurAffixLevelMapDefaultEntryHolder.defaultEntry, + 12); + if (targetWeaponAwakenLevel_ != 0) { + output.writeUInt32(14, targetWeaponAwakenLevel_); + } unknownFields.writeTo(output); } @@ -506,41 +501,41 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (targetWeaponAwakenLevel_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, targetWeaponAwakenLevel_); - } - if (avatarGuid_ != 0L) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(9, avatarGuid_); - } 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(10, curAffixLevelMap__); + .computeMessageSize(3, oldAffixLevelMap__); } if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(11, targetWeaponGuid_); + .computeUInt64Size(7, targetWeaponGuid_); + } + if (avatarGuid_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeUInt64Size(9, avatarGuid_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(12, retcode_); + .computeInt32Size(10, retcode_); } for (java.util.Map.Entry entry - : internalGetOldAffixLevelMap().getMap().entrySet()) { + : internalGetCurAffixLevelMap().getMap().entrySet()) { com.google.protobuf.MapEntry - oldAffixLevelMap__ = OldAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType() + curAffixLevelMap__ = CurAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType() .setKey(entry.getKey()) .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, oldAffixLevelMap__); + .computeMessageSize(12, curAffixLevelMap__); + } + if (targetWeaponAwakenLevel_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(14, targetWeaponAwakenLevel_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -557,16 +552,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp other = (emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; if (!internalGetOldAffixLevelMap().equals( other.internalGetOldAffixLevelMap())) return false; if (!internalGetCurAffixLevelMap().equals( other.internalGetCurAffixLevelMap())) return false; - if (getTargetWeaponGuid() - != other.getTargetWeaponGuid()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (getTargetWeaponAwakenLevel() != other.getTargetWeaponAwakenLevel()) return false; + if (getTargetWeaponGuid() + != other.getTargetWeaponGuid()) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -580,8 +575,6 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); if (!internalGetOldAffixLevelMap().getMap().isEmpty()) { hash = (37 * hash) + OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetOldAffixLevelMap().hashCode(); @@ -590,11 +583,13 @@ 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) + TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getTargetWeaponAwakenLevel(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); @@ -694,11 +689,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 26318
-     * Obf: BBBKJFJPFLK
-     *
- * * Protobuf type {@code WeaponAwakenRsp} */ public static final class Builder extends @@ -714,9 +704,9 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 13: + case 3: return internalGetOldAffixLevelMap(); - case 10: + case 12: return internalGetCurAffixLevelMap(); default: throw new RuntimeException( @@ -727,9 +717,9 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 13: + case 3: return internalGetMutableOldAffixLevelMap(); - case 10: + case 12: return internalGetMutableCurAffixLevelMap(); default: throw new RuntimeException( @@ -762,14 +752,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; - internalGetMutableOldAffixLevelMap().clear(); internalGetMutableCurAffixLevelMap().clear(); - targetWeaponGuid_ = 0L; + retcode_ = 0; targetWeaponAwakenLevel_ = 0; + targetWeaponGuid_ = 0L; + avatarGuid_ = 0L; return this; @@ -799,13 +789,13 @@ 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.retcode_ = retcode_; result.oldAffixLevelMap_ = internalGetOldAffixLevelMap(); result.oldAffixLevelMap_.makeImmutable(); result.curAffixLevelMap_ = internalGetCurAffixLevelMap(); result.curAffixLevelMap_.makeImmutable(); - result.targetWeaponGuid_ = targetWeaponGuid_; + result.retcode_ = retcode_; result.targetWeaponAwakenLevel_ = targetWeaponAwakenLevel_; + result.targetWeaponGuid_ = targetWeaponGuid_; result.avatarGuid_ = avatarGuid_; onBuilt(); return result; @@ -855,19 +845,19 @@ 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; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } internalGetMutableOldAffixLevelMap().mergeFrom( other.internalGetOldAffixLevelMap()); internalGetMutableCurAffixLevelMap().mergeFrom( other.internalGetCurAffixLevelMap()); - if (other.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } if (other.getTargetWeaponAwakenLevel() != 0) { setTargetWeaponAwakenLevel(other.getTargetWeaponAwakenLevel()); } + if (other.getTargetWeaponGuid() != 0L) { + setTargetWeaponGuid(other.getTargetWeaponGuid()); + } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } @@ -901,37 +891,6 @@ public Builder mergeFrom( } private int bitField0_; - private int retcode_ ; - /** - * int32 retcode = 12; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 12; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 12; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.MapField< java.lang.Integer, java.lang.Integer> oldAffixLevelMap_; private com.google.protobuf.MapField @@ -959,7 +918,7 @@ public int getOldAffixLevelMapCount() { return internalGetOldAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -977,7 +936,7 @@ public java.util.Map getOldAffixLevelMap() return getOldAffixLevelMapMap(); } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -985,7 +944,7 @@ public java.util.Map getOldAffixLevelMapMa return internalGetOldAffixLevelMap().getMap(); } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -998,7 +957,7 @@ public int getOldAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ @java.lang.Override @@ -1019,7 +978,7 @@ public Builder clearOldAffixLevelMap() { return this; } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ public Builder removeOldAffixLevelMap( @@ -1038,7 +997,7 @@ public Builder removeOldAffixLevelMap( return internalGetMutableOldAffixLevelMap().getMutableMap(); } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ public Builder putOldAffixLevelMap( int key, @@ -1050,7 +1009,7 @@ public Builder putOldAffixLevelMap( return this; } /** - * map<uint32, uint32> old_affix_level_map = 13; + * map<uint32, uint32> old_affix_level_map = 3; */ public Builder putAllOldAffixLevelMap( @@ -1087,7 +1046,7 @@ public int getCurAffixLevelMapCount() { return internalGetCurAffixLevelMap().getMap().size(); } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -1105,7 +1064,7 @@ public java.util.Map getCurAffixLevelMap() return getCurAffixLevelMapMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -1113,7 +1072,7 @@ public java.util.Map getCurAffixLevelMapMa return internalGetCurAffixLevelMap().getMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -1126,7 +1085,7 @@ public int getCurAffixLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ @java.lang.Override @@ -1147,7 +1106,7 @@ public Builder clearCurAffixLevelMap() { return this; } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ public Builder removeCurAffixLevelMap( @@ -1166,7 +1125,7 @@ public Builder removeCurAffixLevelMap( return internalGetMutableCurAffixLevelMap().getMutableMap(); } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ public Builder putCurAffixLevelMap( int key, @@ -1178,7 +1137,7 @@ public Builder putCurAffixLevelMap( return this; } /** - * map<uint32, uint32> cur_affix_level_map = 10; + * map<uint32, uint32> cur_affix_level_map = 12; */ public Builder putAllCurAffixLevelMap( @@ -1188,40 +1147,40 @@ public Builder putAllCurAffixLevelMap( return this; } - private long targetWeaponGuid_ ; + private int retcode_ ; /** - * uint64 target_weapon_guid = 11; - * @return The targetWeaponGuid. + * int32 retcode = 10; + * @return The retcode. */ @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; + public int getRetcode() { + return retcode_; } /** - * uint64 target_weapon_guid = 11; - * @param value The targetWeaponGuid to set. + * int32 retcode = 10; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setTargetWeaponGuid(long value) { + public Builder setRetcode(int value) { - targetWeaponGuid_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint64 target_weapon_guid = 11; + * int32 retcode = 10; * @return This builder for chaining. */ - public Builder clearTargetWeaponGuid() { + public Builder clearRetcode() { - targetWeaponGuid_ = 0L; + retcode_ = 0; onChanged(); return this; } private int targetWeaponAwakenLevel_ ; /** - * uint32 target_weapon_awaken_level = 1; + * uint32 target_weapon_awaken_level = 14; * @return The targetWeaponAwakenLevel. */ @java.lang.Override @@ -1229,7 +1188,7 @@ public int getTargetWeaponAwakenLevel() { return targetWeaponAwakenLevel_; } /** - * uint32 target_weapon_awaken_level = 1; + * uint32 target_weapon_awaken_level = 14; * @param value The targetWeaponAwakenLevel to set. * @return This builder for chaining. */ @@ -1240,7 +1199,7 @@ public Builder setTargetWeaponAwakenLevel(int value) { return this; } /** - * uint32 target_weapon_awaken_level = 1; + * uint32 target_weapon_awaken_level = 14; * @return This builder for chaining. */ public Builder clearTargetWeaponAwakenLevel() { @@ -1250,6 +1209,37 @@ public Builder clearTargetWeaponAwakenLevel() { 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; @@ -1358,12 +1348,12 @@ public emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp getDe static { java.lang.String[] descriptorData = { "\n\025WeaponAwakenRsp.proto\"\363\002\n\017WeaponAwaken" + - "Rsp\022\017\n\007retcode\030\014 \001(\005\022C\n\023old_affix_level_" + - "map\030\r \003(\0132&.WeaponAwakenRsp.OldAffixLeve" + - "lMapEntry\022C\n\023cur_affix_level_map\030\n \003(\0132&" + - ".WeaponAwakenRsp.CurAffixLevelMapEntry\022\032" + - "\n\022target_weapon_guid\030\013 \001(\004\022\"\n\032target_wea" + - "pon_awaken_level\030\001 \001(\r\022\023\n\013avatar_guid\030\t " + + "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(" + "\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" + @@ -1378,7 +1368,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[] { "Retcode", "OldAffixLevelMap", "CurAffixLevelMap", "TargetWeaponGuid", "TargetWeaponAwakenLevel", "AvatarGuid", }); + new java.lang.String[] { "OldAffixLevelMap", "CurAffixLevelMap", "Retcode", "TargetWeaponAwakenLevel", "TargetWeaponGuid", "AvatarGuid", }); 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 0e4adc299e8..e745438eb29 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java @@ -19,17 +19,12 @@ public interface WeaponPromoteReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 target_weapon_guid = 12; + * uint64 target_weapon_guid = 8; * @return The targetWeaponGuid. */ long getTargetWeaponGuid(); } /** - * 
-   * CmdId: 23298
-   * Obf: LDCKBPMEBGB
-   *
- * * Protobuf type {@code WeaponPromoteReq} */ public static final class WeaponPromoteReq extends @@ -74,7 +69,7 @@ private WeaponPromoteReq( case 0: done = true; break; - case 96: { + case 64: { targetWeaponGuid_ = input.readUInt64(); break; @@ -111,10 +106,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 = 12; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 8; private long targetWeaponGuid_; /** - * uint64 target_weapon_guid = 12; + * uint64 target_weapon_guid = 8; * @return The targetWeaponGuid. */ @java.lang.Override @@ -137,7 +132,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (targetWeaponGuid_ != 0L) { - output.writeUInt64(12, targetWeaponGuid_); + output.writeUInt64(8, targetWeaponGuid_); } unknownFields.writeTo(output); } @@ -150,7 +145,7 @@ public int getSerializedSize() { size = 0; if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(12, targetWeaponGuid_); + .computeUInt64Size(8, targetWeaponGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,11 +274,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 23298
-     * Obf: LDCKBPMEBGB
-     *
- * * Protobuf type {@code WeaponPromoteReq} */ public static final class Builder extends @@ -432,7 +422,7 @@ public Builder mergeFrom( private long targetWeaponGuid_ ; /** - * uint64 target_weapon_guid = 12; + * uint64 target_weapon_guid = 8; * @return The targetWeaponGuid. */ @java.lang.Override @@ -440,7 +430,7 @@ public long getTargetWeaponGuid() { return targetWeaponGuid_; } /** - * uint64 target_weapon_guid = 12; + * uint64 target_weapon_guid = 8; * @param value The targetWeaponGuid to set. * @return This builder for chaining. */ @@ -451,7 +441,7 @@ public Builder setTargetWeaponGuid(long value) { return this; } /** - * uint64 target_weapon_guid = 12; + * uint64 target_weapon_guid = 8; * @return This builder for chaining. */ public Builder clearTargetWeaponGuid() { @@ -528,7 +518,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\014 \001(\004B\033\n\031emu." + + "eReq\022\032\n\022target_weapon_guid\030\010 \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 cbffa364284..c81c5876912 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java @@ -19,13 +19,19 @@ public interface WeaponPromoteRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 cur_promote_level = 4; + * uint64 target_weapon_guid = 13; + * @return The targetWeaponGuid. + */ + long getTargetWeaponGuid(); + + /** + * uint32 cur_promote_level = 3; * @return The curPromoteLevel. */ int getCurPromoteLevel(); /** - * uint32 old_promote_level = 14; + * uint32 old_promote_level = 4; * @return The oldPromoteLevel. */ int getOldPromoteLevel(); @@ -35,19 +41,8 @@ public interface WeaponPromoteRspOrBuilder extends * @return The retcode. */ int getRetcode(); - - /** - * uint64 target_weapon_guid = 3; - * @return The targetWeaponGuid. - */ - long getTargetWeaponGuid(); } /** - * 
-   * CmdId: 715
-   * Obf: DMDOBJKPENG
-   *
- * * Protobuf type {@code WeaponPromoteRsp} */ public static final class WeaponPromoteRsp extends @@ -94,12 +89,12 @@ private WeaponPromoteRsp( break; case 24: { - targetWeaponGuid_ = input.readUInt64(); + curPromoteLevel_ = input.readUInt32(); break; } case 32: { - curPromoteLevel_ = input.readUInt32(); + oldPromoteLevel_ = input.readUInt32(); break; } case 48: { @@ -107,9 +102,9 @@ private WeaponPromoteRsp( retcode_ = input.readInt32(); break; } - case 112: { + case 104: { - oldPromoteLevel_ = input.readUInt32(); + targetWeaponGuid_ = input.readUInt64(); break; } default: { @@ -144,10 +139,21 @@ private WeaponPromoteRsp( emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.class, emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.Builder.class); } - public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 4; + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 13; + private long targetWeaponGuid_; + /** + * uint64 target_weapon_guid = 13; + * @return The targetWeaponGuid. + */ + @java.lang.Override + public long getTargetWeaponGuid() { + return targetWeaponGuid_; + } + + public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 3; private int curPromoteLevel_; /** - * uint32 cur_promote_level = 4; + * uint32 cur_promote_level = 3; * @return The curPromoteLevel. */ @java.lang.Override @@ -155,10 +161,10 @@ public int getCurPromoteLevel() { return curPromoteLevel_; } - public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 14; + public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 4; private int oldPromoteLevel_; /** - * uint32 old_promote_level = 14; + * uint32 old_promote_level = 4; * @return The oldPromoteLevel. */ @java.lang.Override @@ -177,17 +183,6 @@ public int getRetcode() { return retcode_; } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 3; - private long targetWeaponGuid_; - /** - * uint64 target_weapon_guid = 3; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -202,17 +197,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (targetWeaponGuid_ != 0L) { - output.writeUInt64(3, targetWeaponGuid_); - } if (curPromoteLevel_ != 0) { - output.writeUInt32(4, curPromoteLevel_); + output.writeUInt32(3, curPromoteLevel_); + } + if (oldPromoteLevel_ != 0) { + output.writeUInt32(4, oldPromoteLevel_); } if (retcode_ != 0) { output.writeInt32(6, retcode_); } - if (oldPromoteLevel_ != 0) { - output.writeUInt32(14, oldPromoteLevel_); + if (targetWeaponGuid_ != 0L) { + output.writeUInt64(13, targetWeaponGuid_); } unknownFields.writeTo(output); } @@ -223,21 +218,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (targetWeaponGuid_ != 0L) { + if (curPromoteLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(3, targetWeaponGuid_); + .computeUInt32Size(3, curPromoteLevel_); } - if (curPromoteLevel_ != 0) { + if (oldPromoteLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, curPromoteLevel_); + .computeUInt32Size(4, oldPromoteLevel_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(6, retcode_); } - if (oldPromoteLevel_ != 0) { + if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, oldPromoteLevel_); + .computeUInt64Size(13, targetWeaponGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -254,14 +249,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other = (emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp) obj; + if (getTargetWeaponGuid() + != other.getTargetWeaponGuid()) return false; if (getCurPromoteLevel() != other.getCurPromoteLevel()) return false; if (getOldPromoteLevel() != other.getOldPromoteLevel()) return false; if (getRetcode() != other.getRetcode()) return false; - if (getTargetWeaponGuid() - != other.getTargetWeaponGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -273,15 +268,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()); hash = (37 * hash) + CUR_PROMOTE_LEVEL_FIELD_NUMBER; hash = (53 * hash) + getCurPromoteLevel(); hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER; hash = (53 * hash) + getOldPromoteLevel(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTargetWeaponGuid()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,11 +373,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 715
-     * Obf: DMDOBJKPENG
-     *
- * * Protobuf type {@code WeaponPromoteRsp} */ public static final class Builder extends @@ -420,14 +410,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + targetWeaponGuid_ = 0L; + curPromoteLevel_ = 0; oldPromoteLevel_ = 0; retcode_ = 0; - targetWeaponGuid_ = 0L; - return this; } @@ -454,10 +444,10 @@ public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp bui @java.lang.Override public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp buildPartial() { emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp result = new emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp(this); + result.targetWeaponGuid_ = targetWeaponGuid_; result.curPromoteLevel_ = curPromoteLevel_; result.oldPromoteLevel_ = oldPromoteLevel_; result.retcode_ = retcode_; - result.targetWeaponGuid_ = targetWeaponGuid_; onBuilt(); return result; } @@ -506,6 +496,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other) { if (other == emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.getDefaultInstance()) return this; + if (other.getTargetWeaponGuid() != 0L) { + setTargetWeaponGuid(other.getTargetWeaponGuid()); + } if (other.getCurPromoteLevel() != 0) { setCurPromoteLevel(other.getCurPromoteLevel()); } @@ -515,9 +508,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.We if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -547,9 +537,40 @@ public Builder mergeFrom( return this; } + private long targetWeaponGuid_ ; + /** + * uint64 target_weapon_guid = 13; + * @return The targetWeaponGuid. + */ + @java.lang.Override + public long getTargetWeaponGuid() { + return targetWeaponGuid_; + } + /** + * uint64 target_weapon_guid = 13; + * @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 = 13; + * @return This builder for chaining. + */ + public Builder clearTargetWeaponGuid() { + + targetWeaponGuid_ = 0L; + onChanged(); + return this; + } + private int curPromoteLevel_ ; /** - * uint32 cur_promote_level = 4; + * uint32 cur_promote_level = 3; * @return The curPromoteLevel. */ @java.lang.Override @@ -557,7 +578,7 @@ public int getCurPromoteLevel() { return curPromoteLevel_; } /** - * uint32 cur_promote_level = 4; + * uint32 cur_promote_level = 3; * @param value The curPromoteLevel to set. * @return This builder for chaining. */ @@ -568,7 +589,7 @@ public Builder setCurPromoteLevel(int value) { return this; } /** - * uint32 cur_promote_level = 4; + * uint32 cur_promote_level = 3; * @return This builder for chaining. */ public Builder clearCurPromoteLevel() { @@ -580,7 +601,7 @@ public Builder clearCurPromoteLevel() { private int oldPromoteLevel_ ; /** - * uint32 old_promote_level = 14; + * uint32 old_promote_level = 4; * @return The oldPromoteLevel. */ @java.lang.Override @@ -588,7 +609,7 @@ public int getOldPromoteLevel() { return oldPromoteLevel_; } /** - * uint32 old_promote_level = 14; + * uint32 old_promote_level = 4; * @param value The oldPromoteLevel to set. * @return This builder for chaining. */ @@ -599,7 +620,7 @@ public Builder setOldPromoteLevel(int value) { return this; } /** - * uint32 old_promote_level = 14; + * uint32 old_promote_level = 4; * @return This builder for chaining. */ public Builder clearOldPromoteLevel() { @@ -639,37 +660,6 @@ public Builder clearRetcode() { onChanged(); return this; } - - private long targetWeaponGuid_ ; - /** - * uint64 target_weapon_guid = 3; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - /** - * uint64 target_weapon_guid = 3; - * @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 = 3; - * @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) { @@ -738,9 +728,9 @@ public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp get static { java.lang.String[] descriptorData = { "\n\026WeaponPromoteRsp.proto\"u\n\020WeaponPromot" + - "eRsp\022\031\n\021cur_promote_level\030\004 \001(\r\022\031\n\021old_p" + - "romote_level\030\016 \001(\r\022\017\n\007retcode\030\006 \001(\005\022\032\n\022t" + - "arget_weapon_guid\030\003 \001(\004B\033\n\031emu.grasscutt" + + "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" + "er.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -752,7 +742,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[] { "CurPromoteLevel", "OldPromoteLevel", "Retcode", "TargetWeaponGuid", }); + new java.lang.String[] { "TargetWeaponGuid", "CurPromoteLevel", "OldPromoteLevel", "Retcode", }); } // @@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 a3b8794db2d..3eaf79ee4e6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java @@ -19,10 +19,28 @@ public interface WeaponUpgradeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 target_weapon_guid = 14; - * @return The targetWeaponGuid. + * repeated .ItemParam item_param_list = 7; */ - long getTargetWeaponGuid(); + java.util.List + getItemParamListList(); + /** + * repeated .ItemParam item_param_list = 7; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); + /** + * repeated .ItemParam item_param_list = 7; + */ + int getItemParamListCount(); + /** + * repeated .ItemParam item_param_list = 7; + */ + java.util.List + getItemParamListOrBuilderList(); + /** + * repeated .ItemParam item_param_list = 7; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( + int index); /** * repeated uint64 food_weapon_guid_list = 9; @@ -42,35 +60,12 @@ public interface WeaponUpgradeReqOrBuilder extends long getFoodWeaponGuidList(int index); /** - * repeated .ItemParam item_param_list = 12; - */ - java.util.List - getItemParamListList(); - /** - * repeated .ItemParam item_param_list = 12; - */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); - /** - * repeated .ItemParam item_param_list = 12; - */ - int getItemParamListCount(); - /** - * repeated .ItemParam item_param_list = 12; - */ - java.util.List - getItemParamListOrBuilderList(); - /** - * repeated .ItemParam item_param_list = 12; + * uint64 target_weapon_guid = 10; + * @return The targetWeaponGuid. */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( - int index); + long getTargetWeaponGuid(); } /** - * 
-   * CmdId: 9010
-   * Obf: NHOOFHINDJC
-   *
- * * Protobuf type {@code WeaponUpgradeReq} */ public static final class WeaponUpgradeReq extends @@ -83,8 +78,8 @@ private WeaponUpgradeReq(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } private WeaponUpgradeReq() { - foodWeaponGuidList_ = emptyLongList(); itemParamList_ = java.util.Collections.emptyList(); + foodWeaponGuidList_ = emptyLongList(); } @java.lang.Override @@ -118,20 +113,29 @@ private WeaponUpgradeReq( case 0: done = true; break; - case 72: { + case 58: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - foodWeaponGuidList_ = newLongList(); + itemParamList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } + itemParamList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } + case 72: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + foodWeaponGuidList_ = newLongList(); + mutable_bitField0_ |= 0x00000002; + } foodWeaponGuidList_.addLong(input.readUInt64()); break; } case 74: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { foodWeaponGuidList_ = newLongList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { foodWeaponGuidList_.addLong(input.readUInt64()); @@ -139,16 +143,7 @@ private WeaponUpgradeReq( input.popLimit(limit); break; } - case 98: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - itemParamList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - itemParamList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); - break; - } - case 112: { + case 80: { targetWeaponGuid_ = input.readUInt64(); break; @@ -169,10 +164,10 @@ private WeaponUpgradeReq( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - foodWeaponGuidList_.makeImmutable(); // C + itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); } if (((mutable_bitField0_ & 0x00000002) != 0)) { - itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); + foodWeaponGuidList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -191,15 +186,44 @@ private WeaponUpgradeReq( emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.class, emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.Builder.class); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 14; - private long targetWeaponGuid_; + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 7; + private java.util.List itemParamList_; /** - * uint64 target_weapon_guid = 14; - * @return The targetWeaponGuid. + * repeated .ItemParam item_param_list = 7; */ @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; + public java.util.List getItemParamListList() { + return itemParamList_; + } + /** + * repeated .ItemParam item_param_list = 7; + */ + @java.lang.Override + public java.util.List + getItemParamListOrBuilderList() { + return itemParamList_; + } + /** + * repeated .ItemParam item_param_list = 7; + */ + @java.lang.Override + public int getItemParamListCount() { + return itemParamList_.size(); + } + /** + * repeated .ItemParam item_param_list = 7; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { + return itemParamList_.get(index); + } + /** + * repeated .ItemParam item_param_list = 7; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( + int index) { + return itemParamList_.get(index); } public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 9; @@ -230,44 +254,15 @@ public long getFoodWeaponGuidList(int index) { } private int foodWeaponGuidListMemoizedSerializedSize = -1; - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 12; - private java.util.List itemParamList_; - /** - * repeated .ItemParam item_param_list = 12; - */ - @java.lang.Override - public java.util.List getItemParamListList() { - return itemParamList_; - } - /** - * repeated .ItemParam item_param_list = 12; - */ - @java.lang.Override - public java.util.List - getItemParamListOrBuilderList() { - return itemParamList_; - } - /** - * repeated .ItemParam item_param_list = 12; - */ - @java.lang.Override - public int getItemParamListCount() { - return itemParamList_.size(); - } - /** - * repeated .ItemParam item_param_list = 12; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { - return itemParamList_.get(index); - } + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 10; + private long targetWeaponGuid_; /** - * repeated .ItemParam item_param_list = 12; + * uint64 target_weapon_guid = 10; + * @return The targetWeaponGuid. */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( - int index) { - return itemParamList_.get(index); + public long getTargetWeaponGuid() { + return targetWeaponGuid_; } private byte memoizedIsInitialized = -1; @@ -285,6 +280,9 @@ 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(foodWeaponGuidListMemoizedSerializedSize); @@ -292,11 +290,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < foodWeaponGuidList_.size(); i++) { output.writeUInt64NoTag(foodWeaponGuidList_.getLong(i)); } - for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(12, itemParamList_.get(i)); - } if (targetWeaponGuid_ != 0L) { - output.writeUInt64(14, targetWeaponGuid_); + output.writeUInt64(10, targetWeaponGuid_); } unknownFields.writeTo(output); } @@ -307,6 +302,10 @@ 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++) { @@ -321,13 +320,9 @@ public int getSerializedSize() { } foodWeaponGuidListMemoizedSerializedSize = dataSize; } - for (int i = 0; i < itemParamList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, itemParamList_.get(i)); - } if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(14, targetWeaponGuid_); + .computeUInt64Size(10, targetWeaponGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -344,12 +339,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq other = (emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq) obj; - if (getTargetWeaponGuid() - != other.getTargetWeaponGuid()) return false; - if (!getFoodWeaponGuidListList() - .equals(other.getFoodWeaponGuidListList())) return false; if (!getItemParamListList() .equals(other.getItemParamListList())) return false; + if (!getFoodWeaponGuidListList() + .equals(other.getFoodWeaponGuidListList())) return false; + if (getTargetWeaponGuid() + != other.getTargetWeaponGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -361,17 +356,17 @@ 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 (getFoodWeaponGuidListCount() > 0) { - hash = (37 * hash) + FOOD_WEAPON_GUID_LIST_FIELD_NUMBER; - hash = (53 * hash) + getFoodWeaponGuidListList().hashCode(); - } if (getItemParamListCount() > 0) { hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemParamListList().hashCode(); } + 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; @@ -468,11 +463,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 9010
-     * Obf: NHOOFHINDJC
-     *
- * * Protobuf type {@code WeaponUpgradeReq} */ public static final class Builder extends @@ -511,16 +501,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - targetWeaponGuid_ = 0L; - - foodWeaponGuidList_ = emptyLongList(); - bitField0_ = (bitField0_ & ~0x00000001); if (itemParamListBuilder_ == null) { itemParamList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { itemParamListBuilder_.clear(); } + foodWeaponGuidList_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000002); + targetWeaponGuid_ = 0L; + return this; } @@ -548,21 +538,21 @@ public emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq bui public emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq buildPartial() { emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq result = new emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq(this); int from_bitField0_ = bitField0_; - result.targetWeaponGuid_ = targetWeaponGuid_; - if (((bitField0_ & 0x00000001) != 0)) { - foodWeaponGuidList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.foodWeaponGuidList_ = foodWeaponGuidList_; if (itemParamListBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.itemParamList_ = itemParamList_; } else { result.itemParamList_ = itemParamListBuilder_.build(); } + if (((bitField0_ & 0x00000002) != 0)) { + foodWeaponGuidList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.foodWeaponGuidList_ = foodWeaponGuidList_; + result.targetWeaponGuid_ = targetWeaponGuid_; onBuilt(); return result; } @@ -611,24 +601,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq other) { if (other == emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.getDefaultInstance()) return this; - if (other.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); - } - if (!other.foodWeaponGuidList_.isEmpty()) { - if (foodWeaponGuidList_.isEmpty()) { - foodWeaponGuidList_ = other.foodWeaponGuidList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureFoodWeaponGuidListIsMutable(); - foodWeaponGuidList_.addAll(other.foodWeaponGuidList_); - } - onChanged(); - } if (itemParamListBuilder_ == null) { if (!other.itemParamList_.isEmpty()) { if (itemParamList_.isEmpty()) { itemParamList_ = other.itemParamList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureItemParamListIsMutable(); itemParamList_.addAll(other.itemParamList_); @@ -641,7 +618,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.We itemParamListBuilder_.dispose(); itemParamListBuilder_ = null; itemParamList_ = other.itemParamList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); itemParamListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getItemParamListFieldBuilder() : null; @@ -650,6 +627,19 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.We } } } + if (!other.foodWeaponGuidList_.isEmpty()) { + if (foodWeaponGuidList_.isEmpty()) { + foodWeaponGuidList_ = other.foodWeaponGuidList_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureFoodWeaponGuidListIsMutable(); + foodWeaponGuidList_.addAll(other.foodWeaponGuidList_); + } + onChanged(); + } + if (other.getTargetWeaponGuid() != 0L) { + setTargetWeaponGuid(other.getTargetWeaponGuid()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -680,122 +670,12 @@ public Builder mergeFrom( } private int bitField0_; - 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; - } - - private com.google.protobuf.Internal.LongList foodWeaponGuidList_ = emptyLongList(); - private void ensureFoodWeaponGuidListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - foodWeaponGuidList_ = mutableCopy(foodWeaponGuidList_); - bitField0_ |= 0x00000001; - } - } - /** - * repeated uint64 food_weapon_guid_list = 9; - * @return A list containing the foodWeaponGuidList. - */ - public java.util.List - getFoodWeaponGuidListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(foodWeaponGuidList_) : foodWeaponGuidList_; - } - /** - * repeated uint64 food_weapon_guid_list = 9; - * @return The count of foodWeaponGuidList. - */ - public int getFoodWeaponGuidListCount() { - return foodWeaponGuidList_.size(); - } - /** - * repeated uint64 food_weapon_guid_list = 9; - * @param index The index of the element to return. - * @return The foodWeaponGuidList at the given index. - */ - public long getFoodWeaponGuidList(int index) { - return foodWeaponGuidList_.getLong(index); - } - /** - * repeated uint64 food_weapon_guid_list = 9; - * @param index The index to set the value at. - * @param value The foodWeaponGuidList to set. - * @return This builder for chaining. - */ - public Builder setFoodWeaponGuidList( - int index, long value) { - ensureFoodWeaponGuidListIsMutable(); - foodWeaponGuidList_.setLong(index, value); - onChanged(); - return this; - } - /** - * repeated uint64 food_weapon_guid_list = 9; - * @param value The foodWeaponGuidList to add. - * @return This builder for chaining. - */ - public Builder addFoodWeaponGuidList(long value) { - ensureFoodWeaponGuidListIsMutable(); - foodWeaponGuidList_.addLong(value); - onChanged(); - return this; - } - /** - * repeated uint64 food_weapon_guid_list = 9; - * @param values The foodWeaponGuidList to add. - * @return This builder for chaining. - */ - public Builder addAllFoodWeaponGuidList( - java.lang.Iterable values) { - ensureFoodWeaponGuidListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, foodWeaponGuidList_); - onChanged(); - return this; - } - /** - * repeated uint64 food_weapon_guid_list = 9; - * @return This builder for chaining. - */ - public Builder clearFoodWeaponGuidList() { - foodWeaponGuidList_ = emptyLongList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - private java.util.List itemParamList_ = java.util.Collections.emptyList(); private void ensureItemParamListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { itemParamList_ = new java.util.ArrayList(itemParamList_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } @@ -803,7 +683,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 = 12; + * repeated .ItemParam item_param_list = 7; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -813,7 +693,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -823,7 +703,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -833,7 +713,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -850,7 +730,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -864,7 +744,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -880,7 +760,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -897,7 +777,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -911,7 +791,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -925,7 +805,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -940,12 +820,12 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { itemParamList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { itemParamListBuilder_.clear(); @@ -953,7 +833,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -966,14 +846,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder( int index) { return getItemParamListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -983,7 +863,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public java.util.List getItemParamListOrBuilderList() { @@ -994,14 +874,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() { return getItemParamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -1009,7 +889,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 12; + * repeated .ItemParam item_param_list = 7; */ public java.util.List getItemParamListBuilderList() { @@ -1022,13 +902,123 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa itemParamListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( itemParamList_, - ((bitField0_ & 0x00000002) != 0), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); itemParamList_ = null; } return itemParamListBuilder_; } + + private com.google.protobuf.Internal.LongList foodWeaponGuidList_ = emptyLongList(); + private void ensureFoodWeaponGuidListIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + foodWeaponGuidList_ = mutableCopy(foodWeaponGuidList_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated uint64 food_weapon_guid_list = 9; + * @return A list containing the foodWeaponGuidList. + */ + public java.util.List + getFoodWeaponGuidListList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(foodWeaponGuidList_) : foodWeaponGuidList_; + } + /** + * repeated uint64 food_weapon_guid_list = 9; + * @return The count of foodWeaponGuidList. + */ + public int getFoodWeaponGuidListCount() { + return foodWeaponGuidList_.size(); + } + /** + * repeated uint64 food_weapon_guid_list = 9; + * @param index The index of the element to return. + * @return The foodWeaponGuidList at the given index. + */ + public long getFoodWeaponGuidList(int index) { + return foodWeaponGuidList_.getLong(index); + } + /** + * repeated uint64 food_weapon_guid_list = 9; + * @param index The index to set the value at. + * @param value The foodWeaponGuidList to set. + * @return This builder for chaining. + */ + public Builder setFoodWeaponGuidList( + int index, long value) { + ensureFoodWeaponGuidListIsMutable(); + foodWeaponGuidList_.setLong(index, value); + onChanged(); + return this; + } + /** + * repeated uint64 food_weapon_guid_list = 9; + * @param value The foodWeaponGuidList to add. + * @return This builder for chaining. + */ + public Builder addFoodWeaponGuidList(long value) { + ensureFoodWeaponGuidListIsMutable(); + foodWeaponGuidList_.addLong(value); + onChanged(); + return this; + } + /** + * repeated uint64 food_weapon_guid_list = 9; + * @param values The foodWeaponGuidList to add. + * @return This builder for chaining. + */ + public Builder addAllFoodWeaponGuidList( + java.lang.Iterable values) { + ensureFoodWeaponGuidListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, foodWeaponGuidList_); + onChanged(); + return this; + } + /** + * repeated uint64 food_weapon_guid_list = 9; + * @return This builder for chaining. + */ + public Builder clearFoodWeaponGuidList() { + foodWeaponGuidList_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + + private long targetWeaponGuid_ ; + /** + * uint64 target_weapon_guid = 10; + * @return The targetWeaponGuid. + */ + @java.lang.Override + public long getTargetWeaponGuid() { + return targetWeaponGuid_; + } + /** + * uint64 target_weapon_guid = 10; + * @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 = 10; + * @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) { @@ -1097,9 +1087,9 @@ public emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq get static { java.lang.String[] descriptorData = { "\n\026WeaponUpgradeReq.proto\032\017ItemParam.prot" + - "o\"r\n\020WeaponUpgradeReq\022\032\n\022target_weapon_g" + - "uid\030\016 \001(\004\022\035\n\025food_weapon_guid_list\030\t \003(\004" + - "\022#\n\017item_param_list\030\014 \003(\0132\n.ItemParamB\033\n" + + "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" + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1112,7 +1102,7 @@ public emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq get internal_static_WeaponUpgradeReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WeaponUpgradeReq_descriptor, - new java.lang.String[] { "TargetWeaponGuid", "FoodWeaponGuidList", "ItemParamList", }); + new java.lang.String[] { "ItemParamList", "FoodWeaponGuidList", "TargetWeaponGuid", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } 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 1aa1d1f9b20..f23024df5eb 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java @@ -19,59 +19,54 @@ public interface WeaponUpgradeRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 target_weapon_guid = 13; - * @return The targetWeaponGuid. - */ - long getTargetWeaponGuid(); - - /** - * uint32 cur_level = 10; - * @return The curLevel. - */ - int getCurLevel(); - - /** - * uint32 old_level = 7; - * @return The oldLevel. - */ - int getOldLevel(); - - /** - * int32 retcode = 4; - * @return The retcode. - */ - int getRetcode(); - - /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ java.util.List getItemParamListList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ int getItemParamListCount(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ java.util.List getItemParamListOrBuilderList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ 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. + */ + int getCurLevel(); + + /** + * int32 retcode = 8; + * @return The retcode. + */ + int getRetcode(); + + /** + * uint32 old_level = 3; + * @return The oldLevel. + */ + int getOldLevel(); } /** - * 
-   * CmdId: 7193
-   * Obf: DMJFFIJEDGI
-   *
- * * Protobuf type {@code WeaponUpgradeRsp} */ public static final class WeaponUpgradeRsp extends @@ -118,33 +113,33 @@ private WeaponUpgradeRsp( case 0: done = true; break; - case 32: { - - retcode_ = input.readInt32(); + case 10: { + 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 56: { + case 24: { oldLevel_ = input.readUInt32(); break; } - case 80: { + case 48: { - curLevel_ = input.readUInt32(); + targetWeaponGuid_ = input.readUInt64(); break; } - case 104: { + case 64: { - targetWeaponGuid_ = input.readUInt64(); + retcode_ = input.readInt32(); 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)); + case 96: { + + curLevel_ = input.readUInt32(); break; } default: { @@ -182,88 +177,88 @@ private WeaponUpgradeRsp( emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.class, emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.Builder.class); } - public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 13; - private long targetWeaponGuid_; + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 1; + private java.util.List itemParamList_; /** - * uint64 target_weapon_guid = 13; - * @return The targetWeaponGuid. + * repeated .ItemParam item_param_list = 1; */ @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; + public java.util.List getItemParamListList() { + return itemParamList_; } - - public static final int CUR_LEVEL_FIELD_NUMBER = 10; - private int curLevel_; /** - * uint32 cur_level = 10; - * @return The curLevel. + * repeated .ItemParam item_param_list = 1; */ @java.lang.Override - public int getCurLevel() { - return curLevel_; + public java.util.List + getItemParamListOrBuilderList() { + return itemParamList_; } - - public static final int OLD_LEVEL_FIELD_NUMBER = 7; - private int oldLevel_; /** - * uint32 old_level = 7; - * @return The oldLevel. + * repeated .ItemParam item_param_list = 1; */ @java.lang.Override - public int getOldLevel() { - return oldLevel_; + public int getItemParamListCount() { + return itemParamList_.size(); } - - public static final int RETCODE_FIELD_NUMBER = 4; - private int retcode_; /** - * int32 retcode = 4; - * @return The retcode. + * repeated .ItemParam item_param_list = 1; */ @java.lang.Override - public int getRetcode() { - return retcode_; + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { + return itemParamList_.get(index); } - - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 15; - private java.util.List itemParamList_; /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ @java.lang.Override - public java.util.List getItemParamListList() { - return itemParamList_; + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( + int index) { + return itemParamList_.get(index); } + + public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 6; + private long targetWeaponGuid_; /** - * repeated .ItemParam item_param_list = 15; + * uint64 target_weapon_guid = 6; + * @return The targetWeaponGuid. */ @java.lang.Override - public java.util.List - getItemParamListOrBuilderList() { - return itemParamList_; + public long getTargetWeaponGuid() { + return targetWeaponGuid_; } + + public static final int CUR_LEVEL_FIELD_NUMBER = 12; + private int curLevel_; /** - * repeated .ItemParam item_param_list = 15; + * uint32 cur_level = 12; + * @return The curLevel. */ @java.lang.Override - public int getItemParamListCount() { - return itemParamList_.size(); + public int getCurLevel() { + return curLevel_; } + + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; /** - * repeated .ItemParam item_param_list = 15; + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { - return itemParamList_.get(index); + public int getRetcode() { + return retcode_; } + + public static final int OLD_LEVEL_FIELD_NUMBER = 3; + private int oldLevel_; /** - * repeated .ItemParam item_param_list = 15; + * uint32 old_level = 3; + * @return The oldLevel. */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( - int index) { - return itemParamList_.get(index); + public int getOldLevel() { + return oldLevel_; } private byte memoizedIsInitialized = -1; @@ -280,20 +275,20 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (retcode_ != 0) { - output.writeInt32(4, retcode_); + for (int i = 0; i < itemParamList_.size(); i++) { + output.writeMessage(1, itemParamList_.get(i)); } if (oldLevel_ != 0) { - output.writeUInt32(7, oldLevel_); - } - if (curLevel_ != 0) { - output.writeUInt32(10, curLevel_); + output.writeUInt32(3, oldLevel_); } if (targetWeaponGuid_ != 0L) { - output.writeUInt64(13, targetWeaponGuid_); + output.writeUInt64(6, targetWeaponGuid_); } - for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(15, itemParamList_.get(i)); + if (retcode_ != 0) { + output.writeInt32(8, retcode_); + } + if (curLevel_ != 0) { + output.writeUInt32(12, curLevel_); } unknownFields.writeTo(output); } @@ -304,25 +299,25 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { + for (int i = 0; i < itemParamList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, retcode_); + .computeMessageSize(1, itemParamList_.get(i)); } if (oldLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, oldLevel_); + .computeUInt32Size(3, oldLevel_); } - if (curLevel_ != 0) { + if (targetWeaponGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, curLevel_); + .computeUInt64Size(6, targetWeaponGuid_); } - if (targetWeaponGuid_ != 0L) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(13, targetWeaponGuid_); + .computeInt32Size(8, retcode_); } - for (int i = 0; i < itemParamList_.size(); i++) { + if (curLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, itemParamList_.get(i)); + .computeUInt32Size(12, curLevel_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -339,16 +334,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp other = (emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp) obj; + if (!getItemParamListList() + .equals(other.getItemParamListList())) return false; if (getTargetWeaponGuid() != other.getTargetWeaponGuid()) return false; if (getCurLevel() != other.getCurLevel()) return false; - if (getOldLevel() - != other.getOldLevel()) return false; if (getRetcode() != other.getRetcode()) return false; - if (!getItemParamListList() - .equals(other.getItemParamListList())) return false; + if (getOldLevel() + != other.getOldLevel()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -360,19 +355,19 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (getItemParamListCount() > 0) { + 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()); 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(); - if (getItemParamListCount() > 0) { - hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getItemParamListList().hashCode(); - } + hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getOldLevel(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -469,11 +464,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 7193
-     * Obf: DMJFFIJEDGI
-     *
- * * Protobuf type {@code WeaponUpgradeRsp} */ public static final class Builder extends @@ -512,20 +502,20 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - targetWeaponGuid_ = 0L; - - curLevel_ = 0; - - 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; + return this; } @@ -553,10 +543,6 @@ 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.targetWeaponGuid_ = targetWeaponGuid_; - result.curLevel_ = curLevel_; - result.oldLevel_ = oldLevel_; - result.retcode_ = retcode_; if (itemParamListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_); @@ -566,6 +552,10 @@ 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_; onBuilt(); return result; } @@ -614,18 +604,6 @@ 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.getTargetWeaponGuid() != 0L) { - setTargetWeaponGuid(other.getTargetWeaponGuid()); - } - if (other.getCurLevel() != 0) { - setCurLevel(other.getCurLevel()); - } - if (other.getOldLevel() != 0) { - setOldLevel(other.getOldLevel()); - } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (itemParamListBuilder_ == null) { if (!other.itemParamList_.isEmpty()) { if (itemParamList_.isEmpty()) { @@ -652,6 +630,18 @@ 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()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -682,130 +672,6 @@ public Builder mergeFrom( } private int bitField0_; - private long targetWeaponGuid_ ; - /** - * uint64 target_weapon_guid = 13; - * @return The targetWeaponGuid. - */ - @java.lang.Override - public long getTargetWeaponGuid() { - return targetWeaponGuid_; - } - /** - * uint64 target_weapon_guid = 13; - * @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 = 13; - * @return This builder for chaining. - */ - public Builder clearTargetWeaponGuid() { - - targetWeaponGuid_ = 0L; - onChanged(); - return this; - } - - private int curLevel_ ; - /** - * uint32 cur_level = 10; - * @return The curLevel. - */ - @java.lang.Override - public int getCurLevel() { - return curLevel_; - } - /** - * uint32 cur_level = 10; - * @param value The curLevel to set. - * @return This builder for chaining. - */ - public Builder setCurLevel(int value) { - - curLevel_ = value; - onChanged(); - return this; - } - /** - * uint32 cur_level = 10; - * @return This builder for chaining. - */ - public Builder clearCurLevel() { - - curLevel_ = 0; - onChanged(); - return this; - } - - private int oldLevel_ ; - /** - * uint32 old_level = 7; - * @return The oldLevel. - */ - @java.lang.Override - public int getOldLevel() { - return oldLevel_; - } - /** - * uint32 old_level = 7; - * @param value The oldLevel to set. - * @return This builder for chaining. - */ - public Builder setOldLevel(int value) { - - oldLevel_ = value; - onChanged(); - return this; - } - /** - * uint32 old_level = 7; - * @return This builder for chaining. - */ - public Builder clearOldLevel() { - - oldLevel_ = 0; - onChanged(); - return this; - } - - private int retcode_ ; - /** - * int32 retcode = 4; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 4; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 4; - * @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() { @@ -819,7 +685,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 = 1; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -829,7 +695,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -839,7 +705,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -849,7 +715,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -866,7 +732,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -880,7 +746,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -896,7 +762,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -913,7 +779,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -927,7 +793,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -941,7 +807,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -956,7 +822,7 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { @@ -969,7 +835,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -982,14 +848,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ 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 = 1; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -999,7 +865,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ public java.util.List getItemParamListOrBuilderList() { @@ -1010,14 +876,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 1; */ 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 = 1; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -1025,7 +891,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 = 1; */ public java.util.List getItemParamListBuilderList() { @@ -1045,6 +911,130 @@ 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; + * @return The curLevel. + */ + @java.lang.Override + public int getCurLevel() { + return curLevel_; + } + /** + * uint32 cur_level = 12; + * @param value The curLevel to set. + * @return This builder for chaining. + */ + public Builder setCurLevel(int value) { + + curLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 cur_level = 12; + * @return This builder for chaining. + */ + public Builder clearCurLevel() { + + curLevel_ = 0; + onChanged(); + 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_ ; + /** + * uint32 old_level = 3; + * @return The oldLevel. + */ + @java.lang.Override + public int getOldLevel() { + return oldLevel_; + } + /** + * uint32 old_level = 3; + * @param value The oldLevel to set. + * @return This builder for chaining. + */ + public Builder setOldLevel(int value) { + + oldLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 old_level = 3; + * @return This builder for chaining. + */ + public Builder clearOldLevel() { + + oldLevel_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1113,10 +1103,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\032\n\022target_weapon_" + - "guid\030\r \001(\004\022\021\n\tcur_level\030\n \001(\r\022\021\n\told_lev" + - "el\030\007 \001(\r\022\017\n\007retcode\030\004 \001(\005\022#\n\017item_param_" + - "list\030\017 \003(\0132\n.ItemParamB\033\n\031emu.grasscutte" + + "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" + "r.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1129,7 +1119,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[] { "TargetWeaponGuid", "CurLevel", "OldLevel", "Retcode", "ItemParamList", }); + new java.lang.String[] { "ItemParamList", "TargetWeaponGuid", "CurLevel", "Retcode", "OldLevel", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java index e9edc9fcd96..87f72fa638d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java @@ -19,59 +19,54 @@ public interface WorldPlayerLocationNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ java.util.List getPlayerWorldLocListList(); /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index); /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ int getPlayerWorldLocListCount(); /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ java.util.List getPlayerWorldLocListOrBuilderList(); /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder( int index); /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ java.util.List getPlayerLocListList(); /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index); /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ int getPlayerLocListCount(); /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ java.util.List getPlayerLocListOrBuilderList(); /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder( int index); } /** - * 
-   * CmdId: 7085
-   * Obf: KEIDNDOFINC
-   *
- * * Protobuf type {@code WorldPlayerLocationNotify} */ public static final class WorldPlayerLocationNotify extends @@ -119,7 +114,7 @@ private WorldPlayerLocationNotify( case 0: done = true; break; - case 10: { + case 114: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { playerLocList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -128,7 +123,7 @@ private WorldPlayerLocationNotify( input.readMessage(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.parser(), extensionRegistry)); break; } - case 82: { + case 122: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { playerWorldLocList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -175,17 +170,17 @@ private WorldPlayerLocationNotify( emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.class, emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.Builder.class); } - public static final int PLAYER_WORLD_LOC_LIST_FIELD_NUMBER = 10; + public static final int PLAYER_WORLD_LOC_LIST_FIELD_NUMBER = 15; private java.util.List playerWorldLocList_; /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ @java.lang.Override public java.util.List getPlayerWorldLocListList() { return playerWorldLocList_; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ @java.lang.Override public java.util.List @@ -193,21 +188,21 @@ public java.util.Listrepeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ @java.lang.Override public int getPlayerWorldLocListCount() { return playerWorldLocList_.size(); } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ @java.lang.Override public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) { return playerWorldLocList_.get(index); } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ @java.lang.Override public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder( @@ -215,17 +210,17 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo return playerWorldLocList_.get(index); } - public static final int PLAYER_LOC_LIST_FIELD_NUMBER = 1; + public static final int PLAYER_LOC_LIST_FIELD_NUMBER = 14; private java.util.List playerLocList_; /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ @java.lang.Override public java.util.List getPlayerLocListList() { return playerLocList_; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ @java.lang.Override public java.util.List @@ -233,21 +228,21 @@ public java.util.Listrepeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ @java.lang.Override public int getPlayerLocListCount() { return playerLocList_.size(); } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ @java.lang.Override public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) { return playerLocList_.get(index); } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ @java.lang.Override public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder( @@ -270,10 +265,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < playerLocList_.size(); i++) { - output.writeMessage(1, playerLocList_.get(i)); + output.writeMessage(14, playerLocList_.get(i)); } for (int i = 0; i < playerWorldLocList_.size(); i++) { - output.writeMessage(10, playerWorldLocList_.get(i)); + output.writeMessage(15, playerWorldLocList_.get(i)); } unknownFields.writeTo(output); } @@ -286,11 +281,11 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < playerLocList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, playerLocList_.get(i)); + .computeMessageSize(14, playerLocList_.get(i)); } for (int i = 0; i < playerWorldLocList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, playerWorldLocList_.get(i)); + .computeMessageSize(15, playerWorldLocList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -426,11 +421,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 7085
-     * Obf: KEIDNDOFINC
-     *
- * * Protobuf type {@code WorldPlayerLocationNotify} */ public static final class Builder extends @@ -670,7 +660,7 @@ private void ensurePlayerWorldLocListIsMutable() { emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> playerWorldLocListBuilder_; /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public java.util.List getPlayerWorldLocListList() { if (playerWorldLocListBuilder_ == null) { @@ -680,7 +670,7 @@ public java.util.Listrepeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public int getPlayerWorldLocListCount() { if (playerWorldLocListBuilder_ == null) { @@ -690,7 +680,7 @@ public int getPlayerWorldLocListCount() { } } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) { if (playerWorldLocListBuilder_ == null) { @@ -700,7 +690,7 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo } } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder setPlayerWorldLocList( int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) { @@ -717,7 +707,7 @@ public Builder setPlayerWorldLocList( return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder setPlayerWorldLocList( int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) { @@ -731,7 +721,7 @@ public Builder setPlayerWorldLocList( return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder addPlayerWorldLocList(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) { if (playerWorldLocListBuilder_ == null) { @@ -747,7 +737,7 @@ public Builder addPlayerWorldLocList(emu.grasscutter.net.proto.PlayerWorldLocati return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder addPlayerWorldLocList( int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) { @@ -764,7 +754,7 @@ public Builder addPlayerWorldLocList( return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder addPlayerWorldLocList( emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) { @@ -778,7 +768,7 @@ public Builder addPlayerWorldLocList( return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder addPlayerWorldLocList( int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) { @@ -792,7 +782,7 @@ public Builder addPlayerWorldLocList( return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder addAllPlayerWorldLocList( java.lang.Iterable values) { @@ -807,7 +797,7 @@ public Builder addAllPlayerWorldLocList( return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder clearPlayerWorldLocList() { if (playerWorldLocListBuilder_ == null) { @@ -820,7 +810,7 @@ public Builder clearPlayerWorldLocList() { return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public Builder removePlayerWorldLocList(int index) { if (playerWorldLocListBuilder_ == null) { @@ -833,14 +823,14 @@ public Builder removePlayerWorldLocList(int index) { return this; } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder getPlayerWorldLocListBuilder( int index) { return getPlayerWorldLocListFieldBuilder().getBuilder(index); } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder( int index) { @@ -850,7 +840,7 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo } } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public java.util.List getPlayerWorldLocListOrBuilderList() { @@ -861,14 +851,14 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo } } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder() { return getPlayerWorldLocListFieldBuilder().addBuilder( emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance()); } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder( int index) { @@ -876,7 +866,7 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance()); } /** - * repeated .PlayerWorldLocationInfo player_world_loc_list = 10; + * repeated .PlayerWorldLocationInfo player_world_loc_list = 15; */ public java.util.List getPlayerWorldLocListBuilderList() { @@ -910,7 +900,7 @@ private void ensurePlayerLocListIsMutable() { emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> playerLocListBuilder_; /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public java.util.List getPlayerLocListList() { if (playerLocListBuilder_ == null) { @@ -920,7 +910,7 @@ public java.util.Listrepeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public int getPlayerLocListCount() { if (playerLocListBuilder_ == null) { @@ -930,7 +920,7 @@ public int getPlayerLocListCount() { } } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) { if (playerLocListBuilder_ == null) { @@ -940,7 +930,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo } } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder setPlayerLocList( int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) { @@ -957,7 +947,7 @@ public Builder setPlayerLocList( return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder setPlayerLocList( int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) { @@ -971,7 +961,7 @@ public Builder setPlayerLocList( return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder addPlayerLocList(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) { if (playerLocListBuilder_ == null) { @@ -987,7 +977,7 @@ public Builder addPlayerLocList(emu.grasscutter.net.proto.PlayerLocationInfoOute return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder addPlayerLocList( int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) { @@ -1004,7 +994,7 @@ public Builder addPlayerLocList( return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder addPlayerLocList( emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) { @@ -1018,7 +1008,7 @@ public Builder addPlayerLocList( return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder addPlayerLocList( int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) { @@ -1032,7 +1022,7 @@ public Builder addPlayerLocList( return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder addAllPlayerLocList( java.lang.Iterable values) { @@ -1047,7 +1037,7 @@ public Builder addAllPlayerLocList( return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder clearPlayerLocList() { if (playerLocListBuilder_ == null) { @@ -1060,7 +1050,7 @@ public Builder clearPlayerLocList() { return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public Builder removePlayerLocList(int index) { if (playerLocListBuilder_ == null) { @@ -1073,14 +1063,14 @@ public Builder removePlayerLocList(int index) { return this; } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder getPlayerLocListBuilder( int index) { return getPlayerLocListFieldBuilder().getBuilder(index); } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder( int index) { @@ -1090,7 +1080,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo } } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public java.util.List getPlayerLocListOrBuilderList() { @@ -1101,14 +1091,14 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo } } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder() { return getPlayerLocListFieldBuilder().addBuilder( emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance()); } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder( int index) { @@ -1116,7 +1106,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance()); } /** - * repeated .PlayerLocationInfo player_loc_list = 1; + * repeated .PlayerLocationInfo player_loc_list = 14; */ public java.util.List getPlayerLocListBuilderList() { @@ -1206,8 +1196,8 @@ public emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayer "\n\037WorldPlayerLocationNotify.proto\032\035Playe" + "rWorldLocationInfo.proto\032\030PlayerLocation" + "Info.proto\"\202\001\n\031WorldPlayerLocationNotify" + - "\0227\n\025player_world_loc_list\030\n \003(\0132\030.Player" + - "WorldLocationInfo\022,\n\017player_loc_list\030\001 \003" + + "\0227\n\025player_world_loc_list\030\017 \003(\0132\030.Player" + + "WorldLocationInfo\022,\n\017player_loc_list\030\016 \003" + "(\0132\023.PlayerLocationInfoB\033\n\031emu.grasscutt" + "er.net.protob\006proto3" }; diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 30ec3e08b06..8e12a179083 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -101,7 +101,7 @@ public final class PacketOpcodes { public static final int SetEquipLockStateRsp = 9498; public static final int GetActivityInfoRsp = 1628; public static final int AbilityInvocationsNotify = 6819; - public static final int SetNameCardReq = 8517; // TODO: check if correct (another: 7206) + public static final int SetNameCardReq = 8517; public static final int SetNameCardRsp = 6687; public static final int UpdatePlayerShowNameCardListReq = 4170; public static final int UpdatePlayerShowNameCardListRsp = 8130; @@ -118,12 +118,36 @@ public final class PacketOpcodes { public static final int PathfindingEnterSceneReq = 2355; // TODO: no rsp yet public static final int ToTheMoonEnterSceneReq = 6125; public static final int PlayerPropChangeReasonNotify = 25441; - public static final int WorldPlayerReviveReq = 25233; // TODO: no rsp yet + public static final int WorldPlayerReviveReq = 25233; public static final int PlayerPropNotify = 28854; public static final int EvtDoSkillSuccNotify = 3164; public static final int EvtDestroyGadgetNotify = 3809; public static final int EvtEntityRenderersChangedNotify = 7798; public static final int AvatarFightPropUpdateNotify = 21785; // TODO: check if correct + public static final int AbilityChangeNotify = 2810; + public static final int AvatarAddNotify = 7931; + public static final int AvatarPropNotify = 6637; + public static final int DungeonEntryInfoReq = 8028; + public static final int DungeonEntryInfoRsp = 5207; + public static final int HitTreeNotify = 23915; + public static final int DropHintNotify = 7273; + public static final int SetEntityClientDataNotify = 3725; + public static final int WorldPlayerLocationNotify = 8076; + public static final int TakeoffEquipReq = 8686; + public static final int TakeoffEquipRsp = 25091; + public static final int ObstacleModifyNotify = 2307; + public static final int ClientAbilityChangeNotify = 8141; + public static final int ItemAddHintNotify = 196; + public static final int ItemGivingReq = 2640; + public static final int ItemGivingRsp = 2780; + public static final int ScenePlayerInfoNotify = 13; + public static final int ScenePointUnlockNotify = 8974; + public static final int WeaponUpgradeReq = 27357; + public static final int WeaponUpgradeRsp = 356; + public static final int WeaponPromoteReq = 2130; + public static final int WeaponPromoteRsp = 20888; + public static final int WeaponAwakenReq = 1; // TODO: fix UI and get opcode + public static final int WeaponAwakenRsp = 3795; // 4.5.0 Obfuscated public static final int OFCNFIEOFJD = 27048; @@ -255,7 +279,6 @@ public final class PacketOpcodes { public static final int MGFJCHJMFFP = 3584; public static final int JDKCNLIMLDN = 1164; public static final int MFABAPLFIJK = 21471; - public static final int GFKJHNPODMF = 8141; public static final int BEFODEBKCBO = 21889; public static final int GALOJEANJNO = 5252; public static final int NJCKGBMMDMK = 6891; @@ -388,7 +411,6 @@ public final class PacketOpcodes { public static final int HJHDAEKDMBA = 20216; public static final int GPKLIGAAHPL = 1021; public static final int INMAMHOMMGO = 5116; - public static final int GBKEMOMPMPM = 27357; public static final int FKKCJCMOHCJ = 4711; public static final int JJKHEIIKNCO = 6183; public static final int KOGICKBJHNM = 27206; @@ -470,7 +492,6 @@ public final class PacketOpcodes { public static final int GPMLHLOAMPL = 2845; public static final int FJGALKCELMC = 4131; public static final int JALDNCAFEEH = 5971; - public static final int BLIGJPCLEGI = 7931; public static final int DKOJLMNFLEC = 21351; public static final int MPHCNONJPPA = 3406; public static final int GAHLBJPMCFE = 22291; @@ -698,7 +719,6 @@ public final class PacketOpcodes { public static final int PBMJMNBIIEG = 7172; public static final int NJPJDAJIMEO = 22888; public static final int IHHJKPJDFDK = 21146; - public static final int DJKIJDAADCB = 20888; public static final int DBKJHAPACMN = 6678; public static final int LDCFCLPKFBO = 6430; public static final int KKJNHNCLANN = 4924; @@ -780,7 +800,6 @@ public final class PacketOpcodes { public static final int FABIHIBJPBL = 1971; public static final int FENCIMFOBGM = 710; public static final int GJHLHAOFOBM = 1709; - public static final int OCPGAEIPKKM = 3725; public static final int IAAMBMCFMDF = 28593; public static final int HDJNGGHEENK = 4907; public static final int CNPBCLPNEFG = 2818; @@ -817,7 +836,6 @@ public final class PacketOpcodes { public static final int JIKBICCEIGC = 7443; public static final int DBPCMHNEEIH = 6433; public static final int GJAPPGDLBID = 27703; - public static final int MOCAJGLEOPM = 2640; public static final int MFOGBEKBJKG = 21157; public static final int ALFOFEDNOOB = 8366; public static final int APFAIEFMMJI = 9185; @@ -967,7 +985,6 @@ public final class PacketOpcodes { public static final int BIKDDGIGMIJ = 21719; public static final int OFBGONCLPJK = 3471; public static final int MKLLAKEBPKK = 3931; - public static final int GDJLGIBBIIH = 196; public static final int MCFGGCDODBH = 840; public static final int DDPFBLBKEGO = 1242; public static final int IPCHOOCFNAO = 20630; @@ -978,7 +995,6 @@ public final class PacketOpcodes { public static final int DBKAFAKGABJ = 1437; public static final int JEGGHEPINED = 9587; public static final int CMAMONLCKNJ = 21685; - public static final int HMONJDKPIGA = 6637; public static final int MHHCLNKKDMG = 20592; public static final int PLKKHACJLEC = 5681; public static final int OHCFBNMOHFJ = 1497; @@ -1055,7 +1071,6 @@ public final class PacketOpcodes { public static final int KCFGPPCCGNC = 4339; public static final int ILOKEIKLIFI = 20739; public static final int CLDGIMKNHMM = 20791; - public static final int ILJGOAAJBDH = 8974; public static final int EPLOKOMACGD = 6065; public static final int KMPLACPAMKD = 21896; public static final int BDOHFHLPPKP = 24489; @@ -1114,7 +1129,6 @@ public final class PacketOpcodes { public static final int IAOBKDPEBCB = 866; public static final int EPOIDFMOJGM = 5089; public static final int NJHBMKHHHNH = 25136; - public static final int KFPNAAFHCGN = 2130; public static final int MPIGBLJNODK = 21444; public static final int CGEBLADHECO = 3673; public static final int DFAAFPIKALL = 3640; @@ -1320,7 +1334,6 @@ public final class PacketOpcodes { public static final int OOIOPJMMIDC = 4628; public static final int HDNEMKPACDF = 3490; public static final int JDGLCCFNPMK = 9582; - public static final int MHBNLKHJFKO = 5207; public static final int IEECJDDMCNC = 3800; public static final int PEFBHHFALAJ = 9050; public static final int PDCHMFCGBAN = 21892; @@ -1379,7 +1392,6 @@ public final class PacketOpcodes { public static final int PLOOEHCDENH = 1460; public static final int DOAJEBHMNPI = 8939; public static final int MBOGDNAIFAG = 25924; - public static final int KHAPPABNFKF = 13; public static final int IGDCMHFJHEE = 5081; public static final int AAKEHDMGGJD = 25720; public static final int APLGNOPLLMB = 7934; @@ -1455,14 +1467,12 @@ public final class PacketOpcodes { public static final int KKAGKOHKEFC = 5767; public static final int BDAIFLLPACF = 5346; public static final int KOCBLCDPLOP = 3497; - public static final int LJIEJBEGOMB = 23915; public static final int PKCHEJJBMEC = 27210; public static final int IBDJIEFKINA = 29705; public static final int GHJDPDAPCMM = 26047; public static final int DMCLJIBLLAJ = 26251; public static final int HHOBLFMBNBD = 6001; public static final int FMJCACAFFMK = 834; - public static final int NLCLCDCCKAK = 8028; public static final int LBDIGHLBNJF = 23321; public static final int OHIHMANEIBN = 28103; public static final int ODNPOBHMKCL = 9642; @@ -1595,7 +1605,6 @@ public final class PacketOpcodes { public static final int JJNBNIIGHAA = 8593; public static final int KDPGCHAEDGD = 22259; public static final int PACNMMLOLPF = 9392; - public static final int ELKMCFHPDIC = 7273; public static final int DFHFAMFGAFB = 26434; public static final int PIEEEPGACPJ = 7826; public static final int EIPGDJDGDBL = 26636; @@ -1712,7 +1721,6 @@ public final class PacketOpcodes { public static final int DONIENIMBLK = 23673; public static final int JACEEEBPMJI = 26022; public static final int NIIGEOFLJOB = 22281; - public static final int IBKJOEDGHDM = 2780; public static final int PLCNKOCHACF = 28289; public static final int IAFKGADDGBL = 8623; public static final int PFHNHHPGFPM = 5038; @@ -1878,7 +1886,6 @@ public final class PacketOpcodes { public static final int AJEFAJIJLPC = 26679; public static final int DKHIBDHAPNP = 3075; public static final int NCFNMJGHHHD = 23247; - public static final int LCGLIGGAGNH = 2810; public static final int KJLNEIFPOIC = 1639; public static final int PGJNALAIDFJ = 29467; public static final int KLNKMELGGHP = 27790; @@ -1933,7 +1940,6 @@ public final class PacketOpcodes { public static final int NHDGBOCFIMA = 20490; public static final int KIOAFNMFGNG = 26494; public static final int MACLMNJEHIN = 9564; - public static final int IKKOBOACJEE = 3795; public static final int DJPPECMIJAH = 9495; public static final int FBBJAIKNCGI = 20708; public static final int PGAJELHKGFB = 9083; @@ -2239,7 +2245,6 @@ public final class PacketOpcodes { public static final int LBJDFDFIOBB = 28881; public static final int BJOLCPGFJJP = 8597; public static final int IMAJBINLJDD = 20713; - public static final int BHMECEAADOP = 356; public static final int KGFGGKPJKJB = 20248; public static final int MLNEONADCBK = 9608; public static final int FPLGEEEFPJI = 2610; @@ -2640,7 +2645,6 @@ public final class PacketOpcodes { public static final int COGKLGCFPIJ = 4952; public static final int LBPHBPPJDPL = 4092; public static final int CHLDPDLJGGA = 1775; - public static final int NPKBDEEACMA = 2307; public static final int CIMICGLIAGP = 22727; public static final int FPHDDJECLHO = 24713; public static final int MDMDOFOCPGC = 25510; @@ -2703,7 +2707,6 @@ public final class PacketOpcodes { public static final int NBOPHFACMOF = 5123; public static final int KMDLEOCCPPJ = 3082; public static final int OPAJGPJFGHH = 20735; - public static final int MJIJLMMOLPP = 8076; public static final int OCPJNPMHJBA = 7168; public static final int LHNAHODEOPI = 8475; public static final int GNIDOJNFLCJ = 21377; @@ -2846,7 +2849,6 @@ public final class PacketOpcodes { public static final int ANKONNPBGJC = 1; public static final int AOJPBFBPDNB = 1; public static final int APPJMEJEKKG = 1; - public static final int AbilityChangeNotify = 1; public static final int AbilityInvocationFailNotify = 1; public static final int AbilityInvocationFixedNotify = 1; public static final int AcceptCityReputationRequestReq = 1; @@ -2930,7 +2932,6 @@ public final class PacketOpcodes { public static final int AsterMidInfoNotify = 1; public static final int AsterMiscInfoNotify = 1; public static final int AsterProgressInfoNotify = 1; - public static final int AvatarAddNotify = 1; public static final int AvatarBuffAddNotify = 1; public static final int AvatarBuffDelNotify = 1; public static final int AvatarCardChangeReq = 1; @@ -2963,7 +2964,6 @@ public final class PacketOpcodes { public static final int AvatarPromoteReq = 1; public static final int AvatarPromoteRsp = 1; public static final int AvatarPropChangeReasonNotify = 1; - public static final int AvatarPropNotify = 1; public static final int AvatarRenameInfoNotify = 1; public static final int AvatarSatiationDataNotify = 1; public static final int AvatarSkillChangeNotify = 1; @@ -3197,7 +3197,6 @@ public final class PacketOpcodes { public static final int ClearRoguelikeCurseNotify = 1; public static final int ClientAIStateNotify = 1; public static final int ClientAbilitiesInitFinishCombineNotify = 1; - public static final int ClientAbilityChangeNotify = 1; public static final int ClientAbilityInitBeginNotify = 1; public static final int ClientBulletCreateNotify = 1; public static final int ClientCollectorDataNotify = 1; @@ -3339,7 +3338,6 @@ public final class PacketOpcodes { public static final int DragonSpineChapterOpenNotify = 1; public static final int DragonSpineChapterProgressChangeNotify = 1; public static final int DragonSpineCoinChangeNotify = 1; - public static final int DropHintNotify = 1; public static final int DropItemReq = 1; public static final int DropItemRsp = 1; public static final int DuelHeartCgEndNotify = 1; @@ -3376,8 +3374,6 @@ public final class PacketOpcodes { public static final int DungeonDataNotify = 1; public static final int DungeonDieOptionReq = 1; public static final int DungeonDieOptionRsp = 1; - public static final int DungeonEntryInfoReq = 1; - public static final int DungeonEntryInfoRsp = 1; public static final int DungeonEntryToBeExploreNotify = 1; public static final int DungeonFollowNotify = 1; public static final int DungeonGetStatueDropReq = 1; @@ -3990,7 +3986,6 @@ public final class PacketOpcodes { public static final int HideAndSeekSetReadyRsp = 1; public static final int HideAndSeekSettleNotify = 1; public static final int HitClientTrivialNotify = 1; - public static final int HitTreeNotify = 1; public static final int HomeAllUnlockedBgmIdListNotify = 1; public static final int HomeAvatarAllFinishRewardNotify = 1; public static final int HomeAvatarCostumeChangeNotify = 1; @@ -4180,10 +4175,7 @@ public final class PacketOpcodes { public static final int IslandPartyRaftInfoNotify = 1; public static final int IslandPartySailInfoNotify = 1; public static final int IslandPartySettleNotify = 1; - public static final int ItemAddHintNotify = 1; public static final int ItemCdGroupTimeNotify = 1; - public static final int ItemGivingReq = 1; - public static final int ItemGivingRsp = 1; public static final int ItemRenameAvatarReq = 1; public static final int ItemRenameAvatarRsp = 1; public static final int JAAJNHEDHCO = 1; @@ -4473,7 +4465,6 @@ public final class PacketOpcodes { public static final int OMHCJJJOCMC = 1; public static final int ONKDBNHDBIP = 1; public static final int ONMIAIGDACA = 1; - public static final int ObstacleModifyNotify = 1; public static final int OfferingInteractReq = 1; public static final int OfferingInteractRsp = 1; public static final int OneoffGatherPointDetectorDataNotify = 1; @@ -4851,10 +4842,8 @@ public final class PacketOpcodes { public static final int ScenePlayOwnerStartInviteReq = 1; public static final int ScenePlayOwnerStartInviteRsp = 1; public static final int ScenePlayerBackgroundAvatarRefreshNotify = 1; - public static final int ScenePlayerInfoNotify = 1; public static final int ScenePlayerLocationNotify = 1; public static final int ScenePlayerSoundNotify = 1; - public static final int ScenePointUnlockNotify = 1; public static final int SceneRouteChangeNotify = 1; public static final int SceneWeatherForcastReq = 1; public static final int SceneWeatherForcastRsp = 1; @@ -4906,7 +4895,6 @@ public final class PacketOpcodes { public static final int SetCoopChapterViewedRsp = 1; public static final int SetCurExpeditionChallengeIdReq = 1; public static final int SetCurExpeditionChallengeIdRsp = 1; - public static final int SetEntityClientDataNotify = 1; public static final int SetFriendEnterHomeOptionReq = 1; public static final int SetFriendEnterHomeOptionRsp = 1; public static final int SetFriendRemarkNameReq = 1; @@ -5058,8 +5046,6 @@ public final class PacketOpcodes { public static final int TakeReunionSignInRewardRsp = 1; public static final int TakeReunionWatcherRewardReq = 1; public static final int TakeReunionWatcherRewardRsp = 1; - public static final int TakeoffEquipReq = 1; - public static final int TakeoffEquipRsp = 1; public static final int TanukiTravelFinishGuideQuestNotify = 1; public static final int TaskVarNotify = 1; public static final int TeamChainDungeonInfoNotify = 1; @@ -5195,12 +5181,6 @@ public final 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; @@ -5259,7 +5239,6 @@ public final class PacketOpcodes { public static final int WorldOwnerBlossomScheduleInfoNotify = 1; public static final int WorldOwnerDailyTaskNotify = 1; public static final int WorldPlayerInfoNotify = 1; - public static final int WorldPlayerLocationNotify = 1; public static final int WorldPlayerRTTNotify = 1; public static final int WorldPlayerReviveRsp = 1; public static final int WorldRoutineChangeNotify = 1; diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java index 987153e53af..be542727c90 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java @@ -21,12 +21,5 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex .getQuestManager() .queueEvent(QuestContent.QUEST_CONTENT_INTERACT_GADGET, req.getGadgetId()); session.getPlayer().interactWith(req.getGadgetEntityId(), req); - -// session.getPlayer().sendPacket( -// new PacketGadgetInteractRsp( -// req.getGadgetId(), -// req.getGadgetEntityId(), -// InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE, -// InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH)); } } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java index f78c5c521f2..bab34e62b07 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java @@ -23,94 +23,91 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex var giveId = req.getGivingId(); var items = req.getItemParamListList(); - switch (req.getItemGivingType()) { - case QUEST -> { - var questManager = player.getQuestManager(); - var activeGivings = player.getPlayerProgress().getItemGivings(); - if (!activeGivings.containsKey(giveId)) return; + try { + var questManager = player.getQuestManager(); + var activeGivings = player.getPlayerProgress().getItemGivings(); + if (!activeGivings.containsKey(giveId)) return; - // Check the items against the resources. - var data = GameData.getGivingDataMap().get(giveId); - if (data == null) - throw new IllegalArgumentException("No giving data found for " + giveId + "."); + // Check the items against the resources. + var data = GameData.getGivingDataMap().get(giveId); + if (data == null) + throw new IllegalArgumentException("No giving data found for " + giveId + "."); - switch (data.getGivingMethod()) { - case GIVING_METHOD_EXACT -> { - // Check if the player has all the items. - if (!inventory.hasAllItems(items)) { - player.sendPacket(new PacketItemGivingRsp()); - return; - } - - // Remove the items if the quest specifies. - if (data.isRemoveItem()) { - inventory.removeItems(items); - } + switch (data.getGivingMethod()) { + case GIVING_METHOD_EXACT -> { + // Check if the player has all the items. + if (!inventory.hasAllItems(items)) { + player.sendPacket(new PacketItemGivingRsp()); + return; + } - // Send the response packet. - player.sendPacket(new PacketItemGivingRsp(giveId, Mode.EXACT_SUCCESS)); - // Remove the action from the active givings. - questManager.removeGivingItemAction(giveId); - // Queue the content and condition actions. - questManager.queueEvent(QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING, giveId, 0); - questManager.queueEvent(QuestCond.QUEST_COND_ITEM_GIVING_FINISHED, giveId, 0); + // Remove the items if the quest specifies. + if (data.isRemoveItem()) { + inventory.removeItems(items); } - case GIVING_METHOD_VAGUE_GROUP, GIVING_METHOD_GROUP -> { - var matchedGroups = new ArrayList(); - var givenItems = new HashMap(); - // Resolve potential item IDs. - var groupData = GameData.getGivingGroupDataMap(); - data.getGivingGroupIds().stream() - .map(groupId -> groupData.get((int) groupId)) - .filter(Objects::nonNull) - .forEach( - group -> { - var itemIds = group.getItemIds(); + // Send the response packet. + player.sendPacket(new PacketItemGivingRsp(giveId, Mode.EXACT_SUCCESS)); + // Remove the action from the active givings. + questManager.removeGivingItemAction(giveId); + // Queue the content and condition actions. + questManager.queueEvent(QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING, giveId, 0); + questManager.queueEvent(QuestCond.QUEST_COND_ITEM_GIVING_FINISHED, giveId, 0); + } + case GIVING_METHOD_VAGUE_GROUP, GIVING_METHOD_GROUP -> { + var matchedGroups = new ArrayList(); + var givenItems = new HashMap(); - // Match item stacks to the group items. - items.forEach( - param -> { - // Get the item instance. - var itemInstance = inventory.getFirstItem(param.getItemId()); - if (itemInstance == null) return; + // Resolve potential item IDs. + var groupData = GameData.getGivingGroupDataMap(); + data.getGivingGroupIds().stream() + .map(groupId -> groupData.get((int) groupId)) + .filter(Objects::nonNull) + .forEach( + group -> { + var itemIds = group.getItemIds(); - // Get the item ID. - var itemId = itemInstance.getItemId(); - if (!itemIds.contains(itemId)) return; + // Match item stacks to the group items. + items.forEach( + param -> { + // Get the item instance. + var itemInstance = inventory.getFirstItem(param.getItemId()); + if (itemInstance == null) return; - // Add the item to the given items. - givenItems.put(itemId, param.getCount()); - matchedGroups.add(group.getId()); - }); - }); + // Get the item ID. + var itemId = itemInstance.getItemId(); + if (!itemIds.contains(itemId)) return; - // Check if the player has any items. - if (givenItems.isEmpty() && matchedGroups.isEmpty()) { - player.sendPacket(new PacketItemGivingRsp()); - } else { - // Remove the items if the quest specifies. - if (data.isRemoveItem()) { - inventory.removeItems(items); - } + // Add the item to the given items. + givenItems.put(itemId, param.getCount()); + matchedGroups.add(group.getId()); + }); + }); - // Send the response packet. - player.sendPacket(new PacketItemGivingRsp(matchedGroups.get(0), Mode.GROUP_SUCCESS)); - // Mark the giving action as completed. - questManager.markCompleted(giveId); - // Queue the content and condition actions. - questManager.queueEvent( - QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING, giveId, matchedGroups.get(0)); - questManager.queueEvent( - QuestCond.QUEST_COND_ITEM_GIVING_FINISHED, giveId, matchedGroups.get(0)); + // Check if the player has any items. + if (givenItems.isEmpty() && matchedGroups.isEmpty()) { + player.sendPacket(new PacketItemGivingRsp()); + } else { + // Remove the items if the quest specifies. + if (data.isRemoveItem()) { + inventory.removeItems(items); } + + // Send the response packet. + player.sendPacket(new PacketItemGivingRsp(matchedGroups.get(0), Mode.GROUP_SUCCESS)); + // Mark the giving action as completed. + questManager.markCompleted(giveId); + // Queue the content and condition actions. + questManager.queueEvent( + QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING, giveId, matchedGroups.get(0)); + questManager.queueEvent( + QuestCond.QUEST_COND_ITEM_GIVING_FINISHED, giveId, matchedGroups.get(0)); } } } - case GADGET -> { - Grasscutter.getLogger().debug("Unimplemented gadget giving was executed for {}.", giveId); - player.sendPacket(new PacketItemGivingRsp()); - } + } catch (Exception ignored) { + Grasscutter.getLogger().debug("Unimplemented gadget giving was executed for {}.", giveId); + player.sendPacket(new PacketItemGivingRsp()); } } }