Skip to content

GitLab

Unverified Commit 92fbaa86 authored by Simplxs's avatar Simplxs Committed by GitHub
Browse files

Update gc to 3.3 (#1981) 



* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number
Co-authored-by: default avatarGanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
parent 8b83dbf5
Hide whitespace changes
Inline Side-by-side
src/generated/main/java/emu/grasscutter/net/proto/AvatarLifeStateChangeNotifyOuterClass.java
View file @ 92fbaa86
......@@ -19,82 +19,85 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 life_state = 13;</code>
* @return The lifeState.
*/
int getLifeState();
/**
* <code>string attack_tag = 10;</code>
* @return The attackTag.
*/
java.lang.String getAttackTag();
/**
* <code>string attack_tag = 10;</code>
* @return The bytes for attackTag.
*/
com.google.protobuf.ByteString
getAttackTagBytes();
/**
* <code>.PlayerDieType die_type = 2;</code>
* @return The enum numeric value on the wire for dieType.
*/
int getDieTypeValue();
/**
* <code>.PlayerDieType die_type = 2;</code>
* @return The dieType.
* <code>uint32 source_entity_id = 11;</code>
* @return The sourceEntityId.
*/
emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
int getSourceEntityId();
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>
getServerBuffListList();
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
int getServerBuffListCount();
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder>
getServerBuffListOrBuilderList();
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
int index);
/**
* <code>uint32 move_reliable_seq = 5;</code>
* <code>uint32 move_reliable_seq = 12;</code>
* @return The moveReliableSeq.
*/
int getMoveReliableSeq();
/**
* <code>uint32 source_entity_id = 3;</code>
* @return The sourceEntityId.
* <code>uint32 life_state = 6;</code>
* @return The lifeState.
*/
int getSourceEntityId();
int getLifeState();
/**
* <code>.PlayerDieType die_type = 5;</code>
* @return The enum numeric value on the wire for dieType.
*/
int getDieTypeValue();
/**
* <code>.PlayerDieType die_type = 5;</code>
* @return The dieType.
*/
emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
/**
* <code>string attack_tag = 15;</code>
* @return The attackTag.
*/
java.lang.String getAttackTag();
/**
* <code>string attack_tag = 15;</code>
* @return The bytes for attackTag.
*/
com.google.protobuf.ByteString
getAttackTagBytes();
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* CmdId: 1290
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1247;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarLifeStateChangeNotify}
......@@ -109,9 +112,9 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
super(builder);
}
private AvatarLifeStateChangeNotify() {
attackTag_ = "";
dieType_ = 0;
serverBuffList_ = java.util.Collections.emptyList();
dieType_ = 0;
attackTag_ = "";
}
@java.lang.Override
......@@ -146,33 +149,32 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
done = true;
break;
case 16: {
int rawValue = input.readEnum();
dieType_ = rawValue;
avatarGuid_ = input.readUInt64();
break;
}
case 24: {
case 40: {
int rawValue = input.readEnum();
sourceEntityId_ = input.readUInt32();
dieType_ = rawValue;
break;
}
case 40: {
case 48: {
moveReliableSeq_ = input.readUInt32();
lifeState_ = input.readUInt32();
break;
}
case 82: {
java.lang.String s = input.readStringRequireUtf8();
case 88: {
attackTag_ = s;
sourceEntityId_ = input.readUInt32();
break;
}
case 88: {
case 96: {
avatarGuid_ = input.readUInt64();
moveReliableSeq_ = input.readUInt32();
break;
}
case 98: {
case 114: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
mutable_bitField0_ |= 0x00000001;
......@@ -181,9 +183,10 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
break;
}
case 104: {
case 122: {
java.lang.String s = input.readStringRequireUtf8();
lifeState_ = input.readUInt32();
attackTag_ = s;
break;
}
default: {
......@@ -221,85 +224,28 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.class, emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.Builder.class);
}
public static final int LIFE_STATE_FIELD_NUMBER = 13;
private int lifeState_;
/**
* <code>uint32 life_state = 13;</code>
* @return The lifeState.
*/
@java.lang.Override
public int getLifeState() {
return lifeState_;
}
public static final int ATTACK_TAG_FIELD_NUMBER = 10;
private volatile java.lang.Object attackTag_;
/**
* <code>string attack_tag = 10;</code>
* @return The attackTag.
*/
@java.lang.Override
public java.lang.String getAttackTag() {
java.lang.Object ref = attackTag_;
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();
attackTag_ = s;
return s;
}
}
public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 11;
private int sourceEntityId_;
/**
* <code>string attack_tag = 10;</code>
* @return The bytes for attackTag.
* <code>uint32 source_entity_id = 11;</code>
* @return The sourceEntityId.
*/
@java.lang.Override
public com.google.protobuf.ByteString
getAttackTagBytes() {
java.lang.Object ref = attackTag_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
attackTag_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
public static final int DIE_TYPE_FIELD_NUMBER = 2;
private int dieType_;
/**
* <code>.PlayerDieType die_type = 2;</code>
* @return The enum numeric value on the wire for dieType.
*/
@java.lang.Override public int getDieTypeValue() {
return dieType_;
}
/**
* <code>.PlayerDieType die_type = 2;</code>
* @return The dieType.
*/
@java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
public int getSourceEntityId() {
return sourceEntityId_;
}
public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 12;
public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 14;
private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
return serverBuffList_;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder>
......@@ -307,21 +253,21 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return serverBuffList_;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
@java.lang.Override
public int getServerBuffListCount() {
return serverBuffList_.size();
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
return serverBuffList_.get(index);
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
......@@ -329,10 +275,10 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return serverBuffList_.get(index);
}
public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 5;
public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 12;
private int moveReliableSeq_;
/**
* <code>uint32 move_reliable_seq = 5;</code>
* <code>uint32 move_reliable_seq = 12;</code>
* @return The moveReliableSeq.
*/
@java.lang.Override
......@@ -340,21 +286,78 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return moveReliableSeq_;
}
public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 3;
private int sourceEntityId_;
public static final int LIFE_STATE_FIELD_NUMBER = 6;
private int lifeState_;
/**
* <code>uint32 source_entity_id = 3;</code>
* @return The sourceEntityId.
* <code>uint32 life_state = 6;</code>
* @return The lifeState.
*/
@java.lang.Override
public int getSourceEntityId() {
return sourceEntityId_;
public int getLifeState() {
return lifeState_;
}
public static final int DIE_TYPE_FIELD_NUMBER = 5;
private int dieType_;
/**
* <code>.PlayerDieType die_type = 5;</code>
* @return The enum numeric value on the wire for dieType.
*/
@java.lang.Override public int getDieTypeValue() {
return dieType_;
}
/**
* <code>.PlayerDieType die_type = 5;</code>
* @return The dieType.
*/
@java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
}
public static final int ATTACK_TAG_FIELD_NUMBER = 15;
private volatile java.lang.Object attackTag_;
/**
* <code>string attack_tag = 15;</code>
* @return The attackTag.
*/
@java.lang.Override
public java.lang.String getAttackTag() {
java.lang.Object ref = attackTag_;
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();
attackTag_ = s;
return s;
}
}
/**
* <code>string attack_tag = 15;</code>
* @return The bytes for attackTag.
*/
@java.lang.Override
public com.google.protobuf.ByteString
getAttackTagBytes() {
java.lang.Object ref = attackTag_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
attackTag_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
public static final int AVATAR_GUID_FIELD_NUMBER = 11;
public static final int AVATAR_GUID_FIELD_NUMBER = 2;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
......@@ -376,26 +379,26 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(2, avatarGuid_);
}
if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
output.writeEnum(2, dieType_);
output.writeEnum(5, dieType_);
}
if (lifeState_ != 0) {
output.writeUInt32(6, lifeState_);
}
if (sourceEntityId_ != 0) {
output.writeUInt32(3, sourceEntityId_);
output.writeUInt32(11, sourceEntityId_);
}
if (moveReliableSeq_ != 0) {
output.writeUInt32(5, moveReliableSeq_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 10, attackTag_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(11, avatarGuid_);
output.writeUInt32(12, moveReliableSeq_);
}
for (int i = 0; i < serverBuffList_.size(); i++) {
output.writeMessage(12, serverBuffList_.get(i));
output.writeMessage(14, serverBuffList_.get(i));
}
if (lifeState_ != 0) {
output.writeUInt32(13, lifeState_);
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 15, attackTag_);
}
unknownFields.writeTo(output);
}
......@@ -406,32 +409,32 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(2, dieType_);
.computeUInt64Size(2, avatarGuid_);
}
if (sourceEntityId_ != 0) {
if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, sourceEntityId_);
.computeEnumSize(5, dieType_);
}
if (moveReliableSeq_ != 0) {
if (lifeState_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, moveReliableSeq_);
.computeUInt32Size(6, lifeState_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, attackTag_);
if (sourceEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, sourceEntityId_);
}
if (avatarGuid_ != 0L) {
if (moveReliableSeq_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(11, avatarGuid_);
.computeUInt32Size(12, moveReliableSeq_);
}
for (int i = 0; i < serverBuffList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, serverBuffList_.get(i));
.computeMessageSize(14, serverBuffList_.get(i));
}
if (lifeState_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, lifeState_);
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, attackTag_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
......@@ -448,17 +451,17 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify other = (emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify) obj;
if (getLifeState()
!= other.getLifeState()) return false;
if (!getAttackTag()
.equals(other.getAttackTag())) return false;
if (dieType_ != other.dieType_) return false;
if (getSourceEntityId()
!= other.getSourceEntityId()) return false;
if (!getServerBuffListList()
.equals(other.getServerBuffListList())) return false;
if (getMoveReliableSeq()
!= other.getMoveReliableSeq()) return false;
if (getSourceEntityId()
!= other.getSourceEntityId()) return false;
if (getLifeState()
!= other.getLifeState()) return false;
if (dieType_ != other.dieType_) return false;
if (!getAttackTag()
.equals(other.getAttackTag())) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
......@@ -472,20 +475,20 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + LIFE_STATE_FIELD_NUMBER;
hash = (53 * hash) + getLifeState();
hash = (37 * hash) + ATTACK_TAG_FIELD_NUMBER;
hash = (53 * hash) + getAttackTag().hashCode();
hash = (37 * hash) + DIE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + dieType_;
hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getSourceEntityId();
if (getServerBuffListCount() > 0) {
hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
hash = (53 * hash) + getServerBuffListList().hashCode();
}
hash = (37 * hash) + MOVE_RELIABLE_SEQ_FIELD_NUMBER;
hash = (53 * hash) + getMoveReliableSeq();
hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getSourceEntityId();
hash = (37 * hash) + LIFE_STATE_FIELD_NUMBER;
hash = (53 * hash) + getLifeState();
hash = (37 * hash) + DIE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + dieType_;
hash = (37 * hash) + ATTACK_TAG_FIELD_NUMBER;
hash = (53 * hash) + getAttackTag().hashCode();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
......@@ -586,10 +589,13 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1290
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1247;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarLifeStateChangeNotify}
......@@ -630,11 +636,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
lifeState_ = 0;
attackTag_ = "";
dieType_ = 0;
sourceEntityId_ = 0;
if (serverBuffListBuilder_ == null) {
serverBuffList_ = java.util.Collections.emptyList();
......@@ -644,7 +646,11 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
moveReliableSeq_ = 0;
sourceEntityId_ = 0;
lifeState_ = 0;
dieType_ = 0;
attackTag_ = "";
avatarGuid_ = 0L;
......@@ -675,9 +681,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
public emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify buildPartial() {
emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify result = new emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify(this);
int from_bitField0_ = bitField0_;
result.lifeState_ = lifeState_;
result.attackTag_ = attackTag_;
result.dieType_ = dieType_;
result.sourceEntityId_ = sourceEntityId_;
if (serverBuffListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
......@@ -688,7 +692,9 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
result.serverBuffList_ = serverBuffListBuilder_.build();
}
result.moveReliableSeq_ = moveReliableSeq_;
result.sourceEntityId_ = sourceEntityId_;
result.lifeState_ = lifeState_;
result.dieType_ = dieType_;
result.attackTag_ = attackTag_;
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
......@@ -738,15 +744,8 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify other) {
if (other == emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.getDefaultInstance()) return this;
if (other.getLifeState() != 0) {
setLifeState(other.getLifeState());
}
if (!other.getAttackTag().isEmpty()) {
attackTag_ = other.attackTag_;
onChanged();
}
if (other.dieType_ != 0) {
setDieTypeValue(other.getDieTypeValue());
if (other.getSourceEntityId() != 0) {
setSourceEntityId(other.getSourceEntityId());
}
if (serverBuffListBuilder_ == null) {
if (!other.serverBuffList_.isEmpty()) {
......@@ -777,8 +776,15 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
if (other.getMoveReliableSeq() != 0) {
setMoveReliableSeq(other.getMoveReliableSeq());
}
if (other.getSourceEntityId() != 0) {
setSourceEntityId(other.getSourceEntityId());
if (other.getLifeState() != 0) {
setLifeState(other.getLifeState());
}
if (other.dieType_ != 0) {
setDieTypeValue(other.getDieTypeValue());
}
if (!other.getAttackTag().isEmpty()) {
attackTag_ = other.attackTag_;
onChanged();
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
......@@ -813,163 +819,33 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
private int bitField0_;
private int lifeState_ ;
/**
* <code>uint32 life_state = 13;</code>
* @return The lifeState.
*/
@java.lang.Override
public int getLifeState() {
return lifeState_;
}
/**
* <code>uint32 life_state = 13;</code>
* @param value The lifeState to set.
* @return This builder for chaining.
*/
public Builder setLifeState(int value) {
lifeState_ = value;
onChanged();
return this;
}
/**
* <code>uint32 life_state = 13;</code>
* @return This builder for chaining.
*/
public Builder clearLifeState() {
lifeState_ = 0;
onChanged();
return this;
}
private java.lang.Object attackTag_ = "";
/**
* <code>string attack_tag = 10;</code>
* @return The attackTag.
*/
public java.lang.String getAttackTag() {
java.lang.Object ref = attackTag_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
attackTag_ = s;
return s;
} else {
return (java.lang.String) ref;
}
}
/**
* <code>string attack_tag = 10;</code>
* @return The bytes for attackTag.
*/
public com.google.protobuf.ByteString
getAttackTagBytes() {
java.lang.Object ref = attackTag_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
attackTag_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
* <code>string attack_tag = 10;</code>
* @param value The attackTag to set.
* @return This builder for chaining.
*/
public Builder setAttackTag(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
attackTag_ = value;
onChanged();
return this;
}
/**
* <code>string attack_tag = 10;</code>
* @return This builder for chaining.
*/
public Builder clearAttackTag() {
attackTag_ = getDefaultInstance().getAttackTag();
onChanged();
return this;
}
/**
* <code>string attack_tag = 10;</code>
* @param value The bytes for attackTag to set.
* @return This builder for chaining.
*/
public Builder setAttackTagBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
attackTag_ = value;
onChanged();
return this;
}
private int dieType_ = 0;
/**
* <code>.PlayerDieType die_type = 2;</code>
* @return The enum numeric value on the wire for dieType.
*/
@java.lang.Override public int getDieTypeValue() {
return dieType_;
}
/**
* <code>.PlayerDieType die_type = 2;</code>
* @param value The enum numeric value on the wire for dieType to set.
* @return This builder for chaining.
*/
public Builder setDieTypeValue(int value) {
dieType_ = value;
onChanged();
return this;
}
private int sourceEntityId_ ;
/**
* <code>.PlayerDieType die_type = 2;</code>
* @return The dieType.
* <code>uint32 source_entity_id = 11;</code>
* @return The sourceEntityId.
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
public int getSourceEntityId() {
return sourceEntityId_;
}
/**
* <code>.PlayerDieType die_type = 2;</code>
* @param value The dieType to set.
* <code>uint32 source_entity_id = 11;</code>
* @param value The sourceEntityId to set.
* @return This builder for chaining.
*/
public Builder setDieType(emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType value) {
if (value == null) {
throw new NullPointerException();
}
public Builder setSourceEntityId(int value) {
dieType_ = value.getNumber();
sourceEntityId_ = value;
onChanged();
return this;
}
/**
* <code>.PlayerDieType die_type = 2;</code>
* <code>uint32 source_entity_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearDieType() {
public Builder clearSourceEntityId() {
dieType_ = 0;
sourceEntityId_ = 0;
onChanged();
return this;
}
......@@ -987,7 +863,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> serverBuffListBuilder_;
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
if (serverBuffListBuilder_ == null) {
......@@ -997,7 +873,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public int getServerBuffListCount() {
if (serverBuffListBuilder_ == null) {
......@@ -1007,7 +883,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
if (serverBuffListBuilder_ == null) {
......@@ -1017,7 +893,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder setServerBuffList(
int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
......@@ -1034,7 +910,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder setServerBuffList(
int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
......@@ -1048,7 +924,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
if (serverBuffListBuilder_ == null) {
......@@ -1064,7 +940,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder addServerBuffList(
int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
......@@ -1081,7 +957,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder addServerBuffList(
emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
......@@ -1095,7 +971,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder addServerBuffList(
int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
......@@ -1109,7 +985,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder addAllServerBuffList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
......@@ -1124,7 +1000,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder clearServerBuffList() {
if (serverBuffListBuilder_ == null) {
......@@ -1137,7 +1013,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public Builder removeServerBuffList(int index) {
if (serverBuffListBuilder_ == null) {
......@@ -1150,14 +1026,14 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
int index) {
return getServerBuffListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
int index) {
......@@ -1167,7 +1043,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder>
getServerBuffListOrBuilderList() {
......@@ -1178,14 +1054,14 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
}
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder() {
return getServerBuffListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
int index) {
......@@ -1193,7 +1069,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
}
/**
* <code>repeated .ServerBuff server_buff_list = 12;</code>
* <code>repeated .ServerBuff server_buff_list = 14;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder>
getServerBuffListBuilderList() {
......@@ -1216,7 +1092,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
private int moveReliableSeq_ ;
/**
* <code>uint32 move_reliable_seq = 5;</code>
* <code>uint32 move_reliable_seq = 12;</code>
* @return The moveReliableSeq.
*/
@java.lang.Override
......@@ -1224,7 +1100,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return moveReliableSeq_;
}
/**
* <code>uint32 move_reliable_seq = 5;</code>
* <code>uint32 move_reliable_seq = 12;</code>
* @param value The moveReliableSeq to set.
* @return This builder for chaining.
*/
......@@ -1235,7 +1111,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>uint32 move_reliable_seq = 5;</code>
* <code>uint32 move_reliable_seq = 12;</code>
* @return This builder for chaining.
*/
public Builder clearMoveReliableSeq() {
......@@ -1245,40 +1121,170 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
private int sourceEntityId_ ;
private int lifeState_ ;
/**
* <code>uint32 source_entity_id = 3;</code>
* @return The sourceEntityId.
* <code>uint32 life_state = 6;</code>
* @return The lifeState.
*/
@java.lang.Override
public int getSourceEntityId() {
return sourceEntityId_;
public int getLifeState() {
return lifeState_;
}
/**
* <code>uint32 source_entity_id = 3;</code>
* @param value The sourceEntityId to set.
* <code>uint32 life_state = 6;</code>
* @param value The lifeState to set.
* @return This builder for chaining.
*/
public Builder setSourceEntityId(int value) {
public Builder setLifeState(int value) {
sourceEntityId_ = value;
lifeState_ = value;
onChanged();
return this;
}
/**
* <code>uint32 source_entity_id = 3;</code>
* <code>uint32 life_state = 6;</code>
* @return This builder for chaining.
*/
public Builder clearSourceEntityId() {
public Builder clearLifeState() {
sourceEntityId_ = 0;
lifeState_ = 0;
onChanged();
return this;
}
private int dieType_ = 0;
/**
* <code>.PlayerDieType die_type = 5;</code>
* @return The enum numeric value on the wire for dieType.
*/
@java.lang.Override public int getDieTypeValue() {
return dieType_;
}
/**
* <code>.PlayerDieType die_type = 5;</code>
* @param value The enum numeric value on the wire for dieType to set.
* @return This builder for chaining.
*/
public Builder setDieTypeValue(int value) {
dieType_ = value;
onChanged();
return this;
}
/**
* <code>.PlayerDieType die_type = 5;</code>
* @return The dieType.
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
}
/**
* <code>.PlayerDieType die_type = 5;</code>
* @param value The dieType to set.
* @return This builder for chaining.
*/
public Builder setDieType(emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType value) {
if (value == null) {
throw new NullPointerException();
}
dieType_ = value.getNumber();
onChanged();
return this;
}
/**
* <code>.PlayerDieType die_type = 5;</code>
* @return This builder for chaining.
*/
public Builder clearDieType() {
dieType_ = 0;
onChanged();
return this;
}
private java.lang.Object attackTag_ = "";
/**
* <code>string attack_tag = 15;</code>
* @return The attackTag.
*/
public java.lang.String getAttackTag() {
java.lang.Object ref = attackTag_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
attackTag_ = s;
return s;
} else {
return (java.lang.String) ref;
}
}
/**
* <code>string attack_tag = 15;</code>
* @return The bytes for attackTag.
*/
public com.google.protobuf.ByteString
getAttackTagBytes() {
java.lang.Object ref = attackTag_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
attackTag_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
* <code>string attack_tag = 15;</code>
* @param value The attackTag to set.
* @return This builder for chaining.
*/
public Builder setAttackTag(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
attackTag_ = value;
onChanged();
return this;
}
/**
* <code>string attack_tag = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAttackTag() {
attackTag_ = getDefaultInstance().getAttackTag();
onChanged();
return this;
}
/**
* <code>string attack_tag = 15;</code>
* @param value The bytes for attackTag to set.
* @return This builder for chaining.
*/
public Builder setAttackTagBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
attackTag_ = value;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
......@@ -1286,7 +1292,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 2;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
......@@ -1297,7 +1303,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
return this;
}
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
......@@ -1375,12 +1381,12 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n!AvatarLifeStateChangeNotify.proto\032\023Pla" +
"yerDieType.proto\032\020ServerBuff.proto\"\330\001\n\033A" +
"vatarLifeStateChangeNotify\022\022\n\nlife_state" +
"\030\r \001(\r\022\022\n\nattack_tag\030\n \001(\t\022 \n\010die_type\030\002" +
" \001(\0162\016.PlayerDieType\022%\n\020server_buff_list" +
"\030\014 \003(\0132\013.ServerBuff\022\031\n\021move_reliable_seq" +
"\030\005 \001(\r\022\030\n\020source_entity_id\030\003 \001(\r\022\023\n\013avat" +
"ar_guid\030\013 \001(\004B\033\n\031emu.grasscutter.net.pro" +
"vatarLifeStateChangeNotify\022\030\n\020source_ent" +
"ity_id\030\013 \001(\r\022%\n\020server_buff_list\030\016 \003(\0132\013" +
".ServerBuff\022\031\n\021move_reliable_seq\030\014 \001(\r\022\022" +
"\n\nlife_state\030\006 \001(\r\022 \n\010die_type\030\005 \001(\0162\016.P" +
"layerDieType\022\022\n\nattack_tag\030\017 \001(\t\022\023\n\013avat" +
"ar_guid\030\002 \001(\004B\033\n\031emu.grasscutter.net.pro" +
"tob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
......@@ -1394,7 +1400,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
internal_static_AvatarLifeStateChangeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarLifeStateChangeNotify_descriptor,
new java.lang.String[] { "LifeState", "AttackTag", "DieType", "ServerBuffList", "MoveReliableSeq", "SourceEntityId", "AvatarGuid", });
new java.lang.String[] { "SourceEntityId", "ServerBuffList", "MoveReliableSeq", "LifeState", "DieType", "AttackTag", "AvatarGuid", });
emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor();
emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
}
......
src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java
View file @ 92fbaa86
......@@ -19,17 +19,21 @@ public final class AvatarPromoteReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 guid = 5;</code>
* <code>uint64 guid = 1;</code>
* @return The guid.
*/
long getGuid();
}
/**
* <pre>
* CmdId: 1664
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1731;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarPromoteReq}
......@@ -76,7 +80,7 @@ public final class AvatarPromoteReqOuterClass {
case 0:
done = true;
break;
case 40: {
case 8: {
guid_ = input.readUInt64();
break;
......@@ -113,10 +117,10 @@ public final class AvatarPromoteReqOuterClass {
emu.grasscutter.net.proto.AvatarPromoteReqOuterClass.AvatarPromoteReq.class, emu.grasscutter.net.proto.AvatarPromoteReqOuterClass.AvatarPromoteReq.Builder.class);
}
public static final int GUID_FIELD_NUMBER = 5;
public static final int GUID_FIELD_NUMBER = 1;
private long guid_;
/**
* <code>uint64 guid = 5;</code>
* <code>uint64 guid = 1;</code>
* @return The guid.
*/
@java.lang.Override
......@@ -139,7 +143,7 @@ public final class AvatarPromoteReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (guid_ != 0L) {
output.writeUInt64(5, guid_);
output.writeUInt64(1, guid_);
}
unknownFields.writeTo(output);
}
......@@ -152,7 +156,7 @@ public final class AvatarPromoteReqOuterClass {
size = 0;
if (guid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(5, guid_);
.computeUInt64Size(1, guid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
......@@ -282,10 +286,14 @@ public final class AvatarPromoteReqOuterClass {
}
/**
* <pre>
* CmdId: 1664
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1731;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarPromoteReq}
......@@ -436,7 +444,7 @@ public final class AvatarPromoteReqOuterClass {
private long guid_ ;
/**
* <code>uint64 guid = 5;</code>
* <code>uint64 guid = 1;</code>
* @return The guid.
*/
@java.lang.Override
......@@ -444,7 +452,7 @@ public final class AvatarPromoteReqOuterClass {
return guid_;
}
/**
* <code>uint64 guid = 5;</code>
* <code>uint64 guid = 1;</code>
* @param value The guid to set.
* @return This builder for chaining.
*/
......@@ -455,7 +463,7 @@ public final class AvatarPromoteReqOuterClass {
return this;
}
/**
* <code>uint64 guid = 5;</code>
* <code>uint64 guid = 1;</code>
* @return This builder for chaining.
*/
public Builder clearGuid() {
......@@ -532,7 +540,7 @@ public final class AvatarPromoteReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026AvatarPromoteReq.proto\" \n\020AvatarPromot" +
"eReq\022\014\n\004guid\030\005 \001(\004B\033\n\031emu.grasscutter.ne" +
"eReq\022\014\n\004guid\030\001 \001(\004B\033\n\031emu.grasscutter.ne" +
"t.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
......
src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java
View file @ 92fbaa86
......@@ -25,17 +25,20 @@ public final class AvatarPromoteRspOuterClass {
long getGuid();
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 13;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 1639
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1710;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarPromoteRsp}
......@@ -82,14 +85,14 @@ public final class AvatarPromoteRspOuterClass {
case 0:
done = true;
break;
case 64: {
case 88: {
retcode_ = input.readInt32();
guid_ = input.readUInt64();
break;
}
case 88: {
case 104: {
guid_ = input.readUInt64();
retcode_ = input.readInt32();
break;
}
default: {
......@@ -135,10 +138,10 @@ public final class AvatarPromoteRspOuterClass {
return guid_;
}
public static final int RETCODE_FIELD_NUMBER = 8;
public static final int RETCODE_FIELD_NUMBER = 13;
private int retcode_;
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 13;</code>
* @return The retcode.
*/
@java.lang.Override
......@@ -160,12 +163,12 @@ public final class AvatarPromoteRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(8, retcode_);
}
if (guid_ != 0L) {
output.writeUInt64(11, guid_);
}
if (retcode_ != 0) {
output.writeInt32(13, retcode_);
}
unknownFields.writeTo(output);
}
......@@ -175,14 +178,14 @@ public final class AvatarPromoteRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, retcode_);
}
if (guid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(11, guid_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(13, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
......@@ -315,10 +318,13 @@ public final class AvatarPromoteRspOuterClass {
}
/**
* <pre>
* CmdId: 1639
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1710;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarPromoteRsp}
......@@ -506,7 +512,7 @@ public final class AvatarPromoteRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 13;</code>
* @return The retcode.
*/
@java.lang.Override
......@@ -514,7 +520,7 @@ public final class AvatarPromoteRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 13;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
......@@ -525,7 +531,7 @@ public final class AvatarPromoteRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 13;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
......@@ -602,7 +608,7 @@ public final class AvatarPromoteRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026AvatarPromoteRsp.proto\"1\n\020AvatarPromot" +
"eRsp\022\014\n\004guid\030\013 \001(\004\022\017\n\007retcode\030\010 \001(\005B\033\n\031e" +
"eRsp\022\014\n\004guid\030\013 \001(\004\022\017\n\007retcode\030\r \001(\005B\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment