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,47 +19,51 @@ public final class DoGachaReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 gacha_times = 10;</code>
* @return The gachaTimes.
* <code>string gacha_tag = 14;</code>
* @return The gachaTag.
*/
int getGachaTimes();
java.lang.String getGachaTag();
/**
* <code>string gacha_tag = 14;</code>
* @return The bytes for gachaTag.
*/
com.google.protobuf.ByteString
getGachaTagBytes();
/**
* <code>uint32 gacha_schedule_id = 7;</code>
* <code>uint32 gacha_schedule_id = 6;</code>
* @return The gachaScheduleId.
*/
int getGachaScheduleId();
/**
* <code>uint32 gacha_type = 14;</code>
* <code>uint32 gacha_type = 1;</code>
* @return The gachaType.
*/
int getGachaType();
/**
* <code>uint32 gacha_random = 13;</code>
* <code>uint32 gacha_random = 9;</code>
* @return The gachaRandom.
*/
int getGachaRandom();
/**
* <code>string gacha_tag = 4;</code>
* @return The gachaTag.
* <code>uint32 gacha_times = 3;</code>
* @return The gachaTimes.
*/
java.lang.String getGachaTag();
/**
* <code>string gacha_tag = 4;</code>
* @return The bytes for gachaTag.
*/
com.google.protobuf.ByteString
getGachaTagBytes();
int getGachaTimes();
}
/**
* <pre>
* CmdId: 1512
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1556;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code DoGachaReq}
@@ -107,30 +111,30 @@ public final class DoGachaReqOuterClass {
case 0:
done = true;
break;
case 34: {
java.lang.String s = input.readStringRequireUtf8();
case 8: {
gachaTag_ = s;
gachaType_ = input.readUInt32();
break;
}
case 56: {
gachaScheduleId_ = input.readUInt32();
break;
}
case 80: {
case 24: {
gachaTimes_ = input.readUInt32();
break;
}
case 104: {
case 48: {
gachaScheduleId_ = input.readUInt32();
break;
}
case 72: {
gachaRandom_ = input.readUInt32();
break;
}
case 112: {
case 114: {
java.lang.String s = input.readStringRequireUtf8();
gachaType_ = input.readUInt32();
gachaTag_ = s;
break;
}
default: {
@@ -165,54 +169,10 @@ public final class DoGachaReqOuterClass {
emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq.class, emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq.Builder.class);
}
public static final int GACHA_TIMES_FIELD_NUMBER = 10;
private int gachaTimes_;
/**
* <code>uint32 gacha_times = 10;</code>
* @return The gachaTimes.
*/
@java.lang.Override
public int getGachaTimes() {
return gachaTimes_;
}
public static final int GACHA_SCHEDULE_ID_FIELD_NUMBER = 7;
private int gachaScheduleId_;
/**
* <code>uint32 gacha_schedule_id = 7;</code>
* @return The gachaScheduleId.
*/
@java.lang.Override
public int getGachaScheduleId() {
return gachaScheduleId_;
}
public static final int GACHA_TYPE_FIELD_NUMBER = 14;
private int gachaType_;
/**
* <code>uint32 gacha_type = 14;</code>
* @return The gachaType.
*/
@java.lang.Override
public int getGachaType() {
return gachaType_;
}
public static final int GACHA_RANDOM_FIELD_NUMBER = 13;
private int gachaRandom_;
/**
* <code>uint32 gacha_random = 13;</code>
* @return The gachaRandom.
*/
@java.lang.Override
public int getGachaRandom() {
return gachaRandom_;
}
public static final int GACHA_TAG_FIELD_NUMBER = 4;
public static final int GACHA_TAG_FIELD_NUMBER = 14;
private volatile java.lang.Object gachaTag_;
/**
* <code>string gacha_tag = 4;</code>
* <code>string gacha_tag = 14;</code>
* @return The gachaTag.
*/
@java.lang.Override
@@ -229,7 +189,7 @@ public final class DoGachaReqOuterClass {
}
}
/**
* <code>string gacha_tag = 4;</code>
* <code>string gacha_tag = 14;</code>
* @return The bytes for gachaTag.
*/
@java.lang.Override
@@ -247,6 +207,50 @@ public final class DoGachaReqOuterClass {
}
}
public static final int GACHA_SCHEDULE_ID_FIELD_NUMBER = 6;
private int gachaScheduleId_;
/**
* <code>uint32 gacha_schedule_id = 6;</code>
* @return The gachaScheduleId.
*/
@java.lang.Override
public int getGachaScheduleId() {
return gachaScheduleId_;
}
public static final int GACHA_TYPE_FIELD_NUMBER = 1;
private int gachaType_;
/**
* <code>uint32 gacha_type = 1;</code>
* @return The gachaType.
*/
@java.lang.Override
public int getGachaType() {
return gachaType_;
}
public static final int GACHA_RANDOM_FIELD_NUMBER = 9;
private int gachaRandom_;
/**
* <code>uint32 gacha_random = 9;</code>
* @return The gachaRandom.
*/
@java.lang.Override
public int getGachaRandom() {
return gachaRandom_;
}
public static final int GACHA_TIMES_FIELD_NUMBER = 3;
private int gachaTimes_;
/**
* <code>uint32 gacha_times = 3;</code>
* @return The gachaTimes.
*/
@java.lang.Override
public int getGachaTimes() {
return gachaTimes_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -261,20 +265,20 @@ public final class DoGachaReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaTag_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, gachaTag_);
}
if (gachaScheduleId_ != 0) {
output.writeUInt32(7, gachaScheduleId_);
if (gachaType_ != 0) {
output.writeUInt32(1, gachaType_);
}
if (gachaTimes_ != 0) {
output.writeUInt32(10, gachaTimes_);
output.writeUInt32(3, gachaTimes_);
}
if (gachaScheduleId_ != 0) {
output.writeUInt32(6, gachaScheduleId_);
}
if (gachaRandom_ != 0) {
output.writeUInt32(13, gachaRandom_);
output.writeUInt32(9, gachaRandom_);
}
if (gachaType_ != 0) {
output.writeUInt32(14, gachaType_);
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaTag_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 14, gachaTag_);
}
unknownFields.writeTo(output);
}
@@ -285,24 +289,24 @@ public final class DoGachaReqOuterClass {
if (size != -1) return size;
size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaTag_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, gachaTag_);
}
if (gachaScheduleId_ != 0) {
if (gachaType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, gachaScheduleId_);
.computeUInt32Size(1, gachaType_);
}
if (gachaTimes_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, gachaTimes_);
.computeUInt32Size(3, gachaTimes_);
}
if (gachaScheduleId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, gachaScheduleId_);
}
if (gachaRandom_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, gachaRandom_);
.computeUInt32Size(9, gachaRandom_);
}
if (gachaType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, gachaType_);
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaTag_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, gachaTag_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -319,16 +323,16 @@ public final class DoGachaReqOuterClass {
}
emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq other = (emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq) obj;
if (getGachaTimes()
!= other.getGachaTimes()) return false;
if (!getGachaTag()
.equals(other.getGachaTag())) return false;
if (getGachaScheduleId()
!= other.getGachaScheduleId()) return false;
if (getGachaType()
!= other.getGachaType()) return false;
if (getGachaRandom()
!= other.getGachaRandom()) return false;
if (!getGachaTag()
.equals(other.getGachaTag())) return false;
if (getGachaTimes()
!= other.getGachaTimes()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -340,16 +344,16 @@ public final class DoGachaReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + GACHA_TIMES_FIELD_NUMBER;
hash = (53 * hash) + getGachaTimes();
hash = (37 * hash) + GACHA_TAG_FIELD_NUMBER;
hash = (53 * hash) + getGachaTag().hashCode();
hash = (37 * hash) + GACHA_SCHEDULE_ID_FIELD_NUMBER;
hash = (53 * hash) + getGachaScheduleId();
hash = (37 * hash) + GACHA_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getGachaType();
hash = (37 * hash) + GACHA_RANDOM_FIELD_NUMBER;
hash = (53 * hash) + getGachaRandom();
hash = (37 * hash) + GACHA_TAG_FIELD_NUMBER;
hash = (53 * hash) + getGachaTag().hashCode();
hash = (37 * hash) + GACHA_TIMES_FIELD_NUMBER;
hash = (53 * hash) + getGachaTimes();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -447,10 +451,14 @@ public final class DoGachaReqOuterClass {
}
/**
* <pre>
* CmdId: 1512
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1556;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code DoGachaReq}
@@ -490,7 +498,7 @@ public final class DoGachaReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
gachaTimes_ = 0;
gachaTag_ = "";
gachaScheduleId_ = 0;
@@ -498,7 +506,7 @@ public final class DoGachaReqOuterClass {
gachaRandom_ = 0;
gachaTag_ = "";
gachaTimes_ = 0;
return this;
}
@@ -526,11 +534,11 @@ public final class DoGachaReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq buildPartial() {
emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq result = new emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq(this);
result.gachaTimes_ = gachaTimes_;
result.gachaTag_ = gachaTag_;
result.gachaScheduleId_ = gachaScheduleId_;
result.gachaType_ = gachaType_;
result.gachaRandom_ = gachaRandom_;
result.gachaTag_ = gachaTag_;
result.gachaTimes_ = gachaTimes_;
onBuilt();
return result;
}
@@ -579,8 +587,9 @@ public final class DoGachaReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq other) {
if (other == emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq.getDefaultInstance()) return this;
if (other.getGachaTimes() != 0) {
setGachaTimes(other.getGachaTimes());
if (!other.getGachaTag().isEmpty()) {
gachaTag_ = other.gachaTag_;
onChanged();
}
if (other.getGachaScheduleId() != 0) {
setGachaScheduleId(other.getGachaScheduleId());
@@ -591,9 +600,8 @@ public final class DoGachaReqOuterClass {
if (other.getGachaRandom() != 0) {
setGachaRandom(other.getGachaRandom());
}
if (!other.getGachaTag().isEmpty()) {
gachaTag_ = other.gachaTag_;
onChanged();
if (other.getGachaTimes() != 0) {
setGachaTimes(other.getGachaTimes());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -624,133 +632,9 @@ public final class DoGachaReqOuterClass {
return this;
}
private int gachaTimes_ ;
/**
* <code>uint32 gacha_times = 10;</code>
* @return The gachaTimes.
*/
@java.lang.Override
public int getGachaTimes() {
return gachaTimes_;
}
/**
* <code>uint32 gacha_times = 10;</code>
* @param value The gachaTimes to set.
* @return This builder for chaining.
*/
public Builder setGachaTimes(int value) {
gachaTimes_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_times = 10;</code>
* @return This builder for chaining.
*/
public Builder clearGachaTimes() {
gachaTimes_ = 0;
onChanged();
return this;
}
private int gachaScheduleId_ ;
/**
* <code>uint32 gacha_schedule_id = 7;</code>
* @return The gachaScheduleId.
*/
@java.lang.Override
public int getGachaScheduleId() {
return gachaScheduleId_;
}
/**
* <code>uint32 gacha_schedule_id = 7;</code>
* @param value The gachaScheduleId to set.
* @return This builder for chaining.
*/
public Builder setGachaScheduleId(int value) {
gachaScheduleId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_schedule_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearGachaScheduleId() {
gachaScheduleId_ = 0;
onChanged();
return this;
}
private int gachaType_ ;
/**
* <code>uint32 gacha_type = 14;</code>
* @return The gachaType.
*/
@java.lang.Override
public int getGachaType() {
return gachaType_;
}
/**
* <code>uint32 gacha_type = 14;</code>
* @param value The gachaType to set.
* @return This builder for chaining.
*/
public Builder setGachaType(int value) {
gachaType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_type = 14;</code>
* @return This builder for chaining.
*/
public Builder clearGachaType() {
gachaType_ = 0;
onChanged();
return this;
}
private int gachaRandom_ ;
/**
* <code>uint32 gacha_random = 13;</code>
* @return The gachaRandom.
*/
@java.lang.Override
public int getGachaRandom() {
return gachaRandom_;
}
/**
* <code>uint32 gacha_random = 13;</code>
* @param value The gachaRandom to set.
* @return This builder for chaining.
*/
public Builder setGachaRandom(int value) {
gachaRandom_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_random = 13;</code>
* @return This builder for chaining.
*/
public Builder clearGachaRandom() {
gachaRandom_ = 0;
onChanged();
return this;
}
private java.lang.Object gachaTag_ = "";
/**
* <code>string gacha_tag = 4;</code>
* <code>string gacha_tag = 14;</code>
* @return The gachaTag.
*/
public java.lang.String getGachaTag() {
@@ -766,7 +650,7 @@ public final class DoGachaReqOuterClass {
}
}
/**
* <code>string gacha_tag = 4;</code>
* <code>string gacha_tag = 14;</code>
* @return The bytes for gachaTag.
*/
public com.google.protobuf.ByteString
@@ -783,7 +667,7 @@ public final class DoGachaReqOuterClass {
}
}
/**
* <code>string gacha_tag = 4;</code>
* <code>string gacha_tag = 14;</code>
* @param value The gachaTag to set.
* @return This builder for chaining.
*/
@@ -798,7 +682,7 @@ public final class DoGachaReqOuterClass {
return this;
}
/**
* <code>string gacha_tag = 4;</code>
* <code>string gacha_tag = 14;</code>
* @return This builder for chaining.
*/
public Builder clearGachaTag() {
@@ -808,7 +692,7 @@ public final class DoGachaReqOuterClass {
return this;
}
/**
* <code>string gacha_tag = 4;</code>
* <code>string gacha_tag = 14;</code>
* @param value The bytes for gachaTag to set.
* @return This builder for chaining.
*/
@@ -823,6 +707,130 @@ public final class DoGachaReqOuterClass {
onChanged();
return this;
}
private int gachaScheduleId_ ;
/**
* <code>uint32 gacha_schedule_id = 6;</code>
* @return The gachaScheduleId.
*/
@java.lang.Override
public int getGachaScheduleId() {
return gachaScheduleId_;
}
/**
* <code>uint32 gacha_schedule_id = 6;</code>
* @param value The gachaScheduleId to set.
* @return This builder for chaining.
*/
public Builder setGachaScheduleId(int value) {
gachaScheduleId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_schedule_id = 6;</code>
* @return This builder for chaining.
*/
public Builder clearGachaScheduleId() {
gachaScheduleId_ = 0;
onChanged();
return this;
}
private int gachaType_ ;
/**
* <code>uint32 gacha_type = 1;</code>
* @return The gachaType.
*/
@java.lang.Override
public int getGachaType() {
return gachaType_;
}
/**
* <code>uint32 gacha_type = 1;</code>
* @param value The gachaType to set.
* @return This builder for chaining.
*/
public Builder setGachaType(int value) {
gachaType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_type = 1;</code>
* @return This builder for chaining.
*/
public Builder clearGachaType() {
gachaType_ = 0;
onChanged();
return this;
}
private int gachaRandom_ ;
/**
* <code>uint32 gacha_random = 9;</code>
* @return The gachaRandom.
*/
@java.lang.Override
public int getGachaRandom() {
return gachaRandom_;
}
/**
* <code>uint32 gacha_random = 9;</code>
* @param value The gachaRandom to set.
* @return This builder for chaining.
*/
public Builder setGachaRandom(int value) {
gachaRandom_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_random = 9;</code>
* @return This builder for chaining.
*/
public Builder clearGachaRandom() {
gachaRandom_ = 0;
onChanged();
return this;
}
private int gachaTimes_ ;
/**
* <code>uint32 gacha_times = 3;</code>
* @return The gachaTimes.
*/
@java.lang.Override
public int getGachaTimes() {
return gachaTimes_;
}
/**
* <code>uint32 gacha_times = 3;</code>
* @param value The gachaTimes to set.
* @return This builder for chaining.
*/
public Builder setGachaTimes(int value) {
gachaTimes_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gacha_times = 3;</code>
* @return This builder for chaining.
*/
public Builder clearGachaTimes() {
gachaTimes_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -890,10 +898,10 @@ public final class DoGachaReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\020DoGachaReq.proto\"y\n\nDoGachaReq\022\023\n\013gach" +
"a_times\030\n \001(\r\022\031\n\021gacha_schedule_id\030\007 \001(\r" +
"\022\022\n\ngacha_type\030\016 \001(\r\022\024\n\014gacha_random\030\r \001" +
"(\r\022\021\n\tgacha_tag\030\004 \001(\tB\033\n\031emu.grasscutter" +
"\n\020DoGachaReq.proto\"y\n\nDoGachaReq\022\021\n\tgach" +
"a_tag\030\016 \001(\t\022\031\n\021gacha_schedule_id\030\006 \001(\r\022\022" +
"\n\ngacha_type\030\001 \001(\r\022\024\n\014gacha_random\030\t \001(\r" +
"\022\023\n\013gacha_times\030\003 \001(\rB\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -905,7 +913,7 @@ public final class DoGachaReqOuterClass {
internal_static_DoGachaReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DoGachaReq_descriptor,
new java.lang.String[] { "GachaTimes", "GachaScheduleId", "GachaType", "GachaRandom", "GachaTag", });
new java.lang.String[] { "GachaTag", "GachaScheduleId", "GachaType", "GachaRandom", "GachaTimes", });
}
// @@protoc_insertion_point(outer_class_scope)