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:
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
@@ -19,31 +19,35 @@ public final class PlayerCompoundMaterialRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* @return Whether the compoundQueData field is set.
* <code>.CompoundQueueData compound_queue_data = 9;</code>
* @return Whether the compoundQueueData field is set.
*/
boolean hasCompoundQueData();
boolean hasCompoundQueueData();
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* @return The compoundQueData.
* <code>.CompoundQueueData compound_queue_data = 9;</code>
* @return The compoundQueueData.
*/
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueData();
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData();
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueDataOrBuilder();
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder();
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 143
* EnetChannelId: 0
* EnetIsReliable: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 175;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code PlayerCompoundMaterialRsp}
@@ -90,24 +94,24 @@ public final class PlayerCompoundMaterialRspOuterClass {
case 0:
done = true;
break;
case 42: {
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder subBuilder = null;
if (compoundQueData_ != null) {
subBuilder = compoundQueData_.toBuilder();
}
compoundQueData_ = input.readMessage(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(compoundQueData_);
compoundQueData_ = subBuilder.buildPartial();
}
break;
}
case 96: {
case 40: {
retcode_ = input.readInt32();
break;
}
case 74: {
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder subBuilder = null;
if (compoundQueueData_ != null) {
subBuilder = compoundQueueData_.toBuilder();
}
compoundQueueData_ = input.readMessage(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(compoundQueueData_);
compoundQueueData_ = subBuilder.buildPartial();
}
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -140,36 +144,36 @@ public final class PlayerCompoundMaterialRspOuterClass {
emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.class, emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.Builder.class);
}
public static final int COMPOUND_QUE_DATA_FIELD_NUMBER = 5;
private emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData compoundQueData_;
public static final int COMPOUND_QUEUE_DATA_FIELD_NUMBER = 9;
private emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData compoundQueueData_;
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* @return Whether the compoundQueData field is set.
* <code>.CompoundQueueData compound_queue_data = 9;</code>
* @return Whether the compoundQueueData field is set.
*/
@java.lang.Override
public boolean hasCompoundQueData() {
return compoundQueData_ != null;
public boolean hasCompoundQueueData() {
return compoundQueueData_ != null;
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* @return The compoundQueData.
* <code>.CompoundQueueData compound_queue_data = 9;</code>
* @return The compoundQueueData.
*/
@java.lang.Override
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueData() {
return compoundQueData_ == null ? emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueData_;
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData() {
return compoundQueueData_ == null ? emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueueData_;
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueDataOrBuilder() {
return getCompoundQueData();
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() {
return getCompoundQueueData();
}
public static final int RETCODE_FIELD_NUMBER = 12;
public static final int RETCODE_FIELD_NUMBER = 5;
private int retcode_;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -191,11 +195,11 @@ public final class PlayerCompoundMaterialRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (compoundQueData_ != null) {
output.writeMessage(5, getCompoundQueData());
}
if (retcode_ != 0) {
output.writeInt32(12, retcode_);
output.writeInt32(5, retcode_);
}
if (compoundQueueData_ != null) {
output.writeMessage(9, getCompoundQueueData());
}
unknownFields.writeTo(output);
}
@@ -206,13 +210,13 @@ public final class PlayerCompoundMaterialRspOuterClass {
if (size != -1) return size;
size = 0;
if (compoundQueData_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getCompoundQueData());
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, retcode_);
.computeInt32Size(5, retcode_);
}
if (compoundQueueData_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(9, getCompoundQueueData());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -229,10 +233,10 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp other = (emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp) obj;
if (hasCompoundQueData() != other.hasCompoundQueData()) return false;
if (hasCompoundQueData()) {
if (!getCompoundQueData()
.equals(other.getCompoundQueData())) return false;
if (hasCompoundQueueData() != other.hasCompoundQueueData()) return false;
if (hasCompoundQueueData()) {
if (!getCompoundQueueData()
.equals(other.getCompoundQueueData())) return false;
}
if (getRetcode()
!= other.getRetcode()) return false;
@@ -247,9 +251,9 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompoundQueData()) {
hash = (37 * hash) + COMPOUND_QUE_DATA_FIELD_NUMBER;
hash = (53 * hash) + getCompoundQueData().hashCode();
if (hasCompoundQueueData()) {
hash = (37 * hash) + COMPOUND_QUEUE_DATA_FIELD_NUMBER;
hash = (53 * hash) + getCompoundQueueData().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
@@ -350,9 +354,13 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
/**
* <pre>
* CmdId: 143
* EnetChannelId: 0
* EnetIsReliable: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 175;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code PlayerCompoundMaterialRsp}
@@ -392,11 +400,11 @@ public final class PlayerCompoundMaterialRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
if (compoundQueDataBuilder_ == null) {
compoundQueData_ = null;
if (compoundQueueDataBuilder_ == null) {
compoundQueueData_ = null;
} else {
compoundQueData_ = null;
compoundQueDataBuilder_ = null;
compoundQueueData_ = null;
compoundQueueDataBuilder_ = null;
}
retcode_ = 0;
@@ -426,10 +434,10 @@ public final class PlayerCompoundMaterialRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp buildPartial() {
emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp result = new emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp(this);
if (compoundQueDataBuilder_ == null) {
result.compoundQueData_ = compoundQueData_;
if (compoundQueueDataBuilder_ == null) {
result.compoundQueueData_ = compoundQueueData_;
} else {
result.compoundQueData_ = compoundQueDataBuilder_.build();
result.compoundQueueData_ = compoundQueueDataBuilder_.build();
}
result.retcode_ = retcode_;
onBuilt();
@@ -480,8 +488,8 @@ public final class PlayerCompoundMaterialRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp other) {
if (other == emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.getDefaultInstance()) return this;
if (other.hasCompoundQueData()) {
mergeCompoundQueData(other.getCompoundQueData());
if (other.hasCompoundQueueData()) {
mergeCompoundQueueData(other.getCompoundQueueData());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
@@ -515,128 +523,128 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
private emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData compoundQueData_;
private emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData compoundQueueData_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> compoundQueDataBuilder_;
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> compoundQueueDataBuilder_;
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* @return Whether the compoundQueData field is set.
* <code>.CompoundQueueData compound_queue_data = 9;</code>
* @return Whether the compoundQueueData field is set.
*/
public boolean hasCompoundQueData() {
return compoundQueDataBuilder_ != null || compoundQueData_ != null;
public boolean hasCompoundQueueData() {
return compoundQueueDataBuilder_ != null || compoundQueueData_ != null;
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* @return The compoundQueData.
* <code>.CompoundQueueData compound_queue_data = 9;</code>
* @return The compoundQueueData.
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueData() {
if (compoundQueDataBuilder_ == null) {
return compoundQueData_ == null ? emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueData_;
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData() {
if (compoundQueueDataBuilder_ == null) {
return compoundQueueData_ == null ? emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueueData_;
} else {
return compoundQueDataBuilder_.getMessage();
return compoundQueueDataBuilder_.getMessage();
}
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
public Builder setCompoundQueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueDataBuilder_ == null) {
public Builder setCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueueDataBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
compoundQueData_ = value;
compoundQueueData_ = value;
onChanged();
} else {
compoundQueDataBuilder_.setMessage(value);
compoundQueueDataBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
public Builder setCompoundQueData(
public Builder setCompoundQueueData(
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) {
if (compoundQueDataBuilder_ == null) {
compoundQueData_ = builderForValue.build();
if (compoundQueueDataBuilder_ == null) {
compoundQueueData_ = builderForValue.build();
onChanged();
} else {
compoundQueDataBuilder_.setMessage(builderForValue.build());
compoundQueueDataBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
public Builder mergeCompoundQueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueDataBuilder_ == null) {
if (compoundQueData_ != null) {
compoundQueData_ =
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.newBuilder(compoundQueData_).mergeFrom(value).buildPartial();
public Builder mergeCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueueDataBuilder_ == null) {
if (compoundQueueData_ != null) {
compoundQueueData_ =
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.newBuilder(compoundQueueData_).mergeFrom(value).buildPartial();
} else {
compoundQueData_ = value;
compoundQueueData_ = value;
}
onChanged();
} else {
compoundQueDataBuilder_.mergeFrom(value);
compoundQueueDataBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
public Builder clearCompoundQueData() {
if (compoundQueDataBuilder_ == null) {
compoundQueData_ = null;
public Builder clearCompoundQueueData() {
if (compoundQueueDataBuilder_ == null) {
compoundQueueData_ = null;
onChanged();
} else {
compoundQueData_ = null;
compoundQueDataBuilder_ = null;
compoundQueueData_ = null;
compoundQueueDataBuilder_ = null;
}
return this;
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder getCompoundQueDataBuilder() {
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder getCompoundQueueDataBuilder() {
onChanged();
return getCompoundQueDataFieldBuilder().getBuilder();
return getCompoundQueueDataFieldBuilder().getBuilder();
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueDataOrBuilder() {
if (compoundQueDataBuilder_ != null) {
return compoundQueDataBuilder_.getMessageOrBuilder();
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() {
if (compoundQueueDataBuilder_ != null) {
return compoundQueueDataBuilder_.getMessageOrBuilder();
} else {
return compoundQueData_ == null ?
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueData_;
return compoundQueueData_ == null ?
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueueData_;
}
}
/**
* <code>.CompoundQueueData compound_que_data = 5;</code>
* <code>.CompoundQueueData compound_queue_data = 9;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder>
getCompoundQueDataFieldBuilder() {
if (compoundQueDataBuilder_ == null) {
compoundQueDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
getCompoundQueueDataFieldBuilder() {
if (compoundQueueDataBuilder_ == null) {
compoundQueueDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder>(
getCompoundQueData(),
getCompoundQueueData(),
getParentForChildren(),
isClean());
compoundQueData_ = null;
compoundQueueData_ = null;
}
return compoundQueDataBuilder_;
return compoundQueueDataBuilder_;
}
private int retcode_ ;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -644,7 +652,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 5;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -655,7 +663,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -732,10 +740,10 @@ public final class PlayerCompoundMaterialRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\037PlayerCompoundMaterialRsp.proto\032\027Compo" +
"undQueueData.proto\"[\n\031PlayerCompoundMate" +
"rialRsp\022-\n\021compound_que_data\030\005 \001(\0132\022.Com" +
"poundQueueData\022\017\n\007retcode\030\014 \001(\005B\033\n\031emu.g" +
"rasscutter.net.protob\006proto3"
"undQueueData.proto\"]\n\031PlayerCompoundMate" +
"rialRsp\022/\n\023compound_queue_data\030\t \001(\0132\022.C" +
"ompoundQueueData\022\017\n\007retcode\030\005 \001(\005B\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -747,7 +755,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
internal_static_PlayerCompoundMaterialRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerCompoundMaterialRsp_descriptor,
new java.lang.String[] { "CompoundQueData", "Retcode", });
new java.lang.String[] { "CompoundQueueData", "Retcode", });
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.getDescriptor();
}