mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-09 03:13:43 +08:00
Update gc to 3.3 (#1981)
* 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:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+32
-26
@@ -19,17 +19,17 @@ public final class CombineDataNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @return A list containing the combineIdList.
|
||||
*/
|
||||
java.util.List<java.lang.Integer> getCombineIdListList();
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @return The count of combineIdList.
|
||||
*/
|
||||
int getCombineIdListCount();
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The combineIdList at the given index.
|
||||
*/
|
||||
@@ -37,10 +37,13 @@ public final class CombineDataNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 659
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 677;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code CombineDataNotify}
|
||||
@@ -89,7 +92,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 40: {
|
||||
case 56: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
combineIdList_ = newIntList();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -97,7 +100,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
combineIdList_.addInt(input.readUInt32());
|
||||
break;
|
||||
}
|
||||
case 42: {
|
||||
case 58: {
|
||||
int length = input.readRawVarint32();
|
||||
int limit = input.pushLimit(length);
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
|
||||
@@ -145,10 +148,10 @@ public final class CombineDataNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.CombineDataNotifyOuterClass.CombineDataNotify.class, emu.grasscutter.net.proto.CombineDataNotifyOuterClass.CombineDataNotify.Builder.class);
|
||||
}
|
||||
|
||||
public static final int COMBINE_ID_LIST_FIELD_NUMBER = 5;
|
||||
public static final int COMBINE_ID_LIST_FIELD_NUMBER = 7;
|
||||
private com.google.protobuf.Internal.IntList combineIdList_;
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @return A list containing the combineIdList.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -157,14 +160,14 @@ public final class CombineDataNotifyOuterClass {
|
||||
return combineIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @return The count of combineIdList.
|
||||
*/
|
||||
public int getCombineIdListCount() {
|
||||
return combineIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The combineIdList at the given index.
|
||||
*/
|
||||
@@ -189,7 +192,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (getCombineIdListList().size() > 0) {
|
||||
output.writeUInt32NoTag(42);
|
||||
output.writeUInt32NoTag(58);
|
||||
output.writeUInt32NoTag(combineIdListMemoizedSerializedSize);
|
||||
}
|
||||
for (int i = 0; i < combineIdList_.size(); i++) {
|
||||
@@ -347,10 +350,13 @@ public final class CombineDataNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 659
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 677;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code CombineDataNotify}
|
||||
@@ -520,7 +526,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @return A list containing the combineIdList.
|
||||
*/
|
||||
public java.util.List<java.lang.Integer>
|
||||
@@ -529,14 +535,14 @@ public final class CombineDataNotifyOuterClass {
|
||||
java.util.Collections.unmodifiableList(combineIdList_) : combineIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @return The count of combineIdList.
|
||||
*/
|
||||
public int getCombineIdListCount() {
|
||||
return combineIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The combineIdList at the given index.
|
||||
*/
|
||||
@@ -544,7 +550,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
return combineIdList_.getInt(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @param index The index to set the value at.
|
||||
* @param value The combineIdList to set.
|
||||
* @return This builder for chaining.
|
||||
@@ -557,7 +563,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @param value The combineIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -568,7 +574,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @param values The combineIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -581,7 +587,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 combine_id_list = 5;</code>
|
||||
* <code>repeated uint32 combine_id_list = 7;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearCombineIdList() {
|
||||
@@ -658,7 +664,7 @@ public final class CombineDataNotifyOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\027CombineDataNotify.proto\",\n\021CombineData" +
|
||||
"Notify\022\027\n\017combine_id_list\030\005 \003(\rB\033\n\031emu.g" +
|
||||
"Notify\022\027\n\017combine_id_list\030\007 \003(\rB\033\n\031emu.g" +
|
||||
"rasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
|
||||
Reference in New Issue
Block a user