Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-28 20:59:51 +08:00
Code Issues Projects Releases Wiki Activity

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java
+160 -180
View File
@@ -19,47 +19,43 @@ public final class AchievementOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
*/
int getCurProgress();
/**
* <code>uint32 finish_timestamp = 13;</code>
* @return The finishTimestamp.
*/
int getFinishTimestamp();
/**
* <code>.Status status = 6;</code>
* @return The enum numeric value on the wire for status.
*/
int getStatusValue();
/**
* <code>.Status status = 6;</code>
* @return The status.
*/
emu.grasscutter.net.proto.StatusOuterClass.Status getStatus();
/**
* <code>uint32 total_progress = 5;</code>
* <code>uint32 total_progress = 4;</code>
* @return The totalProgress.
*/
int getTotalProgress();
/**
* <code>uint32 id = 9;</code>
* <code>uint32 finish_timestamp = 9;</code>
* @return The finishTimestamp.
*/
int getFinishTimestamp();
/**
* <code>.Status status = 2;</code>
* @return The enum numeric value on the wire for status.
*/
int getStatusValue();
/**
* <code>.Status status = 2;</code>
* @return The status.
*/
emu.grasscutter.net.proto.StatusOuterClass.Status getStatus();
/**
* <code>uint32 id = 10;</code>
* @return The id.
*/
int getId();
/**
* <code>uint32 cur_progress = 3;</code>
* @return The curProgress.
*/
int getCurProgress();
}
/**
* <pre>
* Name: IMEFDIKAJBD
* Name: PBPLDMMEGBO
* </pre>
*
* Protobuf type {@code Achievement}
@@ -108,31 +104,31 @@ public final class AchievementOuterClass {
done = true;
break;
case 16: {
curProgress_ = input.readUInt32();
break;
}
case 40: {
totalProgress_ = input.readUInt32();
break;
}
case 48: {
int rawValue = input.readEnum();
status_ = rawValue;
break;
}
case 72: {
case 24: {
id_ = input.readUInt32();
curProgress_ = input.readUInt32();
break;
}
case 104: {
case 32: {
totalProgress_ = input.readUInt32();
break;
}
case 72: {
finishTimestamp_ = input.readUInt32();
break;
}
case 80: {
id_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -165,25 +161,21 @@ public final class AchievementOuterClass {
emu.grasscutter.net.proto.AchievementOuterClass.Achievement.class, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder.class);
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 2;
private int curProgress_;
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
private int totalProgress_;
/**
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
* <code>uint32 total_progress = 4;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
public int getTotalProgress() {
return totalProgress_;
}
public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 13;
public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 9;
private int finishTimestamp_;
/**
* <code>uint32 finish_timestamp = 13;</code>
* <code>uint32 finish_timestamp = 9;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
@@ -191,17 +183,17 @@ public final class AchievementOuterClass {
return finishTimestamp_;
}
public static final int STATUS_FIELD_NUMBER = 6;
public static final int STATUS_FIELD_NUMBER = 2;
private int status_;
/**
* <code>.Status status = 6;</code>
* <code>.Status status = 2;</code>
* @return The enum numeric value on the wire for status.
*/
@java.lang.Override public int getStatusValue() {
return status_;
}
/**
* <code>.Status status = 6;</code>
* <code>.Status status = 2;</code>
* @return The status.
*/
@java.lang.Override public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() {
@@ -210,21 +202,10 @@ public final class AchievementOuterClass {
return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
}
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 5;
private int totalProgress_;
/**
* <code>uint32 total_progress = 5;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
public static final int ID_FIELD_NUMBER = 9;
public static final int ID_FIELD_NUMBER = 10;
private int id_;
/**
* <code>uint32 id = 9;</code>
* <code>uint32 id = 10;</code>
* @return The id.
*/
@java.lang.Override
@@ -232,6 +213,17 @@ public final class AchievementOuterClass {
return id_;
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 3;
private int curProgress_;
/**
* <code>uint32 cur_progress = 3;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -246,20 +238,20 @@ public final class AchievementOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
output.writeEnum(2, status_);
}
if (curProgress_ != 0) {
output.writeUInt32(2, curProgress_);
output.writeUInt32(3, curProgress_);
}
if (totalProgress_ != 0) {
output.writeUInt32(5, totalProgress_);
}
if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
output.writeEnum(6, status_);
}
if (id_ != 0) {
output.writeUInt32(9, id_);
output.writeUInt32(4, totalProgress_);
}
if (finishTimestamp_ != 0) {
output.writeUInt32(13, finishTimestamp_);
output.writeUInt32(9, finishTimestamp_);
}
if (id_ != 0) {
output.writeUInt32(10, id_);
}
unknownFields.writeTo(output);
}
@@ -270,25 +262,25 @@ public final class AchievementOuterClass {
if (size != -1) return size;
size = 0;
if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(2, status_);
}
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, curProgress_);
.computeUInt32Size(3, curProgress_);
}
if (totalProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, totalProgress_);
}
if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(6, status_);
}
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, id_);
.computeUInt32Size(4, totalProgress_);
}
if (finishTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, finishTimestamp_);
.computeUInt32Size(9, finishTimestamp_);
}
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, id_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -305,15 +297,15 @@ public final class AchievementOuterClass {
}
emu.grasscutter.net.proto.AchievementOuterClass.Achievement other = (emu.grasscutter.net.proto.AchievementOuterClass.Achievement) obj;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getFinishTimestamp()
!= other.getFinishTimestamp()) return false;
if (status_ != other.status_) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getId()
!= other.getId()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -325,16 +317,16 @@ public final class AchievementOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + FINISH_TIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + getFinishTimestamp();
hash = (37 * hash) + STATUS_FIELD_NUMBER;
hash = (53 * hash) + status_;
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -432,7 +424,7 @@ public final class AchievementOuterClass {
}
/**
* <pre>
* Name: IMEFDIKAJBD
* Name: PBPLDMMEGBO
* </pre>
*
* Protobuf type {@code Achievement}
@@ -472,16 +464,16 @@ public final class AchievementOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
curProgress_ = 0;
totalProgress_ = 0;
finishTimestamp_ = 0;
status_ = 0;
totalProgress_ = 0;
id_ = 0;
curProgress_ = 0;
return this;
}
@@ -508,11 +500,11 @@ public final class AchievementOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AchievementOuterClass.Achievement buildPartial() {
emu.grasscutter.net.proto.AchievementOuterClass.Achievement result = new emu.grasscutter.net.proto.AchievementOuterClass.Achievement(this);
result.curProgress_ = curProgress_;
result.totalProgress_ = totalProgress_;
result.finishTimestamp_ = finishTimestamp_;
result.status_ = status_;
result.totalProgress_ = totalProgress_;
result.id_ = id_;
result.curProgress_ = curProgress_;
onBuilt();
return result;
}
@@ -561,8 +553,8 @@ public final class AchievementOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AchievementOuterClass.Achievement other) {
if (other == emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance()) return this;
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
if (other.getFinishTimestamp() != 0) {
setFinishTimestamp(other.getFinishTimestamp());
@@ -570,12 +562,12 @@ public final class AchievementOuterClass {
if (other.status_ != 0) {
setStatusValue(other.getStatusValue());
}
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
if (other.getId() != 0) {
setId(other.getId());
}
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -605,52 +597,40 @@ public final class AchievementOuterClass {
return this;
}
private int curProgress_ ;
private int totalProgress_ ;
/**
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
* <code>uint32 total_progress = 4;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
public int getTotalProgress() {
return totalProgress_;
}
/**
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @param value The curProgress to set.
* <code>uint32 total_progress = 4;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setCurProgress(int value) {
public Builder setTotalProgress(int value) {
curProgress_ = value;
totalProgress_ = value;
onChanged();
return this;
}
/**
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* <code>uint32 total_progress = 4;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
public Builder clearTotalProgress() {
curProgress_ = 0;
totalProgress_ = 0;
onChanged();
return this;
}
private int finishTimestamp_ ;
/**
* <code>uint32 finish_timestamp = 13;</code>
* <code>uint32 finish_timestamp = 9;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
@@ -658,7 +638,7 @@ public final class AchievementOuterClass {
return finishTimestamp_;
}
/**
* <code>uint32 finish_timestamp = 13;</code>
* <code>uint32 finish_timestamp = 9;</code>
* @param value The finishTimestamp to set.
* @return This builder for chaining.
*/
@@ -669,7 +649,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>uint32 finish_timestamp = 13;</code>
* <code>uint32 finish_timestamp = 9;</code>
* @return This builder for chaining.
*/
public Builder clearFinishTimestamp() {
@@ -681,14 +661,14 @@ public final class AchievementOuterClass {
private int status_ = 0;
/**
* <code>.Status status = 6;</code>
* <code>.Status status = 2;</code>
* @return The enum numeric value on the wire for status.
*/
@java.lang.Override public int getStatusValue() {
return status_;
}
/**
* <code>.Status status = 6;</code>
* <code>.Status status = 2;</code>
* @param value The enum numeric value on the wire for status to set.
* @return This builder for chaining.
*/
@@ -699,7 +679,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>.Status status = 6;</code>
* <code>.Status status = 2;</code>
* @return The status.
*/
@java.lang.Override
@@ -709,7 +689,7 @@ public final class AchievementOuterClass {
return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
}
/**
* <code>.Status status = 6;</code>
* <code>.Status status = 2;</code>
* @param value The status to set.
* @return This builder for chaining.
*/
@@ -723,7 +703,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>.Status status = 6;</code>
* <code>.Status status = 2;</code>
* @return This builder for chaining.
*/
public Builder clearStatus() {
@@ -733,40 +713,9 @@ public final class AchievementOuterClass {
return this;
}
private int totalProgress_ ;
/**
* <code>uint32 total_progress = 5;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 total_progress = 5;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 total_progress = 5;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
totalProgress_ = 0;
onChanged();
return this;
}
private int id_ ;
/**
* <code>uint32 id = 9;</code>
* <code>uint32 id = 10;</code>
* @return The id.
*/
@java.lang.Override
@@ -774,7 +723,7 @@ public final class AchievementOuterClass {
return id_;
}
/**
* <code>uint32 id = 9;</code>
* <code>uint32 id = 10;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
@@ -785,7 +734,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>uint32 id = 9;</code>
* <code>uint32 id = 10;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
@@ -794,6 +743,37 @@ public final class AchievementOuterClass {
onChanged();
return this;
}
private int curProgress_ ;
/**
* <code>uint32 cur_progress = 3;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 cur_progress = 3;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
public Builder setCurProgress(int value) {
curProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cur_progress = 3;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
curProgress_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -862,9 +842,9 @@ public final class AchievementOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\021Achievement.proto\032\014Status.proto\"z\n\013Ach" +
"ievement\022\024\n\014cur_progress\030\002 \001(\r\022\030\n\020finish" +
"_timestamp\030\r \001(\r\022\027\n\006status\030\006 \001(\0162\007.Statu" +
"s\022\026\n\016total_progress\030\005 \001(\r\022\n\n\002id\030\t \001(\rB\033\n" +
"ievement\022\026\n\016total_progress\030\004 \001(\r\022\030\n\020fini" +
"sh_timestamp\030\t \001(\r\022\027\n\006status\030\002 \001(\0162\007.Sta" +
"tus\022\n\n\002id\030\n \001(\r\022\024\n\014cur_progress\030\003 \001(\rB\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -877,7 +857,7 @@ public final class AchievementOuterClass {
internal_static_Achievement_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_Achievement_descriptor,
new java.lang.String[] { "CurProgress", "FinishTimestamp", "Status", "TotalProgress", "Id", });
new java.lang.String[] { "TotalProgress", "FinishTimestamp", "Status", "Id", "CurProgress", });
emu.grasscutter.net.proto.StatusOuterClass.getDescriptor();
}