Upgrade to REL3.7 (#2164)

* 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
@@ -19,39 +19,24 @@ public final class HomeGroupPlayerInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
int getUid();
/**
* <code>uint32 player_level = 14;</code>
* <code>uint32 player_level = 7;</code>
* @return The playerLevel.
*/
int getPlayerLevel();
/**
* <code>.ProfilePicture profile_picture = 6;</code>
* @return Whether the profilePicture field is set.
* <code>uint32 uid = 11;</code>
* @return The uid.
*/
boolean hasProfilePicture();
/**
* <code>.ProfilePicture profile_picture = 6;</code>
* @return The profilePicture.
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture();
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder();
int getUid();
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @return The psnId.
*/
java.lang.String getPsnId();
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @return The bytes for psnId.
*/
com.google.protobuf.ByteString
@@ -70,20 +55,35 @@ public final class HomeGroupPlayerInfoOuterClass {
getNicknameBytes();
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @return The onlineId.
*/
java.lang.String getOnlineId();
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @return The bytes for onlineId.
*/
com.google.protobuf.ByteString
getOnlineIdBytes();
/**
* <code>.ProfilePicture profile_picture = 3;</code>
* @return Whether the profilePicture field is set.
*/
boolean hasProfilePicture();
/**
* <code>.ProfilePicture profile_picture = 3;</code>
* @return The profilePicture.
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture();
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder();
}
/**
* <pre>
* Name: GECIFFJAPJD
* Obf: IJHCHNPKNGD
* </pre>
*
* Protobuf type {@code HomeGroupPlayerInfo}
@@ -133,13 +133,7 @@ public final class HomeGroupPlayerInfoOuterClass {
case 0:
done = true;
break;
case 10: {
java.lang.String s = input.readStringRequireUtf8();
psnId_ = s;
break;
}
case 50: {
case 26: {
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder subBuilder = null;
if (profilePicture_ != null) {
subBuilder = profilePicture_.toBuilder();
@@ -152,28 +146,34 @@ public final class HomeGroupPlayerInfoOuterClass {
break;
}
case 42: {
java.lang.String s = input.readStringRequireUtf8();
psnId_ = s;
break;
}
case 56: {
playerLevel_ = input.readUInt32();
break;
}
case 66: {
java.lang.String s = input.readStringRequireUtf8();
onlineId_ = s;
break;
}
case 74: {
java.lang.String s = input.readStringRequireUtf8();
nickname_ = s;
break;
}
case 80: {
case 88: {
uid_ = input.readUInt32();
break;
}
case 90: {
java.lang.String s = input.readStringRequireUtf8();
onlineId_ = s;
break;
}
case 112: {
playerLevel_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -206,21 +206,10 @@ public final class HomeGroupPlayerInfoOuterClass {
emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo.class, emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo.Builder.class);
}
public static final int UID_FIELD_NUMBER = 10;
private int uid_;
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
public static final int PLAYER_LEVEL_FIELD_NUMBER = 14;
public static final int PLAYER_LEVEL_FIELD_NUMBER = 7;
private int playerLevel_;
/**
* <code>uint32 player_level = 14;</code>
* <code>uint32 player_level = 7;</code>
* @return The playerLevel.
*/
@java.lang.Override
@@ -228,36 +217,21 @@ public final class HomeGroupPlayerInfoOuterClass {
return playerLevel_;
}
public static final int PROFILE_PICTURE_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
public static final int UID_FIELD_NUMBER = 11;
private int uid_;
/**
* <code>.ProfilePicture profile_picture = 6;</code>
* @return Whether the profilePicture field is set.
* <code>uint32 uid = 11;</code>
* @return The uid.
*/
@java.lang.Override
public boolean hasProfilePicture() {
return profilePicture_ != null;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
* @return The profilePicture.
*/
@java.lang.Override
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() {
return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
return getProfilePicture();
public int getUid() {
return uid_;
}
public static final int PSN_ID_FIELD_NUMBER = 1;
public static final int PSN_ID_FIELD_NUMBER = 5;
private volatile java.lang.Object psnId_;
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @return The psnId.
*/
@java.lang.Override
@@ -274,7 +248,7 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @return The bytes for psnId.
*/
@java.lang.Override
@@ -330,10 +304,10 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
public static final int ONLINE_ID_FIELD_NUMBER = 11;
public static final int ONLINE_ID_FIELD_NUMBER = 8;
private volatile java.lang.Object onlineId_;
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @return The onlineId.
*/
@java.lang.Override
@@ -350,7 +324,7 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @return The bytes for onlineId.
*/
@java.lang.Override
@@ -368,6 +342,32 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
public static final int PROFILE_PICTURE_FIELD_NUMBER = 3;
private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
/**
* <code>.ProfilePicture profile_picture = 3;</code>
* @return Whether the profilePicture field is set.
*/
@java.lang.Override
public boolean hasProfilePicture() {
return profilePicture_ != null;
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
* @return The profilePicture.
*/
@java.lang.Override
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() {
return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
return getProfilePicture();
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -382,23 +382,23 @@ public final class HomeGroupPlayerInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, psnId_);
}
if (profilePicture_ != null) {
output.writeMessage(6, getProfilePicture());
output.writeMessage(3, getProfilePicture());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 5, psnId_);
}
if (playerLevel_ != 0) {
output.writeUInt32(7, playerLevel_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, onlineId_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 9, nickname_);
}
if (uid_ != 0) {
output.writeUInt32(10, uid_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 11, onlineId_);
}
if (playerLevel_ != 0) {
output.writeUInt32(14, playerLevel_);
output.writeUInt32(11, uid_);
}
unknownFields.writeTo(output);
}
@@ -409,26 +409,26 @@ public final class HomeGroupPlayerInfoOuterClass {
if (size != -1) return size;
size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, psnId_);
}
if (profilePicture_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getProfilePicture());
.computeMessageSize(3, getProfilePicture());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, psnId_);
}
if (playerLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, playerLevel_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, onlineId_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, nickname_);
}
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, uid_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, onlineId_);
}
if (playerLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, playerLevel_);
.computeUInt32Size(11, uid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -445,21 +445,21 @@ public final class HomeGroupPlayerInfoOuterClass {
}
emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo other = (emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo) obj;
if (getUid()
!= other.getUid()) return false;
if (getPlayerLevel()
!= other.getPlayerLevel()) return false;
if (hasProfilePicture() != other.hasProfilePicture()) return false;
if (hasProfilePicture()) {
if (!getProfilePicture()
.equals(other.getProfilePicture())) return false;
}
if (getUid()
!= other.getUid()) return false;
if (!getPsnId()
.equals(other.getPsnId())) return false;
if (!getNickname()
.equals(other.getNickname())) return false;
if (!getOnlineId()
.equals(other.getOnlineId())) return false;
if (hasProfilePicture() != other.hasProfilePicture()) return false;
if (hasProfilePicture()) {
if (!getProfilePicture()
.equals(other.getProfilePicture())) return false;
}
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -471,20 +471,20 @@ public final class HomeGroupPlayerInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (37 * hash) + PLAYER_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getPlayerLevel();
if (hasProfilePicture()) {
hash = (37 * hash) + PROFILE_PICTURE_FIELD_NUMBER;
hash = (53 * hash) + getProfilePicture().hashCode();
}
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (37 * hash) + PSN_ID_FIELD_NUMBER;
hash = (53 * hash) + getPsnId().hashCode();
hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
hash = (53 * hash) + getNickname().hashCode();
hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER;
hash = (53 * hash) + getOnlineId().hashCode();
if (hasProfilePicture()) {
hash = (37 * hash) + PROFILE_PICTURE_FIELD_NUMBER;
hash = (53 * hash) + getProfilePicture().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -582,7 +582,7 @@ public final class HomeGroupPlayerInfoOuterClass {
}
/**
* <pre>
* Name: GECIFFJAPJD
* Obf: IJHCHNPKNGD
* </pre>
*
* Protobuf type {@code HomeGroupPlayerInfo}
@@ -622,9 +622,15 @@ public final class HomeGroupPlayerInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
playerLevel_ = 0;
uid_ = 0;
playerLevel_ = 0;
psnId_ = "";
nickname_ = "";
onlineId_ = "";
if (profilePictureBuilder_ == null) {
profilePicture_ = null;
@@ -632,12 +638,6 @@ public final class HomeGroupPlayerInfoOuterClass {
profilePicture_ = null;
profilePictureBuilder_ = null;
}
psnId_ = "";
nickname_ = "";
onlineId_ = "";
return this;
}
@@ -664,16 +664,16 @@ public final class HomeGroupPlayerInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo buildPartial() {
emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo result = new emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo(this);
result.uid_ = uid_;
result.playerLevel_ = playerLevel_;
result.uid_ = uid_;
result.psnId_ = psnId_;
result.nickname_ = nickname_;
result.onlineId_ = onlineId_;
if (profilePictureBuilder_ == null) {
result.profilePicture_ = profilePicture_;
} else {
result.profilePicture_ = profilePictureBuilder_.build();
}
result.psnId_ = psnId_;
result.nickname_ = nickname_;
result.onlineId_ = onlineId_;
onBuilt();
return result;
}
@@ -722,14 +722,11 @@ public final class HomeGroupPlayerInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo other) {
if (other == emu.grasscutter.net.proto.HomeGroupPlayerInfoOuterClass.HomeGroupPlayerInfo.getDefaultInstance()) return this;
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (other.getPlayerLevel() != 0) {
setPlayerLevel(other.getPlayerLevel());
}
if (other.hasProfilePicture()) {
mergeProfilePicture(other.getProfilePicture());
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (!other.getPsnId().isEmpty()) {
psnId_ = other.psnId_;
@@ -743,6 +740,9 @@ public final class HomeGroupPlayerInfoOuterClass {
onlineId_ = other.onlineId_;
onChanged();
}
if (other.hasProfilePicture()) {
mergeProfilePicture(other.getProfilePicture());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -772,40 +772,9 @@ public final class HomeGroupPlayerInfoOuterClass {
return this;
}
private int uid_ ;
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 10;</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 = 10;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private int playerLevel_ ;
/**
* <code>uint32 player_level = 14;</code>
* <code>uint32 player_level = 7;</code>
* @return The playerLevel.
*/
@java.lang.Override
@@ -813,7 +782,7 @@ public final class HomeGroupPlayerInfoOuterClass {
return playerLevel_;
}
/**
* <code>uint32 player_level = 14;</code>
* <code>uint32 player_level = 7;</code>
* @param value The playerLevel to set.
* @return This builder for chaining.
*/
@@ -824,7 +793,7 @@ public final class HomeGroupPlayerInfoOuterClass {
return this;
}
/**
* <code>uint32 player_level = 14;</code>
* <code>uint32 player_level = 7;</code>
* @return This builder for chaining.
*/
public Builder clearPlayerLevel() {
@@ -834,128 +803,40 @@ public final class HomeGroupPlayerInfoOuterClass {
return this;
}
private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> profilePictureBuilder_;
private int uid_ ;
/**
* <code>.ProfilePicture profile_picture = 6;</code>
* @return Whether the profilePicture field is set.
* <code>uint32 uid = 11;</code>
* @return The uid.
*/
public boolean hasProfilePicture() {
return profilePictureBuilder_ != null || profilePicture_ != null;
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
* @return The profilePicture.
* <code>uint32 uid = 11;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() {
if (profilePictureBuilder_ == null) {
return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
} else {
return profilePictureBuilder_.getMessage();
}
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
public Builder setProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
profilePicture_ = value;
onChanged();
} else {
profilePictureBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
public Builder setProfilePicture(
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder builderForValue) {
if (profilePictureBuilder_ == null) {
profilePicture_ = builderForValue.build();
onChanged();
} else {
profilePictureBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
public Builder mergeProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
if (profilePicture_ != null) {
profilePicture_ =
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.newBuilder(profilePicture_).mergeFrom(value).buildPartial();
} else {
profilePicture_ = value;
}
onChanged();
} else {
profilePictureBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
public Builder clearProfilePicture() {
if (profilePictureBuilder_ == null) {
profilePicture_ = null;
onChanged();
} else {
profilePicture_ = null;
profilePictureBuilder_ = null;
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder getProfilePictureBuilder() {
public Builder setUid(int value) {
uid_ = value;
onChanged();
return getProfilePictureFieldBuilder().getBuilder();
return this;
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
* <code>uint32 uid = 11;</code>
* @return This builder for chaining.
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
if (profilePictureBuilder_ != null) {
return profilePictureBuilder_.getMessageOrBuilder();
} else {
return profilePicture_ == null ?
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
}
}
/**
* <code>.ProfilePicture profile_picture = 6;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder>
getProfilePictureFieldBuilder() {
if (profilePictureBuilder_ == null) {
profilePictureBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder>(
getProfilePicture(),
getParentForChildren(),
isClean());
profilePicture_ = null;
}
return profilePictureBuilder_;
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private java.lang.Object psnId_ = "";
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @return The psnId.
*/
public java.lang.String getPsnId() {
@@ -971,7 +852,7 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @return The bytes for psnId.
*/
public com.google.protobuf.ByteString
@@ -988,7 +869,7 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @param value The psnId to set.
* @return This builder for chaining.
*/
@@ -1003,7 +884,7 @@ public final class HomeGroupPlayerInfoOuterClass {
return this;
}
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearPsnId() {
@@ -1013,7 +894,7 @@ public final class HomeGroupPlayerInfoOuterClass {
return this;
}
/**
* <code>string psn_id = 1;</code>
* <code>string psn_id = 5;</code>
* @param value The bytes for psnId to set.
* @return This builder for chaining.
*/
@@ -1107,7 +988,7 @@ public final class HomeGroupPlayerInfoOuterClass {
private java.lang.Object onlineId_ = "";
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @return The onlineId.
*/
public java.lang.String getOnlineId() {
@@ -1123,7 +1004,7 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @return The bytes for onlineId.
*/
public com.google.protobuf.ByteString
@@ -1140,7 +1021,7 @@ public final class HomeGroupPlayerInfoOuterClass {
}
}
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @param value The onlineId to set.
* @return This builder for chaining.
*/
@@ -1155,7 +1036,7 @@ public final class HomeGroupPlayerInfoOuterClass {
return this;
}
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearOnlineId() {
@@ -1165,7 +1046,7 @@ public final class HomeGroupPlayerInfoOuterClass {
return this;
}
/**
* <code>string online_id = 11;</code>
* <code>string online_id = 8;</code>
* @param value The bytes for onlineId to set.
* @return This builder for chaining.
*/
@@ -1180,6 +1061,125 @@ public final class HomeGroupPlayerInfoOuterClass {
onChanged();
return this;
}
private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> profilePictureBuilder_;
/**
* <code>.ProfilePicture profile_picture = 3;</code>
* @return Whether the profilePicture field is set.
*/
public boolean hasProfilePicture() {
return profilePictureBuilder_ != null || profilePicture_ != null;
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
* @return The profilePicture.
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() {
if (profilePictureBuilder_ == null) {
return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
} else {
return profilePictureBuilder_.getMessage();
}
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
public Builder setProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
profilePicture_ = value;
onChanged();
} else {
profilePictureBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
public Builder setProfilePicture(
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder builderForValue) {
if (profilePictureBuilder_ == null) {
profilePicture_ = builderForValue.build();
onChanged();
} else {
profilePictureBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
public Builder mergeProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
if (profilePicture_ != null) {
profilePicture_ =
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.newBuilder(profilePicture_).mergeFrom(value).buildPartial();
} else {
profilePicture_ = value;
}
onChanged();
} else {
profilePictureBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
public Builder clearProfilePicture() {
if (profilePictureBuilder_ == null) {
profilePicture_ = null;
onChanged();
} else {
profilePicture_ = null;
profilePictureBuilder_ = null;
}
return this;
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder getProfilePictureBuilder() {
onChanged();
return getProfilePictureFieldBuilder().getBuilder();
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
if (profilePictureBuilder_ != null) {
return profilePictureBuilder_.getMessageOrBuilder();
} else {
return profilePicture_ == null ?
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
}
}
/**
* <code>.ProfilePicture profile_picture = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder>
getProfilePictureFieldBuilder() {
if (profilePictureBuilder_ == null) {
profilePictureBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder>(
getProfilePicture(),
getParentForChildren(),
isClean());
profilePicture_ = null;
}
return profilePictureBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1248,11 +1248,11 @@ public final class HomeGroupPlayerInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031HomeGroupPlayerInfo.proto\032\024ProfilePict" +
"ure.proto\"\227\001\n\023HomeGroupPlayerInfo\022\013\n\003uid" +
"\030\n \001(\r\022\024\n\014player_level\030\016 \001(\r\022(\n\017profile_" +
"picture\030\006 \001(\0132\017.ProfilePicture\022\016\n\006psn_id" +
"\030\001 \001(\t\022\020\n\010nickname\030\t \001(\t\022\021\n\tonline_id\030\013 " +
"\001(\tB\033\n\031emu.grasscutter.net.protob\006proto3"
"ure.proto\"\227\001\n\023HomeGroupPlayerInfo\022\024\n\014pla" +
"yer_level\030\007 \001(\r\022\013\n\003uid\030\013 \001(\r\022\016\n\006psn_id\030\005" +
" \001(\t\022\020\n\010nickname\030\t \001(\t\022\021\n\tonline_id\030\010 \001(" +
"\t\022(\n\017profile_picture\030\003 \001(\0132\017.ProfilePict" +
"ureB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -1264,7 +1264,7 @@ public final class HomeGroupPlayerInfoOuterClass {
internal_static_HomeGroupPlayerInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HomeGroupPlayerInfo_descriptor,
new java.lang.String[] { "Uid", "PlayerLevel", "ProfilePicture", "PsnId", "Nickname", "OnlineId", });
new java.lang.String[] { "PlayerLevel", "Uid", "PsnId", "Nickname", "OnlineId", "ProfilePicture", });
emu.grasscutter.net.proto.ProfilePictureOuterClass.getDescriptor();
}