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

Upgrade to REL3.7 (#2164)

Browse Source 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
This commit is contained in:
Magix
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java
+171 -171
View File
@@ -19,43 +19,43 @@ public final class AchievementOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 total_progress = 4;</code>
* @return The totalProgress.
*/
int getTotalProgress();
/**
* <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>
* <code>uint32 id = 3;</code>
* @return The id.
*/
int getId();
/**
* <code>uint32 cur_progress = 3;</code>
* <code>.Status status = 10;</code>
* @return The enum numeric value on the wire for status.
*/
int getStatusValue();
/**
* <code>.Status status = 10;</code>
* @return The status.
*/
emu.grasscutter.net.proto.StatusOuterClass.Status getStatus();
/**
* <code>uint32 total_progress = 14;</code>
* @return The totalProgress.
*/
int getTotalProgress();
/**
* <code>uint32 finish_timestamp = 15;</code>
* @return The finishTimestamp.
*/
int getFinishTimestamp();
/**
* <code>uint32 cur_progress = 5;</code>
* @return The curProgress.
*/
int getCurProgress();
}
/**
* <pre>
* Name: PBPLDMMEGBO
* Obf: LPAPJAKPDJO
* </pre>
*
* Protobuf type {@code Achievement}
@@ -103,32 +103,32 @@ public final class AchievementOuterClass {
case 0:
done = true;
break;
case 16: {
case 24: {
id_ = input.readUInt32();
break;
}
case 40: {
curProgress_ = input.readUInt32();
break;
}
case 80: {
int rawValue = input.readEnum();
status_ = rawValue;
break;
}
case 24: {
curProgress_ = input.readUInt32();
break;
}
case 32: {
case 112: {
totalProgress_ = input.readUInt32();
break;
}
case 72: {
case 120: {
finishTimestamp_ = input.readUInt32();
break;
}
case 80: {
id_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -161,39 +161,28 @@ public final class AchievementOuterClass {
emu.grasscutter.net.proto.AchievementOuterClass.Achievement.class, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder.class);
}
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
private int totalProgress_;
public static final int ID_FIELD_NUMBER = 3;
private int id_;
/**
* <code>uint32 total_progress = 4;</code>
* @return The totalProgress.
* <code>uint32 id = 3;</code>
* @return The id.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
public int getId() {
return id_;
}
public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 9;
private int finishTimestamp_;
/**
* <code>uint32 finish_timestamp = 9;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
public int getFinishTimestamp() {
return finishTimestamp_;
}
public static final int STATUS_FIELD_NUMBER = 2;
public static final int STATUS_FIELD_NUMBER = 10;
private int status_;
/**
* <code>.Status status = 2;</code>
* <code>.Status status = 10;</code>
* @return The enum numeric value on the wire for status.
*/
@java.lang.Override public int getStatusValue() {
return status_;
}
/**
* <code>.Status status = 2;</code>
* <code>.Status status = 10;</code>
* @return The status.
*/
@java.lang.Override public emu.grasscutter.net.proto.StatusOuterClass.Status getStatus() {
@@ -202,21 +191,32 @@ public final class AchievementOuterClass {
return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
}
public static final int ID_FIELD_NUMBER = 10;
private int id_;
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 14;
private int totalProgress_;
/**
* <code>uint32 id = 10;</code>
* @return The id.
* <code>uint32 total_progress = 14;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getId() {
return id_;
public int getTotalProgress() {
return totalProgress_;
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 3;
public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 15;
private int finishTimestamp_;
/**
* <code>uint32 finish_timestamp = 15;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
public int getFinishTimestamp() {
return finishTimestamp_;
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 5;
private int curProgress_;
/**
* <code>uint32 cur_progress = 3;</code>
* <code>uint32 cur_progress = 5;</code>
* @return The curProgress.
*/
@java.lang.Override
@@ -238,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 (id_ != 0) {
output.writeUInt32(3, id_);
}
if (curProgress_ != 0) {
output.writeUInt32(3, curProgress_);
output.writeUInt32(5, curProgress_);
}
if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
output.writeEnum(10, status_);
}
if (totalProgress_ != 0) {
output.writeUInt32(4, totalProgress_);
output.writeUInt32(14, totalProgress_);
}
if (finishTimestamp_ != 0) {
output.writeUInt32(9, finishTimestamp_);
}
if (id_ != 0) {
output.writeUInt32(10, id_);
output.writeUInt32(15, finishTimestamp_);
}
unknownFields.writeTo(output);
}
@@ -262,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()) {
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(2, status_);
.computeUInt32Size(3, id_);
}
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, curProgress_);
.computeUInt32Size(5, curProgress_);
}
if (status_ != emu.grasscutter.net.proto.StatusOuterClass.Status.STATUS_INVALID.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(10, status_);
}
if (totalProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, totalProgress_);
.computeUInt32Size(14, totalProgress_);
}
if (finishTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, finishTimestamp_);
}
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, id_);
.computeUInt32Size(15, finishTimestamp_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -297,13 +297,13 @@ public final class AchievementOuterClass {
}
emu.grasscutter.net.proto.AchievementOuterClass.Achievement other = (emu.grasscutter.net.proto.AchievementOuterClass.Achievement) obj;
if (getId()
!= other.getId()) return false;
if (status_ != other.status_) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getFinishTimestamp()
!= other.getFinishTimestamp()) return false;
if (status_ != other.status_) return false;
if (getId()
!= other.getId()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -317,14 +317,14 @@ public final class AchievementOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + STATUS_FIELD_NUMBER;
hash = (53 * hash) + status_;
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) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (29 * hash) + unknownFields.hashCode();
@@ -424,7 +424,7 @@ public final class AchievementOuterClass {
}
/**
* <pre>
* Name: PBPLDMMEGBO
* Obf: LPAPJAKPDJO
* </pre>
*
* Protobuf type {@code Achievement}
@@ -464,13 +464,13 @@ public final class AchievementOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
totalProgress_ = 0;
finishTimestamp_ = 0;
id_ = 0;
status_ = 0;
id_ = 0;
totalProgress_ = 0;
finishTimestamp_ = 0;
curProgress_ = 0;
@@ -500,10 +500,10 @@ 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.id_ = id_;
result.status_ = status_;
result.totalProgress_ = totalProgress_;
result.finishTimestamp_ = finishTimestamp_;
result.status_ = status_;
result.id_ = id_;
result.curProgress_ = curProgress_;
onBuilt();
return result;
@@ -553,18 +553,18 @@ 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.getId() != 0) {
setId(other.getId());
}
if (other.status_ != 0) {
setStatusValue(other.getStatusValue());
}
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
if (other.getFinishTimestamp() != 0) {
setFinishTimestamp(other.getFinishTimestamp());
}
if (other.status_ != 0) {
setStatusValue(other.getStatusValue());
}
if (other.getId() != 0) {
setId(other.getId());
}
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
@@ -597,78 +597,47 @@ public final class AchievementOuterClass {
return this;
}
private int totalProgress_ ;
private int id_ ;
/**
* <code>uint32 total_progress = 4;</code>
* @return The totalProgress.
* <code>uint32 id = 3;</code>
* @return The id.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
public int getId() {
return id_;
}
/**
* <code>uint32 total_progress = 4;</code>
* @param value The totalProgress to set.
* <code>uint32 id = 3;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
public Builder setId(int value) {
totalProgress_ = value;
id_ = value;
onChanged();
return this;
}
/**
* <code>uint32 total_progress = 4;</code>
* <code>uint32 id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
public Builder clearId() {
totalProgress_ = 0;
onChanged();
return this;
}
private int finishTimestamp_ ;
/**
* <code>uint32 finish_timestamp = 9;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
public int getFinishTimestamp() {
return finishTimestamp_;
}
/**
* <code>uint32 finish_timestamp = 9;</code>
* @param value The finishTimestamp to set.
* @return This builder for chaining.
*/
public Builder setFinishTimestamp(int value) {
finishTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 finish_timestamp = 9;</code>
* @return This builder for chaining.
*/
public Builder clearFinishTimestamp() {
finishTimestamp_ = 0;
id_ = 0;
onChanged();
return this;
}
private int status_ = 0;
/**
* <code>.Status status = 2;</code>
* <code>.Status status = 10;</code>
* @return The enum numeric value on the wire for status.
*/
@java.lang.Override public int getStatusValue() {
return status_;
}
/**
* <code>.Status status = 2;</code>
* <code>.Status status = 10;</code>
* @param value The enum numeric value on the wire for status to set.
* @return This builder for chaining.
*/
@@ -679,7 +648,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>.Status status = 2;</code>
* <code>.Status status = 10;</code>
* @return The status.
*/
@java.lang.Override
@@ -689,7 +658,7 @@ public final class AchievementOuterClass {
return result == null ? emu.grasscutter.net.proto.StatusOuterClass.Status.UNRECOGNIZED : result;
}
/**
* <code>.Status status = 2;</code>
* <code>.Status status = 10;</code>
* @param value The status to set.
* @return This builder for chaining.
*/
@@ -703,7 +672,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>.Status status = 2;</code>
* <code>.Status status = 10;</code>
* @return This builder for chaining.
*/
public Builder clearStatus() {
@@ -713,40 +682,71 @@ public final class AchievementOuterClass {
return this;
}
private int id_ ;
private int totalProgress_ ;
/**
* <code>uint32 id = 10;</code>
* @return The id.
* <code>uint32 total_progress = 14;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getId() {
return id_;
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 id = 10;</code>
* @param value The id to set.
* <code>uint32 total_progress = 14;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
public Builder setTotalProgress(int value) {
id_ = value;
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 10;</code>
* <code>uint32 total_progress = 14;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
public Builder clearTotalProgress() {
id_ = 0;
totalProgress_ = 0;
onChanged();
return this;
}
private int finishTimestamp_ ;
/**
* <code>uint32 finish_timestamp = 15;</code>
* @return The finishTimestamp.
*/
@java.lang.Override
public int getFinishTimestamp() {
return finishTimestamp_;
}
/**
* <code>uint32 finish_timestamp = 15;</code>
* @param value The finishTimestamp to set.
* @return This builder for chaining.
*/
public Builder setFinishTimestamp(int value) {
finishTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 finish_timestamp = 15;</code>
* @return This builder for chaining.
*/
public Builder clearFinishTimestamp() {
finishTimestamp_ = 0;
onChanged();
return this;
}
private int curProgress_ ;
/**
* <code>uint32 cur_progress = 3;</code>
* <code>uint32 cur_progress = 5;</code>
* @return The curProgress.
*/
@java.lang.Override
@@ -754,7 +754,7 @@ public final class AchievementOuterClass {
return curProgress_;
}
/**
* <code>uint32 cur_progress = 3;</code>
* <code>uint32 cur_progress = 5;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
@@ -765,7 +765,7 @@ public final class AchievementOuterClass {
return this;
}
/**
* <code>uint32 cur_progress = 3;</code>
* <code>uint32 cur_progress = 5;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
@@ -842,9 +842,9 @@ public final class AchievementOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\021Achievement.proto\032\014Status.proto\"z\n\013Ach" +
"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" +
"ievement\022\n\n\002id\030\003 \001(\r\022\027\n\006status\030\n \001(\0162\007.S" +
"tatus\022\026\n\016total_progress\030\016 \001(\r\022\030\n\020finish_" +
"timestamp\030\017 \001(\r\022\024\n\014cur_progress\030\005 \001(\rB\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -857,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[] { "TotalProgress", "FinishTimestamp", "Status", "Id", "CurProgress", });
new java.lang.String[] { "Id", "Status", "TotalProgress", "FinishTimestamp", "CurProgress", });
emu.grasscutter.net.proto.StatusOuterClass.getDescriptor();
}