mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-28 11:40:02 +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
+133
-127
@@ -19,29 +19,32 @@ public final class TakeoffEquipRspOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 9;</code>
|
||||
* @return The avatarGuid.
|
||||
* <code>uint32 slot = 3;</code>
|
||||
* @return The slot.
|
||||
*/
|
||||
long getAvatarGuid();
|
||||
int getSlot();
|
||||
|
||||
/**
|
||||
* <code>int32 retcode = 6;</code>
|
||||
* <code>int32 retcode = 10;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getRetcode();
|
||||
|
||||
/**
|
||||
* <code>uint32 slot = 10;</code>
|
||||
* @return The slot.
|
||||
* <code>uint64 avatar_guid = 7;</code>
|
||||
* @return The avatarGuid.
|
||||
*/
|
||||
int getSlot();
|
||||
long getAvatarGuid();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 682
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 690;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code TakeoffEquipRsp}
|
||||
@@ -88,19 +91,19 @@ public final class TakeoffEquipRspOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 48: {
|
||||
case 24: {
|
||||
|
||||
retcode_ = input.readInt32();
|
||||
slot_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 72: {
|
||||
case 56: {
|
||||
|
||||
avatarGuid_ = input.readUInt64();
|
||||
break;
|
||||
}
|
||||
case 80: {
|
||||
|
||||
slot_ = input.readUInt32();
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -135,21 +138,21 @@ public final class TakeoffEquipRspOuterClass {
|
||||
emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp.class, emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp.Builder.class);
|
||||
}
|
||||
|
||||
public static final int AVATAR_GUID_FIELD_NUMBER = 9;
|
||||
private long avatarGuid_;
|
||||
public static final int SLOT_FIELD_NUMBER = 3;
|
||||
private int slot_;
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 9;</code>
|
||||
* @return The avatarGuid.
|
||||
* <code>uint32 slot = 3;</code>
|
||||
* @return The slot.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getAvatarGuid() {
|
||||
return avatarGuid_;
|
||||
public int getSlot() {
|
||||
return slot_;
|
||||
}
|
||||
|
||||
public static final int RETCODE_FIELD_NUMBER = 6;
|
||||
public static final int RETCODE_FIELD_NUMBER = 10;
|
||||
private int retcode_;
|
||||
/**
|
||||
* <code>int32 retcode = 6;</code>
|
||||
* <code>int32 retcode = 10;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -157,15 +160,15 @@ public final class TakeoffEquipRspOuterClass {
|
||||
return retcode_;
|
||||
}
|
||||
|
||||
public static final int SLOT_FIELD_NUMBER = 10;
|
||||
private int slot_;
|
||||
public static final int AVATAR_GUID_FIELD_NUMBER = 7;
|
||||
private long avatarGuid_;
|
||||
/**
|
||||
* <code>uint32 slot = 10;</code>
|
||||
* @return The slot.
|
||||
* <code>uint64 avatar_guid = 7;</code>
|
||||
* @return The avatarGuid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getSlot() {
|
||||
return slot_;
|
||||
public long getAvatarGuid() {
|
||||
return avatarGuid_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@@ -182,14 +185,14 @@ public final class TakeoffEquipRspOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(6, retcode_);
|
||||
if (slot_ != 0) {
|
||||
output.writeUInt32(3, slot_);
|
||||
}
|
||||
if (avatarGuid_ != 0L) {
|
||||
output.writeUInt64(9, avatarGuid_);
|
||||
output.writeUInt64(7, avatarGuid_);
|
||||
}
|
||||
if (slot_ != 0) {
|
||||
output.writeUInt32(10, slot_);
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(10, retcode_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -200,17 +203,17 @@ public final class TakeoffEquipRspOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (retcode_ != 0) {
|
||||
if (slot_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(6, retcode_);
|
||||
.computeUInt32Size(3, slot_);
|
||||
}
|
||||
if (avatarGuid_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(9, avatarGuid_);
|
||||
.computeUInt64Size(7, avatarGuid_);
|
||||
}
|
||||
if (slot_ != 0) {
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(10, slot_);
|
||||
.computeInt32Size(10, retcode_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -227,12 +230,12 @@ public final class TakeoffEquipRspOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp other = (emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp) obj;
|
||||
|
||||
if (getAvatarGuid()
|
||||
!= other.getAvatarGuid()) return false;
|
||||
if (getRetcode()
|
||||
!= other.getRetcode()) return false;
|
||||
if (getSlot()
|
||||
!= other.getSlot()) return false;
|
||||
if (getRetcode()
|
||||
!= other.getRetcode()) return false;
|
||||
if (getAvatarGuid()
|
||||
!= other.getAvatarGuid()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -244,13 +247,13 @@ public final class TakeoffEquipRspOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + SLOT_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getSlot();
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getAvatarGuid());
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
hash = (37 * hash) + SLOT_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getSlot();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -348,10 +351,13 @@ public final class TakeoffEquipRspOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 682
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 690;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code TakeoffEquipRsp}
|
||||
@@ -391,11 +397,11 @@ public final class TakeoffEquipRspOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
avatarGuid_ = 0L;
|
||||
slot_ = 0;
|
||||
|
||||
retcode_ = 0;
|
||||
|
||||
slot_ = 0;
|
||||
avatarGuid_ = 0L;
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -423,9 +429,9 @@ public final class TakeoffEquipRspOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp buildPartial() {
|
||||
emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp result = new emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp(this);
|
||||
result.avatarGuid_ = avatarGuid_;
|
||||
result.retcode_ = retcode_;
|
||||
result.slot_ = slot_;
|
||||
result.retcode_ = retcode_;
|
||||
result.avatarGuid_ = avatarGuid_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -474,14 +480,14 @@ public final class TakeoffEquipRspOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp other) {
|
||||
if (other == emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp.getDefaultInstance()) return this;
|
||||
if (other.getAvatarGuid() != 0L) {
|
||||
setAvatarGuid(other.getAvatarGuid());
|
||||
if (other.getSlot() != 0) {
|
||||
setSlot(other.getSlot());
|
||||
}
|
||||
if (other.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
}
|
||||
if (other.getSlot() != 0) {
|
||||
setSlot(other.getSlot());
|
||||
if (other.getAvatarGuid() != 0L) {
|
||||
setAvatarGuid(other.getAvatarGuid());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
@@ -512,71 +518,9 @@ public final class TakeoffEquipRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private long avatarGuid_ ;
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 9;</code>
|
||||
* @return The avatarGuid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getAvatarGuid() {
|
||||
return avatarGuid_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 9;</code>
|
||||
* @param value The avatarGuid to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setAvatarGuid(long value) {
|
||||
|
||||
avatarGuid_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 9;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarGuid() {
|
||||
|
||||
avatarGuid_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int retcode_ ;
|
||||
/**
|
||||
* <code>int32 retcode = 6;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getRetcode() {
|
||||
return retcode_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 6;</code>
|
||||
* @param value The retcode to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setRetcode(int value) {
|
||||
|
||||
retcode_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearRetcode() {
|
||||
|
||||
retcode_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int slot_ ;
|
||||
/**
|
||||
* <code>uint32 slot = 10;</code>
|
||||
* <code>uint32 slot = 3;</code>
|
||||
* @return The slot.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -584,7 +528,7 @@ public final class TakeoffEquipRspOuterClass {
|
||||
return slot_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 slot = 10;</code>
|
||||
* <code>uint32 slot = 3;</code>
|
||||
* @param value The slot to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -595,7 +539,7 @@ public final class TakeoffEquipRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 slot = 10;</code>
|
||||
* <code>uint32 slot = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearSlot() {
|
||||
@@ -604,6 +548,68 @@ public final class TakeoffEquipRspOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int retcode_ ;
|
||||
/**
|
||||
* <code>int32 retcode = 10;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getRetcode() {
|
||||
return retcode_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 10;</code>
|
||||
* @param value The retcode to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setRetcode(int value) {
|
||||
|
||||
retcode_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearRetcode() {
|
||||
|
||||
retcode_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private long avatarGuid_ ;
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 7;</code>
|
||||
* @return The avatarGuid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getAvatarGuid() {
|
||||
return avatarGuid_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 7;</code>
|
||||
* @param value The avatarGuid to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setAvatarGuid(long value) {
|
||||
|
||||
avatarGuid_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 7;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarGuid() {
|
||||
|
||||
avatarGuid_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -672,8 +678,8 @@ public final class TakeoffEquipRspOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\025TakeoffEquipRsp.proto\"E\n\017TakeoffEquipR" +
|
||||
"sp\022\023\n\013avatar_guid\030\t \001(\004\022\017\n\007retcode\030\006 \001(\005" +
|
||||
"\022\014\n\004slot\030\n \001(\rB\033\n\031emu.grasscutter.net.pr" +
|
||||
"sp\022\014\n\004slot\030\003 \001(\r\022\017\n\007retcode\030\n \001(\005\022\023\n\013ava" +
|
||||
"tar_guid\030\007 \001(\004B\033\n\031emu.grasscutter.net.pr" +
|
||||
"otob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -685,7 +691,7 @@ public final class TakeoffEquipRspOuterClass {
|
||||
internal_static_TakeoffEquipRsp_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_TakeoffEquipRsp_descriptor,
|
||||
new java.lang.String[] { "AvatarGuid", "Retcode", "Slot", });
|
||||
new java.lang.String[] { "Slot", "Retcode", "AvatarGuid", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user