mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-24 05:30:00 +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:
Simplxs
committed by
GitHub
Unverified
GitHub
parent
8b83dbf58c
commit
92fbaa8670
+91
-91
@@ -19,22 +19,22 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>bool is_success = 5;</code>
|
||||
* <code>uint32 id = 2;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
int getId();
|
||||
|
||||
/**
|
||||
* <code>bool is_success = 13;</code>
|
||||
* @return The isSuccess.
|
||||
*/
|
||||
boolean getIsSuccess();
|
||||
|
||||
/**
|
||||
* <code>uint64 cool_down_time = 4;</code>
|
||||
* <code>uint64 cool_down_time = 7;</code>
|
||||
* @return The coolDownTime.
|
||||
*/
|
||||
long getCoolDownTime();
|
||||
|
||||
/**
|
||||
* <code>uint32 id = 15;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
int getId();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code WidgetCoolDownData}
|
||||
@@ -81,21 +81,21 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 32: {
|
||||
case 16: {
|
||||
|
||||
id_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 56: {
|
||||
|
||||
coolDownTime_ = input.readUInt64();
|
||||
break;
|
||||
}
|
||||
case 40: {
|
||||
case 104: {
|
||||
|
||||
isSuccess_ = input.readBool();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
|
||||
id_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -128,10 +128,21 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.class, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder.class);
|
||||
}
|
||||
|
||||
public static final int IS_SUCCESS_FIELD_NUMBER = 5;
|
||||
public static final int ID_FIELD_NUMBER = 2;
|
||||
private int id_;
|
||||
/**
|
||||
* <code>uint32 id = 2;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
|
||||
public static final int IS_SUCCESS_FIELD_NUMBER = 13;
|
||||
private boolean isSuccess_;
|
||||
/**
|
||||
* <code>bool is_success = 5;</code>
|
||||
* <code>bool is_success = 13;</code>
|
||||
* @return The isSuccess.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -139,10 +150,10 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
return isSuccess_;
|
||||
}
|
||||
|
||||
public static final int COOL_DOWN_TIME_FIELD_NUMBER = 4;
|
||||
public static final int COOL_DOWN_TIME_FIELD_NUMBER = 7;
|
||||
private long coolDownTime_;
|
||||
/**
|
||||
* <code>uint64 cool_down_time = 4;</code>
|
||||
* <code>uint64 cool_down_time = 7;</code>
|
||||
* @return The coolDownTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -150,17 +161,6 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
return coolDownTime_;
|
||||
}
|
||||
|
||||
public static final int ID_FIELD_NUMBER = 15;
|
||||
private int id_;
|
||||
/**
|
||||
* <code>uint32 id = 15;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -175,14 +175,14 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (id_ != 0) {
|
||||
output.writeUInt32(2, id_);
|
||||
}
|
||||
if (coolDownTime_ != 0L) {
|
||||
output.writeUInt64(4, coolDownTime_);
|
||||
output.writeUInt64(7, coolDownTime_);
|
||||
}
|
||||
if (isSuccess_ != false) {
|
||||
output.writeBool(5, isSuccess_);
|
||||
}
|
||||
if (id_ != 0) {
|
||||
output.writeUInt32(15, id_);
|
||||
output.writeBool(13, isSuccess_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -193,17 +193,17 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (id_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(2, id_);
|
||||
}
|
||||
if (coolDownTime_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(4, coolDownTime_);
|
||||
.computeUInt64Size(7, coolDownTime_);
|
||||
}
|
||||
if (isSuccess_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(5, isSuccess_);
|
||||
}
|
||||
if (id_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, id_);
|
||||
.computeBoolSize(13, isSuccess_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -220,12 +220,12 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other = (emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData) obj;
|
||||
|
||||
if (getId()
|
||||
!= other.getId()) return false;
|
||||
if (getIsSuccess()
|
||||
!= other.getIsSuccess()) return false;
|
||||
if (getCoolDownTime()
|
||||
!= other.getCoolDownTime()) return false;
|
||||
if (getId()
|
||||
!= other.getId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -237,14 +237,14 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getId();
|
||||
hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsSuccess());
|
||||
hash = (37 * hash) + COOL_DOWN_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getCoolDownTime());
|
||||
hash = (37 * hash) + ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -378,12 +378,12 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
id_ = 0;
|
||||
|
||||
isSuccess_ = false;
|
||||
|
||||
coolDownTime_ = 0L;
|
||||
|
||||
id_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -410,9 +410,9 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData buildPartial() {
|
||||
emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData result = new emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData(this);
|
||||
result.id_ = id_;
|
||||
result.isSuccess_ = isSuccess_;
|
||||
result.coolDownTime_ = coolDownTime_;
|
||||
result.id_ = id_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -461,15 +461,15 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other) {
|
||||
if (other == emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()) return this;
|
||||
if (other.getId() != 0) {
|
||||
setId(other.getId());
|
||||
}
|
||||
if (other.getIsSuccess() != false) {
|
||||
setIsSuccess(other.getIsSuccess());
|
||||
}
|
||||
if (other.getCoolDownTime() != 0L) {
|
||||
setCoolDownTime(other.getCoolDownTime());
|
||||
}
|
||||
if (other.getId() != 0) {
|
||||
setId(other.getId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -499,9 +499,40 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int id_ ;
|
||||
/**
|
||||
* <code>uint32 id = 2;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 2;</code>
|
||||
* @param value The id to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setId(int value) {
|
||||
|
||||
id_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 2;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearId() {
|
||||
|
||||
id_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isSuccess_ ;
|
||||
/**
|
||||
* <code>bool is_success = 5;</code>
|
||||
* <code>bool is_success = 13;</code>
|
||||
* @return The isSuccess.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -509,7 +540,7 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
return isSuccess_;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_success = 5;</code>
|
||||
* <code>bool is_success = 13;</code>
|
||||
* @param value The isSuccess to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -520,7 +551,7 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_success = 5;</code>
|
||||
* <code>bool is_success = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsSuccess() {
|
||||
@@ -532,7 +563,7 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
|
||||
private long coolDownTime_ ;
|
||||
/**
|
||||
* <code>uint64 cool_down_time = 4;</code>
|
||||
* <code>uint64 cool_down_time = 7;</code>
|
||||
* @return The coolDownTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -540,7 +571,7 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
return coolDownTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 cool_down_time = 4;</code>
|
||||
* <code>uint64 cool_down_time = 7;</code>
|
||||
* @param value The coolDownTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -551,7 +582,7 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 cool_down_time = 4;</code>
|
||||
* <code>uint64 cool_down_time = 7;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearCoolDownTime() {
|
||||
@@ -560,37 +591,6 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int id_ ;
|
||||
/**
|
||||
* <code>uint32 id = 15;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 15;</code>
|
||||
* @param value The id to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setId(int value) {
|
||||
|
||||
id_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 15;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearId() {
|
||||
|
||||
id_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -659,8 +659,8 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\030WidgetCoolDownData.proto\"L\n\022WidgetCool" +
|
||||
"DownData\022\022\n\nis_success\030\005 \001(\010\022\026\n\016cool_dow" +
|
||||
"n_time\030\004 \001(\004\022\n\n\002id\030\017 \001(\rB\033\n\031emu.grasscut" +
|
||||
"DownData\022\n\n\002id\030\002 \001(\r\022\022\n\nis_success\030\r \001(\010" +
|
||||
"\022\026\n\016cool_down_time\030\007 \001(\004B\033\n\031emu.grasscut" +
|
||||
"ter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -672,7 +672,7 @@ public final class WidgetCoolDownDataOuterClass {
|
||||
internal_static_WidgetCoolDownData_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_WidgetCoolDownData_descriptor,
|
||||
new java.lang.String[] { "IsSuccess", "CoolDownTime", "Id", });
|
||||
new java.lang.String[] { "Id", "IsSuccess", "CoolDownTime", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user