diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java
index f31266b9e82..59902f81b0d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java
@@ -19,11 +19,11 @@ public interface AvatarTeamUpdateNotifyOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
int getAvatarTeamMapCount();
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
boolean containsAvatarTeamMap(
int key);
@@ -34,19 +34,19 @@ boolean containsAvatarTeamMap(
java.util.Map
getAvatarTeamMap();
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
java.util.Map
getAvatarTeamMapMap();
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrDefault(
int key,
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam defaultValue);
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
@@ -70,6 +70,10 @@ emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThro
long getTempAvatarGuidList(int index);
}
/**
+ *
+ * CmdId: 4042
+ *
+ *
* Protobuf type {@code AvatarTeamUpdateNotify}
*/
public static final class AvatarTeamUpdateNotify extends
@@ -116,6 +120,19 @@ private AvatarTeamUpdateNotify(
case 0:
done = true;
break;
+ case 50: {
+ if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+ avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
+ AvatarTeamMapDefaultEntryHolder.defaultEntry);
+ mutable_bitField0_ |= 0x00000001;
+ }
+ com.google.protobuf.MapEntry
+ avatarTeamMap__ = input.readMessage(
+ AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+ avatarTeamMap_.getMutableMap().put(
+ avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
+ break;
+ }
case 56: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
tempAvatarGuidList_ = newLongList();
@@ -137,19 +154,6 @@ private AvatarTeamUpdateNotify(
input.popLimit(limit);
break;
}
- case 74: {
- if (!((mutable_bitField0_ & 0x00000001) != 0)) {
- avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
- AvatarTeamMapDefaultEntryHolder.defaultEntry);
- mutable_bitField0_ |= 0x00000001;
- }
- com.google.protobuf.MapEntry
- avatarTeamMap__ = input.readMessage(
- AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
- avatarTeamMap_.getMutableMap().put(
- avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
- break;
- }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -182,7 +186,7 @@ private AvatarTeamUpdateNotify(
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
- case 9:
+ case 6:
return internalGetAvatarTeamMap();
default:
throw new RuntimeException(
@@ -197,7 +201,7 @@ protected com.google.protobuf.MapField internalGetMapField(
emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.class, emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.Builder.class);
}
- public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 9;
+ public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 6;
private static final class AvatarTeamMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -224,7 +228,7 @@ public int getAvatarTeamMapCount() {
return internalGetAvatarTeamMap().getMap().size();
}
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -242,7 +246,7 @@ public java.util.Mapmap<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -250,7 +254,7 @@ public java.util.Mapmap<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -263,7 +267,7 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -321,6 +325,12 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
+ com.google.protobuf.GeneratedMessageV3
+ .serializeIntegerMapTo(
+ output,
+ internalGetAvatarTeamMap(),
+ AvatarTeamMapDefaultEntryHolder.defaultEntry,
+ 6);
if (getTempAvatarGuidListList().size() > 0) {
output.writeUInt32NoTag(58);
output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
@@ -328,12 +338,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
}
- com.google.protobuf.GeneratedMessageV3
- .serializeIntegerMapTo(
- output,
- internalGetAvatarTeamMap(),
- AvatarTeamMapDefaultEntryHolder.defaultEntry,
- 9);
unknownFields.writeTo(output);
}
@@ -343,6 +347,16 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
+ for (java.util.Map.Entry entry
+ : internalGetAvatarTeamMap().getMap().entrySet()) {
+ com.google.protobuf.MapEntry
+ avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+ .setKey(entry.getKey())
+ .setValue(entry.getValue())
+ .build();
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(6, avatarTeamMap__);
+ }
{
int dataSize = 0;
for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -357,16 +371,6 @@ public int getSerializedSize() {
}
tempAvatarGuidListMemoizedSerializedSize = dataSize;
}
- for (java.util.Map.Entry entry
- : internalGetAvatarTeamMap().getMap().entrySet()) {
- com.google.protobuf.MapEntry
- avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
- .setKey(entry.getKey())
- .setValue(entry.getValue())
- .build();
- size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(9, avatarTeamMap__);
- }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -501,6 +505,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 4042
+ *
+ *
* Protobuf type {@code AvatarTeamUpdateNotify}
*/
public static final class Builder extends
@@ -516,7 +524,7 @@ public static final class Builder extends
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
- case 9:
+ case 6:
return internalGetAvatarTeamMap();
default:
throw new RuntimeException(
@@ -527,7 +535,7 @@ protected com.google.protobuf.MapField internalGetMapField(
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
- case 9:
+ case 6:
return internalGetMutableAvatarTeamMap();
default:
throw new RuntimeException(
@@ -714,7 +722,7 @@ public int getAvatarTeamMapCount() {
return internalGetAvatarTeamMap().getMap().size();
}
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -732,7 +740,7 @@ public java.util.Mapmap<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -740,7 +748,7 @@ public java.util.Mapmap<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -753,7 +761,7 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
@java.lang.Override
@@ -774,7 +782,7 @@ public Builder clearAvatarTeamMap() {
return this;
}
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
public Builder removeAvatarTeamMap(
@@ -793,7 +801,7 @@ public Builder removeAvatarTeamMap(
return internalGetMutableAvatarTeamMap().getMutableMap();
}
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
public Builder putAvatarTeamMap(
int key,
@@ -805,7 +813,7 @@ public Builder putAvatarTeamMap(
return this;
}
/**
- * map<uint32, .AvatarTeam> avatar_team_map = 9;
+ * map<uint32, .AvatarTeam> avatar_team_map = 6;
*/
public Builder putAllAvatarTeamMap(
@@ -967,7 +975,7 @@ public emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpda
java.lang.String[] descriptorData = {
"\n\034AvatarTeamUpdateNotify.proto\032\020AvatarTe" +
"am.proto\"\277\001\n\026AvatarTeamUpdateNotify\022C\n\017a" +
- "vatar_team_map\030\t \003(\0132*.AvatarTeamUpdateN" +
+ "vatar_team_map\030\006 \003(\0132*.AvatarTeamUpdateN" +
"otify.AvatarTeamMapEntry\022\035\n\025temp_avatar_" +
"guid_list\030\007 \003(\004\032A\n\022AvatarTeamMapEntry\022\013\n" +
"\003key\030\001 \001(\r\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam:\002" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
index e63edee7275..9d4bf740f59 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
@@ -40,13 +40,13 @@ public interface ChangeAvatarReqOrBuilder extends
long getGuid();
/**
- * bool is_move = 9;
+ * bool is_move = 1;
* @return The isMove.
*/
boolean getIsMove();
/**
- * uint32 skill_id = 7;
+ * uint32 skill_id = 9;
* @return The skillId.
*/
int getSkillId();
@@ -100,19 +100,19 @@ private ChangeAvatarReq(
case 0:
done = true;
break;
- case 16: {
+ case 8: {
- guid_ = input.readUInt64();
+ isMove_ = input.readBool();
break;
}
- case 56: {
+ case 16: {
- skillId_ = input.readUInt32();
+ guid_ = input.readUInt64();
break;
}
case 72: {
- isMove_ = input.readBool();
+ skillId_ = input.readUInt32();
break;
}
case 122: {
@@ -197,10 +197,10 @@ public long getGuid() {
return guid_;
}
- public static final int IS_MOVE_FIELD_NUMBER = 9;
+ public static final int IS_MOVE_FIELD_NUMBER = 1;
private boolean isMove_;
/**
- * bool is_move = 9;
+ * bool is_move = 1;
* @return The isMove.
*/
@java.lang.Override
@@ -208,10 +208,10 @@ public boolean getIsMove() {
return isMove_;
}
- public static final int SKILL_ID_FIELD_NUMBER = 7;
+ public static final int SKILL_ID_FIELD_NUMBER = 9;
private int skillId_;
/**
- * uint32 skill_id = 7;
+ * uint32 skill_id = 9;
* @return The skillId.
*/
@java.lang.Override
@@ -233,14 +233,14 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
+ if (isMove_ != false) {
+ output.writeBool(1, isMove_);
+ }
if (guid_ != 0L) {
output.writeUInt64(2, guid_);
}
if (skillId_ != 0) {
- output.writeUInt32(7, skillId_);
- }
- if (isMove_ != false) {
- output.writeBool(9, isMove_);
+ output.writeUInt32(9, skillId_);
}
if (movePos_ != null) {
output.writeMessage(15, getMovePos());
@@ -254,17 +254,17 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
+ if (isMove_ != false) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(1, isMove_);
+ }
if (guid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(2, guid_);
}
if (skillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(7, skillId_);
- }
- if (isMove_ != false) {
- size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(9, isMove_);
+ .computeUInt32Size(9, skillId_);
}
if (movePos_ != null) {
size += com.google.protobuf.CodedOutputStream
@@ -743,7 +743,7 @@ public Builder clearGuid() {
private boolean isMove_ ;
/**
- * bool is_move = 9;
+ * bool is_move = 1;
* @return The isMove.
*/
@java.lang.Override
@@ -751,7 +751,7 @@ public boolean getIsMove() {
return isMove_;
}
/**
- * bool is_move = 9;
+ * bool is_move = 1;
* @param value The isMove to set.
* @return This builder for chaining.
*/
@@ -762,7 +762,7 @@ public Builder setIsMove(boolean value) {
return this;
}
/**
- * bool is_move = 9;
+ * bool is_move = 1;
* @return This builder for chaining.
*/
public Builder clearIsMove() {
@@ -774,7 +774,7 @@ public Builder clearIsMove() {
private int skillId_ ;
/**
- * uint32 skill_id = 7;
+ * uint32 skill_id = 9;
* @return The skillId.
*/
@java.lang.Override
@@ -782,7 +782,7 @@ public int getSkillId() {
return skillId_;
}
/**
- * uint32 skill_id = 7;
+ * uint32 skill_id = 9;
* @param value The skillId to set.
* @return This builder for chaining.
*/
@@ -793,7 +793,7 @@ public Builder setSkillId(int value) {
return this;
}
/**
- * uint32 skill_id = 7;
+ * uint32 skill_id = 9;
* @return This builder for chaining.
*/
public Builder clearSkillId() {
@@ -871,8 +871,8 @@ public emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq getDe
java.lang.String[] descriptorData = {
"\n\025ChangeAvatarReq.proto\032\014Vector.proto\"]\n" +
"\017ChangeAvatarReq\022\031\n\010move_pos\030\017 \001(\0132\007.Vec" +
- "tor\022\014\n\004guid\030\002 \001(\004\022\017\n\007is_move\030\t \001(\010\022\020\n\010sk" +
- "ill_id\030\007 \001(\rB\033\n\031emu.grasscutter.net.prot" +
+ "tor\022\014\n\004guid\030\002 \001(\004\022\017\n\007is_move\030\001 \001(\010\022\020\n\010sk" +
+ "ill_id\030\t \001(\rB\033\n\031emu.grasscutter.net.prot" +
"ob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
index 7c6bc4d9aeb..73b1c8c071f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
@@ -19,11 +19,7 @@ public interface ChangeAvatarRspOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- *
- * 4.5.0
- *
- *
- * uint64 cur_guid = 3;
+ * uint64 cur_guid = 8;
* @return The curGuid.
*/
long getCurGuid();
@@ -41,6 +37,10 @@ public interface ChangeAvatarRspOrBuilder extends
int getSkillId();
}
/**
+ *
+ * CmdId: 21804
+ *
+ *
* Protobuf type {@code ChangeAvatarRsp}
*/
public static final class ChangeAvatarRsp extends
@@ -85,14 +85,14 @@ private ChangeAvatarRsp(
case 0:
done = true;
break;
- case 24: {
+ case 32: {
- curGuid_ = input.readUInt64();
+ retcode_ = input.readInt32();
break;
}
- case 32: {
+ case 64: {
- retcode_ = input.readInt32();
+ curGuid_ = input.readUInt64();
break;
}
case 72: {
@@ -132,14 +132,10 @@ private ChangeAvatarRsp(
emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.class, emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.Builder.class);
}
- public static final int CUR_GUID_FIELD_NUMBER = 3;
+ public static final int CUR_GUID_FIELD_NUMBER = 8;
private long curGuid_;
/**
- *
- * 4.5.0
- *
- *
- * uint64 cur_guid = 3;
+ * uint64 cur_guid = 8;
* @return The curGuid.
*/
@java.lang.Override
@@ -183,12 +179,12 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (curGuid_ != 0L) {
- output.writeUInt64(3, curGuid_);
- }
if (retcode_ != 0) {
output.writeInt32(4, retcode_);
}
+ if (curGuid_ != 0L) {
+ output.writeUInt64(8, curGuid_);
+ }
if (skillId_ != 0) {
output.writeUInt32(9, skillId_);
}
@@ -201,14 +197,14 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (curGuid_ != 0L) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(3, curGuid_);
- }
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, retcode_);
}
+ if (curGuid_ != 0L) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt64Size(8, curGuid_);
+ }
if (skillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, skillId_);
@@ -348,6 +344,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 21804
+ *
+ *
* Protobuf type {@code ChangeAvatarRsp}
*/
public static final class Builder extends
@@ -508,11 +508,7 @@ public Builder mergeFrom(
private long curGuid_ ;
/**
- *
- * 4.5.0
- *
- *
- * uint64 cur_guid = 3;
+ * uint64 cur_guid = 8;
* @return The curGuid.
*/
@java.lang.Override
@@ -520,11 +516,7 @@ public long getCurGuid() {
return curGuid_;
}
/**
- *
- * 4.5.0
- *
- *
- * uint64 cur_guid = 3;
+ * uint64 cur_guid = 8;
* @param value The curGuid to set.
* @return This builder for chaining.
*/
@@ -535,11 +527,7 @@ public Builder setCurGuid(long value) {
return this;
}
/**
- *
- * 4.5.0
- *
- *
- * uint64 cur_guid = 3;
+ * uint64 cur_guid = 8;
* @return This builder for chaining.
*/
public Builder clearCurGuid() {
@@ -678,7 +666,7 @@ public emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp getDe
static {
java.lang.String[] descriptorData = {
"\n\025ChangeAvatarRsp.proto\"F\n\017ChangeAvatarR" +
- "sp\022\020\n\010cur_guid\030\003 \001(\004\022\017\n\007retcode\030\004 \001(\005\022\020\n" +
+ "sp\022\020\n\010cur_guid\030\010 \001(\004\022\017\n\007retcode\030\004 \001(\005\022\020\n" +
"\010skill_id\030\t \001(\rB\033\n\031emu.grasscutter.net.p" +
"rotob\006proto3"
};
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
index a86f9e8b953..b215d277a4b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
@@ -54,11 +54,7 @@ emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder get
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType();
/**
- *
- * random
- *
- *
- * uint32 param = 15;
+ * uint32 param = 9;
* @return The param.
*/
int getParam();
@@ -115,6 +111,11 @@ private SceneEntityAppearNotify(
case 0:
done = true;
break;
+ case 72: {
+
+ param_ = input.readUInt32();
+ break;
+ }
case 80: {
int rawValue = input.readEnum();
@@ -130,11 +131,6 @@ private SceneEntityAppearNotify(
input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry));
break;
}
- case 120: {
-
- param_ = input.readUInt32();
- break;
- }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -229,14 +225,10 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuil
return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
}
- public static final int PARAM_FIELD_NUMBER = 15;
+ public static final int PARAM_FIELD_NUMBER = 9;
private int param_;
/**
- *
- * random
- *
- *
- * uint32 param = 15;
+ * uint32 param = 9;
* @return The param.
*/
@java.lang.Override
@@ -258,15 +250,15 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
+ if (param_ != 0) {
+ output.writeUInt32(9, param_);
+ }
if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
output.writeEnum(10, appearType_);
}
for (int i = 0; i < entityList_.size(); i++) {
output.writeMessage(13, entityList_.get(i));
}
- if (param_ != 0) {
- output.writeUInt32(15, param_);
- }
unknownFields.writeTo(output);
}
@@ -276,6 +268,10 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
+ if (param_ != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(9, param_);
+ }
if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(10, appearType_);
@@ -284,10 +280,6 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, entityList_.get(i));
}
- if (param_ != 0) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(15, param_);
- }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -919,11 +911,7 @@ public Builder clearAppearType() {
private int param_ ;
/**
- *
- * random
- *
- *
- * uint32 param = 15;
+ * uint32 param = 9;
* @return The param.
*/
@java.lang.Override
@@ -931,11 +919,7 @@ public int getParam() {
return param_;
}
/**
- *
- * random
- *
- *
- * uint32 param = 15;
+ * uint32 param = 9;
* @param value The param to set.
* @return This builder for chaining.
*/
@@ -946,11 +930,7 @@ public Builder setParam(int value) {
return this;
}
/**
- *
- * random
- *
- *
- * uint32 param = 15;
+ * uint32 param = 9;
* @return This builder for chaining.
*/
public Builder clearParam() {
@@ -1030,7 +1010,7 @@ public emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAp
"tityInfo.proto\032\020VisionType.proto\"q\n\027Scen" +
"eEntityAppearNotify\022%\n\013entity_list\030\r \003(\013" +
"2\020.SceneEntityInfo\022 \n\013appear_type\030\n \001(\0162" +
- "\013.VisionType\022\r\n\005param\030\017 \001(\rB\033\n\031emu.grass" +
+ "\013.VisionType\022\r\n\005param\030\t \001(\rB\033\n\031emu.grass" +
"cutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java
index c09b5e0f254..240765ad1f4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java
@@ -36,12 +36,12 @@ public interface SceneEntityDisappearNotifyOrBuilder extends
int getEntityList(int index);
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @return The enum numeric value on the wire for disappearType.
*/
int getDisappearTypeValue();
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @return The disappearType.
*/
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType();
@@ -53,6 +53,10 @@ public interface SceneEntityDisappearNotifyOrBuilder extends
int getParam();
}
/**
+ *
+ * CmdId: 7872
+ *
+ *
* Protobuf type {@code SceneEntityDisappearNotify}
*/
public static final class SceneEntityDisappearNotify extends
@@ -100,6 +104,12 @@ private SceneEntityDisappearNotify(
case 0:
done = true;
break;
+ case 40: {
+ int rawValue = input.readEnum();
+
+ disappearType_ = rawValue;
+ break;
+ }
case 48: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
entityList_ = newIntList();
@@ -121,12 +131,6 @@ private SceneEntityDisappearNotify(
input.popLimit(limit);
break;
}
- case 72: {
- int rawValue = input.readEnum();
-
- disappearType_ = rawValue;
- break;
- }
case 96: {
param_ = input.readUInt32();
@@ -195,17 +199,17 @@ public int getEntityList(int index) {
}
private int entityListMemoizedSerializedSize = -1;
- public static final int DISAPPEAR_TYPE_FIELD_NUMBER = 9;
+ public static final int DISAPPEAR_TYPE_FIELD_NUMBER = 5;
private int disappearType_;
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @return The enum numeric value on the wire for disappearType.
*/
@java.lang.Override public int getDisappearTypeValue() {
return disappearType_;
}
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @return The disappearType.
*/
@java.lang.Override public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType() {
@@ -240,6 +244,9 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
+ if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+ output.writeEnum(5, disappearType_);
+ }
if (getEntityListList().size() > 0) {
output.writeUInt32NoTag(50);
output.writeUInt32NoTag(entityListMemoizedSerializedSize);
@@ -247,9 +254,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
for (int i = 0; i < entityList_.size(); i++) {
output.writeUInt32NoTag(entityList_.getInt(i));
}
- if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
- output.writeEnum(9, disappearType_);
- }
if (param_ != 0) {
output.writeUInt32(12, param_);
}
@@ -262,6 +266,10 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
+ if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeEnumSize(5, disappearType_);
+ }
{
int dataSize = 0;
for (int i = 0; i < entityList_.size(); i++) {
@@ -276,10 +284,6 @@ public int getSerializedSize() {
}
entityListMemoizedSerializedSize = dataSize;
}
- if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
- size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(9, disappearType_);
- }
if (param_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, param_);
@@ -419,6 +423,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 7872
+ *
+ *
* Protobuf type {@code SceneEntityDisappearNotify}
*/
public static final class Builder extends
@@ -671,14 +679,14 @@ public Builder clearEntityList() {
private int disappearType_ = 0;
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @return The enum numeric value on the wire for disappearType.
*/
@java.lang.Override public int getDisappearTypeValue() {
return disappearType_;
}
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @param value The enum numeric value on the wire for disappearType to set.
* @return This builder for chaining.
*/
@@ -689,7 +697,7 @@ public Builder setDisappearTypeValue(int value) {
return this;
}
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @return The disappearType.
*/
@java.lang.Override
@@ -699,7 +707,7 @@ public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearTyp
return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
}
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @param value The disappearType to set.
* @return This builder for chaining.
*/
@@ -713,7 +721,7 @@ public Builder setDisappearType(emu.grasscutter.net.proto.VisionTypeOuterClass.V
return this;
}
/**
- * .VisionType disappear_type = 9;
+ * .VisionType disappear_type = 5;
* @return This builder for chaining.
*/
public Builder clearDisappearType() {
@@ -823,7 +831,7 @@ public emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntit
"\n SceneEntityDisappearNotify.proto\032\020Visi" +
"onType.proto\"e\n\032SceneEntityDisappearNoti" +
"fy\022\023\n\013entity_list\030\006 \003(\r\022#\n\016disappear_typ" +
- "e\030\t \001(\0162\013.VisionType\022\r\n\005param\030\014 \001(\rB\033\n\031e" +
+ "e\030\005 \001(\0162\013.VisionType\022\r\n\005param\030\014 \001(\rB\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java
index 0b947340f40..7c32ee35173 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java
@@ -19,18 +19,22 @@ public interface SetPlayerNameReqOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @return The nickName.
*/
java.lang.String getNickName();
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @return The bytes for nickName.
*/
com.google.protobuf.ByteString
getNickNameBytes();
}
/**
+ *
+ * CmdId: 6220
+ *
+ *
* Protobuf type {@code SetPlayerNameReq}
*/
public static final class SetPlayerNameReq extends
@@ -76,7 +80,7 @@ private SetPlayerNameReq(
case 0:
done = true;
break;
- case 98: {
+ case 106: {
java.lang.String s = input.readStringRequireUtf8();
nickName_ = s;
@@ -114,10 +118,10 @@ private SetPlayerNameReq(
emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq.class, emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq.Builder.class);
}
- public static final int NICK_NAME_FIELD_NUMBER = 12;
+ public static final int NICK_NAME_FIELD_NUMBER = 13;
private volatile java.lang.Object nickName_;
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @return The nickName.
*/
@java.lang.Override
@@ -134,7 +138,7 @@ public java.lang.String getNickName() {
}
}
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @return The bytes for nickName.
*/
@java.lang.Override
@@ -167,7 +171,7 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 12, nickName_);
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 13, nickName_);
}
unknownFields.writeTo(output);
}
@@ -179,7 +183,7 @@ public int getSerializedSize() {
size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, nickName_);
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, nickName_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -307,6 +311,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 6220
+ *
+ *
* Protobuf type {@code SetPlayerNameReq}
*/
public static final class Builder extends
@@ -456,7 +464,7 @@ public Builder mergeFrom(
private java.lang.Object nickName_ = "";
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @return The nickName.
*/
public java.lang.String getNickName() {
@@ -472,7 +480,7 @@ public java.lang.String getNickName() {
}
}
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @return The bytes for nickName.
*/
public com.google.protobuf.ByteString
@@ -489,7 +497,7 @@ public java.lang.String getNickName() {
}
}
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @param value The nickName to set.
* @return This builder for chaining.
*/
@@ -504,7 +512,7 @@ public Builder setNickName(
return this;
}
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @return This builder for chaining.
*/
public Builder clearNickName() {
@@ -514,7 +522,7 @@ public Builder clearNickName() {
return this;
}
/**
- * string nick_name = 12;
+ * string nick_name = 13;
* @param value The bytes for nickName to set.
* @return This builder for chaining.
*/
@@ -597,7 +605,7 @@ public emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq get
static {
java.lang.String[] descriptorData = {
"\n\026SetPlayerNameReq.proto\"%\n\020SetPlayerNam" +
- "eReq\022\021\n\tnick_name\030\014 \001(\tB\033\n\031emu.grasscutt" +
+ "eReq\022\021\n\tnick_name\030\r \001(\tB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameRspOuterClass.java
index 78c6ea4dd4e..c70e49c0412 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameRspOuterClass.java
@@ -19,12 +19,12 @@ public interface SetPlayerNameRspOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @return The nickName.
*/
java.lang.String getNickName();
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @return The bytes for nickName.
*/
com.google.protobuf.ByteString
@@ -37,6 +37,10 @@ public interface SetPlayerNameRspOrBuilder extends
int getRetcode();
}
/**
+ *
+ * CmdId: 8361
+ *
+ *
* Protobuf type {@code SetPlayerNameRsp}
*/
public static final class SetPlayerNameRsp extends
@@ -82,15 +86,15 @@ private SetPlayerNameRsp(
case 0:
done = true;
break;
- case 56: {
+ case 18: {
+ java.lang.String s = input.readStringRequireUtf8();
- retcode_ = input.readInt32();
+ nickName_ = s;
break;
}
- case 106: {
- java.lang.String s = input.readStringRequireUtf8();
+ case 56: {
- nickName_ = s;
+ retcode_ = input.readInt32();
break;
}
default: {
@@ -125,10 +129,10 @@ private SetPlayerNameRsp(
emu.grasscutter.net.proto.SetPlayerNameRspOuterClass.SetPlayerNameRsp.class, emu.grasscutter.net.proto.SetPlayerNameRspOuterClass.SetPlayerNameRsp.Builder.class);
}
- public static final int NICK_NAME_FIELD_NUMBER = 13;
+ public static final int NICK_NAME_FIELD_NUMBER = 2;
private volatile java.lang.Object nickName_;
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @return The nickName.
*/
@java.lang.Override
@@ -145,7 +149,7 @@ public java.lang.String getNickName() {
}
}
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @return The bytes for nickName.
*/
@java.lang.Override
@@ -188,12 +192,12 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nickName_);
+ }
if (retcode_ != 0) {
output.writeInt32(7, retcode_);
}
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 13, nickName_);
- }
unknownFields.writeTo(output);
}
@@ -203,13 +207,13 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nickName_);
+ }
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, retcode_);
}
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, nickName_);
- }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -340,6 +344,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 8361
+ *
+ *
* Protobuf type {@code SetPlayerNameRsp}
*/
public static final class Builder extends
@@ -495,7 +503,7 @@ public Builder mergeFrom(
private java.lang.Object nickName_ = "";
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @return The nickName.
*/
public java.lang.String getNickName() {
@@ -511,7 +519,7 @@ public java.lang.String getNickName() {
}
}
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @return The bytes for nickName.
*/
public com.google.protobuf.ByteString
@@ -528,7 +536,7 @@ public java.lang.String getNickName() {
}
}
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @param value The nickName to set.
* @return This builder for chaining.
*/
@@ -543,7 +551,7 @@ public Builder setNickName(
return this;
}
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @return This builder for chaining.
*/
public Builder clearNickName() {
@@ -553,7 +561,7 @@ public Builder clearNickName() {
return this;
}
/**
- * string nick_name = 13;
+ * string nick_name = 2;
* @param value The bytes for nickName to set.
* @return This builder for chaining.
*/
@@ -667,7 +675,7 @@ public emu.grasscutter.net.proto.SetPlayerNameRspOuterClass.SetPlayerNameRsp get
static {
java.lang.String[] descriptorData = {
"\n\026SetPlayerNameRsp.proto\"6\n\020SetPlayerNam" +
- "eRsp\022\021\n\tnick_name\030\r \001(\t\022\017\n\007retcode\030\007 \001(\005" +
+ "eRsp\022\021\n\tnick_name\030\002 \001(\t\022\017\n\007retcode\030\007 \001(\005" +
"B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java
index b0bed0767f9..ee3e05f3d7a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java
@@ -19,18 +19,22 @@ public interface SetPlayerSignatureReqOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * string signature = 6;
+ * string signature = 11;
* @return The signature.
*/
java.lang.String getSignature();
/**
- * string signature = 6;
+ * string signature = 11;
* @return The bytes for signature.
*/
com.google.protobuf.ByteString
getSignatureBytes();
}
/**
+ *
+ * CmdId: 25315
+ *
+ *
* Protobuf type {@code SetPlayerSignatureReq}
*/
public static final class SetPlayerSignatureReq extends
@@ -76,7 +80,7 @@ private SetPlayerSignatureReq(
case 0:
done = true;
break;
- case 50: {
+ case 90: {
java.lang.String s = input.readStringRequireUtf8();
signature_ = s;
@@ -114,10 +118,10 @@ private SetPlayerSignatureReq(
emu.grasscutter.net.proto.SetPlayerSignatureReqOuterClass.SetPlayerSignatureReq.class, emu.grasscutter.net.proto.SetPlayerSignatureReqOuterClass.SetPlayerSignatureReq.Builder.class);
}
- public static final int SIGNATURE_FIELD_NUMBER = 6;
+ public static final int SIGNATURE_FIELD_NUMBER = 11;
private volatile java.lang.Object signature_;
/**
- * string signature = 6;
+ * string signature = 11;
* @return The signature.
*/
@java.lang.Override
@@ -134,7 +138,7 @@ public java.lang.String getSignature() {
}
}
/**
- * string signature = 6;
+ * string signature = 11;
* @return The bytes for signature.
*/
@java.lang.Override
@@ -167,7 +171,7 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 6, signature_);
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 11, signature_);
}
unknownFields.writeTo(output);
}
@@ -179,7 +183,7 @@ public int getSerializedSize() {
size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, signature_);
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, signature_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -307,6 +311,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 25315
+ *
+ *
* Protobuf type {@code SetPlayerSignatureReq}
*/
public static final class Builder extends
@@ -456,7 +464,7 @@ public Builder mergeFrom(
private java.lang.Object signature_ = "";
/**
- * string signature = 6;
+ * string signature = 11;
* @return The signature.
*/
public java.lang.String getSignature() {
@@ -472,7 +480,7 @@ public java.lang.String getSignature() {
}
}
/**
- * string signature = 6;
+ * string signature = 11;
* @return The bytes for signature.
*/
public com.google.protobuf.ByteString
@@ -489,7 +497,7 @@ public java.lang.String getSignature() {
}
}
/**
- * string signature = 6;
+ * string signature = 11;
* @param value The signature to set.
* @return This builder for chaining.
*/
@@ -504,7 +512,7 @@ public Builder setSignature(
return this;
}
/**
- * string signature = 6;
+ * string signature = 11;
* @return This builder for chaining.
*/
public Builder clearSignature() {
@@ -514,7 +522,7 @@ public Builder clearSignature() {
return this;
}
/**
- * string signature = 6;
+ * string signature = 11;
* @param value The bytes for signature to set.
* @return This builder for chaining.
*/
@@ -597,7 +605,7 @@ public emu.grasscutter.net.proto.SetPlayerSignatureReqOuterClass.SetPlayerSignat
static {
java.lang.String[] descriptorData = {
"\n\033SetPlayerSignatureReq.proto\"*\n\025SetPlay" +
- "erSignatureReq\022\021\n\tsignature\030\006 \001(\tB\033\n\031emu" +
+ "erSignatureReq\022\021\n\tsignature\030\013 \001(\tB\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java
index 53f58b63baa..12ab75ae672 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java
@@ -19,12 +19,12 @@ public interface SetPlayerSignatureRspOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * string signature = 2;
+ * string signature = 14;
* @return The signature.
*/
java.lang.String getSignature();
/**
- * string signature = 2;
+ * string signature = 14;
* @return The bytes for signature.
*/
com.google.protobuf.ByteString
@@ -37,6 +37,10 @@ public interface SetPlayerSignatureRspOrBuilder extends
int getRetcode();
}
/**
+ *
+ * CmdId: 23156
+ *
+ *
* Protobuf type {@code SetPlayerSignatureRsp}
*/
public static final class SetPlayerSignatureRsp extends
@@ -82,15 +86,15 @@ private SetPlayerSignatureRsp(
case 0:
done = true;
break;
- case 18: {
- java.lang.String s = input.readStringRequireUtf8();
+ case 72: {
- signature_ = s;
+ retcode_ = input.readInt32();
break;
}
- case 72: {
+ case 114: {
+ java.lang.String s = input.readStringRequireUtf8();
- retcode_ = input.readInt32();
+ signature_ = s;
break;
}
default: {
@@ -125,10 +129,10 @@ private SetPlayerSignatureRsp(
emu.grasscutter.net.proto.SetPlayerSignatureRspOuterClass.SetPlayerSignatureRsp.class, emu.grasscutter.net.proto.SetPlayerSignatureRspOuterClass.SetPlayerSignatureRsp.Builder.class);
}
- public static final int SIGNATURE_FIELD_NUMBER = 2;
+ public static final int SIGNATURE_FIELD_NUMBER = 14;
private volatile java.lang.Object signature_;
/**
- * string signature = 2;
+ * string signature = 14;
* @return The signature.
*/
@java.lang.Override
@@ -145,7 +149,7 @@ public java.lang.String getSignature() {
}
}
/**
- * string signature = 2;
+ * string signature = 14;
* @return The bytes for signature.
*/
@java.lang.Override
@@ -188,12 +192,12 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 2, signature_);
- }
if (retcode_ != 0) {
output.writeInt32(9, retcode_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 14, signature_);
+ }
unknownFields.writeTo(output);
}
@@ -203,13 +207,13 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, signature_);
- }
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, retcode_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, signature_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -340,6 +344,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 23156
+ *
+ *
* Protobuf type {@code SetPlayerSignatureRsp}
*/
public static final class Builder extends
@@ -495,7 +503,7 @@ public Builder mergeFrom(
private java.lang.Object signature_ = "";
/**
- * string signature = 2;
+ * string signature = 14;
* @return The signature.
*/
public java.lang.String getSignature() {
@@ -511,7 +519,7 @@ public java.lang.String getSignature() {
}
}
/**
- * string signature = 2;
+ * string signature = 14;
* @return The bytes for signature.
*/
public com.google.protobuf.ByteString
@@ -528,7 +536,7 @@ public java.lang.String getSignature() {
}
}
/**
- * string signature = 2;
+ * string signature = 14;
* @param value The signature to set.
* @return This builder for chaining.
*/
@@ -543,7 +551,7 @@ public Builder setSignature(
return this;
}
/**
- * string signature = 2;
+ * string signature = 14;
* @return This builder for chaining.
*/
public Builder clearSignature() {
@@ -553,7 +561,7 @@ public Builder clearSignature() {
return this;
}
/**
- * string signature = 2;
+ * string signature = 14;
* @param value The bytes for signature to set.
* @return This builder for chaining.
*/
@@ -667,7 +675,7 @@ public emu.grasscutter.net.proto.SetPlayerSignatureRspOuterClass.SetPlayerSignat
static {
java.lang.String[] descriptorData = {
"\n\033SetPlayerSignatureRsp.proto\";\n\025SetPlay" +
- "erSignatureRsp\022\021\n\tsignature\030\002 \001(\t\022\017\n\007ret" +
+ "erSignatureRsp\022\021\n\tsignature\030\016 \001(\t\022\017\n\007ret" +
"code\030\t \001(\005B\033\n\031emu.grasscutter.net.protob" +
"\006proto3"
};
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
index bfffa42b2c7..ad131e2eb60 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
@@ -19,24 +19,24 @@ public interface SetUpAvatarTeamReqOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @return A list containing the avatarTeamGuidList.
*/
java.util.List getAvatarTeamGuidListList();
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @return The count of avatarTeamGuidList.
*/
int getAvatarTeamGuidListCount();
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
long getAvatarTeamGuidList(int index);
/**
- * uint32 team_id = 6;
+ * uint32 team_id = 8;
* @return The teamId.
*/
int getTeamId();
@@ -104,11 +104,6 @@ private SetUpAvatarTeamReq(
break;
}
case 48: {
-
- teamId_ = input.readUInt32();
- break;
- }
- case 64: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarTeamGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000001;
@@ -116,7 +111,7 @@ private SetUpAvatarTeamReq(
avatarTeamGuidList_.addLong(input.readUInt64());
break;
}
- case 66: {
+ case 50: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -129,6 +124,11 @@ private SetUpAvatarTeamReq(
input.popLimit(limit);
break;
}
+ case 64: {
+
+ teamId_ = input.readUInt32();
+ break;
+ }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -164,10 +164,10 @@ private SetUpAvatarTeamReq(
emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq.class, emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq.Builder.class);
}
- public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 8;
+ public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 6;
private com.google.protobuf.Internal.LongList avatarTeamGuidList_;
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @return A list containing the avatarTeamGuidList.
*/
@java.lang.Override
@@ -176,14 +176,14 @@ private SetUpAvatarTeamReq(
return avatarTeamGuidList_;
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @return The count of avatarTeamGuidList.
*/
public int getAvatarTeamGuidListCount() {
return avatarTeamGuidList_.size();
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
@@ -192,10 +192,10 @@ public long getAvatarTeamGuidList(int index) {
}
private int avatarTeamGuidListMemoizedSerializedSize = -1;
- public static final int TEAM_ID_FIELD_NUMBER = 6;
+ public static final int TEAM_ID_FIELD_NUMBER = 8;
private int teamId_;
/**
- * uint32 team_id = 6;
+ * uint32 team_id = 8;
* @return The teamId.
*/
@java.lang.Override
@@ -232,16 +232,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (curAvatarGuid_ != 0L) {
output.writeUInt64(1, curAvatarGuid_);
}
- if (teamId_ != 0) {
- output.writeUInt32(6, teamId_);
- }
if (getAvatarTeamGuidListList().size() > 0) {
- output.writeUInt32NoTag(66);
+ output.writeUInt32NoTag(50);
output.writeUInt32NoTag(avatarTeamGuidListMemoizedSerializedSize);
}
for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
output.writeUInt64NoTag(avatarTeamGuidList_.getLong(i));
}
+ if (teamId_ != 0) {
+ output.writeUInt32(8, teamId_);
+ }
unknownFields.writeTo(output);
}
@@ -255,10 +255,6 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(1, curAvatarGuid_);
}
- if (teamId_ != 0) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(6, teamId_);
- }
{
int dataSize = 0;
for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
@@ -273,6 +269,10 @@ public int getSerializedSize() {
}
avatarTeamGuidListMemoizedSerializedSize = dataSize;
}
+ if (teamId_ != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(8, teamId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -593,7 +593,7 @@ private void ensureAvatarTeamGuidListIsMutable() {
}
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @return A list containing the avatarTeamGuidList.
*/
public java.util.List
@@ -602,14 +602,14 @@ private void ensureAvatarTeamGuidListIsMutable() {
java.util.Collections.unmodifiableList(avatarTeamGuidList_) : avatarTeamGuidList_;
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @return The count of avatarTeamGuidList.
*/
public int getAvatarTeamGuidListCount() {
return avatarTeamGuidList_.size();
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
@@ -617,7 +617,7 @@ public long getAvatarTeamGuidList(int index) {
return avatarTeamGuidList_.getLong(index);
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @param index The index to set the value at.
* @param value The avatarTeamGuidList to set.
* @return This builder for chaining.
@@ -630,7 +630,7 @@ public Builder setAvatarTeamGuidList(
return this;
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @param value The avatarTeamGuidList to add.
* @return This builder for chaining.
*/
@@ -641,7 +641,7 @@ public Builder addAvatarTeamGuidList(long value) {
return this;
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @param values The avatarTeamGuidList to add.
* @return This builder for chaining.
*/
@@ -654,7 +654,7 @@ public Builder addAllAvatarTeamGuidList(
return this;
}
/**
- * repeated uint64 avatar_team_guid_list = 8;
+ * repeated uint64 avatar_team_guid_list = 6;
* @return This builder for chaining.
*/
public Builder clearAvatarTeamGuidList() {
@@ -666,7 +666,7 @@ public Builder clearAvatarTeamGuidList() {
private int teamId_ ;
/**
- * uint32 team_id = 6;
+ * uint32 team_id = 8;
* @return The teamId.
*/
@java.lang.Override
@@ -674,7 +674,7 @@ public int getTeamId() {
return teamId_;
}
/**
- * uint32 team_id = 6;
+ * uint32 team_id = 8;
* @param value The teamId to set.
* @return This builder for chaining.
*/
@@ -685,7 +685,7 @@ public Builder setTeamId(int value) {
return this;
}
/**
- * uint32 team_id = 6;
+ * uint32 team_id = 8;
* @return This builder for chaining.
*/
public Builder clearTeamId() {
@@ -793,8 +793,8 @@ public emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq
static {
java.lang.String[] descriptorData = {
"\n\030SetUpAvatarTeamReq.proto\"]\n\022SetUpAvata" +
- "rTeamReq\022\035\n\025avatar_team_guid_list\030\010 \003(\004\022" +
- "\017\n\007team_id\030\006 \001(\r\022\027\n\017cur_avatar_guid\030\001 \001(" +
+ "rTeamReq\022\035\n\025avatar_team_guid_list\030\006 \003(\004\022" +
+ "\017\n\007team_id\030\010 \001(\r\022\027\n\017cur_avatar_guid\030\001 \001(" +
"\004B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
index d0d744ab471..ee13f3152a2 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
@@ -53,6 +53,13 @@ public final class PacketOpcodes {
public static final int MarkMapReq = 9954;
public static final int SetUpAvatarTeamReq = 24152; // No Rsp and Notify atm
public static final int ChangeAvatarReq = 21461; // No Rsp and Notify atm
+ public static final int SetPlayerSignatureReq = 25315;
+ public static final int SetPlayerSignatureRsp = 23156;
+ public static final int SetPlayerNameReq = 6220;
+ public static final int SetPlayerNameRsp = 8361;
+ public static final int ChangeAvatarRsp = 21804;
+ public static final int SceneEntityDisappearNotify = 7872;
+ public static final int AvatarTeamUpdateNotify = 4042;
// 4.7.0 Obfuscated
@@ -63,9 +70,7 @@ public final class PacketOpcodes {
public static final int EvtAvatarStandUpNotify = 1;
public static final int ChangeGameTimeRsp = 1;
public static final int PlayerGameTimeNotify = 1;
- public static final int AvatarTeamUpdateNotify = 1;
public static final int SetUpAvatarTeamRsp = 1;
- public static final int ChangeAvatarRsp = 1;
public static final int EvtAvatarLockChairRsp = 1;
public static final int MarkMapRsp = 1;
public static final int AvatarChangeCostumeReq = 1;
@@ -89,7 +94,6 @@ public final class PacketOpcodes {
public static final int WindSeedType1Notify = 1;
public static final int CombatInvocationsNotify = 1;
public static final int EntityFightPropUpdateNotify = 1;
- public static final int SceneEntityDisappearNotify = 1;
public static final int SceneEntityUpdateNotify = 1;
public static final int AvatarLifeStateChangeNotify = 1;
public static final int LifeStateChangeNotify = 1;
@@ -121,10 +125,6 @@ public final class PacketOpcodes {
public static final int GetFriendShowNameCardInfoRsp = 1;
public static final int EntityFightPropChangeReasonNotify = 1;
public static final int PlayerPropChangeNotify = 1;
- public static final int SetPlayerNameReq = 1;
- public static final int SetPlayerNameRsp = 1;
- public static final int SetPlayerSignatureReq = 1;
- public static final int SetPlayerSignatureRsp = 1;
public static final int SetPlayerBirthdayReq = 1;
public static final int SetPlayerBirthdayRsp = 1;
public static final int EvtAiSyncSkillCdNotify = 1;