Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 10:19:51 +08:00
Code Issues Projects Releases Wiki Activity

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java
+117 -109
View File
@@ -37,70 +37,70 @@ public final class OnlinePlayerInfoOuterClass {
getNicknameBytes();
/**
* <code>uint32 playerLevel = 3;</code>
* <code>uint32 player_level = 3;</code>
* @return The playerLevel.
*/
int getPlayerLevel();
/**
* <code>uint32 avatarId = 4;</code>
* <code>uint32 avatar_id = 4;</code>
* @return The avatarId.
*/
int getAvatarId();
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @return The enum numeric value on the wire for mpSettingType.
*/
int getMpSettingTypeValue();
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @return The mpSettingType.
*/
emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType();
/**
* <code>uint32 curPlayerNumInWorld = 6;</code>
* <code>uint32 cur_player_num_in_world = 6;</code>
* @return The curPlayerNumInWorld.
*/
int getCurPlayerNumInWorld();
/**
* <code>uint32 worldLevel = 7;</code>
* <code>uint32 world_level = 7;</code>
* @return The worldLevel.
*/
int getWorldLevel();
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @return The onlineId.
*/
java.lang.String getOnlineId();
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @return The bytes for onlineId.
*/
com.google.protobuf.ByteString
getOnlineIdBytes();
/**
* <code>uint32 nameCardId = 9;</code>
* <code>uint32 name_card_id = 9;</code>
* @return The nameCardId.
*/
int getNameCardId();
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @return A list containing the blacklistUidList.
*/
java.util.List<java.lang.Integer> getBlacklistUidListList();
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @return The count of blacklistUidList.
*/
int getBlacklistUidListCount();
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @param index The index of the element to return.
* @return The blacklistUidList at the given index.
*/
@@ -119,33 +119,37 @@ public final class OnlinePlayerInfoOuterClass {
getSignatureBytes();
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
* @return Whether the profilePicture field is set.
*/
boolean hasProfilePicture();
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
* @return The profilePicture.
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture();
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder();
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @return The psnId.
*/
java.lang.String getPsnId();
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @return The bytes for psnId.
*/
com.google.protobuf.ByteString
getPsnIdBytes();
}
/**
* <pre>
* Name: DFNGPIGNBJJ
* </pre>
*
* Protobuf type {@code OnlinePlayerInfo}
*/
public static final class OnlinePlayerInfo extends
@@ -375,10 +379,10 @@ public final class OnlinePlayerInfoOuterClass {
}
}
public static final int PLAYERLEVEL_FIELD_NUMBER = 3;
public static final int PLAYER_LEVEL_FIELD_NUMBER = 3;
private int playerLevel_;
/**
* <code>uint32 playerLevel = 3;</code>
* <code>uint32 player_level = 3;</code>
* @return The playerLevel.
*/
@java.lang.Override
@@ -386,10 +390,10 @@ public final class OnlinePlayerInfoOuterClass {
return playerLevel_;
}
public static final int AVATARID_FIELD_NUMBER = 4;
public static final int AVATAR_ID_FIELD_NUMBER = 4;
private int avatarId_;
/**
* <code>uint32 avatarId = 4;</code>
* <code>uint32 avatar_id = 4;</code>
* @return The avatarId.
*/
@java.lang.Override
@@ -397,17 +401,17 @@ public final class OnlinePlayerInfoOuterClass {
return avatarId_;
}
public static final int MPSETTINGTYPE_FIELD_NUMBER = 5;
public static final int MP_SETTING_TYPE_FIELD_NUMBER = 5;
private int mpSettingType_;
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @return The enum numeric value on the wire for mpSettingType.
*/
@java.lang.Override public int getMpSettingTypeValue() {
return mpSettingType_;
}
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @return The mpSettingType.
*/
@java.lang.Override public emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType() {
@@ -416,10 +420,10 @@ public final class OnlinePlayerInfoOuterClass {
return result == null ? emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.UNRECOGNIZED : result;
}
public static final int CURPLAYERNUMINWORLD_FIELD_NUMBER = 6;
public static final int CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER = 6;
private int curPlayerNumInWorld_;
/**
* <code>uint32 curPlayerNumInWorld = 6;</code>
* <code>uint32 cur_player_num_in_world = 6;</code>
* @return The curPlayerNumInWorld.
*/
@java.lang.Override
@@ -427,10 +431,10 @@ public final class OnlinePlayerInfoOuterClass {
return curPlayerNumInWorld_;
}
public static final int WORLDLEVEL_FIELD_NUMBER = 7;
public static final int WORLD_LEVEL_FIELD_NUMBER = 7;
private int worldLevel_;
/**
* <code>uint32 worldLevel = 7;</code>
* <code>uint32 world_level = 7;</code>
* @return The worldLevel.
*/
@java.lang.Override
@@ -438,10 +442,10 @@ public final class OnlinePlayerInfoOuterClass {
return worldLevel_;
}
public static final int ONLINEID_FIELD_NUMBER = 8;
public static final int ONLINE_ID_FIELD_NUMBER = 8;
private volatile java.lang.Object onlineId_;
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @return The onlineId.
*/
@java.lang.Override
@@ -458,7 +462,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @return The bytes for onlineId.
*/
@java.lang.Override
@@ -476,10 +480,10 @@ public final class OnlinePlayerInfoOuterClass {
}
}
public static final int NAMECARDID_FIELD_NUMBER = 9;
public static final int NAME_CARD_ID_FIELD_NUMBER = 9;
private int nameCardId_;
/**
* <code>uint32 nameCardId = 9;</code>
* <code>uint32 name_card_id = 9;</code>
* @return The nameCardId.
*/
@java.lang.Override
@@ -487,10 +491,10 @@ public final class OnlinePlayerInfoOuterClass {
return nameCardId_;
}
public static final int BLACKLISTUIDLIST_FIELD_NUMBER = 10;
public static final int BLACKLIST_UID_LIST_FIELD_NUMBER = 10;
private com.google.protobuf.Internal.IntList blacklistUidList_;
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @return A list containing the blacklistUidList.
*/
@java.lang.Override
@@ -499,14 +503,14 @@ public final class OnlinePlayerInfoOuterClass {
return blacklistUidList_;
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @return The count of blacklistUidList.
*/
public int getBlacklistUidListCount() {
return blacklistUidList_.size();
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @param index The index of the element to return.
* @return The blacklistUidList at the given index.
*/
@@ -553,10 +557,10 @@ public final class OnlinePlayerInfoOuterClass {
}
}
public static final int PROFILEPICTURE_FIELD_NUMBER = 12;
public static final int PROFILE_PICTURE_FIELD_NUMBER = 12;
private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
* @return Whether the profilePicture field is set.
*/
@java.lang.Override
@@ -564,7 +568,7 @@ public final class OnlinePlayerInfoOuterClass {
return profilePicture_ != null;
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
* @return The profilePicture.
*/
@java.lang.Override
@@ -572,17 +576,17 @@ public final class OnlinePlayerInfoOuterClass {
return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
return getProfilePicture();
}
public static final int PSNID_FIELD_NUMBER = 13;
public static final int PSN_ID_FIELD_NUMBER = 13;
private volatile java.lang.Object psnId_;
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @return The psnId.
*/
@java.lang.Override
@@ -599,7 +603,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @return The bytes for psnId.
*/
@java.lang.Override
@@ -800,31 +804,31 @@ public final class OnlinePlayerInfoOuterClass {
hash = (53 * hash) + getUid();
hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
hash = (53 * hash) + getNickname().hashCode();
hash = (37 * hash) + PLAYERLEVEL_FIELD_NUMBER;
hash = (37 * hash) + PLAYER_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getPlayerLevel();
hash = (37 * hash) + AVATARID_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarId();
hash = (37 * hash) + MPSETTINGTYPE_FIELD_NUMBER;
hash = (37 * hash) + MP_SETTING_TYPE_FIELD_NUMBER;
hash = (53 * hash) + mpSettingType_;
hash = (37 * hash) + CURPLAYERNUMINWORLD_FIELD_NUMBER;
hash = (37 * hash) + CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER;
hash = (53 * hash) + getCurPlayerNumInWorld();
hash = (37 * hash) + WORLDLEVEL_FIELD_NUMBER;
hash = (37 * hash) + WORLD_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getWorldLevel();
hash = (37 * hash) + ONLINEID_FIELD_NUMBER;
hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER;
hash = (53 * hash) + getOnlineId().hashCode();
hash = (37 * hash) + NAMECARDID_FIELD_NUMBER;
hash = (37 * hash) + NAME_CARD_ID_FIELD_NUMBER;
hash = (53 * hash) + getNameCardId();
if (getBlacklistUidListCount() > 0) {
hash = (37 * hash) + BLACKLISTUIDLIST_FIELD_NUMBER;
hash = (37 * hash) + BLACKLIST_UID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getBlacklistUidListList().hashCode();
}
hash = (37 * hash) + SIGNATURE_FIELD_NUMBER;
hash = (53 * hash) + getSignature().hashCode();
if (hasProfilePicture()) {
hash = (37 * hash) + PROFILEPICTURE_FIELD_NUMBER;
hash = (37 * hash) + PROFILE_PICTURE_FIELD_NUMBER;
hash = (53 * hash) + getProfilePicture().hashCode();
}
hash = (37 * hash) + PSNID_FIELD_NUMBER;
hash = (37 * hash) + PSN_ID_FIELD_NUMBER;
hash = (53 * hash) + getPsnId().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -922,6 +926,10 @@ public final class OnlinePlayerInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: DFNGPIGNBJJ
* </pre>
*
* Protobuf type {@code OnlinePlayerInfo}
*/
public static final class Builder extends
@@ -1274,7 +1282,7 @@ public final class OnlinePlayerInfoOuterClass {
private int playerLevel_ ;
/**
* <code>uint32 playerLevel = 3;</code>
* <code>uint32 player_level = 3;</code>
* @return The playerLevel.
*/
@java.lang.Override
@@ -1282,7 +1290,7 @@ public final class OnlinePlayerInfoOuterClass {
return playerLevel_;
}
/**
* <code>uint32 playerLevel = 3;</code>
* <code>uint32 player_level = 3;</code>
* @param value The playerLevel to set.
* @return This builder for chaining.
*/
@@ -1293,7 +1301,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>uint32 playerLevel = 3;</code>
* <code>uint32 player_level = 3;</code>
* @return This builder for chaining.
*/
public Builder clearPlayerLevel() {
@@ -1305,7 +1313,7 @@ public final class OnlinePlayerInfoOuterClass {
private int avatarId_ ;
/**
* <code>uint32 avatarId = 4;</code>
* <code>uint32 avatar_id = 4;</code>
* @return The avatarId.
*/
@java.lang.Override
@@ -1313,7 +1321,7 @@ public final class OnlinePlayerInfoOuterClass {
return avatarId_;
}
/**
* <code>uint32 avatarId = 4;</code>
* <code>uint32 avatar_id = 4;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
@@ -1324,7 +1332,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>uint32 avatarId = 4;</code>
* <code>uint32 avatar_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
@@ -1336,14 +1344,14 @@ public final class OnlinePlayerInfoOuterClass {
private int mpSettingType_ = 0;
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @return The enum numeric value on the wire for mpSettingType.
*/
@java.lang.Override public int getMpSettingTypeValue() {
return mpSettingType_;
}
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @param value The enum numeric value on the wire for mpSettingType to set.
* @return This builder for chaining.
*/
@@ -1354,7 +1362,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @return The mpSettingType.
*/
@java.lang.Override
@@ -1364,7 +1372,7 @@ public final class OnlinePlayerInfoOuterClass {
return result == null ? emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.UNRECOGNIZED : result;
}
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @param value The mpSettingType to set.
* @return This builder for chaining.
*/
@@ -1378,7 +1386,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>.MpSettingType mpSettingType = 5;</code>
* <code>.MpSettingType mp_setting_type = 5;</code>
* @return This builder for chaining.
*/
public Builder clearMpSettingType() {
@@ -1390,7 +1398,7 @@ public final class OnlinePlayerInfoOuterClass {
private int curPlayerNumInWorld_ ;
/**
* <code>uint32 curPlayerNumInWorld = 6;</code>
* <code>uint32 cur_player_num_in_world = 6;</code>
* @return The curPlayerNumInWorld.
*/
@java.lang.Override
@@ -1398,7 +1406,7 @@ public final class OnlinePlayerInfoOuterClass {
return curPlayerNumInWorld_;
}
/**
* <code>uint32 curPlayerNumInWorld = 6;</code>
* <code>uint32 cur_player_num_in_world = 6;</code>
* @param value The curPlayerNumInWorld to set.
* @return This builder for chaining.
*/
@@ -1409,7 +1417,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>uint32 curPlayerNumInWorld = 6;</code>
* <code>uint32 cur_player_num_in_world = 6;</code>
* @return This builder for chaining.
*/
public Builder clearCurPlayerNumInWorld() {
@@ -1421,7 +1429,7 @@ public final class OnlinePlayerInfoOuterClass {
private int worldLevel_ ;
/**
* <code>uint32 worldLevel = 7;</code>
* <code>uint32 world_level = 7;</code>
* @return The worldLevel.
*/
@java.lang.Override
@@ -1429,7 +1437,7 @@ public final class OnlinePlayerInfoOuterClass {
return worldLevel_;
}
/**
* <code>uint32 worldLevel = 7;</code>
* <code>uint32 world_level = 7;</code>
* @param value The worldLevel to set.
* @return This builder for chaining.
*/
@@ -1440,7 +1448,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>uint32 worldLevel = 7;</code>
* <code>uint32 world_level = 7;</code>
* @return This builder for chaining.
*/
public Builder clearWorldLevel() {
@@ -1452,7 +1460,7 @@ public final class OnlinePlayerInfoOuterClass {
private java.lang.Object onlineId_ = "";
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @return The onlineId.
*/
public java.lang.String getOnlineId() {
@@ -1468,7 +1476,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @return The bytes for onlineId.
*/
public com.google.protobuf.ByteString
@@ -1485,7 +1493,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @param value The onlineId to set.
* @return This builder for chaining.
*/
@@ -1500,7 +1508,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearOnlineId() {
@@ -1510,7 +1518,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>string onlineId = 8;</code>
* <code>string online_id = 8;</code>
* @param value The bytes for onlineId to set.
* @return This builder for chaining.
*/
@@ -1528,7 +1536,7 @@ public final class OnlinePlayerInfoOuterClass {
private int nameCardId_ ;
/**
* <code>uint32 nameCardId = 9;</code>
* <code>uint32 name_card_id = 9;</code>
* @return The nameCardId.
*/
@java.lang.Override
@@ -1536,7 +1544,7 @@ public final class OnlinePlayerInfoOuterClass {
return nameCardId_;
}
/**
* <code>uint32 nameCardId = 9;</code>
* <code>uint32 name_card_id = 9;</code>
* @param value The nameCardId to set.
* @return This builder for chaining.
*/
@@ -1547,7 +1555,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>uint32 nameCardId = 9;</code>
* <code>uint32 name_card_id = 9;</code>
* @return This builder for chaining.
*/
public Builder clearNameCardId() {
@@ -1565,7 +1573,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @return A list containing the blacklistUidList.
*/
public java.util.List<java.lang.Integer>
@@ -1574,14 +1582,14 @@ public final class OnlinePlayerInfoOuterClass {
java.util.Collections.unmodifiableList(blacklistUidList_) : blacklistUidList_;
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @return The count of blacklistUidList.
*/
public int getBlacklistUidListCount() {
return blacklistUidList_.size();
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @param index The index of the element to return.
* @return The blacklistUidList at the given index.
*/
@@ -1589,7 +1597,7 @@ public final class OnlinePlayerInfoOuterClass {
return blacklistUidList_.getInt(index);
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @param index The index to set the value at.
* @param value The blacklistUidList to set.
* @return This builder for chaining.
@@ -1602,7 +1610,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @param value The blacklistUidList to add.
* @return This builder for chaining.
*/
@@ -1613,7 +1621,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @param values The blacklistUidList to add.
* @return This builder for chaining.
*/
@@ -1626,7 +1634,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 blacklistUidList = 10;</code>
* <code>repeated uint32 blacklist_uid_list = 10;</code>
* @return This builder for chaining.
*/
public Builder clearBlacklistUidList() {
@@ -1716,14 +1724,14 @@ public final class OnlinePlayerInfoOuterClass {
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 profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
* @return Whether the profilePicture field is set.
*/
public boolean hasProfilePicture() {
return profilePictureBuilder_ != null || profilePicture_ != null;
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
* @return The profilePicture.
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() {
@@ -1734,7 +1742,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
public Builder setProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
@@ -1750,7 +1758,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
public Builder setProfilePicture(
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder builderForValue) {
@@ -1764,7 +1772,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
public Builder mergeProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
@@ -1782,7 +1790,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
public Builder clearProfilePicture() {
if (profilePictureBuilder_ == null) {
@@ -1796,7 +1804,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder getProfilePictureBuilder() {
@@ -1804,7 +1812,7 @@ public final class OnlinePlayerInfoOuterClass {
return getProfilePictureFieldBuilder().getBuilder();
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</code>
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
if (profilePictureBuilder_ != null) {
@@ -1815,7 +1823,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>.ProfilePicture profilePicture = 12;</code>
* <code>.ProfilePicture profile_picture = 12;</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>
@@ -1833,7 +1841,7 @@ public final class OnlinePlayerInfoOuterClass {
private java.lang.Object psnId_ = "";
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @return The psnId.
*/
public java.lang.String getPsnId() {
@@ -1849,7 +1857,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @return The bytes for psnId.
*/
public com.google.protobuf.ByteString
@@ -1866,7 +1874,7 @@ public final class OnlinePlayerInfoOuterClass {
}
}
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @param value The psnId to set.
* @return This builder for chaining.
*/
@@ -1881,7 +1889,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearPsnId() {
@@ -1891,7 +1899,7 @@ public final class OnlinePlayerInfoOuterClass {
return this;
}
/**
* <code>string psnId = 13;</code>
* <code>string psn_id = 13;</code>
* @param value The bytes for psnId to set.
* @return This builder for chaining.
*/
@@ -1974,16 +1982,16 @@ public final class OnlinePlayerInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026OnlinePlayerInfo.proto\032\023MpSettingType." +
"proto\032\024ProfilePicture.proto\"\273\002\n\020OnlinePl" +
"proto\032\024ProfilePicture.proto\"\313\002\n\020OnlinePl" +
"ayerInfo\022\013\n\003uid\030\001 \001(\r\022\020\n\010nickname\030\002 \001(\t\022" +
"\023\n\013playerLevel\030\003 \001(\r\022\020\n\010avatarId\030\004 \001(\r\022%" +
"\n\rmpSettingType\030\005 \001(\0162\016.MpSettingType\022\033\n" +
"\023curPlayerNumInWorld\030\006 \001(\r\022\022\n\nworldLevel" +
"\030\007 \001(\r\022\020\n\010onlineId\030\010 \001(\t\022\022\n\nnameCardId\030\t" +
" \001(\r\022\030\n\020blacklistUidList\030\n \003(\r\022\021\n\tsignat" +
"ure\030\013 \001(\t\022\'\n\016profilePicture\030\014 \001(\0132\017.Prof" +
"ilePicture\022\r\n\005psnId\030\r \001(\tB\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
"\024\n\014player_level\030\003 \001(\r\022\021\n\tavatar_id\030\004 \001(\r" +
"\022\'\n\017mp_setting_type\030\005 \001(\0162\016.MpSettingTyp" +
"e\022\037\n\027cur_player_num_in_world\030\006 \001(\r\022\023\n\013wo" +
"rld_level\030\007 \001(\r\022\021\n\tonline_id\030\010 \001(\t\022\024\n\014na" +
"me_card_id\030\t \001(\r\022\032\n\022blacklist_uid_list\030\n" +
" \003(\r\022\021\n\tsignature\030\013 \001(\t\022(\n\017profile_pictu" +
"re\030\014 \001(\0132\017.ProfilePicture\022\016\n\006psn_id\030\r \001(" +
"\tB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,