getInvokesBuilderList() {
@@ -831,7 +831,7 @@ public emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvoc
java.lang.String[] descriptorData = {
"\n\036AbilityInvocationsNotify.proto\032\030Abilit" +
"yInvokeEntry.proto\"@\n\030AbilityInvocations" +
- "Notify\022$\n\007invokes\030\t \003(\0132\023.AbilityInvokeE" +
+ "Notify\022$\n\007invokes\030\r \003(\0132\023.AbilityInvokeE" +
"ntryB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerInfoRspOuterClass.java
index af1007c4ef1..d677cd5540b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerInfoRspOuterClass.java
@@ -19,42 +19,41 @@ public interface GetOnlinePlayerInfoRspOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 target_uid = 2;
+ * uint32 target_uid = 5;
* @return The targetUid.
*/
int getTargetUid();
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
* @return Whether the targetPlayerInfo field is set.
*/
boolean hasTargetPlayerInfo();
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
* @return The targetPlayerInfo.
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getTargetPlayerInfo();
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getTargetPlayerInfoOrBuilder();
/**
- * uint32 param = 5;
- * @return The param.
+ * int32 retcode = 8;
+ * @return The retcode.
*/
- int getParam();
+ int getRetcode();
/**
- * int32 retcode = 6;
- * @return The retcode.
+ * uint32 param = 15;
+ * @return The param.
*/
- int getRetcode();
+ int getParam();
}
/**
*
- * CmdId: 8759
- * Obf: LDNOEIHGGKN
+ * CmdId: 25443
*
*
* Protobuf type {@code GetOnlinePlayerInfoRsp}
@@ -101,22 +100,12 @@ private GetOnlinePlayerInfoRsp(
case 0:
done = true;
break;
- case 16: {
-
- targetUid_ = input.readUInt32();
- break;
- }
case 40: {
- param_ = input.readUInt32();
- break;
- }
- case 48: {
-
- retcode_ = input.readInt32();
+ targetUid_ = input.readUInt32();
break;
}
- case 114: {
+ case 58: {
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
if (targetPlayerInfo_ != null) {
subBuilder = targetPlayerInfo_.toBuilder();
@@ -129,6 +118,16 @@ private GetOnlinePlayerInfoRsp(
break;
}
+ case 64: {
+
+ retcode_ = input.readInt32();
+ break;
+ }
+ case 120: {
+
+ param_ = input.readUInt32();
+ break;
+ }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -161,10 +160,10 @@ private GetOnlinePlayerInfoRsp(
emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterClass.GetOnlinePlayerInfoRsp.class, emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterClass.GetOnlinePlayerInfoRsp.Builder.class);
}
- public static final int TARGET_UID_FIELD_NUMBER = 2;
+ public static final int TARGET_UID_FIELD_NUMBER = 5;
private int targetUid_;
/**
- * uint32 target_uid = 2;
+ * uint32 target_uid = 5;
* @return The targetUid.
*/
@java.lang.Override
@@ -172,10 +171,10 @@ public int getTargetUid() {
return targetUid_;
}
- public static final int TARGET_PLAYER_INFO_FIELD_NUMBER = 14;
+ public static final int TARGET_PLAYER_INFO_FIELD_NUMBER = 7;
private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo targetPlayerInfo_;
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
* @return Whether the targetPlayerInfo field is set.
*/
@java.lang.Override
@@ -183,7 +182,7 @@ public boolean hasTargetPlayerInfo() {
return targetPlayerInfo_ != null;
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
* @return The targetPlayerInfo.
*/
@java.lang.Override
@@ -191,33 +190,33 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get
return targetPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : targetPlayerInfo_;
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
@java.lang.Override
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getTargetPlayerInfoOrBuilder() {
return getTargetPlayerInfo();
}
- public static final int PARAM_FIELD_NUMBER = 5;
- private int param_;
+ public static final int RETCODE_FIELD_NUMBER = 8;
+ private int retcode_;
/**
- * uint32 param = 5;
- * @return The param.
+ * int32 retcode = 8;
+ * @return The retcode.
*/
@java.lang.Override
- public int getParam() {
- return param_;
+ public int getRetcode() {
+ return retcode_;
}
- public static final int RETCODE_FIELD_NUMBER = 6;
- private int retcode_;
+ public static final int PARAM_FIELD_NUMBER = 15;
+ private int param_;
/**
- * int32 retcode = 6;
- * @return The retcode.
+ * uint32 param = 15;
+ * @return The param.
*/
@java.lang.Override
- public int getRetcode() {
- return retcode_;
+ public int getParam() {
+ return param_;
}
private byte memoizedIsInitialized = -1;
@@ -235,16 +234,16 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (targetUid_ != 0) {
- output.writeUInt32(2, targetUid_);
+ output.writeUInt32(5, targetUid_);
}
- if (param_ != 0) {
- output.writeUInt32(5, param_);
+ if (targetPlayerInfo_ != null) {
+ output.writeMessage(7, getTargetPlayerInfo());
}
if (retcode_ != 0) {
- output.writeInt32(6, retcode_);
+ output.writeInt32(8, retcode_);
}
- if (targetPlayerInfo_ != null) {
- output.writeMessage(14, getTargetPlayerInfo());
+ if (param_ != 0) {
+ output.writeUInt32(15, param_);
}
unknownFields.writeTo(output);
}
@@ -257,19 +256,19 @@ public int getSerializedSize() {
size = 0;
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(2, targetUid_);
+ .computeUInt32Size(5, targetUid_);
}
- if (param_ != 0) {
+ if (targetPlayerInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(5, param_);
+ .computeMessageSize(7, getTargetPlayerInfo());
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(6, retcode_);
+ .computeInt32Size(8, retcode_);
}
- if (targetPlayerInfo_ != null) {
+ if (param_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(14, getTargetPlayerInfo());
+ .computeUInt32Size(15, param_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -293,10 +292,10 @@ public boolean equals(final java.lang.Object obj) {
if (!getTargetPlayerInfo()
.equals(other.getTargetPlayerInfo())) return false;
}
- if (getParam()
- != other.getParam()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
+ if (getParam()
+ != other.getParam()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -314,10 +313,10 @@ public int hashCode() {
hash = (37 * hash) + TARGET_PLAYER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getTargetPlayerInfo().hashCode();
}
- hash = (37 * hash) + PARAM_FIELD_NUMBER;
- hash = (53 * hash) + getParam();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
+ hash = (37 * hash) + PARAM_FIELD_NUMBER;
+ hash = (53 * hash) + getParam();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -415,8 +414,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 8759
- * Obf: LDNOEIHGGKN
+ * CmdId: 25443
*
*
* Protobuf type {@code GetOnlinePlayerInfoRsp}
@@ -464,10 +462,10 @@ public Builder clear() {
targetPlayerInfo_ = null;
targetPlayerInfoBuilder_ = null;
}
- param_ = 0;
-
retcode_ = 0;
+ param_ = 0;
+
return this;
}
@@ -500,8 +498,8 @@ public emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterClass.GetOnlinePlaye
} else {
result.targetPlayerInfo_ = targetPlayerInfoBuilder_.build();
}
- result.param_ = param_;
result.retcode_ = retcode_;
+ result.param_ = param_;
onBuilt();
return result;
}
@@ -556,12 +554,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterCl
if (other.hasTargetPlayerInfo()) {
mergeTargetPlayerInfo(other.getTargetPlayerInfo());
}
- if (other.getParam() != 0) {
- setParam(other.getParam());
- }
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
+ if (other.getParam() != 0) {
+ setParam(other.getParam());
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -593,7 +591,7 @@ public Builder mergeFrom(
private int targetUid_ ;
/**
- * uint32 target_uid = 2;
+ * uint32 target_uid = 5;
* @return The targetUid.
*/
@java.lang.Override
@@ -601,7 +599,7 @@ public int getTargetUid() {
return targetUid_;
}
/**
- * uint32 target_uid = 2;
+ * uint32 target_uid = 5;
* @param value The targetUid to set.
* @return This builder for chaining.
*/
@@ -612,7 +610,7 @@ public Builder setTargetUid(int value) {
return this;
}
/**
- * uint32 target_uid = 2;
+ * uint32 target_uid = 5;
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
@@ -626,14 +624,14 @@ public Builder clearTargetUid() {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> targetPlayerInfoBuilder_;
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
* @return Whether the targetPlayerInfo field is set.
*/
public boolean hasTargetPlayerInfo() {
return targetPlayerInfoBuilder_ != null || targetPlayerInfo_ != null;
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
* @return The targetPlayerInfo.
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getTargetPlayerInfo() {
@@ -644,7 +642,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get
}
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
public Builder setTargetPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
if (targetPlayerInfoBuilder_ == null) {
@@ -660,7 +658,7 @@ public Builder setTargetPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOut
return this;
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
public Builder setTargetPlayerInfo(
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -674,7 +672,7 @@ public Builder setTargetPlayerInfo(
return this;
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
public Builder mergeTargetPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
if (targetPlayerInfoBuilder_ == null) {
@@ -692,7 +690,7 @@ public Builder mergeTargetPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoO
return this;
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
public Builder clearTargetPlayerInfo() {
if (targetPlayerInfoBuilder_ == null) {
@@ -706,7 +704,7 @@ public Builder clearTargetPlayerInfo() {
return this;
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getTargetPlayerInfoBuilder() {
@@ -714,7 +712,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Bui
return getTargetPlayerInfoFieldBuilder().getBuilder();
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getTargetPlayerInfoOrBuilder() {
if (targetPlayerInfoBuilder_ != null) {
@@ -725,7 +723,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBu
}
}
/**
- * .OnlinePlayerInfo target_player_info = 14;
+ * .OnlinePlayerInfo target_player_info = 7;
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>
@@ -741,64 +739,64 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBu
return targetPlayerInfoBuilder_;
}
- private int param_ ;
+ private int retcode_ ;
/**
- * uint32 param = 5;
- * @return The param.
+ * int32 retcode = 8;
+ * @return The retcode.
*/
@java.lang.Override
- public int getParam() {
- return param_;
+ public int getRetcode() {
+ return retcode_;
}
/**
- * uint32 param = 5;
- * @param value The param to set.
+ * int32 retcode = 8;
+ * @param value The retcode to set.
* @return This builder for chaining.
*/
- public Builder setParam(int value) {
+ public Builder setRetcode(int value) {
- param_ = value;
+ retcode_ = value;
onChanged();
return this;
}
/**
- * uint32 param = 5;
+ * int32 retcode = 8;
* @return This builder for chaining.
*/
- public Builder clearParam() {
+ public Builder clearRetcode() {
- param_ = 0;
+ retcode_ = 0;
onChanged();
return this;
}
- private int retcode_ ;
+ private int param_ ;
/**
- * int32 retcode = 6;
- * @return The retcode.
+ * uint32 param = 15;
+ * @return The param.
*/
@java.lang.Override
- public int getRetcode() {
- return retcode_;
+ public int getParam() {
+ return param_;
}
/**
- * int32 retcode = 6;
- * @param value The retcode to set.
+ * uint32 param = 15;
+ * @param value The param to set.
* @return This builder for chaining.
*/
- public Builder setRetcode(int value) {
+ public Builder setParam(int value) {
- retcode_ = value;
+ param_ = value;
onChanged();
return this;
}
/**
- * int32 retcode = 6;
+ * uint32 param = 15;
* @return This builder for chaining.
*/
- public Builder clearRetcode() {
+ public Builder clearParam() {
- retcode_ = 0;
+ param_ = 0;
onChanged();
return this;
}
@@ -871,9 +869,9 @@ public emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterClass.GetOnlinePlaye
java.lang.String[] descriptorData = {
"\n\034GetOnlinePlayerInfoRsp.proto\032\026OnlinePl" +
"ayerInfo.proto\"{\n\026GetOnlinePlayerInfoRsp" +
- "\022\022\n\ntarget_uid\030\002 \001(\r\022-\n\022target_player_in" +
- "fo\030\016 \001(\0132\021.OnlinePlayerInfo\022\r\n\005param\030\005 \001" +
- "(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031emu.grasscutter.n" +
+ "\022\022\n\ntarget_uid\030\005 \001(\r\022-\n\022target_player_in" +
+ "fo\030\007 \001(\0132\021.OnlinePlayerInfo\022\017\n\007retcode\030\010" +
+ " \001(\005\022\r\n\005param\030\017 \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -886,7 +884,7 @@ public emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterClass.GetOnlinePlaye
internal_static_GetOnlinePlayerInfoRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_GetOnlinePlayerInfoRsp_descriptor,
- new java.lang.String[] { "TargetUid", "TargetPlayerInfo", "Param", "Retcode", });
+ new java.lang.String[] { "TargetUid", "TargetPlayerInfo", "Retcode", "Param", });
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java
index bcd53766a47..f4aebfa609a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java
@@ -19,36 +19,35 @@ public interface PlayerApplyEnterMpNotifyOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 src_app_id = 5;
+ * uint32 src_app_id = 1;
* @return The srcAppId.
*/
int getSrcAppId();
/**
- * uint32 src_thread_index = 8;
+ * uint32 src_thread_index = 11;
* @return The srcThreadIndex.
*/
int getSrcThreadIndex();
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
* @return Whether the srcPlayerInfo field is set.
*/
boolean hasSrcPlayerInfo();
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
* @return The srcPlayerInfo.
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
}
/**
*
- * CmdId: 5296
- * Obf: DKNEOIPGLJP
+ * CmdId: 5245
*
*
* Protobuf type {@code PlayerApplyEnterMpNotify}
@@ -95,17 +94,17 @@ private PlayerApplyEnterMpNotify(
case 0:
done = true;
break;
- case 40: {
+ case 8: {
srcAppId_ = input.readUInt32();
break;
}
- case 64: {
+ case 88: {
srcThreadIndex_ = input.readUInt32();
break;
}
- case 114: {
+ case 106: {
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
if (srcPlayerInfo_ != null) {
subBuilder = srcPlayerInfo_.toBuilder();
@@ -150,10 +149,10 @@ private PlayerApplyEnterMpNotify(
emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.class, emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.Builder.class);
}
- public static final int SRC_APP_ID_FIELD_NUMBER = 5;
+ public static final int SRC_APP_ID_FIELD_NUMBER = 1;
private int srcAppId_;
/**
- * uint32 src_app_id = 5;
+ * uint32 src_app_id = 1;
* @return The srcAppId.
*/
@java.lang.Override
@@ -161,10 +160,10 @@ public int getSrcAppId() {
return srcAppId_;
}
- public static final int SRC_THREAD_INDEX_FIELD_NUMBER = 8;
+ public static final int SRC_THREAD_INDEX_FIELD_NUMBER = 11;
private int srcThreadIndex_;
/**
- * uint32 src_thread_index = 8;
+ * uint32 src_thread_index = 11;
* @return The srcThreadIndex.
*/
@java.lang.Override
@@ -172,10 +171,10 @@ public int getSrcThreadIndex() {
return srcThreadIndex_;
}
- public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 14;
+ public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 13;
private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
* @return Whether the srcPlayerInfo field is set.
*/
@java.lang.Override
@@ -183,7 +182,7 @@ public boolean hasSrcPlayerInfo() {
return srcPlayerInfo_ != null;
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
* @return The srcPlayerInfo.
*/
@java.lang.Override
@@ -191,7 +190,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get
return srcPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : srcPlayerInfo_;
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
@java.lang.Override
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
@@ -213,13 +212,13 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (srcAppId_ != 0) {
- output.writeUInt32(5, srcAppId_);
+ output.writeUInt32(1, srcAppId_);
}
if (srcThreadIndex_ != 0) {
- output.writeUInt32(8, srcThreadIndex_);
+ output.writeUInt32(11, srcThreadIndex_);
}
if (srcPlayerInfo_ != null) {
- output.writeMessage(14, getSrcPlayerInfo());
+ output.writeMessage(13, getSrcPlayerInfo());
}
unknownFields.writeTo(output);
}
@@ -232,15 +231,15 @@ public int getSerializedSize() {
size = 0;
if (srcAppId_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(5, srcAppId_);
+ .computeUInt32Size(1, srcAppId_);
}
if (srcThreadIndex_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(8, srcThreadIndex_);
+ .computeUInt32Size(11, srcThreadIndex_);
}
if (srcPlayerInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(14, getSrcPlayerInfo());
+ .computeMessageSize(13, getSrcPlayerInfo());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -382,8 +381,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 5296
- * Obf: DKNEOIPGLJP
+ * CmdId: 5245
*
*
* Protobuf type {@code PlayerApplyEnterMpNotify}
@@ -554,7 +552,7 @@ public Builder mergeFrom(
private int srcAppId_ ;
/**
- * uint32 src_app_id = 5;
+ * uint32 src_app_id = 1;
* @return The srcAppId.
*/
@java.lang.Override
@@ -562,7 +560,7 @@ public int getSrcAppId() {
return srcAppId_;
}
/**
- * uint32 src_app_id = 5;
+ * uint32 src_app_id = 1;
* @param value The srcAppId to set.
* @return This builder for chaining.
*/
@@ -573,7 +571,7 @@ public Builder setSrcAppId(int value) {
return this;
}
/**
- * uint32 src_app_id = 5;
+ * uint32 src_app_id = 1;
* @return This builder for chaining.
*/
public Builder clearSrcAppId() {
@@ -585,7 +583,7 @@ public Builder clearSrcAppId() {
private int srcThreadIndex_ ;
/**
- * uint32 src_thread_index = 8;
+ * uint32 src_thread_index = 11;
* @return The srcThreadIndex.
*/
@java.lang.Override
@@ -593,7 +591,7 @@ public int getSrcThreadIndex() {
return srcThreadIndex_;
}
/**
- * uint32 src_thread_index = 8;
+ * uint32 src_thread_index = 11;
* @param value The srcThreadIndex to set.
* @return This builder for chaining.
*/
@@ -604,7 +602,7 @@ public Builder setSrcThreadIndex(int value) {
return this;
}
/**
- * uint32 src_thread_index = 8;
+ * uint32 src_thread_index = 11;
* @return This builder for chaining.
*/
public Builder clearSrcThreadIndex() {
@@ -618,14 +616,14 @@ public Builder clearSrcThreadIndex() {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> srcPlayerInfoBuilder_;
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
* @return Whether the srcPlayerInfo field is set.
*/
public boolean hasSrcPlayerInfo() {
return srcPlayerInfoBuilder_ != null || srcPlayerInfo_ != null;
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
* @return The srcPlayerInfo.
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo() {
@@ -636,7 +634,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get
}
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
if (srcPlayerInfoBuilder_ == null) {
@@ -652,7 +650,7 @@ public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterC
return this;
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
public Builder setSrcPlayerInfo(
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -666,7 +664,7 @@ public Builder setSrcPlayerInfo(
return this;
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
if (srcPlayerInfoBuilder_ == null) {
@@ -684,7 +682,7 @@ public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOute
return this;
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
public Builder clearSrcPlayerInfo() {
if (srcPlayerInfoBuilder_ == null) {
@@ -698,7 +696,7 @@ public Builder clearSrcPlayerInfo() {
return this;
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getSrcPlayerInfoBuilder() {
@@ -706,7 +704,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Bui
return getSrcPlayerInfoFieldBuilder().getBuilder();
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
if (srcPlayerInfoBuilder_ != null) {
@@ -717,7 +715,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBu
}
}
/**
- * .OnlinePlayerInfo src_player_info = 14;
+ * .OnlinePlayerInfo src_player_info = 13;
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>
@@ -801,8 +799,8 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyE
java.lang.String[] descriptorData = {
"\n\036PlayerApplyEnterMpNotify.proto\032\026Online" +
"PlayerInfo.proto\"t\n\030PlayerApplyEnterMpNo" +
- "tify\022\022\n\nsrc_app_id\030\005 \001(\r\022\030\n\020src_thread_i" +
- "ndex\030\010 \001(\r\022*\n\017src_player_info\030\016 \001(\0132\021.On" +
+ "tify\022\022\n\nsrc_app_id\030\001 \001(\r\022\030\n\020src_thread_i" +
+ "ndex\030\013 \001(\r\022*\n\017src_player_info\030\r \001(\0132\021.On" +
"linePlayerInfoB\033\n\031emu.grasscutter.net.pr" +
"otob\006proto3"
};
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java
index a0b628eb04a..a9ac41294ab 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java
@@ -19,15 +19,14 @@ public interface PlayerApplyEnterMpReqOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 target_uid = 4;
+ * uint32 target_uid = 7;
* @return The targetUid.
*/
int getTargetUid();
}
/**
*
- * CmdId: 9629
- * Obf: HLANGOHBOGO
+ * CmdId: 4701
*
*
* Protobuf type {@code PlayerApplyEnterMpReq}
@@ -74,7 +73,7 @@ private PlayerApplyEnterMpReq(
case 0:
done = true;
break;
- case 32: {
+ case 56: {
targetUid_ = input.readUInt32();
break;
@@ -111,10 +110,10 @@ private PlayerApplyEnterMpReq(
emu.grasscutter.net.proto.PlayerApplyEnterMpReqOuterClass.PlayerApplyEnterMpReq.class, emu.grasscutter.net.proto.PlayerApplyEnterMpReqOuterClass.PlayerApplyEnterMpReq.Builder.class);
}
- public static final int TARGET_UID_FIELD_NUMBER = 4;
+ public static final int TARGET_UID_FIELD_NUMBER = 7;
private int targetUid_;
/**
- * uint32 target_uid = 4;
+ * uint32 target_uid = 7;
* @return The targetUid.
*/
@java.lang.Override
@@ -137,7 +136,7 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (targetUid_ != 0) {
- output.writeUInt32(4, targetUid_);
+ output.writeUInt32(7, targetUid_);
}
unknownFields.writeTo(output);
}
@@ -150,7 +149,7 @@ public int getSerializedSize() {
size = 0;
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(4, targetUid_);
+ .computeUInt32Size(7, targetUid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -279,8 +278,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 9629
- * Obf: HLANGOHBOGO
+ * CmdId: 4701
*
*
* Protobuf type {@code PlayerApplyEnterMpReq}
@@ -431,7 +429,7 @@ public Builder mergeFrom(
private int targetUid_ ;
/**
- * uint32 target_uid = 4;
+ * uint32 target_uid = 7;
* @return The targetUid.
*/
@java.lang.Override
@@ -439,7 +437,7 @@ public int getTargetUid() {
return targetUid_;
}
/**
- * uint32 target_uid = 4;
+ * uint32 target_uid = 7;
* @param value The targetUid to set.
* @return This builder for chaining.
*/
@@ -450,7 +448,7 @@ public Builder setTargetUid(int value) {
return this;
}
/**
- * uint32 target_uid = 4;
+ * uint32 target_uid = 7;
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
@@ -527,7 +525,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpReqOuterClass.PlayerApplyEnte
static {
java.lang.String[] descriptorData = {
"\n\033PlayerApplyEnterMpReq.proto\"+\n\025PlayerA" +
- "pplyEnterMpReq\022\022\n\ntarget_uid\030\004 \001(\rB\033\n\031em" +
+ "pplyEnterMpReq\022\022\n\ntarget_uid\030\007 \001(\rB\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultNotifyOuterClass.java
index f1873139655..e2cc5fd044a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultNotifyOuterClass.java
@@ -19,44 +19,43 @@ public interface PlayerApplyEnterMpResultNotifyOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @return The enum numeric value on the wire for reason.
- */
- int getReasonValue();
- /**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @return The reason.
+ * uint32 target_uid = 6;
+ * @return The targetUid.
*/
- emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason();
+ int getTargetUid();
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @return The targetNickname.
*/
java.lang.String getTargetNickname();
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @return The bytes for targetNickname.
*/
com.google.protobuf.ByteString
getTargetNicknameBytes();
/**
- * uint32 target_uid = 3;
- * @return The targetUid.
+ * bool is_agreed = 9;
+ * @return The isAgreed.
*/
- int getTargetUid();
+ boolean getIsAgreed();
/**
- * bool is_agreed = 2;
- * @return The isAgreed.
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @return The enum numeric value on the wire for reason.
*/
- boolean getIsAgreed();
+ int getReasonValue();
+ /**
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @return The reason.
+ */
+ emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason();
}
/**
*
- * CmdId: 3467
- * Obf: EIIOBJEBLEH
+ * CmdId: 8810
*
*
* Protobuf type {@code PlayerApplyEnterMpResultNotify}
@@ -71,8 +70,8 @@ private PlayerApplyEnterMpResultNotify(com.google.protobuf.GeneratedMessageV3.Bu
super(builder);
}
private PlayerApplyEnterMpResultNotify() {
- reason_ = 0;
targetNickname_ = "";
+ reason_ = 0;
}
@java.lang.Override
@@ -105,26 +104,26 @@ private PlayerApplyEnterMpResultNotify(
case 0:
done = true;
break;
- case 16: {
+ case 48: {
- isAgreed_ = input.readBool();
+ targetUid_ = input.readUInt32();
break;
}
- case 24: {
+ case 58: {
+ java.lang.String s = input.readStringRequireUtf8();
- targetUid_ = input.readUInt32();
+ targetNickname_ = s;
break;
}
- case 80: {
- int rawValue = input.readEnum();
+ case 72: {
- reason_ = rawValue;
+ isAgreed_ = input.readBool();
break;
}
- case 114: {
- java.lang.String s = input.readStringRequireUtf8();
+ case 112: {
+ int rawValue = input.readEnum();
- targetNickname_ = s;
+ reason_ = rawValue;
break;
}
default: {
@@ -160,10 +159,6 @@ private PlayerApplyEnterMpResultNotify(
}
/**
- *
- * Obf: DLBJOMOJCKD
- *
- *
* Protobuf enum {@code PlayerApplyEnterMpResultNotify.Reason}
*/
public enum Reason
@@ -379,29 +374,21 @@ private Reason(int value) {
// @@protoc_insertion_point(enum_scope:PlayerApplyEnterMpResultNotify.Reason)
}
- public static final int REASON_FIELD_NUMBER = 10;
- private int reason_;
- /**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @return The enum numeric value on the wire for reason.
- */
- @java.lang.Override public int getReasonValue() {
- return reason_;
- }
+ public static final int TARGET_UID_FIELD_NUMBER = 6;
+ private int targetUid_;
/**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @return The reason.
+ * uint32 target_uid = 6;
+ * @return The targetUid.
*/
- @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
- @SuppressWarnings("deprecation")
- emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
- return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
+ @java.lang.Override
+ public int getTargetUid() {
+ return targetUid_;
}
- public static final int TARGET_NICKNAME_FIELD_NUMBER = 14;
+ public static final int TARGET_NICKNAME_FIELD_NUMBER = 7;
private volatile java.lang.Object targetNickname_;
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @return The targetNickname.
*/
@java.lang.Override
@@ -418,7 +405,7 @@ public java.lang.String getTargetNickname() {
}
}
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @return The bytes for targetNickname.
*/
@java.lang.Override
@@ -436,21 +423,10 @@ public java.lang.String getTargetNickname() {
}
}
- public static final int TARGET_UID_FIELD_NUMBER = 3;
- private int targetUid_;
- /**
- * uint32 target_uid = 3;
- * @return The targetUid.
- */
- @java.lang.Override
- public int getTargetUid() {
- return targetUid_;
- }
-
- public static final int IS_AGREED_FIELD_NUMBER = 2;
+ public static final int IS_AGREED_FIELD_NUMBER = 9;
private boolean isAgreed_;
/**
- * bool is_agreed = 2;
+ * bool is_agreed = 9;
* @return The isAgreed.
*/
@java.lang.Override
@@ -458,6 +434,25 @@ public boolean getIsAgreed() {
return isAgreed_;
}
+ public static final int REASON_FIELD_NUMBER = 14;
+ private int reason_;
+ /**
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @return The enum numeric value on the wire for reason.
+ */
+ @java.lang.Override public int getReasonValue() {
+ return reason_;
+ }
+ /**
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @return The reason.
+ */
+ @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
+ @SuppressWarnings("deprecation")
+ emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
+ return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -472,17 +467,17 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (isAgreed_ != false) {
- output.writeBool(2, isAgreed_);
- }
if (targetUid_ != 0) {
- output.writeUInt32(3, targetUid_);
- }
- if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_JUDGE.getNumber()) {
- output.writeEnum(10, reason_);
+ output.writeUInt32(6, targetUid_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 14, targetNickname_);
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, targetNickname_);
+ }
+ if (isAgreed_ != false) {
+ output.writeBool(9, isAgreed_);
+ }
+ if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_JUDGE.getNumber()) {
+ output.writeEnum(14, reason_);
}
unknownFields.writeTo(output);
}
@@ -493,20 +488,20 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (isAgreed_ != false) {
+ if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(2, isAgreed_);
+ .computeUInt32Size(6, targetUid_);
}
- if (targetUid_ != 0) {
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, targetNickname_);
+ }
+ if (isAgreed_ != false) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(3, targetUid_);
+ .computeBoolSize(9, isAgreed_);
}
if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_JUDGE.getNumber()) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(10, reason_);
- }
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, targetNickname_);
+ .computeEnumSize(14, reason_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -523,13 +518,13 @@ public boolean equals(final java.lang.Object obj) {
}
emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify other = (emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify) obj;
- if (reason_ != other.reason_) return false;
- if (!getTargetNickname()
- .equals(other.getTargetNickname())) return false;
if (getTargetUid()
!= other.getTargetUid()) return false;
+ if (!getTargetNickname()
+ .equals(other.getTargetNickname())) return false;
if (getIsAgreed()
!= other.getIsAgreed()) return false;
+ if (reason_ != other.reason_) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -541,15 +536,15 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + REASON_FIELD_NUMBER;
- hash = (53 * hash) + reason_;
- hash = (37 * hash) + TARGET_NICKNAME_FIELD_NUMBER;
- hash = (53 * hash) + getTargetNickname().hashCode();
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
+ hash = (37 * hash) + TARGET_NICKNAME_FIELD_NUMBER;
+ hash = (53 * hash) + getTargetNickname().hashCode();
hash = (37 * hash) + IS_AGREED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsAgreed());
+ hash = (37 * hash) + REASON_FIELD_NUMBER;
+ hash = (53 * hash) + reason_;
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -647,8 +642,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 3467
- * Obf: EIIOBJEBLEH
+ * CmdId: 8810
*
*
* Protobuf type {@code PlayerApplyEnterMpResultNotify}
@@ -688,14 +682,14 @@ private void maybeForceBuilderInitialization() {
@java.lang.Override
public Builder clear() {
super.clear();
- reason_ = 0;
+ targetUid_ = 0;
targetNickname_ = "";
- targetUid_ = 0;
-
isAgreed_ = false;
+ reason_ = 0;
+
return this;
}
@@ -722,10 +716,10 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.Player
@java.lang.Override
public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify buildPartial() {
emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify result = new emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify(this);
- result.reason_ = reason_;
- result.targetNickname_ = targetNickname_;
result.targetUid_ = targetUid_;
+ result.targetNickname_ = targetNickname_;
result.isAgreed_ = isAgreed_;
+ result.reason_ = reason_;
onBuilt();
return result;
}
@@ -774,19 +768,19 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify other) {
if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.getDefaultInstance()) return this;
- if (other.reason_ != 0) {
- setReasonValue(other.getReasonValue());
+ if (other.getTargetUid() != 0) {
+ setTargetUid(other.getTargetUid());
}
if (!other.getTargetNickname().isEmpty()) {
targetNickname_ = other.targetNickname_;
onChanged();
}
- if (other.getTargetUid() != 0) {
- setTargetUid(other.getTargetUid());
- }
if (other.getIsAgreed() != false) {
setIsAgreed(other.getIsAgreed());
}
+ if (other.reason_ != 0) {
+ setReasonValue(other.getReasonValue());
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -816,63 +810,40 @@ public Builder mergeFrom(
return this;
}
- private int reason_ = 0;
- /**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @return The enum numeric value on the wire for reason.
- */
- @java.lang.Override public int getReasonValue() {
- return reason_;
- }
- /**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @param value The enum numeric value on the wire for reason to set.
- * @return This builder for chaining.
- */
- public Builder setReasonValue(int value) {
-
- reason_ = value;
- onChanged();
- return this;
- }
+ private int targetUid_ ;
/**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @return The reason.
+ * uint32 target_uid = 6;
+ * @return The targetUid.
*/
@java.lang.Override
- public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
- @SuppressWarnings("deprecation")
- emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
- return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
+ public int getTargetUid() {
+ return targetUid_;
}
/**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
- * @param value The reason to set.
+ * uint32 target_uid = 6;
+ * @param value The targetUid to set.
* @return This builder for chaining.
*/
- public Builder setReason(emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason value) {
- if (value == null) {
- throw new NullPointerException();
- }
+ public Builder setTargetUid(int value) {
- reason_ = value.getNumber();
+ targetUid_ = value;
onChanged();
return this;
}
/**
- * .PlayerApplyEnterMpResultNotify.Reason reason = 10;
+ * uint32 target_uid = 6;
* @return This builder for chaining.
*/
- public Builder clearReason() {
+ public Builder clearTargetUid() {
- reason_ = 0;
+ targetUid_ = 0;
onChanged();
return this;
}
private java.lang.Object targetNickname_ = "";
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @return The targetNickname.
*/
public java.lang.String getTargetNickname() {
@@ -888,7 +859,7 @@ public java.lang.String getTargetNickname() {
}
}
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @return The bytes for targetNickname.
*/
public com.google.protobuf.ByteString
@@ -905,7 +876,7 @@ public java.lang.String getTargetNickname() {
}
}
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @param value The targetNickname to set.
* @return This builder for chaining.
*/
@@ -920,7 +891,7 @@ public Builder setTargetNickname(
return this;
}
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @return This builder for chaining.
*/
public Builder clearTargetNickname() {
@@ -930,7 +901,7 @@ public Builder clearTargetNickname() {
return this;
}
/**
- * string target_nickname = 14;
+ * string target_nickname = 7;
* @param value The bytes for targetNickname to set.
* @return This builder for chaining.
*/
@@ -946,64 +917,87 @@ public Builder setTargetNicknameBytes(
return this;
}
- private int targetUid_ ;
+ private boolean isAgreed_ ;
/**
- * uint32 target_uid = 3;
- * @return The targetUid.
+ * bool is_agreed = 9;
+ * @return The isAgreed.
*/
@java.lang.Override
- public int getTargetUid() {
- return targetUid_;
+ public boolean getIsAgreed() {
+ return isAgreed_;
}
/**
- * uint32 target_uid = 3;
- * @param value The targetUid to set.
+ * bool is_agreed = 9;
+ * @param value The isAgreed to set.
* @return This builder for chaining.
*/
- public Builder setTargetUid(int value) {
+ public Builder setIsAgreed(boolean value) {
- targetUid_ = value;
+ isAgreed_ = value;
onChanged();
return this;
}
/**
- * uint32 target_uid = 3;
+ * bool is_agreed = 9;
* @return This builder for chaining.
*/
- public Builder clearTargetUid() {
+ public Builder clearIsAgreed() {
- targetUid_ = 0;
+ isAgreed_ = false;
onChanged();
return this;
}
- private boolean isAgreed_ ;
+ private int reason_ = 0;
/**
- * bool is_agreed = 2;
- * @return The isAgreed.
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @return The enum numeric value on the wire for reason.
+ */
+ @java.lang.Override public int getReasonValue() {
+ return reason_;
+ }
+ /**
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @param value The enum numeric value on the wire for reason to set.
+ * @return This builder for chaining.
+ */
+ public Builder setReasonValue(int value) {
+
+ reason_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @return The reason.
*/
@java.lang.Override
- public boolean getIsAgreed() {
- return isAgreed_;
+ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
+ @SuppressWarnings("deprecation")
+ emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
+ return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
}
/**
- * bool is_agreed = 2;
- * @param value The isAgreed to set.
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
+ * @param value The reason to set.
* @return This builder for chaining.
*/
- public Builder setIsAgreed(boolean value) {
+ public Builder setReason(emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
- isAgreed_ = value;
+ reason_ = value.getNumber();
onChanged();
return this;
}
/**
- * bool is_agreed = 2;
+ * .PlayerApplyEnterMpResultNotify.Reason reason = 14;
* @return This builder for chaining.
*/
- public Builder clearIsAgreed() {
+ public Builder clearReason() {
- isAgreed_ = false;
+ reason_ = 0;
onChanged();
return this;
}
@@ -1075,10 +1069,10 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.Player
static {
java.lang.String[] descriptorData = {
"\n$PlayerApplyEnterMpResultNotify.proto\"\355" +
- "\004\n\036PlayerApplyEnterMpResultNotify\0226\n\006rea" +
- "son\030\n \001(\0162&.PlayerApplyEnterMpResultNoti" +
- "fy.Reason\022\027\n\017target_nickname\030\016 \001(\t\022\022\n\nta" +
- "rget_uid\030\003 \001(\r\022\021\n\tis_agreed\030\002 \001(\010\"\322\003\n\006Re" +
+ "\004\n\036PlayerApplyEnterMpResultNotify\022\022\n\ntar" +
+ "get_uid\030\006 \001(\r\022\027\n\017target_nickname\030\007 \001(\t\022\021" +
+ "\n\tis_agreed\030\t \001(\010\0226\n\006reason\030\016 \001(\0162&.Play" +
+ "erApplyEnterMpResultNotify.Reason\"\322\003\n\006Re" +
"ason\022\027\n\023REASON_PLAYER_JUDGE\020\000\022\035\n\031REASON_" +
"SCENE_CANNOT_ENTER\020\001\022!\n\035REASON_PLAYER_CA" +
"NNOT_ENTER_MP\020\002\022\027\n\023REASON_SYSTEM_JUDGE\020\003" +
@@ -1102,7 +1096,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.Player
internal_static_PlayerApplyEnterMpResultNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerApplyEnterMpResultNotify_descriptor,
- new java.lang.String[] { "Reason", "TargetNickname", "TargetUid", "IsAgreed", });
+ new java.lang.String[] { "TargetUid", "TargetNickname", "IsAgreed", "Reason", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java
index 4597e2c1ee9..59b4cbed32c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java
@@ -19,21 +19,20 @@ public interface PlayerApplyEnterMpResultReqOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 apply_uid = 11;
- * @return The applyUid.
+ * bool is_agreed = 3;
+ * @return The isAgreed.
*/
- int getApplyUid();
+ boolean getIsAgreed();
/**
- * bool is_agreed = 12;
- * @return The isAgreed.
+ * uint32 apply_uid = 15;
+ * @return The applyUid.
*/
- boolean getIsAgreed();
+ int getApplyUid();
}
/**
*
- * CmdId: 24849
- * Obf: DCHAHENHFKC
+ * CmdId: 23674
*
*
* Protobuf type {@code PlayerApplyEnterMpResultReq}
@@ -80,14 +79,14 @@ private PlayerApplyEnterMpResultReq(
case 0:
done = true;
break;
- case 88: {
+ case 24: {
- applyUid_ = input.readUInt32();
+ isAgreed_ = input.readBool();
break;
}
- case 96: {
+ case 120: {
- isAgreed_ = input.readBool();
+ applyUid_ = input.readUInt32();
break;
}
default: {
@@ -122,26 +121,26 @@ private PlayerApplyEnterMpResultReq(
emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq.class, emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq.Builder.class);
}
- public static final int APPLY_UID_FIELD_NUMBER = 11;
- private int applyUid_;
+ public static final int IS_AGREED_FIELD_NUMBER = 3;
+ private boolean isAgreed_;
/**
- * uint32 apply_uid = 11;
- * @return The applyUid.
+ * bool is_agreed = 3;
+ * @return The isAgreed.
*/
@java.lang.Override
- public int getApplyUid() {
- return applyUid_;
+ public boolean getIsAgreed() {
+ return isAgreed_;
}
- public static final int IS_AGREED_FIELD_NUMBER = 12;
- private boolean isAgreed_;
+ public static final int APPLY_UID_FIELD_NUMBER = 15;
+ private int applyUid_;
/**
- * bool is_agreed = 12;
- * @return The isAgreed.
+ * uint32 apply_uid = 15;
+ * @return The applyUid.
*/
@java.lang.Override
- public boolean getIsAgreed() {
- return isAgreed_;
+ public int getApplyUid() {
+ return applyUid_;
}
private byte memoizedIsInitialized = -1;
@@ -158,11 +157,11 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (applyUid_ != 0) {
- output.writeUInt32(11, applyUid_);
- }
if (isAgreed_ != false) {
- output.writeBool(12, isAgreed_);
+ output.writeBool(3, isAgreed_);
+ }
+ if (applyUid_ != 0) {
+ output.writeUInt32(15, applyUid_);
}
unknownFields.writeTo(output);
}
@@ -173,13 +172,13 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (applyUid_ != 0) {
+ if (isAgreed_ != false) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(11, applyUid_);
+ .computeBoolSize(3, isAgreed_);
}
- if (isAgreed_ != false) {
+ if (applyUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(12, isAgreed_);
+ .computeUInt32Size(15, applyUid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -196,10 +195,10 @@ public boolean equals(final java.lang.Object obj) {
}
emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq other = (emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq) obj;
- if (getApplyUid()
- != other.getApplyUid()) return false;
if (getIsAgreed()
!= other.getIsAgreed()) return false;
+ if (getApplyUid()
+ != other.getApplyUid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -211,11 +210,11 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
- hash = (53 * hash) + getApplyUid();
hash = (37 * hash) + IS_AGREED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsAgreed());
+ hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
+ hash = (53 * hash) + getApplyUid();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -313,8 +312,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 24849
- * Obf: DCHAHENHFKC
+ * CmdId: 23674
*
*
* Protobuf type {@code PlayerApplyEnterMpResultReq}
@@ -354,10 +352,10 @@ private void maybeForceBuilderInitialization() {
@java.lang.Override
public Builder clear() {
super.clear();
- applyUid_ = 0;
-
isAgreed_ = false;
+ applyUid_ = 0;
+
return this;
}
@@ -384,8 +382,8 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApp
@java.lang.Override
public emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq buildPartial() {
emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq result = new emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq(this);
- result.applyUid_ = applyUid_;
result.isAgreed_ = isAgreed_;
+ result.applyUid_ = applyUid_;
onBuilt();
return result;
}
@@ -434,12 +432,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq other) {
if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq.getDefaultInstance()) return this;
- if (other.getApplyUid() != 0) {
- setApplyUid(other.getApplyUid());
- }
if (other.getIsAgreed() != false) {
setIsAgreed(other.getIsAgreed());
}
+ if (other.getApplyUid() != 0) {
+ setApplyUid(other.getApplyUid());
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -469,64 +467,64 @@ public Builder mergeFrom(
return this;
}
- private int applyUid_ ;
+ private boolean isAgreed_ ;
/**
- * uint32 apply_uid = 11;
- * @return The applyUid.
+ * bool is_agreed = 3;
+ * @return The isAgreed.
*/
@java.lang.Override
- public int getApplyUid() {
- return applyUid_;
+ public boolean getIsAgreed() {
+ return isAgreed_;
}
/**
- * uint32 apply_uid = 11;
- * @param value The applyUid to set.
+ * bool is_agreed = 3;
+ * @param value The isAgreed to set.
* @return This builder for chaining.
*/
- public Builder setApplyUid(int value) {
+ public Builder setIsAgreed(boolean value) {
- applyUid_ = value;
+ isAgreed_ = value;
onChanged();
return this;
}
/**
- * uint32 apply_uid = 11;
+ * bool is_agreed = 3;
* @return This builder for chaining.
*/
- public Builder clearApplyUid() {
+ public Builder clearIsAgreed() {
- applyUid_ = 0;
+ isAgreed_ = false;
onChanged();
return this;
}
- private boolean isAgreed_ ;
+ private int applyUid_ ;
/**
- * bool is_agreed = 12;
- * @return The isAgreed.
+ * uint32 apply_uid = 15;
+ * @return The applyUid.
*/
@java.lang.Override
- public boolean getIsAgreed() {
- return isAgreed_;
+ public int getApplyUid() {
+ return applyUid_;
}
/**
- * bool is_agreed = 12;
- * @param value The isAgreed to set.
+ * uint32 apply_uid = 15;
+ * @param value The applyUid to set.
* @return This builder for chaining.
*/
- public Builder setIsAgreed(boolean value) {
+ public Builder setApplyUid(int value) {
- isAgreed_ = value;
+ applyUid_ = value;
onChanged();
return this;
}
/**
- * bool is_agreed = 12;
+ * uint32 apply_uid = 15;
* @return This builder for chaining.
*/
- public Builder clearIsAgreed() {
+ public Builder clearApplyUid() {
- isAgreed_ = false;
+ applyUid_ = 0;
onChanged();
return this;
}
@@ -598,8 +596,8 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApp
static {
java.lang.String[] descriptorData = {
"\n!PlayerApplyEnterMpResultReq.proto\"C\n\033P" +
- "layerApplyEnterMpResultReq\022\021\n\tapply_uid\030" +
- "\013 \001(\r\022\021\n\tis_agreed\030\014 \001(\010B\033\n\031emu.grasscut" +
+ "layerApplyEnterMpResultReq\022\021\n\tis_agreed\030" +
+ "\003 \001(\010\022\021\n\tapply_uid\030\017 \001(\rB\033\n\031emu.grasscut" +
"ter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +609,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApp
internal_static_PlayerApplyEnterMpResultReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerApplyEnterMpResultReq_descriptor,
- new java.lang.String[] { "ApplyUid", "IsAgreed", });
+ new java.lang.String[] { "IsAgreed", "ApplyUid", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java
index 088567ac4ea..0057d00891a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java
@@ -19,33 +19,32 @@ public interface PlayerApplyEnterMpResultRspOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 apply_uid = 3;
- * @return The applyUid.
+ * int32 retcode = 4;
+ * @return The retcode.
*/
- int getApplyUid();
+ int getRetcode();
/**
- * int32 retcode = 12;
- * @return The retcode.
+ * uint32 apply_uid = 7;
+ * @return The applyUid.
*/
- int getRetcode();
+ int getApplyUid();
/**
- * uint32 param = 11;
+ * uint32 param = 10;
* @return The param.
*/
int getParam();
/**
- * bool is_agreed = 7;
+ * bool is_agreed = 11;
* @return The isAgreed.
*/
boolean getIsAgreed();
}
/**
*
- * CmdId: 6395
- * Obf: JGFCKHJPDFA
+ * CmdId: 27380
*
*
* Protobuf type {@code PlayerApplyEnterMpResultRsp}
@@ -92,24 +91,24 @@ private PlayerApplyEnterMpResultRsp(
case 0:
done = true;
break;
- case 24: {
+ case 32: {
- applyUid_ = input.readUInt32();
+ retcode_ = input.readInt32();
break;
}
case 56: {
- isAgreed_ = input.readBool();
+ applyUid_ = input.readUInt32();
break;
}
- case 88: {
+ case 80: {
param_ = input.readUInt32();
break;
}
- case 96: {
+ case 88: {
- retcode_ = input.readInt32();
+ isAgreed_ = input.readBool();
break;
}
default: {
@@ -144,32 +143,32 @@ private PlayerApplyEnterMpResultRsp(
emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp.class, emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp.Builder.class);
}
- public static final int APPLY_UID_FIELD_NUMBER = 3;
- private int applyUid_;
+ public static final int RETCODE_FIELD_NUMBER = 4;
+ private int retcode_;
/**
- * uint32 apply_uid = 3;
- * @return The applyUid.
+ * int32 retcode = 4;
+ * @return The retcode.
*/
@java.lang.Override
- public int getApplyUid() {
- return applyUid_;
+ public int getRetcode() {
+ return retcode_;
}
- public static final int RETCODE_FIELD_NUMBER = 12;
- private int retcode_;
+ public static final int APPLY_UID_FIELD_NUMBER = 7;
+ private int applyUid_;
/**
- * int32 retcode = 12;
- * @return The retcode.
+ * uint32 apply_uid = 7;
+ * @return The applyUid.
*/
@java.lang.Override
- public int getRetcode() {
- return retcode_;
+ public int getApplyUid() {
+ return applyUid_;
}
- public static final int PARAM_FIELD_NUMBER = 11;
+ public static final int PARAM_FIELD_NUMBER = 10;
private int param_;
/**
- * uint32 param = 11;
+ * uint32 param = 10;
* @return The param.
*/
@java.lang.Override
@@ -177,10 +176,10 @@ public int getParam() {
return param_;
}
- public static final int IS_AGREED_FIELD_NUMBER = 7;
+ public static final int IS_AGREED_FIELD_NUMBER = 11;
private boolean isAgreed_;
/**
- * bool is_agreed = 7;
+ * bool is_agreed = 11;
* @return The isAgreed.
*/
@java.lang.Override
@@ -202,17 +201,17 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (applyUid_ != 0) {
- output.writeUInt32(3, applyUid_);
+ if (retcode_ != 0) {
+ output.writeInt32(4, retcode_);
}
- if (isAgreed_ != false) {
- output.writeBool(7, isAgreed_);
+ if (applyUid_ != 0) {
+ output.writeUInt32(7, applyUid_);
}
if (param_ != 0) {
- output.writeUInt32(11, param_);
+ output.writeUInt32(10, param_);
}
- if (retcode_ != 0) {
- output.writeInt32(12, retcode_);
+ if (isAgreed_ != false) {
+ output.writeBool(11, isAgreed_);
}
unknownFields.writeTo(output);
}
@@ -223,21 +222,21 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (applyUid_ != 0) {
+ if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(3, applyUid_);
+ .computeInt32Size(4, retcode_);
}
- if (isAgreed_ != false) {
+ if (applyUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(7, isAgreed_);
+ .computeUInt32Size(7, applyUid_);
}
if (param_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(11, param_);
+ .computeUInt32Size(10, param_);
}
- if (retcode_ != 0) {
+ if (isAgreed_ != false) {
size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(12, retcode_);
+ .computeBoolSize(11, isAgreed_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -254,10 +253,10 @@ public boolean equals(final java.lang.Object obj) {
}
emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp other = (emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp) obj;
- if (getApplyUid()
- != other.getApplyUid()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
+ if (getApplyUid()
+ != other.getApplyUid()) return false;
if (getParam()
!= other.getParam()) return false;
if (getIsAgreed()
@@ -273,10 +272,10 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
- hash = (53 * hash) + getApplyUid();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
+ hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
+ hash = (53 * hash) + getApplyUid();
hash = (37 * hash) + PARAM_FIELD_NUMBER;
hash = (53 * hash) + getParam();
hash = (37 * hash) + IS_AGREED_FIELD_NUMBER;
@@ -379,8 +378,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 6395
- * Obf: JGFCKHJPDFA
+ * CmdId: 27380
*
*
* Protobuf type {@code PlayerApplyEnterMpResultRsp}
@@ -420,10 +418,10 @@ private void maybeForceBuilderInitialization() {
@java.lang.Override
public Builder clear() {
super.clear();
- applyUid_ = 0;
-
retcode_ = 0;
+ applyUid_ = 0;
+
param_ = 0;
isAgreed_ = false;
@@ -454,8 +452,8 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApp
@java.lang.Override
public emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp buildPartial() {
emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp result = new emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp(this);
- result.applyUid_ = applyUid_;
result.retcode_ = retcode_;
+ result.applyUid_ = applyUid_;
result.param_ = param_;
result.isAgreed_ = isAgreed_;
onBuilt();
@@ -506,12 +504,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp other) {
if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp.getDefaultInstance()) return this;
- if (other.getApplyUid() != 0) {
- setApplyUid(other.getApplyUid());
- }
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
+ if (other.getApplyUid() != 0) {
+ setApplyUid(other.getApplyUid());
+ }
if (other.getParam() != 0) {
setParam(other.getParam());
}
@@ -547,71 +545,71 @@ public Builder mergeFrom(
return this;
}
- private int applyUid_ ;
+ private int retcode_ ;
/**
- * uint32 apply_uid = 3;
- * @return The applyUid.
+ * int32 retcode = 4;
+ * @return The retcode.
*/
@java.lang.Override
- public int getApplyUid() {
- return applyUid_;
+ public int getRetcode() {
+ return retcode_;
}
/**
- * uint32 apply_uid = 3;
- * @param value The applyUid to set.
+ * int32 retcode = 4;
+ * @param value The retcode to set.
* @return This builder for chaining.
*/
- public Builder setApplyUid(int value) {
+ public Builder setRetcode(int value) {
- applyUid_ = value;
+ retcode_ = value;
onChanged();
return this;
}
/**
- * uint32 apply_uid = 3;
+ * int32 retcode = 4;
* @return This builder for chaining.
*/
- public Builder clearApplyUid() {
+ public Builder clearRetcode() {
- applyUid_ = 0;
+ retcode_ = 0;
onChanged();
return this;
}
- private int retcode_ ;
+ private int applyUid_ ;
/**
- * int32 retcode = 12;
- * @return The retcode.
+ * uint32 apply_uid = 7;
+ * @return The applyUid.
*/
@java.lang.Override
- public int getRetcode() {
- return retcode_;
+ public int getApplyUid() {
+ return applyUid_;
}
/**
- * int32 retcode = 12;
- * @param value The retcode to set.
+ * uint32 apply_uid = 7;
+ * @param value The applyUid to set.
* @return This builder for chaining.
*/
- public Builder setRetcode(int value) {
+ public Builder setApplyUid(int value) {
- retcode_ = value;
+ applyUid_ = value;
onChanged();
return this;
}
/**
- * int32 retcode = 12;
+ * uint32 apply_uid = 7;
* @return This builder for chaining.
*/
- public Builder clearRetcode() {
+ public Builder clearApplyUid() {
- retcode_ = 0;
+ applyUid_ = 0;
onChanged();
return this;
}
private int param_ ;
/**
- * uint32 param = 11;
+ * uint32 param = 10;
* @return The param.
*/
@java.lang.Override
@@ -619,7 +617,7 @@ public int getParam() {
return param_;
}
/**
- * uint32 param = 11;
+ * uint32 param = 10;
* @param value The param to set.
* @return This builder for chaining.
*/
@@ -630,7 +628,7 @@ public Builder setParam(int value) {
return this;
}
/**
- * uint32 param = 11;
+ * uint32 param = 10;
* @return This builder for chaining.
*/
public Builder clearParam() {
@@ -642,7 +640,7 @@ public Builder clearParam() {
private boolean isAgreed_ ;
/**
- * bool is_agreed = 7;
+ * bool is_agreed = 11;
* @return The isAgreed.
*/
@java.lang.Override
@@ -650,7 +648,7 @@ public boolean getIsAgreed() {
return isAgreed_;
}
/**
- * bool is_agreed = 7;
+ * bool is_agreed = 11;
* @param value The isAgreed to set.
* @return This builder for chaining.
*/
@@ -661,7 +659,7 @@ public Builder setIsAgreed(boolean value) {
return this;
}
/**
- * bool is_agreed = 7;
+ * bool is_agreed = 11;
* @return This builder for chaining.
*/
public Builder clearIsAgreed() {
@@ -738,9 +736,9 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApp
static {
java.lang.String[] descriptorData = {
"\n!PlayerApplyEnterMpResultRsp.proto\"c\n\033P" +
- "layerApplyEnterMpResultRsp\022\021\n\tapply_uid\030" +
- "\003 \001(\r\022\017\n\007retcode\030\014 \001(\005\022\r\n\005param\030\013 \001(\r\022\021\n" +
- "\tis_agreed\030\007 \001(\010B\033\n\031emu.grasscutter.net." +
+ "layerApplyEnterMpResultRsp\022\017\n\007retcode\030\004 " +
+ "\001(\005\022\021\n\tapply_uid\030\007 \001(\r\022\r\n\005param\030\n \001(\r\022\021\n" +
+ "\tis_agreed\030\013 \001(\010B\033\n\031emu.grasscutter.net." +
"protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +750,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApp
internal_static_PlayerApplyEnterMpResultRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerApplyEnterMpResultRsp_descriptor,
- new java.lang.String[] { "ApplyUid", "Retcode", "Param", "IsAgreed", });
+ new java.lang.String[] { "Retcode", "ApplyUid", "Param", "IsAgreed", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java
index 406d8f71109..38090228886 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java
@@ -19,27 +19,26 @@ public interface PlayerApplyEnterMpRspOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 param = 10;
- * @return The param.
+ * uint32 target_uid = 9;
+ * @return The targetUid.
*/
- int getParam();
+ int getTargetUid();
/**
- * int32 retcode = 8;
+ * int32 retcode = 11;
* @return The retcode.
*/
int getRetcode();
/**
- * uint32 target_uid = 11;
- * @return The targetUid.
+ * uint32 param = 13;
+ * @return The param.
*/
- int getTargetUid();
+ int getParam();
}
/**
*
- * CmdId: 20994
- * Obf: IGEKDAHIAFB
+ * CmdId: 24897
*
*
* Protobuf type {@code PlayerApplyEnterMpRsp}
@@ -86,19 +85,19 @@ private PlayerApplyEnterMpRsp(
case 0:
done = true;
break;
- case 64: {
+ case 72: {
- retcode_ = input.readInt32();
+ targetUid_ = input.readUInt32();
break;
}
- case 80: {
+ case 88: {
- param_ = input.readUInt32();
+ retcode_ = input.readInt32();
break;
}
- case 88: {
+ case 104: {
- targetUid_ = input.readUInt32();
+ param_ = input.readUInt32();
break;
}
default: {
@@ -133,21 +132,21 @@ private PlayerApplyEnterMpRsp(
emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp.class, emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp.Builder.class);
}
- public static final int PARAM_FIELD_NUMBER = 10;
- private int param_;
+ public static final int TARGET_UID_FIELD_NUMBER = 9;
+ private int targetUid_;
/**
- * uint32 param = 10;
- * @return The param.
+ * uint32 target_uid = 9;
+ * @return The targetUid.
*/
@java.lang.Override
- public int getParam() {
- return param_;
+ public int getTargetUid() {
+ return targetUid_;
}
- public static final int RETCODE_FIELD_NUMBER = 8;
+ public static final int RETCODE_FIELD_NUMBER = 11;
private int retcode_;
/**
- * int32 retcode = 8;
+ * int32 retcode = 11;
* @return The retcode.
*/
@java.lang.Override
@@ -155,15 +154,15 @@ public int getRetcode() {
return retcode_;
}
- public static final int TARGET_UID_FIELD_NUMBER = 11;
- private int targetUid_;
+ public static final int PARAM_FIELD_NUMBER = 13;
+ private int param_;
/**
- * uint32 target_uid = 11;
- * @return The targetUid.
+ * uint32 param = 13;
+ * @return The param.
*/
@java.lang.Override
- public int getTargetUid() {
- return targetUid_;
+ public int getParam() {
+ return param_;
}
private byte memoizedIsInitialized = -1;
@@ -180,14 +179,14 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
+ if (targetUid_ != 0) {
+ output.writeUInt32(9, targetUid_);
+ }
if (retcode_ != 0) {
- output.writeInt32(8, retcode_);
+ output.writeInt32(11, retcode_);
}
if (param_ != 0) {
- output.writeUInt32(10, param_);
- }
- if (targetUid_ != 0) {
- output.writeUInt32(11, targetUid_);
+ output.writeUInt32(13, param_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +197,17 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (retcode_ != 0) {
+ if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(8, retcode_);
+ .computeUInt32Size(9, targetUid_);
}
- if (param_ != 0) {
+ if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(10, param_);
+ .computeInt32Size(11, retcode_);
}
- if (targetUid_ != 0) {
+ if (param_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(11, targetUid_);
+ .computeUInt32Size(13, param_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,12 +224,12 @@ public boolean equals(final java.lang.Object obj) {
}
emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp other = (emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp) obj;
- if (getParam()
- != other.getParam()) return false;
- if (getRetcode()
- != other.getRetcode()) return false;
if (getTargetUid()
!= other.getTargetUid()) return false;
+ if (getRetcode()
+ != other.getRetcode()) return false;
+ if (getParam()
+ != other.getParam()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -242,12 +241,12 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + PARAM_FIELD_NUMBER;
- hash = (53 * hash) + getParam();
- hash = (37 * hash) + RETCODE_FIELD_NUMBER;
- hash = (53 * hash) + getRetcode();
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
+ hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+ hash = (53 * hash) + getRetcode();
+ hash = (37 * hash) + PARAM_FIELD_NUMBER;
+ hash = (53 * hash) + getParam();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -345,8 +344,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 20994
- * Obf: IGEKDAHIAFB
+ * CmdId: 24897
*
*
* Protobuf type {@code PlayerApplyEnterMpRsp}
@@ -386,11 +384,11 @@ private void maybeForceBuilderInitialization() {
@java.lang.Override
public Builder clear() {
super.clear();
- param_ = 0;
+ targetUid_ = 0;
retcode_ = 0;
- targetUid_ = 0;
+ param_ = 0;
return this;
}
@@ -418,9 +416,9 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnte
@java.lang.Override
public emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp buildPartial() {
emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp result = new emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp(this);
- result.param_ = param_;
- result.retcode_ = retcode_;
result.targetUid_ = targetUid_;
+ result.retcode_ = retcode_;
+ result.param_ = param_;
onBuilt();
return result;
}
@@ -469,14 +467,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp other) {
if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp.getDefaultInstance()) return this;
- if (other.getParam() != 0) {
- setParam(other.getParam());
+ if (other.getTargetUid() != 0) {
+ setTargetUid(other.getTargetUid());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
- if (other.getTargetUid() != 0) {
- setTargetUid(other.getTargetUid());
+ if (other.getParam() != 0) {
+ setParam(other.getParam());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -507,40 +505,40 @@ public Builder mergeFrom(
return this;
}
- private int param_ ;
+ private int targetUid_ ;
/**
- * uint32 param = 10;
- * @return The param.
+ * uint32 target_uid = 9;
+ * @return The targetUid.
*/
@java.lang.Override
- public int getParam() {
- return param_;
+ public int getTargetUid() {
+ return targetUid_;
}
/**
- * uint32 param = 10;
- * @param value The param to set.
+ * uint32 target_uid = 9;
+ * @param value The targetUid to set.
* @return This builder for chaining.
*/
- public Builder setParam(int value) {
+ public Builder setTargetUid(int value) {
- param_ = value;
+ targetUid_ = value;
onChanged();
return this;
}
/**
- * uint32 param = 10;
+ * uint32 target_uid = 9;
* @return This builder for chaining.
*/
- public Builder clearParam() {
+ public Builder clearTargetUid() {
- param_ = 0;
+ targetUid_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
- * int32 retcode = 8;
+ * int32 retcode = 11;
* @return The retcode.
*/
@java.lang.Override
@@ -548,7 +546,7 @@ public int getRetcode() {
return retcode_;
}
/**
- * int32 retcode = 8;
+ * int32 retcode = 11;
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -559,7 +557,7 @@ public Builder setRetcode(int value) {
return this;
}
/**
- * int32 retcode = 8;
+ * int32 retcode = 11;
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -569,33 +567,33 @@ public Builder clearRetcode() {
return this;
}
- private int targetUid_ ;
+ private int param_ ;
/**
- * uint32 target_uid = 11;
- * @return The targetUid.
+ * uint32 param = 13;
+ * @return The param.
*/
@java.lang.Override
- public int getTargetUid() {
- return targetUid_;
+ public int getParam() {
+ return param_;
}
/**
- * uint32 target_uid = 11;
- * @param value The targetUid to set.
+ * uint32 param = 13;
+ * @param value The param to set.
* @return This builder for chaining.
*/
- public Builder setTargetUid(int value) {
+ public Builder setParam(int value) {
- targetUid_ = value;
+ param_ = value;
onChanged();
return this;
}
/**
- * uint32 target_uid = 11;
+ * uint32 param = 13;
* @return This builder for chaining.
*/
- public Builder clearTargetUid() {
+ public Builder clearParam() {
- targetUid_ = 0;
+ param_ = 0;
onChanged();
return this;
}
@@ -667,8 +665,8 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnte
static {
java.lang.String[] descriptorData = {
"\n\033PlayerApplyEnterMpRsp.proto\"K\n\025PlayerA" +
- "pplyEnterMpRsp\022\r\n\005param\030\n \001(\r\022\017\n\007retcode" +
- "\030\010 \001(\005\022\022\n\ntarget_uid\030\013 \001(\rB\033\n\031emu.grassc" +
+ "pplyEnterMpRsp\022\022\n\ntarget_uid\030\t \001(\r\022\017\n\007re" +
+ "tcode\030\013 \001(\005\022\r\n\005param\030\r \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +678,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnte
internal_static_PlayerApplyEnterMpRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerApplyEnterMpRsp_descriptor,
- new java.lang.String[] { "Param", "Retcode", "TargetUid", });
+ new java.lang.String[] { "TargetUid", "Retcode", "Param", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java
index e8c818c5e29..25fb9b281ec 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java
@@ -19,27 +19,26 @@ public interface PlayerGetForceQuitBanInfoRspOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 match_id = 6;
+ * uint32 match_id = 2;
* @return The matchId.
*/
int getMatchId();
/**
- * int32 retcode = 12;
+ * int32 retcode = 9;
* @return The retcode.
*/
int getRetcode();
/**
- * uint32 expire_time = 3;
+ * uint32 expire_time = 14;
* @return The expireTime.
*/
int getExpireTime();
}
/**
*
- * CmdId: 8368
- * Obf: CMGBPGFCJDL
+ * CmdId: 29159
*
*
* Protobuf type {@code PlayerGetForceQuitBanInfoRsp}
@@ -86,19 +85,19 @@ private PlayerGetForceQuitBanInfoRsp(
case 0:
done = true;
break;
- case 24: {
+ case 16: {
- expireTime_ = input.readUInt32();
+ matchId_ = input.readUInt32();
break;
}
- case 48: {
+ case 72: {
- matchId_ = input.readUInt32();
+ retcode_ = input.readInt32();
break;
}
- case 96: {
+ case 112: {
- retcode_ = input.readInt32();
+ expireTime_ = input.readUInt32();
break;
}
default: {
@@ -133,10 +132,10 @@ private PlayerGetForceQuitBanInfoRsp(
emu.grasscutter.net.proto.PlayerGetForceQuitBanInfoRspOuterClass.PlayerGetForceQuitBanInfoRsp.class, emu.grasscutter.net.proto.PlayerGetForceQuitBanInfoRspOuterClass.PlayerGetForceQuitBanInfoRsp.Builder.class);
}
- public static final int MATCH_ID_FIELD_NUMBER = 6;
+ public static final int MATCH_ID_FIELD_NUMBER = 2;
private int matchId_;
/**
- * uint32 match_id = 6;
+ * uint32 match_id = 2;
* @return The matchId.
*/
@java.lang.Override
@@ -144,10 +143,10 @@ public int getMatchId() {
return matchId_;
}
- public static final int RETCODE_FIELD_NUMBER = 12;
+ public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
- * int32 retcode = 12;
+ * int32 retcode = 9;
* @return The retcode.
*/
@java.lang.Override
@@ -155,10 +154,10 @@ public int getRetcode() {
return retcode_;
}
- public static final int EXPIRE_TIME_FIELD_NUMBER = 3;
+ public static final int EXPIRE_TIME_FIELD_NUMBER = 14;
private int expireTime_;
/**
- * uint32 expire_time = 3;
+ * uint32 expire_time = 14;
* @return The expireTime.
*/
@java.lang.Override
@@ -180,14 +179,14 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (expireTime_ != 0) {
- output.writeUInt32(3, expireTime_);
- }
if (matchId_ != 0) {
- output.writeUInt32(6, matchId_);
+ output.writeUInt32(2, matchId_);
}
if (retcode_ != 0) {
- output.writeInt32(12, retcode_);
+ output.writeInt32(9, retcode_);
+ }
+ if (expireTime_ != 0) {
+ output.writeUInt32(14, expireTime_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +197,17 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (expireTime_ != 0) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(3, expireTime_);
- }
if (matchId_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(6, matchId_);
+ .computeUInt32Size(2, matchId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(12, retcode_);
+ .computeInt32Size(9, retcode_);
+ }
+ if (expireTime_ != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(14, expireTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -345,8 +344,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 8368
- * Obf: CMGBPGFCJDL
+ * CmdId: 29159
*
*
* Protobuf type {@code PlayerGetForceQuitBanInfoRsp}
@@ -509,7 +507,7 @@ public Builder mergeFrom(
private int matchId_ ;
/**
- * uint32 match_id = 6;
+ * uint32 match_id = 2;
* @return The matchId.
*/
@java.lang.Override
@@ -517,7 +515,7 @@ public int getMatchId() {
return matchId_;
}
/**
- * uint32 match_id = 6;
+ * uint32 match_id = 2;
* @param value The matchId to set.
* @return This builder for chaining.
*/
@@ -528,7 +526,7 @@ public Builder setMatchId(int value) {
return this;
}
/**
- * uint32 match_id = 6;
+ * uint32 match_id = 2;
* @return This builder for chaining.
*/
public Builder clearMatchId() {
@@ -540,7 +538,7 @@ public Builder clearMatchId() {
private int retcode_ ;
/**
- * int32 retcode = 12;
+ * int32 retcode = 9;
* @return The retcode.
*/
@java.lang.Override
@@ -548,7 +546,7 @@ public int getRetcode() {
return retcode_;
}
/**
- * int32 retcode = 12;
+ * int32 retcode = 9;
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -559,7 +557,7 @@ public Builder setRetcode(int value) {
return this;
}
/**
- * int32 retcode = 12;
+ * int32 retcode = 9;
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -571,7 +569,7 @@ public Builder clearRetcode() {
private int expireTime_ ;
/**
- * uint32 expire_time = 3;
+ * uint32 expire_time = 14;
* @return The expireTime.
*/
@java.lang.Override
@@ -579,7 +577,7 @@ public int getExpireTime() {
return expireTime_;
}
/**
- * uint32 expire_time = 3;
+ * uint32 expire_time = 14;
* @param value The expireTime to set.
* @return This builder for chaining.
*/
@@ -590,7 +588,7 @@ public Builder setExpireTime(int value) {
return this;
}
/**
- * uint32 expire_time = 3;
+ * uint32 expire_time = 14;
* @return This builder for chaining.
*/
public Builder clearExpireTime() {
@@ -668,7 +666,7 @@ public emu.grasscutter.net.proto.PlayerGetForceQuitBanInfoRspOuterClass.PlayerGe
java.lang.String[] descriptorData = {
"\n\"PlayerGetForceQuitBanInfoRsp.proto\"V\n\034" +
"PlayerGetForceQuitBanInfoRsp\022\020\n\010match_id" +
- "\030\006 \001(\r\022\017\n\007retcode\030\014 \001(\005\022\023\n\013expire_time\030\003" +
+ "\030\002 \001(\r\022\017\n\007retcode\030\t \001(\005\022\023\n\013expire_time\030\016" +
" \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java
index 8122e960e7d..81dab606a8c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java
@@ -19,38 +19,37 @@ public interface PlayerPreEnterMpNotifyOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @return The enum numeric value on the wire for state.
*/
int getStateValue();
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @return The state.
*/
emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State getState();
/**
- * string nickname = 10;
+ * uint32 uid = 3;
+ * @return The uid.
+ */
+ int getUid();
+
+ /**
+ * string nickname = 12;
* @return The nickname.
*/
java.lang.String getNickname();
/**
- * string nickname = 10;
+ * string nickname = 12;
* @return The bytes for nickname.
*/
com.google.protobuf.ByteString
getNicknameBytes();
-
- /**
- * uint32 uid = 5;
- * @return The uid.
- */
- int getUid();
}
/**
*
- * CmdId: 23905
- * Obf: ONELCJDDCIP
+ * CmdId: 23352
*
*
* Protobuf type {@code PlayerPreEnterMpNotify}
@@ -99,21 +98,21 @@ private PlayerPreEnterMpNotify(
case 0:
done = true;
break;
- case 40: {
+ case 8: {
+ int rawValue = input.readEnum();
- uid_ = input.readUInt32();
+ state_ = rawValue;
break;
}
- case 82: {
- java.lang.String s = input.readStringRequireUtf8();
+ case 24: {
- nickname_ = s;
+ uid_ = input.readUInt32();
break;
}
- case 88: {
- int rawValue = input.readEnum();
+ case 98: {
+ java.lang.String s = input.readStringRequireUtf8();
- state_ = rawValue;
+ nickname_ = s;
break;
}
default: {
@@ -149,10 +148,6 @@ private PlayerPreEnterMpNotify(
}
/**
- *
- * Obf: CIAEAJLPCDG
- *
- *
* Protobuf enum {@code PlayerPreEnterMpNotify.State}
*/
public enum State
@@ -269,17 +264,17 @@ private State(int value) {
// @@protoc_insertion_point(enum_scope:PlayerPreEnterMpNotify.State)
}
- public static final int STATE_FIELD_NUMBER = 11;
+ public static final int STATE_FIELD_NUMBER = 1;
private int state_;
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @return The enum numeric value on the wire for state.
*/
@java.lang.Override public int getStateValue() {
return state_;
}
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @return The state.
*/
@java.lang.Override public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State getState() {
@@ -288,10 +283,21 @@ private State(int value) {
return result == null ? emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.UNRECOGNIZED : result;
}
- public static final int NICKNAME_FIELD_NUMBER = 10;
+ public static final int UID_FIELD_NUMBER = 3;
+ private int uid_;
+ /**
+ * uint32 uid = 3;
+ * @return The uid.
+ */
+ @java.lang.Override
+ public int getUid() {
+ return uid_;
+ }
+
+ public static final int NICKNAME_FIELD_NUMBER = 12;
private volatile java.lang.Object nickname_;
/**
- * string nickname = 10;
+ * string nickname = 12;
* @return The nickname.
*/
@java.lang.Override
@@ -308,7 +314,7 @@ public java.lang.String getNickname() {
}
}
/**
- * string nickname = 10;
+ * string nickname = 12;
* @return The bytes for nickname.
*/
@java.lang.Override
@@ -326,17 +332,6 @@ public java.lang.String getNickname() {
}
}
- public static final int UID_FIELD_NUMBER = 5;
- private int uid_;
- /**
- * uint32 uid = 5;
- * @return The uid.
- */
- @java.lang.Override
- public int getUid() {
- return uid_;
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -351,14 +346,14 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
+ if (state_ != emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.INVALID.getNumber()) {
+ output.writeEnum(1, state_);
+ }
if (uid_ != 0) {
- output.writeUInt32(5, uid_);
+ output.writeUInt32(3, uid_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 10, nickname_);
- }
- if (state_ != emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.INVALID.getNumber()) {
- output.writeEnum(11, state_);
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 12, nickname_);
}
unknownFields.writeTo(output);
}
@@ -369,16 +364,16 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
+ if (state_ != emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.INVALID.getNumber()) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeEnumSize(1, state_);
+ }
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(5, uid_);
+ .computeUInt32Size(3, uid_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, nickname_);
- }
- if (state_ != emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.INVALID.getNumber()) {
- size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(11, state_);
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, nickname_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -396,10 +391,10 @@ public boolean equals(final java.lang.Object obj) {
emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify other = (emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify) obj;
if (state_ != other.state_) return false;
- if (!getNickname()
- .equals(other.getNickname())) return false;
if (getUid()
!= other.getUid()) return false;
+ if (!getNickname()
+ .equals(other.getNickname())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -413,10 +408,10 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
- hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
- hash = (53 * hash) + getNickname().hashCode();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
+ hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
+ hash = (53 * hash) + getNickname().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -514,8 +509,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 23905
- * Obf: ONELCJDDCIP
+ * CmdId: 23352
*
*
* Protobuf type {@code PlayerPreEnterMpNotify}
@@ -557,10 +551,10 @@ public Builder clear() {
super.clear();
state_ = 0;
- nickname_ = "";
-
uid_ = 0;
+ nickname_ = "";
+
return this;
}
@@ -588,8 +582,8 @@ public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnter
public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify buildPartial() {
emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify result = new emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify(this);
result.state_ = state_;
- result.nickname_ = nickname_;
result.uid_ = uid_;
+ result.nickname_ = nickname_;
onBuilt();
return result;
}
@@ -641,13 +635,13 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterCl
if (other.state_ != 0) {
setStateValue(other.getStateValue());
}
+ if (other.getUid() != 0) {
+ setUid(other.getUid());
+ }
if (!other.getNickname().isEmpty()) {
nickname_ = other.nickname_;
onChanged();
}
- if (other.getUid() != 0) {
- setUid(other.getUid());
- }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -679,14 +673,14 @@ public Builder mergeFrom(
private int state_ = 0;
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @return The enum numeric value on the wire for state.
*/
@java.lang.Override public int getStateValue() {
return state_;
}
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @param value The enum numeric value on the wire for state to set.
* @return This builder for chaining.
*/
@@ -697,7 +691,7 @@ public Builder setStateValue(int value) {
return this;
}
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @return The state.
*/
@java.lang.Override
@@ -707,7 +701,7 @@ public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnter
return result == null ? emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.UNRECOGNIZED : result;
}
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @param value The state to set.
* @return This builder for chaining.
*/
@@ -721,7 +715,7 @@ public Builder setState(emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterCla
return this;
}
/**
- * .PlayerPreEnterMpNotify.State state = 11;
+ * .PlayerPreEnterMpNotify.State state = 1;
* @return This builder for chaining.
*/
public Builder clearState() {
@@ -731,9 +725,40 @@ public Builder clearState() {
return this;
}
+ private int uid_ ;
+ /**
+ * uint32 uid = 3;
+ * @return The uid.
+ */
+ @java.lang.Override
+ public int getUid() {
+ return uid_;
+ }
+ /**
+ * uint32 uid = 3;
+ * @param value The uid to set.
+ * @return This builder for chaining.
+ */
+ public Builder setUid(int value) {
+
+ uid_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * uint32 uid = 3;
+ * @return This builder for chaining.
+ */
+ public Builder clearUid() {
+
+ uid_ = 0;
+ onChanged();
+ return this;
+ }
+
private java.lang.Object nickname_ = "";
/**
- * string nickname = 10;
+ * string nickname = 12;
* @return The nickname.
*/
public java.lang.String getNickname() {
@@ -749,7 +774,7 @@ public java.lang.String getNickname() {
}
}
/**
- * string nickname = 10;
+ * string nickname = 12;
* @return The bytes for nickname.
*/
public com.google.protobuf.ByteString
@@ -766,7 +791,7 @@ public java.lang.String getNickname() {
}
}
/**
- * string nickname = 10;
+ * string nickname = 12;
* @param value The nickname to set.
* @return This builder for chaining.
*/
@@ -781,7 +806,7 @@ public Builder setNickname(
return this;
}
/**
- * string nickname = 10;
+ * string nickname = 12;
* @return This builder for chaining.
*/
public Builder clearNickname() {
@@ -791,7 +816,7 @@ public Builder clearNickname() {
return this;
}
/**
- * string nickname = 10;
+ * string nickname = 12;
* @param value The bytes for nickname to set.
* @return This builder for chaining.
*/
@@ -806,37 +831,6 @@ public Builder setNicknameBytes(
onChanged();
return this;
}
-
- private int uid_ ;
- /**
- * uint32 uid = 5;
- * @return The uid.
- */
- @java.lang.Override
- public int getUid() {
- return uid_;
- }
- /**
- * uint32 uid = 5;
- * @param value The uid to set.
- * @return This builder for chaining.
- */
- public Builder setUid(int value) {
-
- uid_ = value;
- onChanged();
- return this;
- }
- /**
- * uint32 uid = 5;
- * @return This builder for chaining.
- */
- public Builder clearUid() {
-
- uid_ = 0;
- onChanged();
- return this;
- }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -905,9 +899,9 @@ public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnter
static {
java.lang.String[] descriptorData = {
"\n\034PlayerPreEnterMpNotify.proto\"\223\001\n\026Playe" +
- "rPreEnterMpNotify\022,\n\005state\030\013 \001(\0162\035.Playe" +
- "rPreEnterMpNotify.State\022\020\n\010nickname\030\n \001(" +
- "\t\022\013\n\003uid\030\005 \001(\r\",\n\005State\022\013\n\007INVALID\020\000\022\t\n\005" +
+ "rPreEnterMpNotify\022,\n\005state\030\001 \001(\0162\035.Playe" +
+ "rPreEnterMpNotify.State\022\013\n\003uid\030\003 \001(\r\022\020\n\010" +
+ "nickname\030\014 \001(\t\",\n\005State\022\013\n\007INVALID\020\000\022\t\n\005" +
"START\020\001\022\013\n\007TIMEOUT\020\002B\033\n\031emu.grasscutter." +
"net.protob\006proto3"
};
@@ -920,7 +914,7 @@ public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnter
internal_static_PlayerPreEnterMpNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerPreEnterMpNotify_descriptor,
- new java.lang.String[] { "State", "Nickname", "Uid", });
+ new java.lang.String[] { "State", "Uid", "Nickname", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java
index fcabf55d0a0..64b710ec3d9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java
@@ -25,16 +25,12 @@ public interface PlayerRTTInfoOrBuilder extends
int getRtt();
/**
- * uint32 uid = 1;
+ * uint32 uid = 11;
* @return The uid.
*/
int getUid();
}
/**
- *
- * Obf: MCDPPKMOEJJ
- *
- *
* Protobuf type {@code PlayerRTTInfo}
*/
public static final class PlayerRTTInfo extends
@@ -79,14 +75,14 @@ private PlayerRTTInfo(
case 0:
done = true;
break;
- case 8: {
+ case 16: {
- uid_ = input.readUInt32();
+ rtt_ = input.readUInt32();
break;
}
- case 16: {
+ case 88: {
- rtt_ = input.readUInt32();
+ uid_ = input.readUInt32();
break;
}
default: {
@@ -132,10 +128,10 @@ public int getRtt() {
return rtt_;
}
- public static final int UID_FIELD_NUMBER = 1;
+ public static final int UID_FIELD_NUMBER = 11;
private int uid_;
/**
- * uint32 uid = 1;
+ * uint32 uid = 11;
* @return The uid.
*/
@java.lang.Override
@@ -157,12 +153,12 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (uid_ != 0) {
- output.writeUInt32(1, uid_);
- }
if (rtt_ != 0) {
output.writeUInt32(2, rtt_);
}
+ if (uid_ != 0) {
+ output.writeUInt32(11, uid_);
+ }
unknownFields.writeTo(output);
}
@@ -172,14 +168,14 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (uid_ != 0) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(1, uid_);
- }
if (rtt_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, rtt_);
}
+ if (uid_ != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(11, uid_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -310,10 +306,6 @@ protected Builder newBuilderForType(
return builder;
}
/**
- *
- * Obf: MCDPPKMOEJJ
- *
- *
* Protobuf type {@code PlayerRTTInfo}
*/
public static final class Builder extends
@@ -499,7 +491,7 @@ public Builder clearRtt() {
private int uid_ ;
/**
- * uint32 uid = 1;
+ * uint32 uid = 11;
* @return The uid.
*/
@java.lang.Override
@@ -507,7 +499,7 @@ public int getUid() {
return uid_;
}
/**
- * uint32 uid = 1;
+ * uint32 uid = 11;
* @param value The uid to set.
* @return This builder for chaining.
*/
@@ -518,7 +510,7 @@ public Builder setUid(int value) {
return this;
}
/**
- * uint32 uid = 1;
+ * uint32 uid = 11;
* @return This builder for chaining.
*/
public Builder clearUid() {
@@ -595,7 +587,7 @@ public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getDefaul
static {
java.lang.String[] descriptorData = {
"\n\023PlayerRTTInfo.proto\")\n\rPlayerRTTInfo\022\013" +
- "\n\003rtt\030\002 \001(\r\022\013\n\003uid\030\001 \001(\rB\033\n\031emu.grasscut" +
+ "\n\003rtt\030\002 \001(\r\022\013\n\003uid\030\013 \001(\rB\033\n\031emu.grasscut" +
"ter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java
index 39039e49c65..94642c830f0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java
@@ -34,7 +34,7 @@ public interface PlayerWorldLocationInfoOrBuilder extends
emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocOrBuilder();
/**
- * uint32 scene_id = 5;
+ * uint32 scene_id = 12;
* @return The sceneId.
*/
int getSceneId();
@@ -84,11 +84,6 @@ private PlayerWorldLocationInfo(
case 0:
done = true;
break;
- case 40: {
-
- sceneId_ = input.readUInt32();
- break;
- }
case 58: {
emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder subBuilder = null;
if (playerLoc_ != null) {
@@ -102,6 +97,11 @@ private PlayerWorldLocationInfo(
break;
}
+ case 96: {
+
+ sceneId_ = input.readUInt32();
+ break;
+ }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -160,10 +160,10 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo
return getPlayerLoc();
}
- public static final int SCENE_ID_FIELD_NUMBER = 5;
+ public static final int SCENE_ID_FIELD_NUMBER = 12;
private int sceneId_;
/**
- * uint32 scene_id = 5;
+ * uint32 scene_id = 12;
* @return The sceneId.
*/
@java.lang.Override
@@ -185,12 +185,12 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (sceneId_ != 0) {
- output.writeUInt32(5, sceneId_);
- }
if (playerLoc_ != null) {
output.writeMessage(7, getPlayerLoc());
}
+ if (sceneId_ != 0) {
+ output.writeUInt32(12, sceneId_);
+ }
unknownFields.writeTo(output);
}
@@ -200,14 +200,14 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (sceneId_ != 0) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(5, sceneId_);
- }
if (playerLoc_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(7, getPlayerLoc());
}
+ if (sceneId_ != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(12, sceneId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -624,7 +624,7 @@ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo
private int sceneId_ ;
/**
- * uint32 scene_id = 5;
+ * uint32 scene_id = 12;
* @return The sceneId.
*/
@java.lang.Override
@@ -632,7 +632,7 @@ public int getSceneId() {
return sceneId_;
}
/**
- * uint32 scene_id = 5;
+ * uint32 scene_id = 12;
* @param value The sceneId to set.
* @return This builder for chaining.
*/
@@ -643,7 +643,7 @@ public Builder setSceneId(int value) {
return this;
}
/**
- * uint32 scene_id = 5;
+ * uint32 scene_id = 12;
* @return This builder for chaining.
*/
public Builder clearSceneId() {
@@ -722,7 +722,7 @@ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLo
"\n\035PlayerWorldLocationInfo.proto\032\030PlayerL" +
"ocationInfo.proto\"T\n\027PlayerWorldLocation" +
"Info\022\'\n\nplayer_loc\030\007 \001(\0132\023.PlayerLocatio" +
- "nInfo\022\020\n\010scene_id\030\005 \001(\rB\033\n\031emu.grasscutt" +
+ "nInfo\022\020\n\010scene_id\030\014 \001(\rB\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/WorldPlayerInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerInfoNotifyOuterClass.java
index 6b4abb23302..0b1e4f11e57 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerInfoNotifyOuterClass.java
@@ -19,74 +19,73 @@ public interface WorldPlayerInfoNotifyOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- java.util.List
- getPlayerInfoListList();
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index);
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- int getPlayerInfoListCount();
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- java.util.List
- getPlayerInfoListOrBuilderList();
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
- int index);
-
- /**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
java.util.List
getPlayerWidgetInfoListList();
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index);
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
int getPlayerWidgetInfoListCount();
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
java.util.List
getPlayerWidgetInfoListOrBuilderList();
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
int index);
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @return A list containing the playerUidList.
*/
java.util.List getPlayerUidListList();
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @return The count of playerUidList.
*/
int getPlayerUidListCount();
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @param index The index of the element to return.
* @return The playerUidList at the given index.
*/
int getPlayerUidList(int index);
+
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ java.util.List
+ getPlayerInfoListList();
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index);
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ int getPlayerInfoListCount();
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ java.util.List
+ getPlayerInfoListOrBuilderList();
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+ int index);
}
/**
*
- * CmdId: 2239
- * Obf: JGMOCNKDELA
+ * CmdId: 23024
*
*
* Protobuf type {@code WorldPlayerInfoNotify}
@@ -101,9 +100,9 @@ private WorldPlayerInfoNotify(com.google.protobuf.GeneratedMessageV3.Builder
super(builder);
}
private WorldPlayerInfoNotify() {
- playerInfoList_ = java.util.Collections.emptyList();
playerWidgetInfoList_ = java.util.Collections.emptyList();
playerUidList_ = emptyIntList();
+ playerInfoList_ = java.util.Collections.emptyList();
}
@java.lang.Override
@@ -137,38 +136,29 @@ private WorldPlayerInfoNotify(
case 0:
done = true;
break;
- case 42: {
- if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+ case 10: {
+ if (!((mutable_bitField0_ & 0x00000001) != 0)) {
playerWidgetInfoList_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000002;
+ mutable_bitField0_ |= 0x00000001;
}
playerWidgetInfoList_.add(
input.readMessage(emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.parser(), extensionRegistry));
break;
}
- case 58: {
- if (!((mutable_bitField0_ & 0x00000001) != 0)) {
- playerInfoList_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000001;
- }
- playerInfoList_.add(
- input.readMessage(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.parser(), extensionRegistry));
- break;
- }
- case 120: {
- if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+ case 40: {
+ if (!((mutable_bitField0_ & 0x00000002) != 0)) {
playerUidList_ = newIntList();
- mutable_bitField0_ |= 0x00000004;
+ mutable_bitField0_ |= 0x00000002;
}
playerUidList_.addInt(input.readUInt32());
break;
}
- case 122: {
+ case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
- if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+ if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
playerUidList_ = newIntList();
- mutable_bitField0_ |= 0x00000004;
+ mutable_bitField0_ |= 0x00000002;
}
while (input.getBytesUntilLimit() > 0) {
playerUidList_.addInt(input.readUInt32());
@@ -176,6 +166,15 @@ private WorldPlayerInfoNotify(
input.popLimit(limit);
break;
}
+ case 66: {
+ if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+ playerInfoList_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000004;
+ }
+ playerInfoList_.add(
+ input.readMessage(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.parser(), extensionRegistry));
+ break;
+ }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -191,14 +190,14 @@ private WorldPlayerInfoNotify(
throw new com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000002) != 0)) {
+ if (((mutable_bitField0_ & 0x00000001) != 0)) {
playerWidgetInfoList_ = java.util.Collections.unmodifiableList(playerWidgetInfoList_);
}
- if (((mutable_bitField0_ & 0x00000001) != 0)) {
- playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
+ if (((mutable_bitField0_ & 0x00000002) != 0)) {
+ playerUidList_.makeImmutable(); // C
}
if (((mutable_bitField0_ & 0x00000004) != 0)) {
- playerUidList_.makeImmutable(); // C
+ playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
@@ -217,57 +216,17 @@ private WorldPlayerInfoNotify(
emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify.class, emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify.Builder.class);
}
- public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 7;
- private java.util.List playerInfoList_;
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- @java.lang.Override
- public java.util.List getPlayerInfoListList() {
- return playerInfoList_;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- @java.lang.Override
- public java.util.List
- getPlayerInfoListOrBuilderList() {
- return playerInfoList_;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- @java.lang.Override
- public int getPlayerInfoListCount() {
- return playerInfoList_.size();
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- @java.lang.Override
- public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
- return playerInfoList_.get(index);
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- @java.lang.Override
- public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
- int index) {
- return playerInfoList_.get(index);
- }
-
- public static final int PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER = 5;
+ public static final int PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER = 1;
private java.util.List playerWidgetInfoList_;
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
@java.lang.Override
public java.util.List getPlayerWidgetInfoListList() {
return playerWidgetInfoList_;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
@java.lang.Override
public java.util.List
@@ -275,21 +234,21 @@ public java.util.Listrepeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
@java.lang.Override
public int getPlayerWidgetInfoListCount() {
return playerWidgetInfoList_.size();
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index) {
return playerWidgetInfoList_.get(index);
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
@@ -297,10 +256,10 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBu
return playerWidgetInfoList_.get(index);
}
- public static final int PLAYER_UID_LIST_FIELD_NUMBER = 15;
+ public static final int PLAYER_UID_LIST_FIELD_NUMBER = 5;
private com.google.protobuf.Internal.IntList playerUidList_;
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @return A list containing the playerUidList.
*/
@java.lang.Override
@@ -309,14 +268,14 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBu
return playerUidList_;
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @return The count of playerUidList.
*/
public int getPlayerUidListCount() {
return playerUidList_.size();
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @param index The index of the element to return.
* @return The playerUidList at the given index.
*/
@@ -325,6 +284,46 @@ public int getPlayerUidList(int index) {
}
private int playerUidListMemoizedSerializedSize = -1;
+ public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 8;
+ private java.util.List playerInfoList_;
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ @java.lang.Override
+ public java.util.List getPlayerInfoListList() {
+ return playerInfoList_;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ @java.lang.Override
+ public java.util.List
+ getPlayerInfoListOrBuilderList() {
+ return playerInfoList_;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ @java.lang.Override
+ public int getPlayerInfoListCount() {
+ return playerInfoList_.size();
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ @java.lang.Override
+ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
+ return playerInfoList_.get(index);
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ @java.lang.Override
+ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+ int index) {
+ return playerInfoList_.get(index);
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -341,18 +340,18 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
for (int i = 0; i < playerWidgetInfoList_.size(); i++) {
- output.writeMessage(5, playerWidgetInfoList_.get(i));
- }
- for (int i = 0; i < playerInfoList_.size(); i++) {
- output.writeMessage(7, playerInfoList_.get(i));
+ output.writeMessage(1, playerWidgetInfoList_.get(i));
}
if (getPlayerUidListList().size() > 0) {
- output.writeUInt32NoTag(122);
+ output.writeUInt32NoTag(42);
output.writeUInt32NoTag(playerUidListMemoizedSerializedSize);
}
for (int i = 0; i < playerUidList_.size(); i++) {
output.writeUInt32NoTag(playerUidList_.getInt(i));
}
+ for (int i = 0; i < playerInfoList_.size(); i++) {
+ output.writeMessage(8, playerInfoList_.get(i));
+ }
unknownFields.writeTo(output);
}
@@ -364,11 +363,7 @@ public int getSerializedSize() {
size = 0;
for (int i = 0; i < playerWidgetInfoList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(5, playerWidgetInfoList_.get(i));
- }
- for (int i = 0; i < playerInfoList_.size(); i++) {
- size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(7, playerInfoList_.get(i));
+ .computeMessageSize(1, playerWidgetInfoList_.get(i));
}
{
int dataSize = 0;
@@ -384,6 +379,10 @@ public int getSerializedSize() {
}
playerUidListMemoizedSerializedSize = dataSize;
}
+ for (int i = 0; i < playerInfoList_.size(); i++) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(8, playerInfoList_.get(i));
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -399,12 +398,12 @@ public boolean equals(final java.lang.Object obj) {
}
emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify other = (emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify) obj;
- if (!getPlayerInfoListList()
- .equals(other.getPlayerInfoListList())) return false;
if (!getPlayerWidgetInfoListList()
.equals(other.getPlayerWidgetInfoListList())) return false;
if (!getPlayerUidListList()
.equals(other.getPlayerUidListList())) return false;
+ if (!getPlayerInfoListList()
+ .equals(other.getPlayerInfoListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -416,10 +415,6 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- if (getPlayerInfoListCount() > 0) {
- hash = (37 * hash) + PLAYER_INFO_LIST_FIELD_NUMBER;
- hash = (53 * hash) + getPlayerInfoListList().hashCode();
- }
if (getPlayerWidgetInfoListCount() > 0) {
hash = (37 * hash) + PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER;
hash = (53 * hash) + getPlayerWidgetInfoListList().hashCode();
@@ -428,6 +423,10 @@ public int hashCode() {
hash = (37 * hash) + PLAYER_UID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getPlayerUidListList().hashCode();
}
+ if (getPlayerInfoListCount() > 0) {
+ hash = (37 * hash) + PLAYER_INFO_LIST_FIELD_NUMBER;
+ hash = (53 * hash) + getPlayerInfoListList().hashCode();
+ }
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -525,8 +524,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 2239
- * Obf: JGMOCNKDELA
+ * CmdId: 23024
*
*
* Protobuf type {@code WorldPlayerInfoNotify}
@@ -561,27 +559,27 @@ private Builder(
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessageV3
.alwaysUseFieldBuilders) {
- getPlayerInfoListFieldBuilder();
getPlayerWidgetInfoListFieldBuilder();
+ getPlayerInfoListFieldBuilder();
}
}
@java.lang.Override
public Builder clear() {
super.clear();
- if (playerInfoListBuilder_ == null) {
- playerInfoList_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
- } else {
- playerInfoListBuilder_.clear();
- }
if (playerWidgetInfoListBuilder_ == null) {
playerWidgetInfoList_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000001);
} else {
playerWidgetInfoListBuilder_.clear();
}
playerUidList_ = emptyIntList();
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
+ if (playerInfoListBuilder_ == null) {
+ playerInfoList_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ } else {
+ playerInfoListBuilder_.clear();
+ }
return this;
}
@@ -609,29 +607,29 @@ public emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfo
public emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify buildPartial() {
emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify result = new emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify(this);
int from_bitField0_ = bitField0_;
- if (playerInfoListBuilder_ == null) {
- if (((bitField0_ & 0x00000001) != 0)) {
- playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
- bitField0_ = (bitField0_ & ~0x00000001);
- }
- result.playerInfoList_ = playerInfoList_;
- } else {
- result.playerInfoList_ = playerInfoListBuilder_.build();
- }
if (playerWidgetInfoListBuilder_ == null) {
- if (((bitField0_ & 0x00000002) != 0)) {
+ if (((bitField0_ & 0x00000001) != 0)) {
playerWidgetInfoList_ = java.util.Collections.unmodifiableList(playerWidgetInfoList_);
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000001);
}
result.playerWidgetInfoList_ = playerWidgetInfoList_;
} else {
result.playerWidgetInfoList_ = playerWidgetInfoListBuilder_.build();
}
- if (((bitField0_ & 0x00000004) != 0)) {
+ if (((bitField0_ & 0x00000002) != 0)) {
playerUidList_.makeImmutable();
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
}
result.playerUidList_ = playerUidList_;
+ if (playerInfoListBuilder_ == null) {
+ if (((bitField0_ & 0x00000004) != 0)) {
+ playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
+ bitField0_ = (bitField0_ & ~0x00000004);
+ }
+ result.playerInfoList_ = playerInfoList_;
+ } else {
+ result.playerInfoList_ = playerInfoListBuilder_.build();
+ }
onBuilt();
return result;
}
@@ -680,37 +678,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify other) {
if (other == emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify.getDefaultInstance()) return this;
- if (playerInfoListBuilder_ == null) {
- if (!other.playerInfoList_.isEmpty()) {
- if (playerInfoList_.isEmpty()) {
- playerInfoList_ = other.playerInfoList_;
- bitField0_ = (bitField0_ & ~0x00000001);
- } else {
- ensurePlayerInfoListIsMutable();
- playerInfoList_.addAll(other.playerInfoList_);
- }
- onChanged();
- }
- } else {
- if (!other.playerInfoList_.isEmpty()) {
- if (playerInfoListBuilder_.isEmpty()) {
- playerInfoListBuilder_.dispose();
- playerInfoListBuilder_ = null;
- playerInfoList_ = other.playerInfoList_;
- bitField0_ = (bitField0_ & ~0x00000001);
- playerInfoListBuilder_ =
- com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
- getPlayerInfoListFieldBuilder() : null;
- } else {
- playerInfoListBuilder_.addAllMessages(other.playerInfoList_);
- }
- }
- }
if (playerWidgetInfoListBuilder_ == null) {
if (!other.playerWidgetInfoList_.isEmpty()) {
if (playerWidgetInfoList_.isEmpty()) {
playerWidgetInfoList_ = other.playerWidgetInfoList_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000001);
} else {
ensurePlayerWidgetInfoListIsMutable();
playerWidgetInfoList_.addAll(other.playerWidgetInfoList_);
@@ -723,7 +695,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterCla
playerWidgetInfoListBuilder_.dispose();
playerWidgetInfoListBuilder_ = null;
playerWidgetInfoList_ = other.playerWidgetInfoList_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000001);
playerWidgetInfoListBuilder_ =
com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
getPlayerWidgetInfoListFieldBuilder() : null;
@@ -735,289 +707,75 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterCla
if (!other.playerUidList_.isEmpty()) {
if (playerUidList_.isEmpty()) {
playerUidList_ = other.playerUidList_;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
ensurePlayerUidListIsMutable();
playerUidList_.addAll(other.playerUidList_);
}
onChanged();
}
- this.mergeUnknownFields(other.unknownFields);
- onChanged();
- return this;
- }
-
- @java.lang.Override
- public final boolean isInitialized() {
- return true;
- }
-
- @java.lang.Override
- public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify) e.getUnfinishedMessage();
- throw e.unwrapIOException();
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
- private int bitField0_;
-
- private java.util.List playerInfoList_ =
- java.util.Collections.emptyList();
- private void ensurePlayerInfoListIsMutable() {
- if (!((bitField0_ & 0x00000001) != 0)) {
- playerInfoList_ = new java.util.ArrayList(playerInfoList_);
- bitField0_ |= 0x00000001;
- }
- }
-
- private com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> playerInfoListBuilder_;
-
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public java.util.List getPlayerInfoListList() {
- if (playerInfoListBuilder_ == null) {
- return java.util.Collections.unmodifiableList(playerInfoList_);
- } else {
- return playerInfoListBuilder_.getMessageList();
- }
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public int getPlayerInfoListCount() {
- if (playerInfoListBuilder_ == null) {
- return playerInfoList_.size();
- } else {
- return playerInfoListBuilder_.getCount();
- }
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
if (playerInfoListBuilder_ == null) {
- return playerInfoList_.get(index);
- } else {
- return playerInfoListBuilder_.getMessage(index);
- }
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder setPlayerInfoList(
- int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
- if (playerInfoListBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensurePlayerInfoListIsMutable();
- playerInfoList_.set(index, value);
- onChanged();
- } else {
- playerInfoListBuilder_.setMessage(index, value);
- }
- return this;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder setPlayerInfoList(
- int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
- if (playerInfoListBuilder_ == null) {
- ensurePlayerInfoListIsMutable();
- playerInfoList_.set(index, builderForValue.build());
- onChanged();
- } else {
- playerInfoListBuilder_.setMessage(index, builderForValue.build());
- }
- return this;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder addPlayerInfoList(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
- if (playerInfoListBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
+ if (!other.playerInfoList_.isEmpty()) {
+ if (playerInfoList_.isEmpty()) {
+ playerInfoList_ = other.playerInfoList_;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ } else {
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.addAll(other.playerInfoList_);
+ }
+ onChanged();
}
- ensurePlayerInfoListIsMutable();
- playerInfoList_.add(value);
- onChanged();
} else {
- playerInfoListBuilder_.addMessage(value);
- }
- return this;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder addPlayerInfoList(
- int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
- if (playerInfoListBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
+ if (!other.playerInfoList_.isEmpty()) {
+ if (playerInfoListBuilder_.isEmpty()) {
+ playerInfoListBuilder_.dispose();
+ playerInfoListBuilder_ = null;
+ playerInfoList_ = other.playerInfoList_;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ playerInfoListBuilder_ =
+ com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+ getPlayerInfoListFieldBuilder() : null;
+ } else {
+ playerInfoListBuilder_.addAllMessages(other.playerInfoList_);
+ }
}
- ensurePlayerInfoListIsMutable();
- playerInfoList_.add(index, value);
- onChanged();
- } else {
- playerInfoListBuilder_.addMessage(index, value);
- }
- return this;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder addPlayerInfoList(
- emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
- if (playerInfoListBuilder_ == null) {
- ensurePlayerInfoListIsMutable();
- playerInfoList_.add(builderForValue.build());
- onChanged();
- } else {
- playerInfoListBuilder_.addMessage(builderForValue.build());
- }
- return this;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder addPlayerInfoList(
- int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
- if (playerInfoListBuilder_ == null) {
- ensurePlayerInfoListIsMutable();
- playerInfoList_.add(index, builderForValue.build());
- onChanged();
- } else {
- playerInfoListBuilder_.addMessage(index, builderForValue.build());
- }
- return this;
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder addAllPlayerInfoList(
- java.lang.Iterable values) {
- if (playerInfoListBuilder_ == null) {
- ensurePlayerInfoListIsMutable();
- com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, playerInfoList_);
- onChanged();
- } else {
- playerInfoListBuilder_.addAllMessages(values);
}
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
return this;
}
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder clearPlayerInfoList() {
- if (playerInfoListBuilder_ == null) {
- playerInfoList_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
- onChanged();
- } else {
- playerInfoListBuilder_.clear();
- }
- return this;
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
}
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public Builder removePlayerInfoList(int index) {
- if (playerInfoListBuilder_ == null) {
- ensurePlayerInfoListIsMutable();
- playerInfoList_.remove(index);
- onChanged();
- } else {
- playerInfoListBuilder_.remove(index);
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
}
return this;
}
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getPlayerInfoListBuilder(
- int index) {
- return getPlayerInfoListFieldBuilder().getBuilder(index);
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
- int index) {
- if (playerInfoListBuilder_ == null) {
- return playerInfoList_.get(index); } else {
- return playerInfoListBuilder_.getMessageOrBuilder(index);
- }
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public java.util.List
- getPlayerInfoListOrBuilderList() {
- if (playerInfoListBuilder_ != null) {
- return playerInfoListBuilder_.getMessageOrBuilderList();
- } else {
- return java.util.Collections.unmodifiableList(playerInfoList_);
- }
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder() {
- return getPlayerInfoListFieldBuilder().addBuilder(
- emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder(
- int index) {
- return getPlayerInfoListFieldBuilder().addBuilder(
- index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
- }
- /**
- * repeated .OnlinePlayerInfo player_info_list = 7;
- */
- public java.util.List
- getPlayerInfoListBuilderList() {
- return getPlayerInfoListFieldBuilder().getBuilderList();
- }
- private com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>
- getPlayerInfoListFieldBuilder() {
- if (playerInfoListBuilder_ == null) {
- playerInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>(
- playerInfoList_,
- ((bitField0_ & 0x00000001) != 0),
- getParentForChildren(),
- isClean());
- playerInfoList_ = null;
- }
- return playerInfoListBuilder_;
- }
+ private int bitField0_;
private java.util.List playerWidgetInfoList_ =
java.util.Collections.emptyList();
private void ensurePlayerWidgetInfoListIsMutable() {
- if (!((bitField0_ & 0x00000002) != 0)) {
+ if (!((bitField0_ & 0x00000001) != 0)) {
playerWidgetInfoList_ = new java.util.ArrayList(playerWidgetInfoList_);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
}
@@ -1025,7 +783,7 @@ private void ensurePlayerWidgetInfoListIsMutable() {
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> playerWidgetInfoListBuilder_;
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public java.util.List getPlayerWidgetInfoListList() {
if (playerWidgetInfoListBuilder_ == null) {
@@ -1035,7 +793,7 @@ public java.util.Listrepeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public int getPlayerWidgetInfoListCount() {
if (playerWidgetInfoListBuilder_ == null) {
@@ -1045,7 +803,7 @@ public int getPlayerWidgetInfoListCount() {
}
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index) {
if (playerWidgetInfoListBuilder_ == null) {
@@ -1055,7 +813,7 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo get
}
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder setPlayerWidgetInfoList(
int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
@@ -1072,7 +830,7 @@ public Builder setPlayerWidgetInfoList(
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder setPlayerWidgetInfoList(
int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -1086,7 +844,7 @@ public Builder setPlayerWidgetInfoList(
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder addPlayerWidgetInfoList(emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
if (playerWidgetInfoListBuilder_ == null) {
@@ -1102,7 +860,7 @@ public Builder addPlayerWidgetInfoList(emu.grasscutter.net.proto.PlayerWidgetInf
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder addPlayerWidgetInfoList(
int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
@@ -1119,7 +877,7 @@ public Builder addPlayerWidgetInfoList(
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder addPlayerWidgetInfoList(
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -1133,7 +891,7 @@ public Builder addPlayerWidgetInfoList(
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder addPlayerWidgetInfoList(
int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -1147,7 +905,7 @@ public Builder addPlayerWidgetInfoList(
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder addAllPlayerWidgetInfoList(
java.lang.Iterable values) {
@@ -1162,12 +920,12 @@ public Builder addAllPlayerWidgetInfoList(
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder clearPlayerWidgetInfoList() {
if (playerWidgetInfoListBuilder_ == null) {
playerWidgetInfoList_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
} else {
playerWidgetInfoListBuilder_.clear();
@@ -1175,7 +933,7 @@ public Builder clearPlayerWidgetInfoList() {
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public Builder removePlayerWidgetInfoList(int index) {
if (playerWidgetInfoListBuilder_ == null) {
@@ -1188,14 +946,14 @@ public Builder removePlayerWidgetInfoList(int index) {
return this;
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder getPlayerWidgetInfoListBuilder(
int index) {
return getPlayerWidgetInfoListFieldBuilder().getBuilder(index);
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
int index) {
@@ -1205,7 +963,7 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBu
}
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public java.util.List
getPlayerWidgetInfoListOrBuilderList() {
@@ -1216,14 +974,14 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBu
}
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder addPlayerWidgetInfoListBuilder() {
return getPlayerWidgetInfoListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance());
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder addPlayerWidgetInfoListBuilder(
int index) {
@@ -1231,7 +989,7 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Bui
index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance());
}
/**
- * repeated .PlayerWidgetInfo player_widget_info_list = 5;
+ * repeated .PlayerWidgetInfo player_widget_info_list = 1;
*/
public java.util.List
getPlayerWidgetInfoListBuilderList() {
@@ -1244,7 +1002,7 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Bui
playerWidgetInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder>(
playerWidgetInfoList_,
- ((bitField0_ & 0x00000002) != 0),
+ ((bitField0_ & 0x00000001) != 0),
getParentForChildren(),
isClean());
playerWidgetInfoList_ = null;
@@ -1254,29 +1012,29 @@ public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Bui
private com.google.protobuf.Internal.IntList playerUidList_ = emptyIntList();
private void ensurePlayerUidListIsMutable() {
- if (!((bitField0_ & 0x00000004) != 0)) {
+ if (!((bitField0_ & 0x00000002) != 0)) {
playerUidList_ = mutableCopy(playerUidList_);
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @return A list containing the playerUidList.
*/
public java.util.List
getPlayerUidListList() {
- return ((bitField0_ & 0x00000004) != 0) ?
+ return ((bitField0_ & 0x00000002) != 0) ?
java.util.Collections.unmodifiableList(playerUidList_) : playerUidList_;
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @return The count of playerUidList.
*/
public int getPlayerUidListCount() {
return playerUidList_.size();
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @param index The index of the element to return.
* @return The playerUidList at the given index.
*/
@@ -1284,7 +1042,7 @@ public int getPlayerUidList(int index) {
return playerUidList_.getInt(index);
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @param index The index to set the value at.
* @param value The playerUidList to set.
* @return This builder for chaining.
@@ -1297,7 +1055,7 @@ public Builder setPlayerUidList(
return this;
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @param value The playerUidList to add.
* @return This builder for chaining.
*/
@@ -1308,7 +1066,7 @@ public Builder addPlayerUidList(int value) {
return this;
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @param values The playerUidList to add.
* @return This builder for chaining.
*/
@@ -1321,15 +1079,255 @@ public Builder addAllPlayerUidList(
return this;
}
/**
- * repeated uint32 player_uid_list = 15;
+ * repeated uint32 player_uid_list = 5;
* @return This builder for chaining.
*/
public Builder clearPlayerUidList() {
playerUidList_ = emptyIntList();
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
return this;
}
+
+ private java.util.List playerInfoList_ =
+ java.util.Collections.emptyList();
+ private void ensurePlayerInfoListIsMutable() {
+ if (!((bitField0_ & 0x00000004) != 0)) {
+ playerInfoList_ = new java.util.ArrayList(playerInfoList_);
+ bitField0_ |= 0x00000004;
+ }
+ }
+
+ private com.google.protobuf.RepeatedFieldBuilderV3<
+ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> playerInfoListBuilder_;
+
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public java.util.List getPlayerInfoListList() {
+ if (playerInfoListBuilder_ == null) {
+ return java.util.Collections.unmodifiableList(playerInfoList_);
+ } else {
+ return playerInfoListBuilder_.getMessageList();
+ }
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public int getPlayerInfoListCount() {
+ if (playerInfoListBuilder_ == null) {
+ return playerInfoList_.size();
+ } else {
+ return playerInfoListBuilder_.getCount();
+ }
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
+ if (playerInfoListBuilder_ == null) {
+ return playerInfoList_.get(index);
+ } else {
+ return playerInfoListBuilder_.getMessage(index);
+ }
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder setPlayerInfoList(
+ int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
+ if (playerInfoListBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.set(index, value);
+ onChanged();
+ } else {
+ playerInfoListBuilder_.setMessage(index, value);
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder setPlayerInfoList(
+ int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
+ if (playerInfoListBuilder_ == null) {
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.set(index, builderForValue.build());
+ onChanged();
+ } else {
+ playerInfoListBuilder_.setMessage(index, builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder addPlayerInfoList(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
+ if (playerInfoListBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.add(value);
+ onChanged();
+ } else {
+ playerInfoListBuilder_.addMessage(value);
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder addPlayerInfoList(
+ int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
+ if (playerInfoListBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.add(index, value);
+ onChanged();
+ } else {
+ playerInfoListBuilder_.addMessage(index, value);
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder addPlayerInfoList(
+ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
+ if (playerInfoListBuilder_ == null) {
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.add(builderForValue.build());
+ onChanged();
+ } else {
+ playerInfoListBuilder_.addMessage(builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder addPlayerInfoList(
+ int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
+ if (playerInfoListBuilder_ == null) {
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.add(index, builderForValue.build());
+ onChanged();
+ } else {
+ playerInfoListBuilder_.addMessage(index, builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder addAllPlayerInfoList(
+ java.lang.Iterable values) {
+ if (playerInfoListBuilder_ == null) {
+ ensurePlayerInfoListIsMutable();
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, playerInfoList_);
+ onChanged();
+ } else {
+ playerInfoListBuilder_.addAllMessages(values);
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder clearPlayerInfoList() {
+ if (playerInfoListBuilder_ == null) {
+ playerInfoList_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ onChanged();
+ } else {
+ playerInfoListBuilder_.clear();
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public Builder removePlayerInfoList(int index) {
+ if (playerInfoListBuilder_ == null) {
+ ensurePlayerInfoListIsMutable();
+ playerInfoList_.remove(index);
+ onChanged();
+ } else {
+ playerInfoListBuilder_.remove(index);
+ }
+ return this;
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getPlayerInfoListBuilder(
+ int index) {
+ return getPlayerInfoListFieldBuilder().getBuilder(index);
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+ int index) {
+ if (playerInfoListBuilder_ == null) {
+ return playerInfoList_.get(index); } else {
+ return playerInfoListBuilder_.getMessageOrBuilder(index);
+ }
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public java.util.List
+ getPlayerInfoListOrBuilderList() {
+ if (playerInfoListBuilder_ != null) {
+ return playerInfoListBuilder_.getMessageOrBuilderList();
+ } else {
+ return java.util.Collections.unmodifiableList(playerInfoList_);
+ }
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder() {
+ return getPlayerInfoListFieldBuilder().addBuilder(
+ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder(
+ int index) {
+ return getPlayerInfoListFieldBuilder().addBuilder(
+ index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
+ }
+ /**
+ * repeated .OnlinePlayerInfo player_info_list = 8;
+ */
+ public java.util.List
+ getPlayerInfoListBuilderList() {
+ return getPlayerInfoListFieldBuilder().getBuilderList();
+ }
+ private com.google.protobuf.RepeatedFieldBuilderV3<
+ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>
+ getPlayerInfoListFieldBuilder() {
+ if (playerInfoListBuilder_ == null) {
+ playerInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>(
+ playerInfoList_,
+ ((bitField0_ & 0x00000004) != 0),
+ getParentForChildren(),
+ isClean());
+ playerInfoList_ = null;
+ }
+ return playerInfoListBuilder_;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1399,10 +1397,10 @@ public emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfo
java.lang.String[] descriptorData = {
"\n\033WorldPlayerInfoNotify.proto\032\026OnlinePla" +
"yerInfo.proto\032\026PlayerWidgetInfo.proto\"\221\001" +
- "\n\025WorldPlayerInfoNotify\022+\n\020player_info_l" +
- "ist\030\007 \003(\0132\021.OnlinePlayerInfo\0222\n\027player_w" +
- "idget_info_list\030\005 \003(\0132\021.PlayerWidgetInfo" +
- "\022\027\n\017player_uid_list\030\017 \003(\rB\033\n\031emu.grasscu" +
+ "\n\025WorldPlayerInfoNotify\0222\n\027player_widget" +
+ "_info_list\030\001 \003(\0132\021.PlayerWidgetInfo\022\027\n\017p" +
+ "layer_uid_list\030\005 \003(\r\022+\n\020player_info_list" +
+ "\030\010 \003(\0132\021.OnlinePlayerInfoB\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1416,7 +1414,7 @@ public emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfo
internal_static_WorldPlayerInfoNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WorldPlayerInfoNotify_descriptor,
- new java.lang.String[] { "PlayerInfoList", "PlayerWidgetInfoList", "PlayerUidList", });
+ new java.lang.String[] { "PlayerWidgetInfoList", "PlayerUidList", "PlayerInfoList", });
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.getDescriptor();
}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java
index 87f72fa638d..8e6c7add85d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java
@@ -19,54 +19,58 @@ public interface WorldPlayerLocationNotifyOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- java.util.List
- getPlayerWorldLocListList();
+ java.util.List
+ getPlayerLocListList();
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index);
+ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index);
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- int getPlayerWorldLocListCount();
+ int getPlayerLocListCount();
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- java.util.List
- getPlayerWorldLocListOrBuilderList();
+ java.util.List
+ getPlayerLocListOrBuilderList();
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
+ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
int index);
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- java.util.List
- getPlayerLocListList();
+ java.util.List
+ getPlayerWorldLocListList();
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index);
+ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index);
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- int getPlayerLocListCount();
+ int getPlayerWorldLocListCount();
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- java.util.List
- getPlayerLocListOrBuilderList();
+ java.util.List
+ getPlayerWorldLocListOrBuilderList();
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
+ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
int index);
}
/**
+ *
+ * CmdId: 22207
+ *
+ *
* Protobuf type {@code WorldPlayerLocationNotify}
*/
public static final class WorldPlayerLocationNotify extends
@@ -79,8 +83,8 @@ private WorldPlayerLocationNotify(com.google.protobuf.GeneratedMessageV3.Builder
super(builder);
}
private WorldPlayerLocationNotify() {
- playerWorldLocList_ = java.util.Collections.emptyList();
playerLocList_ = java.util.Collections.emptyList();
+ playerWorldLocList_ = java.util.Collections.emptyList();
}
@java.lang.Override
@@ -114,19 +118,19 @@ private WorldPlayerLocationNotify(
case 0:
done = true;
break;
- case 114: {
- if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+ case 18: {
+ if (!((mutable_bitField0_ & 0x00000001) != 0)) {
playerLocList_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000002;
+ mutable_bitField0_ |= 0x00000001;
}
playerLocList_.add(
input.readMessage(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.parser(), extensionRegistry));
break;
}
- case 122: {
- if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+ case 90: {
+ if (!((mutable_bitField0_ & 0x00000002) != 0)) {
playerWorldLocList_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000001;
+ mutable_bitField0_ |= 0x00000002;
}
playerWorldLocList_.add(
input.readMessage(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.parser(), extensionRegistry));
@@ -147,10 +151,10 @@ private WorldPlayerLocationNotify(
throw new com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000002) != 0)) {
+ if (((mutable_bitField0_ & 0x00000001) != 0)) {
playerLocList_ = java.util.Collections.unmodifiableList(playerLocList_);
}
- if (((mutable_bitField0_ & 0x00000001) != 0)) {
+ if (((mutable_bitField0_ & 0x00000002) != 0)) {
playerWorldLocList_ = java.util.Collections.unmodifiableList(playerWorldLocList_);
}
this.unknownFields = unknownFields.build();
@@ -170,84 +174,84 @@ private WorldPlayerLocationNotify(
emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.class, emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.Builder.class);
}
- public static final int PLAYER_WORLD_LOC_LIST_FIELD_NUMBER = 15;
- private java.util.List playerWorldLocList_;
+ public static final int PLAYER_LOC_LIST_FIELD_NUMBER = 2;
+ private java.util.List playerLocList_;
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
@java.lang.Override
- public java.util.List getPlayerWorldLocListList() {
- return playerWorldLocList_;
+ public java.util.List getPlayerLocListList() {
+ return playerLocList_;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
@java.lang.Override
- public java.util.List
- getPlayerWorldLocListOrBuilderList() {
- return playerWorldLocList_;
+ public java.util.List
+ getPlayerLocListOrBuilderList() {
+ return playerLocList_;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
@java.lang.Override
- public int getPlayerWorldLocListCount() {
- return playerWorldLocList_.size();
+ public int getPlayerLocListCount() {
+ return playerLocList_.size();
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
@java.lang.Override
- public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
- return playerWorldLocList_.get(index);
+ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) {
+ return playerLocList_.get(index);
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
@java.lang.Override
- public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
+ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
int index) {
- return playerWorldLocList_.get(index);
+ return playerLocList_.get(index);
}
- public static final int PLAYER_LOC_LIST_FIELD_NUMBER = 14;
- private java.util.List playerLocList_;
+ public static final int PLAYER_WORLD_LOC_LIST_FIELD_NUMBER = 11;
+ private java.util.List playerWorldLocList_;
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
@java.lang.Override
- public java.util.List getPlayerLocListList() {
- return playerLocList_;
+ public java.util.List getPlayerWorldLocListList() {
+ return playerWorldLocList_;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
@java.lang.Override
- public java.util.List
- getPlayerLocListOrBuilderList() {
- return playerLocList_;
+ public java.util.List
+ getPlayerWorldLocListOrBuilderList() {
+ return playerWorldLocList_;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
@java.lang.Override
- public int getPlayerLocListCount() {
- return playerLocList_.size();
+ public int getPlayerWorldLocListCount() {
+ return playerWorldLocList_.size();
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
@java.lang.Override
- public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) {
- return playerLocList_.get(index);
+ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
+ return playerWorldLocList_.get(index);
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
@java.lang.Override
- public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
+ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
int index) {
- return playerLocList_.get(index);
+ return playerWorldLocList_.get(index);
}
private byte memoizedIsInitialized = -1;
@@ -265,10 +269,10 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < playerLocList_.size(); i++) {
- output.writeMessage(14, playerLocList_.get(i));
+ output.writeMessage(2, playerLocList_.get(i));
}
for (int i = 0; i < playerWorldLocList_.size(); i++) {
- output.writeMessage(15, playerWorldLocList_.get(i));
+ output.writeMessage(11, playerWorldLocList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -281,11 +285,11 @@ public int getSerializedSize() {
size = 0;
for (int i = 0; i < playerLocList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(14, playerLocList_.get(i));
+ .computeMessageSize(2, playerLocList_.get(i));
}
for (int i = 0; i < playerWorldLocList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(15, playerWorldLocList_.get(i));
+ .computeMessageSize(11, playerWorldLocList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -302,10 +306,10 @@ public boolean equals(final java.lang.Object obj) {
}
emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify other = (emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify) obj;
- if (!getPlayerWorldLocListList()
- .equals(other.getPlayerWorldLocListList())) return false;
if (!getPlayerLocListList()
.equals(other.getPlayerLocListList())) return false;
+ if (!getPlayerWorldLocListList()
+ .equals(other.getPlayerWorldLocListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -317,14 +321,14 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- if (getPlayerWorldLocListCount() > 0) {
- hash = (37 * hash) + PLAYER_WORLD_LOC_LIST_FIELD_NUMBER;
- hash = (53 * hash) + getPlayerWorldLocListList().hashCode();
- }
if (getPlayerLocListCount() > 0) {
hash = (37 * hash) + PLAYER_LOC_LIST_FIELD_NUMBER;
hash = (53 * hash) + getPlayerLocListList().hashCode();
}
+ if (getPlayerWorldLocListCount() > 0) {
+ hash = (37 * hash) + PLAYER_WORLD_LOC_LIST_FIELD_NUMBER;
+ hash = (53 * hash) + getPlayerWorldLocListList().hashCode();
+ }
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -421,6 +425,10 @@ protected Builder newBuilderForType(
return builder;
}
/**
+ *
+ * CmdId: 22207
+ *
+ *
* Protobuf type {@code WorldPlayerLocationNotify}
*/
public static final class Builder extends
@@ -453,24 +461,24 @@ private Builder(
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessageV3
.alwaysUseFieldBuilders) {
- getPlayerWorldLocListFieldBuilder();
getPlayerLocListFieldBuilder();
+ getPlayerWorldLocListFieldBuilder();
}
}
@java.lang.Override
public Builder clear() {
super.clear();
- if (playerWorldLocListBuilder_ == null) {
- playerWorldLocList_ = java.util.Collections.emptyList();
+ if (playerLocListBuilder_ == null) {
+ playerLocList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
- playerWorldLocListBuilder_.clear();
+ playerLocListBuilder_.clear();
}
- if (playerLocListBuilder_ == null) {
- playerLocList_ = java.util.Collections.emptyList();
+ if (playerWorldLocListBuilder_ == null) {
+ playerWorldLocList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
} else {
- playerLocListBuilder_.clear();
+ playerWorldLocListBuilder_.clear();
}
return this;
}
@@ -499,23 +507,23 @@ public emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayer
public emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify buildPartial() {
emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify result = new emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify(this);
int from_bitField0_ = bitField0_;
- if (playerWorldLocListBuilder_ == null) {
+ if (playerLocListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
- playerWorldLocList_ = java.util.Collections.unmodifiableList(playerWorldLocList_);
+ playerLocList_ = java.util.Collections.unmodifiableList(playerLocList_);
bitField0_ = (bitField0_ & ~0x00000001);
}
- result.playerWorldLocList_ = playerWorldLocList_;
+ result.playerLocList_ = playerLocList_;
} else {
- result.playerWorldLocList_ = playerWorldLocListBuilder_.build();
+ result.playerLocList_ = playerLocListBuilder_.build();
}
- if (playerLocListBuilder_ == null) {
+ if (playerWorldLocListBuilder_ == null) {
if (((bitField0_ & 0x00000002) != 0)) {
- playerLocList_ = java.util.Collections.unmodifiableList(playerLocList_);
+ playerWorldLocList_ = java.util.Collections.unmodifiableList(playerWorldLocList_);
bitField0_ = (bitField0_ & ~0x00000002);
}
- result.playerLocList_ = playerLocList_;
+ result.playerWorldLocList_ = playerWorldLocList_;
} else {
- result.playerLocList_ = playerLocListBuilder_.build();
+ result.playerWorldLocList_ = playerWorldLocListBuilder_.build();
}
onBuilt();
return result;
@@ -565,37 +573,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify other) {
if (other == emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.getDefaultInstance()) return this;
- if (playerWorldLocListBuilder_ == null) {
- if (!other.playerWorldLocList_.isEmpty()) {
- if (playerWorldLocList_.isEmpty()) {
- playerWorldLocList_ = other.playerWorldLocList_;
- bitField0_ = (bitField0_ & ~0x00000001);
- } else {
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.addAll(other.playerWorldLocList_);
- }
- onChanged();
- }
- } else {
- if (!other.playerWorldLocList_.isEmpty()) {
- if (playerWorldLocListBuilder_.isEmpty()) {
- playerWorldLocListBuilder_.dispose();
- playerWorldLocListBuilder_ = null;
- playerWorldLocList_ = other.playerWorldLocList_;
- bitField0_ = (bitField0_ & ~0x00000001);
- playerWorldLocListBuilder_ =
- com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
- getPlayerWorldLocListFieldBuilder() : null;
- } else {
- playerWorldLocListBuilder_.addAllMessages(other.playerWorldLocList_);
- }
- }
- }
if (playerLocListBuilder_ == null) {
if (!other.playerLocList_.isEmpty()) {
if (playerLocList_.isEmpty()) {
playerLocList_ = other.playerLocList_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000001);
} else {
ensurePlayerLocListIsMutable();
playerLocList_.addAll(other.playerLocList_);
@@ -608,7 +590,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerLocationNotifyOute
playerLocListBuilder_.dispose();
playerLocListBuilder_ = null;
playerLocList_ = other.playerLocList_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000001);
playerLocListBuilder_ =
com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
getPlayerLocListFieldBuilder() : null;
@@ -617,6 +599,32 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerLocationNotifyOute
}
}
}
+ if (playerWorldLocListBuilder_ == null) {
+ if (!other.playerWorldLocList_.isEmpty()) {
+ if (playerWorldLocList_.isEmpty()) {
+ playerWorldLocList_ = other.playerWorldLocList_;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ } else {
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.addAll(other.playerWorldLocList_);
+ }
+ onChanged();
+ }
+ } else {
+ if (!other.playerWorldLocList_.isEmpty()) {
+ if (playerWorldLocListBuilder_.isEmpty()) {
+ playerWorldLocListBuilder_.dispose();
+ playerWorldLocListBuilder_ = null;
+ playerWorldLocList_ = other.playerWorldLocList_;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ playerWorldLocListBuilder_ =
+ com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+ getPlayerWorldLocListFieldBuilder() : null;
+ } else {
+ playerWorldLocListBuilder_.addAllMessages(other.playerWorldLocList_);
+ }
+ }
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -647,484 +655,484 @@ public Builder mergeFrom(
}
private int bitField0_;
- private java.util.List playerWorldLocList_ =
+ private java.util.List playerLocList_ =
java.util.Collections.emptyList();
- private void ensurePlayerWorldLocListIsMutable() {
+ private void ensurePlayerLocListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
- playerWorldLocList_ = new java.util.ArrayList(playerWorldLocList_);
+ playerLocList_ = new java.util.ArrayList(playerLocList_);
bitField0_ |= 0x00000001;
}
}
private com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> playerWorldLocListBuilder_;
+ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> playerLocListBuilder_;
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public java.util.List getPlayerWorldLocListList() {
- if (playerWorldLocListBuilder_ == null) {
- return java.util.Collections.unmodifiableList(playerWorldLocList_);
+ public java.util.List getPlayerLocListList() {
+ if (playerLocListBuilder_ == null) {
+ return java.util.Collections.unmodifiableList(playerLocList_);
} else {
- return playerWorldLocListBuilder_.getMessageList();
+ return playerLocListBuilder_.getMessageList();
}
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public int getPlayerWorldLocListCount() {
- if (playerWorldLocListBuilder_ == null) {
- return playerWorldLocList_.size();
+ public int getPlayerLocListCount() {
+ if (playerLocListBuilder_ == null) {
+ return playerLocList_.size();
} else {
- return playerWorldLocListBuilder_.getCount();
+ return playerLocListBuilder_.getCount();
}
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
- if (playerWorldLocListBuilder_ == null) {
- return playerWorldLocList_.get(index);
+ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) {
+ if (playerLocListBuilder_ == null) {
+ return playerLocList_.get(index);
} else {
- return playerWorldLocListBuilder_.getMessage(index);
+ return playerLocListBuilder_.getMessage(index);
}
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder setPlayerWorldLocList(
- int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
- if (playerWorldLocListBuilder_ == null) {
+ public Builder setPlayerLocList(
+ int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
+ if (playerLocListBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.set(index, value);
+ ensurePlayerLocListIsMutable();
+ playerLocList_.set(index, value);
onChanged();
} else {
- playerWorldLocListBuilder_.setMessage(index, value);
+ playerLocListBuilder_.setMessage(index, value);
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder setPlayerWorldLocList(
- int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
- if (playerWorldLocListBuilder_ == null) {
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.set(index, builderForValue.build());
+ public Builder setPlayerLocList(
+ int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
+ if (playerLocListBuilder_ == null) {
+ ensurePlayerLocListIsMutable();
+ playerLocList_.set(index, builderForValue.build());
onChanged();
} else {
- playerWorldLocListBuilder_.setMessage(index, builderForValue.build());
+ playerLocListBuilder_.setMessage(index, builderForValue.build());
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder addPlayerWorldLocList(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
- if (playerWorldLocListBuilder_ == null) {
+ public Builder addPlayerLocList(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
+ if (playerLocListBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.add(value);
+ ensurePlayerLocListIsMutable();
+ playerLocList_.add(value);
onChanged();
} else {
- playerWorldLocListBuilder_.addMessage(value);
+ playerLocListBuilder_.addMessage(value);
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder addPlayerWorldLocList(
- int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
- if (playerWorldLocListBuilder_ == null) {
+ public Builder addPlayerLocList(
+ int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
+ if (playerLocListBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.add(index, value);
+ ensurePlayerLocListIsMutable();
+ playerLocList_.add(index, value);
onChanged();
} else {
- playerWorldLocListBuilder_.addMessage(index, value);
+ playerLocListBuilder_.addMessage(index, value);
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder addPlayerWorldLocList(
- emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
- if (playerWorldLocListBuilder_ == null) {
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.add(builderForValue.build());
+ public Builder addPlayerLocList(
+ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
+ if (playerLocListBuilder_ == null) {
+ ensurePlayerLocListIsMutable();
+ playerLocList_.add(builderForValue.build());
onChanged();
} else {
- playerWorldLocListBuilder_.addMessage(builderForValue.build());
+ playerLocListBuilder_.addMessage(builderForValue.build());
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder addPlayerWorldLocList(
- int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
- if (playerWorldLocListBuilder_ == null) {
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.add(index, builderForValue.build());
+ public Builder addPlayerLocList(
+ int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
+ if (playerLocListBuilder_ == null) {
+ ensurePlayerLocListIsMutable();
+ playerLocList_.add(index, builderForValue.build());
onChanged();
} else {
- playerWorldLocListBuilder_.addMessage(index, builderForValue.build());
+ playerLocListBuilder_.addMessage(index, builderForValue.build());
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder addAllPlayerWorldLocList(
- java.lang.Iterable values) {
- if (playerWorldLocListBuilder_ == null) {
- ensurePlayerWorldLocListIsMutable();
+ public Builder addAllPlayerLocList(
+ java.lang.Iterable values) {
+ if (playerLocListBuilder_ == null) {
+ ensurePlayerLocListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, playerWorldLocList_);
+ values, playerLocList_);
onChanged();
} else {
- playerWorldLocListBuilder_.addAllMessages(values);
+ playerLocListBuilder_.addAllMessages(values);
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder clearPlayerWorldLocList() {
- if (playerWorldLocListBuilder_ == null) {
- playerWorldLocList_ = java.util.Collections.emptyList();
+ public Builder clearPlayerLocList() {
+ if (playerLocListBuilder_ == null) {
+ playerLocList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
} else {
- playerWorldLocListBuilder_.clear();
+ playerLocListBuilder_.clear();
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public Builder removePlayerWorldLocList(int index) {
- if (playerWorldLocListBuilder_ == null) {
- ensurePlayerWorldLocListIsMutable();
- playerWorldLocList_.remove(index);
+ public Builder removePlayerLocList(int index) {
+ if (playerLocListBuilder_ == null) {
+ ensurePlayerLocListIsMutable();
+ playerLocList_.remove(index);
onChanged();
} else {
- playerWorldLocListBuilder_.remove(index);
+ playerLocListBuilder_.remove(index);
}
return this;
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder getPlayerWorldLocListBuilder(
+ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder getPlayerLocListBuilder(
int index) {
- return getPlayerWorldLocListFieldBuilder().getBuilder(index);
+ return getPlayerLocListFieldBuilder().getBuilder(index);
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
+ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
int index) {
- if (playerWorldLocListBuilder_ == null) {
- return playerWorldLocList_.get(index); } else {
- return playerWorldLocListBuilder_.getMessageOrBuilder(index);
+ if (playerLocListBuilder_ == null) {
+ return playerLocList_.get(index); } else {
+ return playerLocListBuilder_.getMessageOrBuilder(index);
}
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public java.util.List
- getPlayerWorldLocListOrBuilderList() {
- if (playerWorldLocListBuilder_ != null) {
- return playerWorldLocListBuilder_.getMessageOrBuilderList();
+ public java.util.List
+ getPlayerLocListOrBuilderList() {
+ if (playerLocListBuilder_ != null) {
+ return playerLocListBuilder_.getMessageOrBuilderList();
} else {
- return java.util.Collections.unmodifiableList(playerWorldLocList_);
+ return java.util.Collections.unmodifiableList(playerLocList_);
}
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder() {
- return getPlayerWorldLocListFieldBuilder().addBuilder(
- emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
+ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder() {
+ return getPlayerLocListFieldBuilder().addBuilder(
+ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance());
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder(
+ public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder(
int index) {
- return getPlayerWorldLocListFieldBuilder().addBuilder(
- index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
+ return getPlayerLocListFieldBuilder().addBuilder(
+ index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance());
}
/**
- * repeated .PlayerWorldLocationInfo player_world_loc_list = 15;
+ * repeated .PlayerLocationInfo player_loc_list = 2;
*/
- public java.util.List
- getPlayerWorldLocListBuilderList() {
- return getPlayerWorldLocListFieldBuilder().getBuilderList();
+ public java.util.List
+ getPlayerLocListBuilderList() {
+ return getPlayerLocListFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder>
- getPlayerWorldLocListFieldBuilder() {
- if (playerWorldLocListBuilder_ == null) {
- playerWorldLocListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder>(
- playerWorldLocList_,
+ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder>
+ getPlayerLocListFieldBuilder() {
+ if (playerLocListBuilder_ == null) {
+ playerLocListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+ emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder>(
+ playerLocList_,
((bitField0_ & 0x00000001) != 0),
getParentForChildren(),
isClean());
- playerWorldLocList_ = null;
+ playerLocList_ = null;
}
- return playerWorldLocListBuilder_;
+ return playerLocListBuilder_;
}
- private java.util.List playerLocList_ =
+ private java.util.List playerWorldLocList_ =
java.util.Collections.emptyList();
- private void ensurePlayerLocListIsMutable() {
+ private void ensurePlayerWorldLocListIsMutable() {
if (!((bitField0_ & 0x00000002) != 0)) {
- playerLocList_ = new java.util.ArrayList(playerLocList_);
+ playerWorldLocList_ = new java.util.ArrayList(playerWorldLocList_);
bitField0_ |= 0x00000002;
}
}
private com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> playerLocListBuilder_;
+ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> playerWorldLocListBuilder_;
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public java.util.List getPlayerLocListList() {
- if (playerLocListBuilder_ == null) {
- return java.util.Collections.unmodifiableList(playerLocList_);
+ public java.util.List getPlayerWorldLocListList() {
+ if (playerWorldLocListBuilder_ == null) {
+ return java.util.Collections.unmodifiableList(playerWorldLocList_);
} else {
- return playerLocListBuilder_.getMessageList();
+ return playerWorldLocListBuilder_.getMessageList();
}
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public int getPlayerLocListCount() {
- if (playerLocListBuilder_ == null) {
- return playerLocList_.size();
+ public int getPlayerWorldLocListCount() {
+ if (playerWorldLocListBuilder_ == null) {
+ return playerWorldLocList_.size();
} else {
- return playerLocListBuilder_.getCount();
+ return playerWorldLocListBuilder_.getCount();
}
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) {
- if (playerLocListBuilder_ == null) {
- return playerLocList_.get(index);
+ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
+ if (playerWorldLocListBuilder_ == null) {
+ return playerWorldLocList_.get(index);
} else {
- return playerLocListBuilder_.getMessage(index);
+ return playerWorldLocListBuilder_.getMessage(index);
}
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder setPlayerLocList(
- int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
- if (playerLocListBuilder_ == null) {
+ public Builder setPlayerWorldLocList(
+ int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
+ if (playerWorldLocListBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensurePlayerLocListIsMutable();
- playerLocList_.set(index, value);
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.set(index, value);
onChanged();
} else {
- playerLocListBuilder_.setMessage(index, value);
+ playerWorldLocListBuilder_.setMessage(index, value);
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder setPlayerLocList(
- int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
- if (playerLocListBuilder_ == null) {
- ensurePlayerLocListIsMutable();
- playerLocList_.set(index, builderForValue.build());
+ public Builder setPlayerWorldLocList(
+ int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
+ if (playerWorldLocListBuilder_ == null) {
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.set(index, builderForValue.build());
onChanged();
} else {
- playerLocListBuilder_.setMessage(index, builderForValue.build());
+ playerWorldLocListBuilder_.setMessage(index, builderForValue.build());
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder addPlayerLocList(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
- if (playerLocListBuilder_ == null) {
+ public Builder addPlayerWorldLocList(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
+ if (playerWorldLocListBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensurePlayerLocListIsMutable();
- playerLocList_.add(value);
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.add(value);
onChanged();
} else {
- playerLocListBuilder_.addMessage(value);
+ playerWorldLocListBuilder_.addMessage(value);
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder addPlayerLocList(
- int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
- if (playerLocListBuilder_ == null) {
+ public Builder addPlayerWorldLocList(
+ int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
+ if (playerWorldLocListBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensurePlayerLocListIsMutable();
- playerLocList_.add(index, value);
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.add(index, value);
onChanged();
} else {
- playerLocListBuilder_.addMessage(index, value);
+ playerWorldLocListBuilder_.addMessage(index, value);
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder addPlayerLocList(
- emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
- if (playerLocListBuilder_ == null) {
- ensurePlayerLocListIsMutable();
- playerLocList_.add(builderForValue.build());
+ public Builder addPlayerWorldLocList(
+ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
+ if (playerWorldLocListBuilder_ == null) {
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.add(builderForValue.build());
onChanged();
} else {
- playerLocListBuilder_.addMessage(builderForValue.build());
+ playerWorldLocListBuilder_.addMessage(builderForValue.build());
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder addPlayerLocList(
- int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
- if (playerLocListBuilder_ == null) {
- ensurePlayerLocListIsMutable();
- playerLocList_.add(index, builderForValue.build());
+ public Builder addPlayerWorldLocList(
+ int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
+ if (playerWorldLocListBuilder_ == null) {
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.add(index, builderForValue.build());
onChanged();
} else {
- playerLocListBuilder_.addMessage(index, builderForValue.build());
+ playerWorldLocListBuilder_.addMessage(index, builderForValue.build());
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder addAllPlayerLocList(
- java.lang.Iterable values) {
- if (playerLocListBuilder_ == null) {
- ensurePlayerLocListIsMutable();
+ public Builder addAllPlayerWorldLocList(
+ java.lang.Iterable values) {
+ if (playerWorldLocListBuilder_ == null) {
+ ensurePlayerWorldLocListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, playerLocList_);
+ values, playerWorldLocList_);
onChanged();
} else {
- playerLocListBuilder_.addAllMessages(values);
+ playerWorldLocListBuilder_.addAllMessages(values);
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder clearPlayerLocList() {
- if (playerLocListBuilder_ == null) {
- playerLocList_ = java.util.Collections.emptyList();
+ public Builder clearPlayerWorldLocList() {
+ if (playerWorldLocListBuilder_ == null) {
+ playerWorldLocList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
} else {
- playerLocListBuilder_.clear();
+ playerWorldLocListBuilder_.clear();
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public Builder removePlayerLocList(int index) {
- if (playerLocListBuilder_ == null) {
- ensurePlayerLocListIsMutable();
- playerLocList_.remove(index);
+ public Builder removePlayerWorldLocList(int index) {
+ if (playerWorldLocListBuilder_ == null) {
+ ensurePlayerWorldLocListIsMutable();
+ playerWorldLocList_.remove(index);
onChanged();
} else {
- playerLocListBuilder_.remove(index);
+ playerWorldLocListBuilder_.remove(index);
}
return this;
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder getPlayerLocListBuilder(
+ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder getPlayerWorldLocListBuilder(
int index) {
- return getPlayerLocListFieldBuilder().getBuilder(index);
+ return getPlayerWorldLocListFieldBuilder().getBuilder(index);
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
+ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
int index) {
- if (playerLocListBuilder_ == null) {
- return playerLocList_.get(index); } else {
- return playerLocListBuilder_.getMessageOrBuilder(index);
+ if (playerWorldLocListBuilder_ == null) {
+ return playerWorldLocList_.get(index); } else {
+ return playerWorldLocListBuilder_.getMessageOrBuilder(index);
}
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public java.util.List
- getPlayerLocListOrBuilderList() {
- if (playerLocListBuilder_ != null) {
- return playerLocListBuilder_.getMessageOrBuilderList();
+ public java.util.List
+ getPlayerWorldLocListOrBuilderList() {
+ if (playerWorldLocListBuilder_ != null) {
+ return playerWorldLocListBuilder_.getMessageOrBuilderList();
} else {
- return java.util.Collections.unmodifiableList(playerLocList_);
+ return java.util.Collections.unmodifiableList(playerWorldLocList_);
}
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder() {
- return getPlayerLocListFieldBuilder().addBuilder(
- emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance());
+ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder() {
+ return getPlayerWorldLocListFieldBuilder().addBuilder(
+ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder(
+ public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder(
int index) {
- return getPlayerLocListFieldBuilder().addBuilder(
- index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance());
+ return getPlayerWorldLocListFieldBuilder().addBuilder(
+ index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
}
/**
- * repeated .PlayerLocationInfo player_loc_list = 14;
+ * repeated .PlayerWorldLocationInfo player_world_loc_list = 11;
*/
- public java.util.List
- getPlayerLocListBuilderList() {
- return getPlayerLocListFieldBuilder().getBuilderList();
+ public java.util.List
+ getPlayerWorldLocListBuilderList() {
+ return getPlayerWorldLocListFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder>
- getPlayerLocListFieldBuilder() {
- if (playerLocListBuilder_ == null) {
- playerLocListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
- emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder>(
- playerLocList_,
+ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder>
+ getPlayerWorldLocListFieldBuilder() {
+ if (playerWorldLocListBuilder_ == null) {
+ playerWorldLocListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+ emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder>(
+ playerWorldLocList_,
((bitField0_ & 0x00000002) != 0),
getParentForChildren(),
isClean());
- playerLocList_ = null;
+ playerWorldLocList_ = null;
}
- return playerLocListBuilder_;
+ return playerWorldLocListBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
@@ -1196,9 +1204,9 @@ public emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayer
"\n\037WorldPlayerLocationNotify.proto\032\035Playe" +
"rWorldLocationInfo.proto\032\030PlayerLocation" +
"Info.proto\"\202\001\n\031WorldPlayerLocationNotify" +
- "\0227\n\025player_world_loc_list\030\017 \003(\0132\030.Player" +
- "WorldLocationInfo\022,\n\017player_loc_list\030\016 \003" +
- "(\0132\023.PlayerLocationInfoB\033\n\031emu.grasscutt" +
+ "\022,\n\017player_loc_list\030\002 \003(\0132\023.PlayerLocati" +
+ "onInfo\0227\n\025player_world_loc_list\030\013 \003(\0132\030." +
+ "PlayerWorldLocationInfoB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1212,7 +1220,7 @@ public emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayer
internal_static_WorldPlayerLocationNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WorldPlayerLocationNotify_descriptor,
- new java.lang.String[] { "PlayerWorldLocList", "PlayerLocList", });
+ new java.lang.String[] { "PlayerLocList", "PlayerWorldLocList", });
emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.getDescriptor();
emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.getDescriptor();
}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java
index 69ace6d7f59..ab9442da57d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java
@@ -19,33 +19,32 @@ public interface WorldPlayerRTTNotifyOrBuilder extends
com.google.protobuf.MessageOrBuilder {
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
java.util.List
getPlayerRttListList();
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getPlayerRttList(int index);
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
int getPlayerRttListCount();
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
java.util.List
getPlayerRttListOrBuilderList();
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder getPlayerRttListOrBuilder(
int index);
}
/**
*
- * CmdId: 421
- * Obf: JNKBKEOBKGL
+ * CmdId: 22234
*
*
* Protobuf type {@code WorldPlayerRTTNotify}
@@ -94,7 +93,7 @@ private WorldPlayerRTTNotify(
case 0:
done = true;
break;
- case 50: {
+ case 18: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
playerRttList_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000001;
@@ -138,17 +137,17 @@ private WorldPlayerRTTNotify(
emu.grasscutter.net.proto.WorldPlayerRTTNotifyOuterClass.WorldPlayerRTTNotify.class, emu.grasscutter.net.proto.WorldPlayerRTTNotifyOuterClass.WorldPlayerRTTNotify.Builder.class);
}
- public static final int PLAYER_RTT_LIST_FIELD_NUMBER = 6;
+ public static final int PLAYER_RTT_LIST_FIELD_NUMBER = 2;
private java.util.List playerRttList_;
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
@java.lang.Override
public java.util.List getPlayerRttListList() {
return playerRttList_;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
@java.lang.Override
public java.util.List
@@ -156,21 +155,21 @@ public java.util.Listrepeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
@java.lang.Override
public int getPlayerRttListCount() {
return playerRttList_.size();
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getPlayerRttList(int index) {
return playerRttList_.get(index);
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder getPlayerRttListOrBuilder(
@@ -193,7 +192,7 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < playerRttList_.size(); i++) {
- output.writeMessage(6, playerRttList_.get(i));
+ output.writeMessage(2, playerRttList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -206,7 +205,7 @@ public int getSerializedSize() {
size = 0;
for (int i = 0; i < playerRttList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(6, playerRttList_.get(i));
+ .computeMessageSize(2, playerRttList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -337,8 +336,7 @@ protected Builder newBuilderForType(
}
/**
*
- * CmdId: 421
- * Obf: JNKBKEOBKGL
+ * CmdId: 22234
*
*
* Protobuf type {@code WorldPlayerRTTNotify}
@@ -538,7 +536,7 @@ private void ensurePlayerRttListIsMutable() {
emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder> playerRttListBuilder_;
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public java.util.List getPlayerRttListList() {
if (playerRttListBuilder_ == null) {
@@ -548,7 +546,7 @@ public java.util.Listrepeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public int getPlayerRttListCount() {
if (playerRttListBuilder_ == null) {
@@ -558,7 +556,7 @@ public int getPlayerRttListCount() {
}
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getPlayerRttList(int index) {
if (playerRttListBuilder_ == null) {
@@ -568,7 +566,7 @@ public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getPlayer
}
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder setPlayerRttList(
int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo value) {
@@ -585,7 +583,7 @@ public Builder setPlayerRttList(
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder setPlayerRttList(
int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder builderForValue) {
@@ -599,7 +597,7 @@ public Builder setPlayerRttList(
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder addPlayerRttList(emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo value) {
if (playerRttListBuilder_ == null) {
@@ -615,7 +613,7 @@ public Builder addPlayerRttList(emu.grasscutter.net.proto.PlayerRTTInfoOuterClas
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder addPlayerRttList(
int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo value) {
@@ -632,7 +630,7 @@ public Builder addPlayerRttList(
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder addPlayerRttList(
emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder builderForValue) {
@@ -646,7 +644,7 @@ public Builder addPlayerRttList(
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder addPlayerRttList(
int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder builderForValue) {
@@ -660,7 +658,7 @@ public Builder addPlayerRttList(
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder addAllPlayerRttList(
java.lang.Iterable values) {
@@ -675,7 +673,7 @@ public Builder addAllPlayerRttList(
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder clearPlayerRttList() {
if (playerRttListBuilder_ == null) {
@@ -688,7 +686,7 @@ public Builder clearPlayerRttList() {
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public Builder removePlayerRttList(int index) {
if (playerRttListBuilder_ == null) {
@@ -701,14 +699,14 @@ public Builder removePlayerRttList(int index) {
return this;
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder getPlayerRttListBuilder(
int index) {
return getPlayerRttListFieldBuilder().getBuilder(index);
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder getPlayerRttListOrBuilder(
int index) {
@@ -718,7 +716,7 @@ public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder
}
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public java.util.List
getPlayerRttListOrBuilderList() {
@@ -729,14 +727,14 @@ public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder
}
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder addPlayerRttListBuilder() {
return getPlayerRttListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.getDefaultInstance());
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder addPlayerRttListBuilder(
int index) {
@@ -744,7 +742,7 @@ public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder a
index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.getDefaultInstance());
}
/**
- * repeated .PlayerRTTInfo player_rtt_list = 6;
+ * repeated .PlayerRTTInfo player_rtt_list = 2;
*/
public java.util.List
getPlayerRttListBuilderList() {
@@ -833,7 +831,7 @@ public emu.grasscutter.net.proto.WorldPlayerRTTNotifyOuterClass.WorldPlayerRTTNo
java.lang.String[] descriptorData = {
"\n\032WorldPlayerRTTNotify.proto\032\023PlayerRTTI" +
"nfo.proto\"?\n\024WorldPlayerRTTNotify\022\'\n\017pla" +
- "yer_rtt_list\030\006 \003(\0132\016.PlayerRTTInfoB\033\n\031em" +
+ "yer_rtt_list\030\002 \003(\0132\016.PlayerRTTInfoB\033\n\031em" +
"u.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 9c464c91e80..80a9f00e1b5 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
@@ -321,14 +321,14 @@ public class PacketOpcodes {
public static final int AvatarWearFlycloakRsp = 27660;
public static final int AvatarGainFlycloakNotify = 6824;
public static final int AvatarChangeTraceEffectReq = 28932;
- public static final int PlayerApplyEnterMpResultNotify = 8810; // proto
- public static final int GetOnlinePlayerInfoRsp = 25443; // proto
- public static final int PlayerApplyEnterMpNotify = 5245; // proto
- public static final int PlayerApplyEnterMpReq = 4701; // proto
- public static final int PlayerApplyEnterMpRsp = 24897; // proto
- public static final int PlayerApplyEnterMpResultReq = 23674; // proto
- public static final int PlayerApplyEnterMpAfterMatchAgreedNotify = 21662; // proto
- public static final int DeathZoneInfoNotify = 24379; // proto
+ public static final int PlayerApplyEnterMpResultNotify = 8810;
+ public static final int GetOnlinePlayerInfoRsp = 25443;
+ public static final int PlayerApplyEnterMpNotify = 5245;
+ public static final int PlayerApplyEnterMpReq = 4701;
+ public static final int PlayerApplyEnterMpRsp = 24897;
+ public static final int PlayerApplyEnterMpResultReq = 23674;
+ public static final int PlayerApplyEnterMpAfterMatchAgreedNotify = 21662;
+ public static final int DeathZoneInfoNotify = 24379;
public static final int AddFriendNotify = 23316;
public static final int AskAddFriendNotify = 5432;
public static final int AskAddFriendReq = 23646;
@@ -354,8 +354,8 @@ public class PacketOpcodes {
public static final int HomeGetBlueprintSlotInfoReq = 9031; // proto
public static final int HomeGetBlueprintSlotInfoRsp = 23776; // proto
public static final int HomeCreateBlueprintRsp = 25729; // proto
- public static final int WorldPlayerLocationNotify = 22207; // proto
- public static final int ResinChangeNotify = 4336; // proto
+ public static final int WorldPlayerLocationNotify = 22207;
+ public static final int ResinChangeNotify = 4336;
public static final int GetAllMailReq = 7646;
public static final int GetAllMailRsp = 22156;
public static final int GetMailItemReq = 8354;
@@ -415,6 +415,12 @@ public class PacketOpcodes {
public static final int DungeonDieOptionRsp = 28706;
public static final int ChangeTeamNameReq = 29880;
public static final int ChangeTeamNameRsp = 7491;
+ public static final int AbilityInvocationsNotify = 4844;
+ public static final int WorldPlayerRTTNotify = 22234;
+ public static final int PlayerApplyEnterMpResultRsp = 27380;
+ public static final int PlayerGetForceQuitBanInfoRsp = 29159;
+ public static final int PlayerPreEnterMpNotify = 23352;
+ public static final int WorldPlayerInfoNotify = 23024;
// Obfuscated
public static final int Unk5000_GAHMPOELOAL = 24500;
@@ -1150,7 +1156,6 @@ public class PacketOpcodes {
public static final int Unk5000_NEDJHNGNEKC = 6284;
public static final int Unk5000_DNFCGDLPODD = 24899;
public static final int Unk5000_NFIKAKPLDBL = 4080;
- public static final int Unk5000_IOPBODOJOLA = 23024;
public static final int Unk5000_JGLFJJOHDIB = 8292;
public static final int Unk5000_DPGBOICLANK = 20239;
public static final int Unk5000_IPCBPOAPOKF = 25786;
@@ -1428,7 +1433,6 @@ public class PacketOpcodes {
public static final int Unk5000_EFLLKAMDBED = 1936;
public static final int Unk5000_KBHKABMFHIA = 6217;
public static final int Unk5000_LKKMKBCMGBC = 23068;
- public static final int Unk5000_PEGDMPLDBGH = 23352;
public static final int Unk5000_PINEMFJJJNH = 23625;
public static final int Unk5000_JOEJHMANJOH = 22039;
public static final int Unk5000_KAILGDDAEOD = 21461;
@@ -1958,7 +1962,6 @@ public class PacketOpcodes {
public static final int Unk5000_FDGOJDCLDAH = 26447;
public static final int Unk5000_IOCGPKAHPPD = 23591;
public static final int Unk5000_OIMBEJHELGD = 20296;
- public static final int Unk5000_OJGOCMBGPCP = 22234;
public static final int Unk5000_JKOFFPMNPOD = 808;
public static final int Unk5000_JFBFGACBOEM = 20463;
public static final int Unk5000_OIHPLAEKINM = 3917;
@@ -2006,7 +2009,6 @@ public class PacketOpcodes {
public static final int Unk5000_KOLJGBKCDFE = 5992;
public static final int Unk5000_CKNFOGKBEMO = 28469;
public static final int Unk5000_ACDIDGPAHIH = 952;
- public static final int Unk5000_LCEDHAFADGN = 29159;
public static final int Unk5000_CCPJFPKCIHI = 23690;
public static final int Unk5000_PNBMLJPIPGP = 8695;
public static final int Unk5000_KHJKCJDEAHO = 29677;
@@ -2297,7 +2299,6 @@ public class PacketOpcodes {
public static final int Unk5000_NKGJPLKLBBI = 26733;
public static final int Unk5000_KKNPOIEDGDI = 24228;
public static final int Unk5000_KOGEJBNKKPD = 348;
- public static final int Unk5000_GGFHOECCEJD = 4844;
public static final int Unk5000_JAIGABGGKCC = 4138;
public static final int Unk5000_HKHAEJHJHCE = 23619;
public static final int Unk5000_INEKFALKDAL = 4455;
@@ -2335,7 +2336,6 @@ public class PacketOpcodes {
public static final int Unk5000_ECIJEDPGKFF = 21275;
public static final int Unk5000_JMKIDMACAIN = 23004;
public static final int Unk5000_PBCBMMOHLOF = 25942;
- public static final int Unk5000_OAPOFLJEPPA = 27380;
public static final int Unk5000_EBKEAJCJKJN = 6259;
public static final int Unk5000_PPCFAKHEBJF = 23720;
public static final int Unk5000_BAHDFMCPJLG = 4649;
@@ -3129,7 +3129,6 @@ public class PacketOpcodes {
public static final int PlayerEnterMapLayerNotify = 1;
public static final int SkipPlayerGameTimeReq = 1;
public static final int HomeAvatarTalkReq = 1;
- public static final int PlayerApplyEnterMpResultRsp = 1;
public static final int GetOnlinePlayerInfoReq = 1;
public static final int GetShopmallDataRsp = 1;
public static final int ServerAnnounceRevokeNotify = 1;
@@ -3144,7 +3143,6 @@ public class PacketOpcodes {
public static final int FurnitureMakeRsp = 1;
public static final int AbilityInvocationFailNotify = 1;
public static final int AbilityInvocationFixedNotify = 1;
- public static final int AbilityInvocationsNotify = 1;
public static final int AcceptCityReputationRequestReq = 1;
public static final int AcceptCityReputationRequestRsp = 1;
public static final int AchievementUpdateNotify = 1;
@@ -4494,7 +4492,6 @@ public class PacketOpcodes {
public static final int PlayerGeneralMatchConfirmNotify = 1;
public static final int PlayerGeneralMatchDismissNotify = 1;
public static final int PlayerGetForceQuitBanInfoReq = 1;
- public static final int PlayerGetForceQuitBanInfoRsp = 1;
public static final int PlayerInjectFixNotify = 1;
public static final int PlayerIpRegionNotify = 1;
public static final int PlayerLevelRewardUpdateNotify = 1;
@@ -4507,7 +4504,6 @@ public class PacketOpcodes {
public static final int PlayerNicknameAuditDataNotify = 1;
public static final int PlayerNicknameNotify = 1;
public static final int PlayerNormalLuaShellNotify = 1;
- public static final int PlayerPreEnterMpNotify = 1;
public static final int PlayerQuitFromMpNotify = 1;
public static final int PlayerRandomCookReq = 1;
public static final int PlayerRandomCookRsp = 1;
@@ -5160,8 +5156,6 @@ public class PacketOpcodes {
public static final int WorldOwnerBlossomBriefInfoNotify = 1;
public static final int WorldOwnerBlossomScheduleInfoNotify = 1;
public static final int WorldOwnerDailyTaskNotify = 1;
- public static final int WorldPlayerInfoNotify = 1;
- public static final int WorldPlayerRTTNotify = 1;
// Unknown
public static final HashSet BANNED_PACKETS = new HashSet<>() {
diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
index 752414e9158..220c11a51f6 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
@@ -11,21 +11,21 @@ public class PacketOpcodesUtils {
public static final Set LOOP_PACKETS =
Set.of(
PacketOpcodes.PingReq,
- // PacketOpcodes.PingRsp,
- // PacketOpcodes.WorldPlayerRTTNotify,
- // PacketOpcodes.UnionCmdNotify,
- // PacketOpcodes.SceneTimeNotify,
+ PacketOpcodes.PingRsp,
+ PacketOpcodes.WorldPlayerRTTNotify,
+ PacketOpcodes.UnionCmdNotify,
+ PacketOpcodes.SceneTimeNotify,
// PacketOpcodes.QueryPathReq,
// PacketOpcodes.QueryPathRsp,
// Satiation sends these every tick
- // PacketOpcodes.PlayerTimeNotify,
- // PacketOpcodes.PlayerPropNotify,
+ PacketOpcodes.PlayerTimeNotify,
+ PacketOpcodes.PlayerPropNotify,
- // PacketOpcodes.AbilityInvocationsNotify,
- // PacketOpcodes.CombatInvocationsNotify,
- // PacketOpcodes.PlayerGameTimeNotify,
- // PacketOpcodes.AvatarPropNotify,
+ PacketOpcodes.AbilityInvocationsNotify,
+ PacketOpcodes.CombatInvocationsNotify,
+ PacketOpcodes.PlayerGameTimeNotify,
+ PacketOpcodes.AvatarPropNotify,
PacketOpcodes.AvatarSatiationDataNotify
);
private static final Int2ObjectMap opcodeMap;
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java
index 3a0a1e34142..9b74c0f6785 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerPropReq.java
@@ -19,7 +19,7 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex
switch (prop) {
default -> player.setProperty(prop, (int) p.getVal(), true);
case PROP_IS_MP_MODE_AVAILABLE -> {
- if (!player.setProperty(prop, (int) p.getVal(), false)) {
+ if (!player.setProperty(prop, (int) p.getIval(), false)) {
session.send(new PacketSetPlayerPropRsp(1));
return;
}