mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 10:33:34 +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
+130
-124
@@ -19,29 +19,32 @@ public final class MusicGameStartRspOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 music_basic_id = 4;</code>
|
||||
* @return The musicBasicId.
|
||||
*/
|
||||
int getMusicBasicId();
|
||||
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* <code>int32 retcode = 12;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getRetcode();
|
||||
|
||||
/**
|
||||
* <code>uint64 music_share_id = 15;</code>
|
||||
* @return The musicShareId.
|
||||
* <code>uint32 music_basic_id = 13;</code>
|
||||
* @return The musicBasicId.
|
||||
*/
|
||||
long getMusicShareId();
|
||||
int getMusicBasicId();
|
||||
|
||||
/**
|
||||
* <code>uint64 ugc_guid = 5;</code>
|
||||
* @return The ugcGuid.
|
||||
*/
|
||||
long getUgcGuid();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 8326
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 8216;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code MusicGameStartRsp}
|
||||
@@ -88,21 +91,21 @@ public final class MusicGameStartRspOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 8: {
|
||||
case 40: {
|
||||
|
||||
ugcGuid_ = input.readUInt64();
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 32: {
|
||||
case 104: {
|
||||
|
||||
musicBasicId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
|
||||
musicShareId_ = input.readUInt64();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -135,21 +138,10 @@ public final class MusicGameStartRspOuterClass {
|
||||
emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.class, emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.Builder.class);
|
||||
}
|
||||
|
||||
public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 4;
|
||||
private int musicBasicId_;
|
||||
/**
|
||||
* <code>uint32 music_basic_id = 4;</code>
|
||||
* @return The musicBasicId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getMusicBasicId() {
|
||||
return musicBasicId_;
|
||||
}
|
||||
|
||||
public static final int RETCODE_FIELD_NUMBER = 1;
|
||||
public static final int RETCODE_FIELD_NUMBER = 12;
|
||||
private int retcode_;
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* <code>int32 retcode = 12;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -157,15 +149,26 @@ public final class MusicGameStartRspOuterClass {
|
||||
return retcode_;
|
||||
}
|
||||
|
||||
public static final int MUSIC_SHARE_ID_FIELD_NUMBER = 15;
|
||||
private long musicShareId_;
|
||||
public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 13;
|
||||
private int musicBasicId_;
|
||||
/**
|
||||
* <code>uint64 music_share_id = 15;</code>
|
||||
* @return The musicShareId.
|
||||
* <code>uint32 music_basic_id = 13;</code>
|
||||
* @return The musicBasicId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getMusicShareId() {
|
||||
return musicShareId_;
|
||||
public int getMusicBasicId() {
|
||||
return musicBasicId_;
|
||||
}
|
||||
|
||||
public static final int UGC_GUID_FIELD_NUMBER = 5;
|
||||
private long ugcGuid_;
|
||||
/**
|
||||
* <code>uint64 ugc_guid = 5;</code>
|
||||
* @return The ugcGuid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getUgcGuid() {
|
||||
return ugcGuid_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@@ -182,14 +185,14 @@ public final class MusicGameStartRspOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (ugcGuid_ != 0L) {
|
||||
output.writeUInt64(5, ugcGuid_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(1, retcode_);
|
||||
output.writeInt32(12, retcode_);
|
||||
}
|
||||
if (musicBasicId_ != 0) {
|
||||
output.writeUInt32(4, musicBasicId_);
|
||||
}
|
||||
if (musicShareId_ != 0L) {
|
||||
output.writeUInt64(15, musicShareId_);
|
||||
output.writeUInt32(13, musicBasicId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -200,17 +203,17 @@ public final class MusicGameStartRspOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (ugcGuid_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(5, ugcGuid_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(1, retcode_);
|
||||
.computeInt32Size(12, retcode_);
|
||||
}
|
||||
if (musicBasicId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(4, musicBasicId_);
|
||||
}
|
||||
if (musicShareId_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(15, musicShareId_);
|
||||
.computeUInt32Size(13, musicBasicId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -227,12 +230,12 @@ public final class MusicGameStartRspOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp other = (emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp) obj;
|
||||
|
||||
if (getMusicBasicId()
|
||||
!= other.getMusicBasicId()) return false;
|
||||
if (getRetcode()
|
||||
!= other.getRetcode()) return false;
|
||||
if (getMusicShareId()
|
||||
!= other.getMusicShareId()) return false;
|
||||
if (getMusicBasicId()
|
||||
!= other.getMusicBasicId()) return false;
|
||||
if (getUgcGuid()
|
||||
!= other.getUgcGuid()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -244,13 +247,13 @@ public final class MusicGameStartRspOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getMusicBasicId();
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
hash = (37 * hash) + MUSIC_SHARE_ID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getMusicBasicId();
|
||||
hash = (37 * hash) + UGC_GUID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getMusicShareId());
|
||||
getUgcGuid());
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -348,10 +351,13 @@ public final class MusicGameStartRspOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 8326
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 8216;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code MusicGameStartRsp}
|
||||
@@ -391,11 +397,11 @@ public final class MusicGameStartRspOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
musicBasicId_ = 0;
|
||||
|
||||
retcode_ = 0;
|
||||
|
||||
musicShareId_ = 0L;
|
||||
musicBasicId_ = 0;
|
||||
|
||||
ugcGuid_ = 0L;
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -423,9 +429,9 @@ public final class MusicGameStartRspOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp buildPartial() {
|
||||
emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp result = new emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp(this);
|
||||
result.musicBasicId_ = musicBasicId_;
|
||||
result.retcode_ = retcode_;
|
||||
result.musicShareId_ = musicShareId_;
|
||||
result.musicBasicId_ = musicBasicId_;
|
||||
result.ugcGuid_ = ugcGuid_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -474,14 +480,14 @@ public final class MusicGameStartRspOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp other) {
|
||||
if (other == emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.getDefaultInstance()) return this;
|
||||
if (other.getMusicBasicId() != 0) {
|
||||
setMusicBasicId(other.getMusicBasicId());
|
||||
}
|
||||
if (other.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
}
|
||||
if (other.getMusicShareId() != 0L) {
|
||||
setMusicShareId(other.getMusicShareId());
|
||||
if (other.getMusicBasicId() != 0) {
|
||||
setMusicBasicId(other.getMusicBasicId());
|
||||
}
|
||||
if (other.getUgcGuid() != 0L) {
|
||||
setUgcGuid(other.getUgcGuid());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
@@ -512,40 +518,9 @@ public final class MusicGameStartRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int musicBasicId_ ;
|
||||
/**
|
||||
* <code>uint32 music_basic_id = 4;</code>
|
||||
* @return The musicBasicId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getMusicBasicId() {
|
||||
return musicBasicId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 music_basic_id = 4;</code>
|
||||
* @param value The musicBasicId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setMusicBasicId(int value) {
|
||||
|
||||
musicBasicId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 music_basic_id = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearMusicBasicId() {
|
||||
|
||||
musicBasicId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int retcode_ ;
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* <code>int32 retcode = 12;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -553,7 +528,7 @@ public final class MusicGameStartRspOuterClass {
|
||||
return retcode_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* <code>int32 retcode = 12;</code>
|
||||
* @param value The retcode to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -564,7 +539,7 @@ public final class MusicGameStartRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* <code>int32 retcode = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearRetcode() {
|
||||
@@ -574,33 +549,64 @@ public final class MusicGameStartRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private long musicShareId_ ;
|
||||
private int musicBasicId_ ;
|
||||
/**
|
||||
* <code>uint64 music_share_id = 15;</code>
|
||||
* @return The musicShareId.
|
||||
* <code>uint32 music_basic_id = 13;</code>
|
||||
* @return The musicBasicId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getMusicShareId() {
|
||||
return musicShareId_;
|
||||
public int getMusicBasicId() {
|
||||
return musicBasicId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 music_share_id = 15;</code>
|
||||
* @param value The musicShareId to set.
|
||||
* <code>uint32 music_basic_id = 13;</code>
|
||||
* @param value The musicBasicId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setMusicShareId(long value) {
|
||||
public Builder setMusicBasicId(int value) {
|
||||
|
||||
musicShareId_ = value;
|
||||
musicBasicId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 music_share_id = 15;</code>
|
||||
* <code>uint32 music_basic_id = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearMusicShareId() {
|
||||
public Builder clearMusicBasicId() {
|
||||
|
||||
musicShareId_ = 0L;
|
||||
musicBasicId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private long ugcGuid_ ;
|
||||
/**
|
||||
* <code>uint64 ugc_guid = 5;</code>
|
||||
* @return The ugcGuid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getUgcGuid() {
|
||||
return ugcGuid_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 ugc_guid = 5;</code>
|
||||
* @param value The ugcGuid to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setUgcGuid(long value) {
|
||||
|
||||
ugcGuid_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 ugc_guid = 5;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearUgcGuid() {
|
||||
|
||||
ugcGuid_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@@ -671,10 +677,10 @@ public final class MusicGameStartRspOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\027MusicGameStartRsp.proto\"T\n\021MusicGameSt" +
|
||||
"artRsp\022\026\n\016music_basic_id\030\004 \001(\r\022\017\n\007retcod" +
|
||||
"e\030\001 \001(\005\022\026\n\016music_share_id\030\017 \001(\004B\033\n\031emu.g" +
|
||||
"rasscutter.net.protob\006proto3"
|
||||
"\n\027MusicGameStartRsp.proto\"N\n\021MusicGameSt" +
|
||||
"artRsp\022\017\n\007retcode\030\014 \001(\005\022\026\n\016music_basic_i" +
|
||||
"d\030\r \001(\r\022\020\n\010ugc_guid\030\005 \001(\004B\033\n\031emu.grasscu" +
|
||||
"tter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -685,7 +691,7 @@ public final class MusicGameStartRspOuterClass {
|
||||
internal_static_MusicGameStartRsp_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_MusicGameStartRsp_descriptor,
|
||||
new java.lang.String[] { "MusicBasicId", "Retcode", "MusicShareId", });
|
||||
new java.lang.String[] { "Retcode", "MusicBasicId", "UgcGuid", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user