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,26 @@ public final class MusicGameStartRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 11;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 music_basic_id = 9;</code>
* <code>uint32 music_basic_id = 13;</code>
* @return The musicBasicId.
*/
int getMusicBasicId();
/**
* <code>uint64 ugc_guid = 4;</code>
* <code>uint64 ugc_guid = 10;</code>
* @return The ugcGuid.
*/
long getUgcGuid();
}
/**
* <pre>
* CmdId: 8128
* Name: NKACBDDGFOO
* CmdId: 8290
* </pre>
*
* Protobuf type {@code MusicGameStartRsp}
@@ -86,21 +85,21 @@ public final class MusicGameStartRspOuterClass {
case 0:
done = true;
break;
case 32: {
case 8: {
retcode_ = input.readInt32();
break;
}
case 80: {
ugcGuid_ = input.readUInt64();
break;
}
case 72: {
case 104: {
musicBasicId_ = input.readUInt32();
break;
}
case 88: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +132,10 @@ public final class MusicGameStartRspOuterClass {
emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.class, emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 11;
public static final int RETCODE_FIELD_NUMBER = 1;
private int retcode_;
/**
* <code>int32 retcode = 11;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -144,10 +143,10 @@ public final class MusicGameStartRspOuterClass {
return retcode_;
}
public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 9;
public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 13;
private int musicBasicId_;
/**
* <code>uint32 music_basic_id = 9;</code>
* <code>uint32 music_basic_id = 13;</code>
* @return The musicBasicId.
*/
@java.lang.Override
@@ -155,10 +154,10 @@ public final class MusicGameStartRspOuterClass {
return musicBasicId_;
}
public static final int UGC_GUID_FIELD_NUMBER = 4;
public static final int UGC_GUID_FIELD_NUMBER = 10;
private long ugcGuid_;
/**
* <code>uint64 ugc_guid = 4;</code>
* <code>uint64 ugc_guid = 10;</code>
* @return The ugcGuid.
*/
@java.lang.Override
@@ -180,14 +179,14 @@ public final class MusicGameStartRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(1, retcode_);
}
if (ugcGuid_ != 0L) {
output.writeUInt64(4, ugcGuid_);
output.writeUInt64(10, ugcGuid_);
}
if (musicBasicId_ != 0) {
output.writeUInt32(9, musicBasicId_);
}
if (retcode_ != 0) {
output.writeInt32(11, retcode_);
output.writeUInt32(13, musicBasicId_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +197,17 @@ public final class MusicGameStartRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, retcode_);
}
if (ugcGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(4, ugcGuid_);
.computeUInt64Size(10, ugcGuid_);
}
if (musicBasicId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, musicBasicId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(11, retcode_);
.computeUInt32Size(13, musicBasicId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -346,8 +345,7 @@ public final class MusicGameStartRspOuterClass {
}
/**
* <pre>
* CmdId: 8128
* Name: NKACBDDGFOO
* CmdId: 8290
* </pre>
*
* Protobuf type {@code MusicGameStartRsp}
@@ -510,7 +508,7 @@ public final class MusicGameStartRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 11;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -518,7 +516,7 @@ public final class MusicGameStartRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 11;</code>
* <code>int32 retcode = 1;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -529,7 +527,7 @@ public final class MusicGameStartRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 11;</code>
* <code>int32 retcode = 1;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -541,7 +539,7 @@ public final class MusicGameStartRspOuterClass {
private int musicBasicId_ ;
/**
* <code>uint32 music_basic_id = 9;</code>
* <code>uint32 music_basic_id = 13;</code>
* @return The musicBasicId.
*/
@java.lang.Override
@@ -549,7 +547,7 @@ public final class MusicGameStartRspOuterClass {
return musicBasicId_;
}
/**
* <code>uint32 music_basic_id = 9;</code>
* <code>uint32 music_basic_id = 13;</code>
* @param value The musicBasicId to set.
* @return This builder for chaining.
*/
@@ -560,7 +558,7 @@ public final class MusicGameStartRspOuterClass {
return this;
}
/**
* <code>uint32 music_basic_id = 9;</code>
* <code>uint32 music_basic_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearMusicBasicId() {
@@ -572,7 +570,7 @@ public final class MusicGameStartRspOuterClass {
private long ugcGuid_ ;
/**
* <code>uint64 ugc_guid = 4;</code>
* <code>uint64 ugc_guid = 10;</code>
* @return The ugcGuid.
*/
@java.lang.Override
@@ -580,7 +578,7 @@ public final class MusicGameStartRspOuterClass {
return ugcGuid_;
}
/**
* <code>uint64 ugc_guid = 4;</code>
* <code>uint64 ugc_guid = 10;</code>
* @param value The ugcGuid to set.
* @return This builder for chaining.
*/
@@ -591,7 +589,7 @@ public final class MusicGameStartRspOuterClass {
return this;
}
/**
* <code>uint64 ugc_guid = 4;</code>
* <code>uint64 ugc_guid = 10;</code>
* @return This builder for chaining.
*/
public Builder clearUgcGuid() {
@@ -668,8 +666,8 @@ public final class MusicGameStartRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\027MusicGameStartRsp.proto\"N\n\021MusicGameSt" +
"artRsp\022\017\n\007retcode\030\013 \001(\005\022\026\n\016music_basic_i" +
"d\030\t \001(\r\022\020\n\010ugc_guid\030\004 \001(\004B\033\n\031emu.grasscu" +
"artRsp\022\017\n\007retcode\030\001 \001(\005\022\026\n\016music_basic_i" +
"d\030\r \001(\r\022\020\n\010ugc_guid\030\n \001(\004B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor