Upgrade to REL3.7 (#2164)

* 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
@@ -19,27 +19,27 @@ public final class ChangeGameTimeRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 extra_days = 11;</code>
* @return The extraDays.
*/
int getExtraDays();
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 cur_game_time = 12;</code>
* <code>uint32 extra_days = 14;</code>
* @return The extraDays.
*/
int getExtraDays();
/**
* <code>uint32 cur_game_time = 5;</code>
* @return The curGameTime.
*/
int getCurGameTime();
}
/**
* <pre>
* CmdId: 163
* Name: BEPBEGIBFIJ
* CmdId: 130
* Obf: LABMPLOLGJJ
* </pre>
*
* Protobuf type {@code ChangeGameTimeRsp}
@@ -86,21 +86,21 @@ public final class ChangeGameTimeRspOuterClass {
case 0:
done = true;
break;
case 24: {
case 16: {
retcode_ = input.readInt32();
break;
}
case 88: {
extraDays_ = input.readUInt32();
break;
}
case 96: {
case 40: {
curGameTime_ = input.readUInt32();
break;
}
case 112: {
extraDays_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +133,10 @@ public final class ChangeGameTimeRspOuterClass {
emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.class, emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.Builder.class);
}
public static final int EXTRA_DAYS_FIELD_NUMBER = 11;
private int extraDays_;
/**
* <code>uint32 extra_days = 11;</code>
* @return The extraDays.
*/
@java.lang.Override
public int getExtraDays() {
return extraDays_;
}
public static final int RETCODE_FIELD_NUMBER = 3;
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -155,10 +144,21 @@ public final class ChangeGameTimeRspOuterClass {
return retcode_;
}
public static final int CUR_GAME_TIME_FIELD_NUMBER = 12;
public static final int EXTRA_DAYS_FIELD_NUMBER = 14;
private int extraDays_;
/**
* <code>uint32 extra_days = 14;</code>
* @return The extraDays.
*/
@java.lang.Override
public int getExtraDays() {
return extraDays_;
}
public static final int CUR_GAME_TIME_FIELD_NUMBER = 5;
private int curGameTime_;
/**
* <code>uint32 cur_game_time = 12;</code>
* <code>uint32 cur_game_time = 5;</code>
* @return The curGameTime.
*/
@java.lang.Override
@@ -181,13 +181,13 @@ public final class ChangeGameTimeRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(3, retcode_);
}
if (extraDays_ != 0) {
output.writeUInt32(11, extraDays_);
output.writeInt32(2, retcode_);
}
if (curGameTime_ != 0) {
output.writeUInt32(12, curGameTime_);
output.writeUInt32(5, curGameTime_);
}
if (extraDays_ != 0) {
output.writeUInt32(14, extraDays_);
}
unknownFields.writeTo(output);
}
@@ -200,15 +200,15 @@ public final class ChangeGameTimeRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, retcode_);
}
if (extraDays_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, extraDays_);
.computeInt32Size(2, retcode_);
}
if (curGameTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, curGameTime_);
.computeUInt32Size(5, curGameTime_);
}
if (extraDays_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, extraDays_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,10 +225,10 @@ public final class ChangeGameTimeRspOuterClass {
}
emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp other = (emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp) obj;
if (getExtraDays()
!= other.getExtraDays()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getExtraDays()
!= other.getExtraDays()) return false;
if (getCurGameTime()
!= other.getCurGameTime()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +242,10 @@ public final class ChangeGameTimeRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER;
hash = (53 * hash) + getExtraDays();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER;
hash = (53 * hash) + getExtraDays();
hash = (37 * hash) + CUR_GAME_TIME_FIELD_NUMBER;
hash = (53 * hash) + getCurGameTime();
hash = (29 * hash) + unknownFields.hashCode();
@@ -345,8 +345,8 @@ public final class ChangeGameTimeRspOuterClass {
}
/**
* <pre>
* CmdId: 163
* Name: BEPBEGIBFIJ
* CmdId: 130
* Obf: LABMPLOLGJJ
* </pre>
*
* Protobuf type {@code ChangeGameTimeRsp}
@@ -386,10 +386,10 @@ public final class ChangeGameTimeRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
extraDays_ = 0;
retcode_ = 0;
extraDays_ = 0;
curGameTime_ = 0;
return this;
@@ -418,8 +418,8 @@ public final class ChangeGameTimeRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp buildPartial() {
emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp result = new emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp(this);
result.extraDays_ = extraDays_;
result.retcode_ = retcode_;
result.extraDays_ = extraDays_;
result.curGameTime_ = curGameTime_;
onBuilt();
return result;
@@ -469,12 +469,12 @@ public final class ChangeGameTimeRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp other) {
if (other == emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.getDefaultInstance()) return this;
if (other.getExtraDays() != 0) {
setExtraDays(other.getExtraDays());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getExtraDays() != 0) {
setExtraDays(other.getExtraDays());
}
if (other.getCurGameTime() != 0) {
setCurGameTime(other.getCurGameTime());
}
@@ -507,40 +507,9 @@ public final class ChangeGameTimeRspOuterClass {
return this;
}
private int extraDays_ ;
/**
* <code>uint32 extra_days = 11;</code>
* @return The extraDays.
*/
@java.lang.Override
public int getExtraDays() {
return extraDays_;
}
/**
* <code>uint32 extra_days = 11;</code>
* @param value The extraDays to set.
* @return This builder for chaining.
*/
public Builder setExtraDays(int value) {
extraDays_ = value;
onChanged();
return this;
}
/**
* <code>uint32 extra_days = 11;</code>
* @return This builder for chaining.
*/
public Builder clearExtraDays() {
extraDays_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -548,7 +517,7 @@ public final class ChangeGameTimeRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 2;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -559,7 +528,7 @@ public final class ChangeGameTimeRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 2;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -569,9 +538,40 @@ public final class ChangeGameTimeRspOuterClass {
return this;
}
private int extraDays_ ;
/**
* <code>uint32 extra_days = 14;</code>
* @return The extraDays.
*/
@java.lang.Override
public int getExtraDays() {
return extraDays_;
}
/**
* <code>uint32 extra_days = 14;</code>
* @param value The extraDays to set.
* @return This builder for chaining.
*/
public Builder setExtraDays(int value) {
extraDays_ = value;
onChanged();
return this;
}
/**
* <code>uint32 extra_days = 14;</code>
* @return This builder for chaining.
*/
public Builder clearExtraDays() {
extraDays_ = 0;
onChanged();
return this;
}
private int curGameTime_ ;
/**
* <code>uint32 cur_game_time = 12;</code>
* <code>uint32 cur_game_time = 5;</code>
* @return The curGameTime.
*/
@java.lang.Override
@@ -579,7 +579,7 @@ public final class ChangeGameTimeRspOuterClass {
return curGameTime_;
}
/**
* <code>uint32 cur_game_time = 12;</code>
* <code>uint32 cur_game_time = 5;</code>
* @param value The curGameTime to set.
* @return This builder for chaining.
*/
@@ -590,7 +590,7 @@ public final class ChangeGameTimeRspOuterClass {
return this;
}
/**
* <code>uint32 cur_game_time = 12;</code>
* <code>uint32 cur_game_time = 5;</code>
* @return This builder for chaining.
*/
public Builder clearCurGameTime() {
@@ -667,8 +667,8 @@ public final class ChangeGameTimeRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\027ChangeGameTimeRsp.proto\"O\n\021ChangeGameT" +
"imeRsp\022\022\n\nextra_days\030\013 \001(\r\022\017\n\007retcode\030\003 " +
"\001(\005\022\025\n\rcur_game_time\030\014 \001(\rB\033\n\031emu.grassc" +
"imeRsp\022\017\n\007retcode\030\002 \001(\005\022\022\n\nextra_days\030\016 " +
"\001(\r\022\025\n\rcur_game_time\030\005 \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +680,7 @@ public final class ChangeGameTimeRspOuterClass {
internal_static_ChangeGameTimeRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ChangeGameTimeRsp_descriptor,
new java.lang.String[] { "ExtraDays", "Retcode", "CurGameTime", });
new java.lang.String[] { "Retcode", "ExtraDays", "CurGameTime", });
}
// @@protoc_insertion_point(outer_class_scope)