Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-30 03:59:57 +08:00
Code Issues Projects Releases Wiki Activity

Upgrade to REL3.7 (#2164)

Browse Source 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
This commit is contained in:
Magix
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoRspOuterClass.java
+86 -86
View File
@@ -18,6 +18,12 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
// @@protoc_insertion_point(interface_extends:GetFriendShowAvatarInfoRsp)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 uid = 13;</code>
* @return The uid.
*/
int getUid();
/**
* <code>repeated .ShowAvatarInfo show_avatar_info_list = 10;</code>
*/
@@ -43,21 +49,15 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
int index);
/**
* <code>uint32 uid = 3;</code>
* @return The uid.
*/
int getUid();
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 4026
* Name: MAIBFBAOOEK
* CmdId: 4018
* Obf: IMDEPFBGBPM
* </pre>
*
* Protobuf type {@code GetFriendShowAvatarInfoRsp}
@@ -106,11 +106,6 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
case 0:
done = true;
break;
case 24: {
uid_ = input.readUInt32();
break;
}
case 82: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
showAvatarInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo>();
@@ -120,11 +115,16 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
input.readMessage(emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.parser(), extensionRegistry));
break;
}
case 120: {
case 88: {
retcode_ = input.readInt32();
break;
}
case 104: {
uid_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -160,6 +160,17 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp.class, emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp.Builder.class);
}
public static final int UID_FIELD_NUMBER = 13;
private int uid_;
/**
* <code>uint32 uid = 13;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
public static final int SHOW_AVATAR_INFO_LIST_FIELD_NUMBER = 10;
private java.util.List<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo> showAvatarInfoList_;
/**
@@ -200,21 +211,10 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
return showAvatarInfoList_.get(index);
}
public static final int UID_FIELD_NUMBER = 3;
private int uid_;
/**
* <code>uint32 uid = 3;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
public static final int RETCODE_FIELD_NUMBER = 15;
public static final int RETCODE_FIELD_NUMBER = 11;
private int retcode_;
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -236,14 +236,14 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (uid_ != 0) {
output.writeUInt32(3, uid_);
}
for (int i = 0; i < showAvatarInfoList_.size(); i++) {
output.writeMessage(10, showAvatarInfoList_.get(i));
}
if (retcode_ != 0) {
output.writeInt32(15, retcode_);
output.writeInt32(11, retcode_);
}
if (uid_ != 0) {
output.writeUInt32(13, uid_);
}
unknownFields.writeTo(output);
}
@@ -254,17 +254,17 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
if (size != -1) return size;
size = 0;
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, uid_);
}
for (int i = 0; i < showAvatarInfoList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, showAvatarInfoList_.get(i));
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(15, retcode_);
.computeInt32Size(11, retcode_);
}
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, uid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -281,10 +281,10 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
}
emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp other = (emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp) obj;
if (!getShowAvatarInfoListList()
.equals(other.getShowAvatarInfoListList())) return false;
if (getUid()
!= other.getUid()) return false;
if (!getShowAvatarInfoListList()
.equals(other.getShowAvatarInfoListList())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -298,12 +298,12 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
if (getShowAvatarInfoListCount() > 0) {
hash = (37 * hash) + SHOW_AVATAR_INFO_LIST_FIELD_NUMBER;
hash = (53 * hash) + getShowAvatarInfoListList().hashCode();
}
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -403,8 +403,8 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
}
/**
* <pre>
* CmdId: 4026
* Name: MAIBFBAOOEK
* CmdId: 4018
* Obf: IMDEPFBGBPM
* </pre>
*
* Protobuf type {@code GetFriendShowAvatarInfoRsp}
@@ -445,14 +445,14 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
uid_ = 0;
if (showAvatarInfoListBuilder_ == null) {
showAvatarInfoList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
showAvatarInfoListBuilder_.clear();
}
uid_ = 0;
retcode_ = 0;
return this;
@@ -482,6 +482,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
public emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp buildPartial() {
emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp result = new emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp(this);
int from_bitField0_ = bitField0_;
result.uid_ = uid_;
if (showAvatarInfoListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
showAvatarInfoList_ = java.util.Collections.unmodifiableList(showAvatarInfoList_);
@@ -491,7 +492,6 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
} else {
result.showAvatarInfoList_ = showAvatarInfoListBuilder_.build();
}
result.uid_ = uid_;
result.retcode_ = retcode_;
onBuilt();
return result;
@@ -541,6 +541,9 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp other) {
if (other == emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp.getDefaultInstance()) return this;
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (showAvatarInfoListBuilder_ == null) {
if (!other.showAvatarInfoList_.isEmpty()) {
if (showAvatarInfoList_.isEmpty()) {
@@ -567,9 +570,6 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
}
}
}
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
@@ -603,6 +603,37 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
}
private int bitField0_;
private int uid_ ;
/**
* <code>uint32 uid = 13;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 13;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo> showAvatarInfoList_ =
java.util.Collections.emptyList();
private void ensureShowAvatarInfoListIsMutable() {
@@ -843,40 +874,9 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
return showAvatarInfoListBuilder_;
}
private int uid_ ;
/**
* <code>uint32 uid = 3;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 3;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 3;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -884,7 +884,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 11;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -895,7 +895,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 11;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -973,8 +973,8 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
java.lang.String[] descriptorData = {
"\n GetFriendShowAvatarInfoRsp.proto\032\024Show" +
"AvatarInfo.proto\"j\n\032GetFriendShowAvatarI" +
"nfoRsp\022.\n\025show_avatar_info_list\030\n \003(\0132\017." +
"ShowAvatarInfo\022\013\n\003uid\030\003 \001(\r\022\017\n\007retcode\030\017" +
"nfoRsp\022\013\n\003uid\030\r \001(\r\022.\n\025show_avatar_info_" +
"list\030\n \003(\0132\017.ShowAvatarInfo\022\017\n\007retcode\030\013" +
" \001(\005B\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
@@ -988,7 +988,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
internal_static_GetFriendShowAvatarInfoRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_GetFriendShowAvatarInfoRsp_descriptor,
new java.lang.String[] { "ShowAvatarInfoList", "Uid", "Retcode", });
new java.lang.String[] { "Uid", "ShowAvatarInfoList", "Retcode", });
emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.getDescriptor();
}