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

Update gc to 3.3 (#1981)

Browse Source 
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
+175 -167
View File
@@ -19,40 +19,44 @@ public final class SetUpAvatarTeamReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 team_id = 3;</code>
* <code>uint32 team_id = 13;</code>
* @return The teamId.
*/
int getTeamId();
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @return A list containing the avatarTeamGuidList.
*/
java.util.List<java.lang.Long> getAvatarTeamGuidListList();
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @return The count of avatarTeamGuidList.
*/
int getAvatarTeamGuidListCount();
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
long getAvatarTeamGuidList(int index);
/**
* <code>uint64 cur_avatar_guid = 5;</code>
* @return The curAvatarGuid.
*/
long getCurAvatarGuid();
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @return A list containing the avatarTeamGuidList.
*/
java.util.List<java.lang.Long> getAvatarTeamGuidListList();
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @return The count of avatarTeamGuidList.
*/
int getAvatarTeamGuidListCount();
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
long getAvatarTeamGuidList(int index);
}
/**
* <pre>
* CmdId: 1690
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1713;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code SetUpAvatarTeamReq}
@@ -101,17 +105,17 @@ public final class SetUpAvatarTeamReqOuterClass {
case 0:
done = true;
break;
case 24: {
teamId_ = input.readUInt32();
break;
}
case 40: {
curAvatarGuid_ = input.readUInt64();
break;
}
case 56: {
case 104: {
teamId_ = input.readUInt32();
break;
}
case 112: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarTeamGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000001;
@@ -119,7 +123,7 @@ public final class SetUpAvatarTeamReqOuterClass {
avatarTeamGuidList_.addLong(input.readUInt64());
break;
}
case 58: {
case 114: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -167,10 +171,10 @@ public final class SetUpAvatarTeamReqOuterClass {
emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq.class, emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq.Builder.class);
}
public static final int TEAM_ID_FIELD_NUMBER = 3;
public static final int TEAM_ID_FIELD_NUMBER = 13;
private int teamId_;
/**
* <code>uint32 team_id = 3;</code>
* <code>uint32 team_id = 13;</code>
* @return The teamId.
*/
@java.lang.Override
@@ -178,34 +182,6 @@ public final class SetUpAvatarTeamReqOuterClass {
return teamId_;
}
public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 7;
private com.google.protobuf.Internal.LongList avatarTeamGuidList_;
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @return A list containing the avatarTeamGuidList.
*/
@java.lang.Override
public java.util.List<java.lang.Long>
getAvatarTeamGuidListList() {
return avatarTeamGuidList_;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @return The count of avatarTeamGuidList.
*/
public int getAvatarTeamGuidListCount() {
return avatarTeamGuidList_.size();
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
public long getAvatarTeamGuidList(int index) {
return avatarTeamGuidList_.getLong(index);
}
private int avatarTeamGuidListMemoizedSerializedSize = -1;
public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 5;
private long curAvatarGuid_;
/**
@@ -217,6 +193,34 @@ public final class SetUpAvatarTeamReqOuterClass {
return curAvatarGuid_;
}
public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 14;
private com.google.protobuf.Internal.LongList avatarTeamGuidList_;
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @return A list containing the avatarTeamGuidList.
*/
@java.lang.Override
public java.util.List<java.lang.Long>
getAvatarTeamGuidListList() {
return avatarTeamGuidList_;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @return The count of avatarTeamGuidList.
*/
public int getAvatarTeamGuidListCount() {
return avatarTeamGuidList_.size();
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
public long getAvatarTeamGuidList(int index) {
return avatarTeamGuidList_.getLong(index);
}
private int avatarTeamGuidListMemoizedSerializedSize = -1;
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -232,14 +236,14 @@ public final class SetUpAvatarTeamReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (teamId_ != 0) {
output.writeUInt32(3, teamId_);
}
if (curAvatarGuid_ != 0L) {
output.writeUInt64(5, curAvatarGuid_);
}
if (teamId_ != 0) {
output.writeUInt32(13, teamId_);
}
if (getAvatarTeamGuidListList().size() > 0) {
output.writeUInt32NoTag(58);
output.writeUInt32NoTag(114);
output.writeUInt32NoTag(avatarTeamGuidListMemoizedSerializedSize);
}
for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
@@ -254,14 +258,14 @@ public final class SetUpAvatarTeamReqOuterClass {
if (size != -1) return size;
size = 0;
if (teamId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, teamId_);
}
if (curAvatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(5, curAvatarGuid_);
}
if (teamId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, teamId_);
}
{
int dataSize = 0;
for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
@@ -293,10 +297,10 @@ public final class SetUpAvatarTeamReqOuterClass {
if (getTeamId()
!= other.getTeamId()) return false;
if (!getAvatarTeamGuidListList()
.equals(other.getAvatarTeamGuidListList())) return false;
if (getCurAvatarGuid()
!= other.getCurAvatarGuid()) return false;
if (!getAvatarTeamGuidListList()
.equals(other.getAvatarTeamGuidListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -310,13 +314,13 @@ public final class SetUpAvatarTeamReqOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TEAM_ID_FIELD_NUMBER;
hash = (53 * hash) + getTeamId();
hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCurAvatarGuid());
if (getAvatarTeamGuidListCount() > 0) {
hash = (37 * hash) + AVATAR_TEAM_GUID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getAvatarTeamGuidListList().hashCode();
}
hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCurAvatarGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -414,10 +418,14 @@ public final class SetUpAvatarTeamReqOuterClass {
}
/**
* <pre>
* CmdId: 1690
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1713;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code SetUpAvatarTeamReq}
@@ -459,10 +467,10 @@ public final class SetUpAvatarTeamReqOuterClass {
super.clear();
teamId_ = 0;
avatarTeamGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
curAvatarGuid_ = 0L;
avatarTeamGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -491,12 +499,12 @@ public final class SetUpAvatarTeamReqOuterClass {
emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq result = new emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq(this);
int from_bitField0_ = bitField0_;
result.teamId_ = teamId_;
result.curAvatarGuid_ = curAvatarGuid_;
if (((bitField0_ & 0x00000001) != 0)) {
avatarTeamGuidList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.avatarTeamGuidList_ = avatarTeamGuidList_;
result.curAvatarGuid_ = curAvatarGuid_;
onBuilt();
return result;
}
@@ -548,6 +556,9 @@ public final class SetUpAvatarTeamReqOuterClass {
if (other.getTeamId() != 0) {
setTeamId(other.getTeamId());
}
if (other.getCurAvatarGuid() != 0L) {
setCurAvatarGuid(other.getCurAvatarGuid());
}
if (!other.avatarTeamGuidList_.isEmpty()) {
if (avatarTeamGuidList_.isEmpty()) {
avatarTeamGuidList_ = other.avatarTeamGuidList_;
@@ -558,9 +569,6 @@ public final class SetUpAvatarTeamReqOuterClass {
}
onChanged();
}
if (other.getCurAvatarGuid() != 0L) {
setCurAvatarGuid(other.getCurAvatarGuid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -593,7 +601,7 @@ public final class SetUpAvatarTeamReqOuterClass {
private int teamId_ ;
/**
* <code>uint32 team_id = 3;</code>
* <code>uint32 team_id = 13;</code>
* @return The teamId.
*/
@java.lang.Override
@@ -601,7 +609,7 @@ public final class SetUpAvatarTeamReqOuterClass {
return teamId_;
}
/**
* <code>uint32 team_id = 3;</code>
* <code>uint32 team_id = 13;</code>
* @param value The teamId to set.
* @return This builder for chaining.
*/
@@ -612,7 +620,7 @@ public final class SetUpAvatarTeamReqOuterClass {
return this;
}
/**
* <code>uint32 team_id = 3;</code>
* <code>uint32 team_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearTeamId() {
@@ -622,85 +630,6 @@ public final class SetUpAvatarTeamReqOuterClass {
return this;
}
private com.google.protobuf.Internal.LongList avatarTeamGuidList_ = emptyLongList();
private void ensureAvatarTeamGuidListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
avatarTeamGuidList_ = mutableCopy(avatarTeamGuidList_);
bitField0_ |= 0x00000001;
}
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @return A list containing the avatarTeamGuidList.
*/
public java.util.List<java.lang.Long>
getAvatarTeamGuidListList() {
return ((bitField0_ & 0x00000001) != 0) ?
java.util.Collections.unmodifiableList(avatarTeamGuidList_) : avatarTeamGuidList_;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @return The count of avatarTeamGuidList.
*/
public int getAvatarTeamGuidListCount() {
return avatarTeamGuidList_.size();
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
public long getAvatarTeamGuidList(int index) {
return avatarTeamGuidList_.getLong(index);
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @param index The index to set the value at.
* @param value The avatarTeamGuidList to set.
* @return This builder for chaining.
*/
public Builder setAvatarTeamGuidList(
int index, long value) {
ensureAvatarTeamGuidListIsMutable();
avatarTeamGuidList_.setLong(index, value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @param value The avatarTeamGuidList to add.
* @return This builder for chaining.
*/
public Builder addAvatarTeamGuidList(long value) {
ensureAvatarTeamGuidListIsMutable();
avatarTeamGuidList_.addLong(value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @param values The avatarTeamGuidList to add.
* @return This builder for chaining.
*/
public Builder addAllAvatarTeamGuidList(
java.lang.Iterable<? extends java.lang.Long> values) {
ensureAvatarTeamGuidListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, avatarTeamGuidList_);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 7;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarTeamGuidList() {
avatarTeamGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
return this;
}
private long curAvatarGuid_ ;
/**
* <code>uint64 cur_avatar_guid = 5;</code>
@@ -731,6 +660,85 @@ public final class SetUpAvatarTeamReqOuterClass {
onChanged();
return this;
}
private com.google.protobuf.Internal.LongList avatarTeamGuidList_ = emptyLongList();
private void ensureAvatarTeamGuidListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
avatarTeamGuidList_ = mutableCopy(avatarTeamGuidList_);
bitField0_ |= 0x00000001;
}
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @return A list containing the avatarTeamGuidList.
*/
public java.util.List<java.lang.Long>
getAvatarTeamGuidListList() {
return ((bitField0_ & 0x00000001) != 0) ?
java.util.Collections.unmodifiableList(avatarTeamGuidList_) : avatarTeamGuidList_;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @return The count of avatarTeamGuidList.
*/
public int getAvatarTeamGuidListCount() {
return avatarTeamGuidList_.size();
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarTeamGuidList at the given index.
*/
public long getAvatarTeamGuidList(int index) {
return avatarTeamGuidList_.getLong(index);
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @param index The index to set the value at.
* @param value The avatarTeamGuidList to set.
* @return This builder for chaining.
*/
public Builder setAvatarTeamGuidList(
int index, long value) {
ensureAvatarTeamGuidListIsMutable();
avatarTeamGuidList_.setLong(index, value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @param value The avatarTeamGuidList to add.
* @return This builder for chaining.
*/
public Builder addAvatarTeamGuidList(long value) {
ensureAvatarTeamGuidListIsMutable();
avatarTeamGuidList_.addLong(value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @param values The avatarTeamGuidList to add.
* @return This builder for chaining.
*/
public Builder addAllAvatarTeamGuidList(
java.lang.Iterable<? extends java.lang.Long> values) {
ensureAvatarTeamGuidListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, avatarTeamGuidList_);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_team_guid_list = 14;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarTeamGuidList() {
avatarTeamGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -799,8 +807,8 @@ public final class SetUpAvatarTeamReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\030SetUpAvatarTeamReq.proto\"]\n\022SetUpAvata" +
"rTeamReq\022\017\n\007team_id\030\003 \001(\r\022\035\n\025avatar_team" +
"_guid_list\030\007 \003(\004\022\027\n\017cur_avatar_guid\030\005 \001(" +
"rTeamReq\022\017\n\007team_id\030\r \001(\r\022\027\n\017cur_avatar_" +
"guid\030\005 \001(\004\022\035\n\025avatar_team_guid_list\030\016 \003(" +
"\004B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -812,7 +820,7 @@ public final class SetUpAvatarTeamReqOuterClass {
internal_static_SetUpAvatarTeamReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SetUpAvatarTeamReq_descriptor,
new java.lang.String[] { "TeamId", "AvatarTeamGuidList", "CurAvatarGuid", });
new java.lang.String[] { "TeamId", "CurAvatarGuid", "AvatarTeamGuidList", });
}
// @@protoc_insertion_point(outer_class_scope)