mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 05:23:36 +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
+73
-73
@@ -36,16 +36,16 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
int getFactorList(int index);
|
||||
|
||||
/**
|
||||
* <code>uint32 template_id = 8;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
int getTemplateId();
|
||||
|
||||
/**
|
||||
* <code>uint32 entrance_id = 2;</code>
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
int getEntranceId();
|
||||
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
int getTemplateId();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code ParentQuestRandomInfo}
|
||||
@@ -115,12 +115,12 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
input.popLimit(limit);
|
||||
break;
|
||||
}
|
||||
case 16: {
|
||||
case 64: {
|
||||
|
||||
entranceId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 64: {
|
||||
case 120: {
|
||||
|
||||
templateId_ = input.readUInt32();
|
||||
break;
|
||||
@@ -188,21 +188,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
private int factorListMemoizedSerializedSize = -1;
|
||||
|
||||
public static final int TEMPLATE_ID_FIELD_NUMBER = 8;
|
||||
private int templateId_;
|
||||
/**
|
||||
* <code>uint32 template_id = 8;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTemplateId() {
|
||||
return templateId_;
|
||||
}
|
||||
|
||||
public static final int ENTRANCE_ID_FIELD_NUMBER = 2;
|
||||
public static final int ENTRANCE_ID_FIELD_NUMBER = 8;
|
||||
private int entranceId_;
|
||||
/**
|
||||
* <code>uint32 entrance_id = 2;</code>
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -210,6 +199,17 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return entranceId_;
|
||||
}
|
||||
|
||||
public static final int TEMPLATE_ID_FIELD_NUMBER = 15;
|
||||
private int templateId_;
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTemplateId() {
|
||||
return templateId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -233,10 +233,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
output.writeUInt32NoTag(factorList_.getInt(i));
|
||||
}
|
||||
if (entranceId_ != 0) {
|
||||
output.writeUInt32(2, entranceId_);
|
||||
output.writeUInt32(8, entranceId_);
|
||||
}
|
||||
if (templateId_ != 0) {
|
||||
output.writeUInt32(8, templateId_);
|
||||
output.writeUInt32(15, templateId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -263,11 +263,11 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
if (entranceId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(2, entranceId_);
|
||||
.computeUInt32Size(8, entranceId_);
|
||||
}
|
||||
if (templateId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(8, templateId_);
|
||||
.computeUInt32Size(15, templateId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -286,10 +286,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
|
||||
if (!getFactorListList()
|
||||
.equals(other.getFactorListList())) return false;
|
||||
if (getTemplateId()
|
||||
!= other.getTemplateId()) return false;
|
||||
if (getEntranceId()
|
||||
!= other.getEntranceId()) return false;
|
||||
if (getTemplateId()
|
||||
!= other.getTemplateId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -305,10 +305,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
hash = (37 * hash) + FACTOR_LIST_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getFactorListList().hashCode();
|
||||
}
|
||||
hash = (37 * hash) + TEMPLATE_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTemplateId();
|
||||
hash = (37 * hash) + ENTRANCE_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getEntranceId();
|
||||
hash = (37 * hash) + TEMPLATE_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTemplateId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -444,10 +444,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
super.clear();
|
||||
factorList_ = emptyIntList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
templateId_ = 0;
|
||||
|
||||
entranceId_ = 0;
|
||||
|
||||
templateId_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -480,8 +480,8 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
}
|
||||
result.factorList_ = factorList_;
|
||||
result.templateId_ = templateId_;
|
||||
result.entranceId_ = entranceId_;
|
||||
result.templateId_ = templateId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -540,12 +540,12 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
onChanged();
|
||||
}
|
||||
if (other.getTemplateId() != 0) {
|
||||
setTemplateId(other.getTemplateId());
|
||||
}
|
||||
if (other.getEntranceId() != 0) {
|
||||
setEntranceId(other.getEntranceId());
|
||||
}
|
||||
if (other.getTemplateId() != 0) {
|
||||
setTemplateId(other.getTemplateId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -655,40 +655,9 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int templateId_ ;
|
||||
/**
|
||||
* <code>uint32 template_id = 8;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTemplateId() {
|
||||
return templateId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 template_id = 8;</code>
|
||||
* @param value The templateId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setTemplateId(int value) {
|
||||
|
||||
templateId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 template_id = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTemplateId() {
|
||||
|
||||
templateId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int entranceId_ ;
|
||||
/**
|
||||
* <code>uint32 entrance_id = 2;</code>
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -696,7 +665,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return entranceId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entrance_id = 2;</code>
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @param value The entranceId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -707,7 +676,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entrance_id = 2;</code>
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearEntranceId() {
|
||||
@@ -716,6 +685,37 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int templateId_ ;
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTemplateId() {
|
||||
return templateId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* @param value The templateId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setTemplateId(int value) {
|
||||
|
||||
templateId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTemplateId() {
|
||||
|
||||
templateId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -784,8 +784,8 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\033ParentQuestRandomInfo.proto\"V\n\025ParentQ" +
|
||||
"uestRandomInfo\022\023\n\013factor_list\030\001 \003(\r\022\023\n\013t" +
|
||||
"emplate_id\030\010 \001(\r\022\023\n\013entrance_id\030\002 \001(\rB\033\n" +
|
||||
"uestRandomInfo\022\023\n\013factor_list\030\001 \003(\r\022\023\n\013e" +
|
||||
"ntrance_id\030\010 \001(\r\022\023\n\013template_id\030\017 \001(\rB\033\n" +
|
||||
"\031emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -797,7 +797,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
internal_static_ParentQuestRandomInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_ParentQuestRandomInfo_descriptor,
|
||||
new java.lang.String[] { "FactorList", "TemplateId", "EntranceId", });
|
||||
new java.lang.String[] { "FactorList", "EntranceId", "TemplateId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user