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,24 +19,24 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
* @return Whether the sceneArrangementInfo field is set.
*/
boolean hasSceneArrangementInfo();
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
* @return The sceneArrangementInfo.
*/
emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo getSceneArrangementInfo();
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoOrBuilder();
}
/**
* <pre>
* CmdId: 4461
* Name: OIACCGHPIPD
* CmdId: 4871
* Obf: AHPNGIHKNPH
* </pre>
*
* Protobuf type {@code HomeUpdateArrangementInfoReq}
@@ -83,7 +83,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
case 0:
done = true;
break;
case 122: {
case 50: {
emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder subBuilder = null;
if (sceneArrangementInfo_ != null) {
subBuilder = sceneArrangementInfo_.toBuilder();
@@ -128,10 +128,10 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
emu.grasscutter.net.proto.HomeUpdateArrangementInfoReqOuterClass.HomeUpdateArrangementInfoReq.class, emu.grasscutter.net.proto.HomeUpdateArrangementInfoReqOuterClass.HomeUpdateArrangementInfoReq.Builder.class);
}
public static final int SCENE_ARRANGEMENT_INFO_FIELD_NUMBER = 15;
public static final int SCENE_ARRANGEMENT_INFO_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo sceneArrangementInfo_;
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
* @return Whether the sceneArrangementInfo field is set.
*/
@java.lang.Override
@@ -139,7 +139,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
return sceneArrangementInfo_ != null;
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
* @return The sceneArrangementInfo.
*/
@java.lang.Override
@@ -147,7 +147,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
return sceneArrangementInfo_ == null ? emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.getDefaultInstance() : sceneArrangementInfo_;
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoOrBuilder() {
@@ -169,7 +169,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (sceneArrangementInfo_ != null) {
output.writeMessage(15, getSceneArrangementInfo());
output.writeMessage(6, getSceneArrangementInfo());
}
unknownFields.writeTo(output);
}
@@ -182,7 +182,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
size = 0;
if (sceneArrangementInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, getSceneArrangementInfo());
.computeMessageSize(6, getSceneArrangementInfo());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -316,8 +316,8 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
}
/**
* <pre>
* CmdId: 4461
* Name: OIACCGHPIPD
* CmdId: 4871
* Obf: AHPNGIHKNPH
* </pre>
*
* Protobuf type {@code HomeUpdateArrangementInfoReq}
@@ -478,14 +478,14 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder> sceneArrangementInfoBuilder_;
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
* @return Whether the sceneArrangementInfo field is set.
*/
public boolean hasSceneArrangementInfo() {
return sceneArrangementInfoBuilder_ != null || sceneArrangementInfo_ != null;
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
* @return The sceneArrangementInfo.
*/
public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo getSceneArrangementInfo() {
@@ -496,7 +496,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
}
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
public Builder setSceneArrangementInfo(emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo value) {
if (sceneArrangementInfoBuilder_ == null) {
@@ -512,7 +512,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
return this;
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
public Builder setSceneArrangementInfo(
emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder builderForValue) {
@@ -526,7 +526,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
return this;
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
public Builder mergeSceneArrangementInfo(emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo value) {
if (sceneArrangementInfoBuilder_ == null) {
@@ -544,7 +544,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
return this;
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
public Builder clearSceneArrangementInfo() {
if (sceneArrangementInfoBuilder_ == null) {
@@ -558,7 +558,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
return this;
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder getSceneArrangementInfoBuilder() {
@@ -566,7 +566,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
return getSceneArrangementInfoFieldBuilder().getBuilder();
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoOrBuilder() {
if (sceneArrangementInfoBuilder_ != null) {
@@ -577,7 +577,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
}
}
/**
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
* <code>.HomeSceneArrangementInfo scene_arrangement_info = 6;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder>
@@ -662,7 +662,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
"\n\"HomeUpdateArrangementInfoReq.proto\032\036Ho" +
"meSceneArrangementInfo.proto\"Y\n\034HomeUpda" +
"teArrangementInfoReq\0229\n\026scene_arrangemen" +
"t_info\030\017 \001(\0132\031.HomeSceneArrangementInfoB" +
"t_info\030\006 \001(\0132\031.HomeSceneArrangementInfoB" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor