Add support for v3.5.0 (#2090)

* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
@@ -19,41 +19,49 @@ public final class AchievementOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 curProgress = 10;</code>
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
*/
int getCurProgress();
/**
* <code>uint32 id = 13;</code>
* @return The id.
* <code>uint32 finish_timestamp = 13;</code>
* @return The finishTimestamp.
*/
int getId();
int getFinishTimestamp();
/**
* <code>uint32 totalProgress = 14;</code>
* @return The totalProgress.
*/
int getTotalProgress();
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @return The enum numeric value on the wire for status.
*/
int getStatusValue();
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @return The status.
*/
emu.grasscutter.net.proto.StatusOuterClass.Status getStatus();
/**
* <code>uint32 finishTimestamp = 6;</code>
* @return The finishTimestamp.
* <code>uint32 total_progress = 5;</code>
* @return The totalProgress.
*/
int getFinishTimestamp();
int getTotalProgress();
/**
* <code>uint32 id = 9;</code>
* @return The id.
*/
int getId();
}
/**
* <pre>
* Name: IMEFDIKAJBD
* </pre>
*
* Protobuf type {@code Achievement}
*/
public static final class Achievement extends
@@ -99,30 +107,30 @@ public final class AchievementOuterClass {
case 0:
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 48: {
finishTimestamp_ = input.readUInt32();
break;
}
case 80: {
curProgress_ = input.readUInt32();
break;
}
case 104: {
case 72: {
id_ = input.readUInt32();
break;
}
case 112: {
case 104: {
totalProgress_ = input.readUInt32();
finishTimestamp_ = input.readUInt32();
break;
}
default: {
@@ -157,10 +165,14 @@ public final class AchievementOuterClass {
emu.grasscutter.net.proto.AchievementOuterClass.Achievement.class, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder.class);
}
public static final int CURPROGRESS_FIELD_NUMBER = 10;
public static final int CUR_PROGRESS_FIELD_NUMBER = 2;
private int curProgress_;
/**
* <code>uint32 curProgress = 10;</code>
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
*/
@java.lang.Override
@@ -168,39 +180,28 @@ public final class AchievementOuterClass {
return curProgress_;
}
public static final int ID_FIELD_NUMBER = 13;
private int id_;
public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 13;
private int finishTimestamp_;
/**
* <code>uint32 id = 13;</code>
* @return The id.
* <code>uint32 finish_timestamp = 13;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
public int getId() {
return id_;
public int getFinishTimestamp() {
return finishTimestamp_;
}
public static final int TOTALPROGRESS_FIELD_NUMBER = 14;
private int totalProgress_;
/**
* <code>uint32 totalProgress = 14;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
public static final int STATUS_FIELD_NUMBER = 5;
public static final int STATUS_FIELD_NUMBER = 6;
private int status_;
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @return The enum numeric value on the wire for status.
*/
@java.lang.Override public int getStatusValue() {
return status_;
}
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @return The status.
*/
@java.lang.Override public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() {
@@ -209,15 +210,26 @@ public final class AchievementOuterClass {
return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
}
public static final int FINISHTIMESTAMP_FIELD_NUMBER = 6;
private int finishTimestamp_;
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 5;
private int totalProgress_;
/**
* <code>uint32 finishTimestamp = 6;</code>
* @return The finishTimestamp.
* <code>uint32 total_progress = 5;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getFinishTimestamp() {
return finishTimestamp_;
public int getTotalProgress() {
return totalProgress_;
}
public static final int ID_FIELD_NUMBER = 9;
private int id_;
/**
* <code>uint32 id = 9;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
private byte memoizedIsInitialized = -1;
@@ -234,20 +246,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(5, status_);
}
if (finishTimestamp_ != 0) {
output.writeUInt32(6, finishTimestamp_);
}
if (curProgress_ != 0) {
output.writeUInt32(10, curProgress_);
}
if (id_ != 0) {
output.writeUInt32(13, id_);
output.writeUInt32(2, curProgress_);
}
if (totalProgress_ != 0) {
output.writeUInt32(14, totalProgress_);
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_);
}
if (finishTimestamp_ != 0) {
output.writeUInt32(13, finishTimestamp_);
}
unknownFields.writeTo(output);
}
@@ -258,25 +270,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(5, status_);
}
if (finishTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, finishTimestamp_);
}
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, curProgress_);
}
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, id_);
.computeUInt32Size(2, curProgress_);
}
if (totalProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, totalProgress_);
.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_);
}
if (finishTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, finishTimestamp_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -295,13 +307,13 @@ public final class AchievementOuterClass {
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getId()
!= other.getId()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (status_ != other.status_) 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 (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -313,16 +325,16 @@ public final class AchievementOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CURPROGRESS_FIELD_NUMBER;
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + TOTALPROGRESS_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) + FINISHTIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + getFinishTimestamp();
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -419,6 +431,10 @@ public final class AchievementOuterClass {
return builder;
}
/**
* <pre>
* Name: IMEFDIKAJBD
* </pre>
*
* Protobuf type {@code Achievement}
*/
public static final class Builder extends
@@ -458,13 +474,13 @@ public final class AchievementOuterClass {
super.clear();
curProgress_ = 0;
id_ = 0;
totalProgress_ = 0;
finishTimestamp_ = 0;
status_ = 0;
finishTimestamp_ = 0;
totalProgress_ = 0;
id_ = 0;
return this;
}
@@ -493,10 +509,10 @@ public final class AchievementOuterClass {
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.id_ = id_;
result.totalProgress_ = totalProgress_;
result.status_ = status_;
result.finishTimestamp_ = finishTimestamp_;
result.status_ = status_;
result.totalProgress_ = totalProgress_;
result.id_ = id_;
onBuilt();
return result;
}
@@ -548,17 +564,17 @@ public final class AchievementOuterClass {
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
if (other.getId() != 0) {
setId(other.getId());
}
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
if (other.getFinishTimestamp() != 0) {
setFinishTimestamp(other.getFinishTimestamp());
}
if (other.status_ != 0) {
setStatusValue(other.getStatusValue());
}
if (other.getFinishTimestamp() != 0) {
setFinishTimestamp(other.getFinishTimestamp());
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
if (other.getId() != 0) {
setId(other.getId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -591,7 +607,11 @@ public final class AchievementOuterClass {
private int curProgress_ ;
/**
* <code>uint32 curProgress = 10;</code>
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
*/
@java.lang.Override
@@ -599,7 +619,11 @@ public final class AchievementOuterClass {
return curProgress_;
}
/**
* <code>uint32 curProgress = 10;</code>
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
@@ -610,7 +634,11 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>uint32 curProgress = 10;</code>
* <pre>
* Name: JPGOFPINCMO &gt; Status
* </pre>
*
* <code>uint32 cur_progress = 2;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
@@ -620,78 +648,47 @@ public final class AchievementOuterClass {
return this;
}
private int id_ ;
private int finishTimestamp_ ;
/**
* <code>uint32 id = 13;</code>
* @return The id.
* <code>uint32 finish_timestamp = 13;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
public int getId() {
return id_;
public int getFinishTimestamp() {
return finishTimestamp_;
}
/**
* <code>uint32 id = 13;</code>
* @param value The id to set.
* <code>uint32 finish_timestamp = 13;</code>
* @param value The finishTimestamp to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
public Builder setFinishTimestamp(int value) {
id_ = value;
finishTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 13;</code>
* <code>uint32 finish_timestamp = 13;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
public Builder clearFinishTimestamp() {
id_ = 0;
onChanged();
return this;
}
private int totalProgress_ ;
/**
* <code>uint32 totalProgress = 14;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 totalProgress = 14;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 totalProgress = 14;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
totalProgress_ = 0;
finishTimestamp_ = 0;
onChanged();
return this;
}
private int status_ = 0;
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @return The enum numeric value on the wire for status.
*/
@java.lang.Override public int getStatusValue() {
return status_;
}
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @param value The enum numeric value on the wire for status to set.
* @return This builder for chaining.
*/
@@ -702,7 +699,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @return The status.
*/
@java.lang.Override
@@ -712,7 +709,7 @@ public final class AchievementOuterClass {
return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
}
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @param value The status to set.
* @return This builder for chaining.
*/
@@ -726,7 +723,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>.Status status = 5;</code>
* <code>.Status status = 6;</code>
* @return This builder for chaining.
*/
public Builder clearStatus() {
@@ -736,33 +733,64 @@ public final class AchievementOuterClass {
return this;
}
private int finishTimestamp_ ;
private int totalProgress_ ;
/**
* <code>uint32 finishTimestamp = 6;</code>
* @return The finishTimestamp.
* <code>uint32 total_progress = 5;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getFinishTimestamp() {
return finishTimestamp_;
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 finishTimestamp = 6;</code>
* @param value The finishTimestamp to set.
* <code>uint32 total_progress = 5;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setFinishTimestamp(int value) {
public Builder setTotalProgress(int value) {
finishTimestamp_ = value;
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 finishTimestamp = 6;</code>
* <code>uint32 total_progress = 5;</code>
* @return This builder for chaining.
*/
public Builder clearFinishTimestamp() {
public Builder clearTotalProgress() {
finishTimestamp_ = 0;
totalProgress_ = 0;
onChanged();
return this;
}
private int id_ ;
/**
* <code>uint32 id = 9;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
/**
* <code>uint32 id = 9;</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 = 9;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
id_ = 0;
onChanged();
return this;
}
@@ -833,11 +861,11 @@ public final class AchievementOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\021Achievement.proto\032\014Status.proto\"w\n\013Ach" +
"ievement\022\023\n\013curProgress\030\n \001(\r\022\n\n\002id\030\r \001(" +
"\r\022\025\n\rtotalProgress\030\016 \001(\r\022\027\n\006status\030\005 \001(\016" +
"2\007.Status\022\027\n\017finishTimestamp\030\006 \001(\rB\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
"\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" +
"\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -849,7 +877,7 @@ public final class AchievementOuterClass {
internal_static_Achievement_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_Achievement_descriptor,
new java.lang.String[] { "CurProgress", "Id", "TotalProgress", "Status", "FinishTimestamp", });
new java.lang.String[] { "CurProgress", "FinishTimestamp", "Status", "TotalProgress", "Id", });
emu.grasscutter.net.proto.StatusOuterClass.getDescriptor();
}