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,39 +19,39 @@ public final class FurnitureMakeHelpRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
java.util.List<emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData>
getHelpDataListList();
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData getHelpDataList(int index);
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
int getHelpDataListCount();
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpDataOrBuilder>
getHelpDataListOrBuilderList();
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpDataOrBuilder getHelpDataListOrBuilder(
int index);
}
/**
* <pre>
* CmdId: 4567
* Name: EDBKNPNNLMH
* CmdId: 4581
* Obf: HBPNHOHAOOC
* </pre>
*
* Protobuf type {@code FurnitureMakeHelpRsp}
@@ -100,12 +100,7 @@ public final class FurnitureMakeHelpRspOuterClass {
case 0:
done = true;
break;
case 104: {
retcode_ = input.readInt32();
break;
}
case 114: {
case 50: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
helpDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData>();
mutable_bitField0_ |= 0x00000001;
@@ -114,6 +109,11 @@ public final class FurnitureMakeHelpRspOuterClass {
input.readMessage(emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.parser(), extensionRegistry));
break;
}
case 64: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +149,10 @@ public final class FurnitureMakeHelpRspOuterClass {
emu.grasscutter.net.proto.FurnitureMakeHelpRspOuterClass.FurnitureMakeHelpRsp.class, emu.grasscutter.net.proto.FurnitureMakeHelpRspOuterClass.FurnitureMakeHelpRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 13;
public static final int RETCODE_FIELD_NUMBER = 8;
private int retcode_;
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -160,17 +160,17 @@ public final class FurnitureMakeHelpRspOuterClass {
return retcode_;
}
public static final int HELP_DATA_LIST_FIELD_NUMBER = 14;
public static final int HELP_DATA_LIST_FIELD_NUMBER = 6;
private java.util.List<emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData> helpDataList_;
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData> getHelpDataListList() {
return helpDataList_;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpDataOrBuilder>
@@ -178,21 +178,21 @@ public final class FurnitureMakeHelpRspOuterClass {
return helpDataList_;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
@java.lang.Override
public int getHelpDataListCount() {
return helpDataList_.size();
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData getHelpDataList(int index) {
return helpDataList_.get(index);
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpDataOrBuilder getHelpDataListOrBuilder(
@@ -214,11 +214,11 @@ public final class FurnitureMakeHelpRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(13, retcode_);
}
for (int i = 0; i < helpDataList_.size(); i++) {
output.writeMessage(14, helpDataList_.get(i));
output.writeMessage(6, helpDataList_.get(i));
}
if (retcode_ != 0) {
output.writeInt32(8, retcode_);
}
unknownFields.writeTo(output);
}
@@ -229,13 +229,13 @@ public final class FurnitureMakeHelpRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(13, retcode_);
}
for (int i = 0; i < helpDataList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, helpDataList_.get(i));
.computeMessageSize(6, helpDataList_.get(i));
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -370,8 +370,8 @@ public final class FurnitureMakeHelpRspOuterClass {
}
/**
* <pre>
* CmdId: 4567
* Name: EDBKNPNNLMH
* CmdId: 4581
* Obf: HBPNHOHAOOC
* </pre>
*
* Protobuf type {@code FurnitureMakeHelpRsp}
@@ -566,7 +566,7 @@ public final class FurnitureMakeHelpRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -574,7 +574,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 8;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -585,7 +585,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 8;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -608,7 +608,7 @@ public final class FurnitureMakeHelpRspOuterClass {
emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpDataOrBuilder> helpDataListBuilder_;
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public java.util.List<emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData> getHelpDataListList() {
if (helpDataListBuilder_ == null) {
@@ -618,7 +618,7 @@ public final class FurnitureMakeHelpRspOuterClass {
}
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public int getHelpDataListCount() {
if (helpDataListBuilder_ == null) {
@@ -628,7 +628,7 @@ public final class FurnitureMakeHelpRspOuterClass {
}
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData getHelpDataList(int index) {
if (helpDataListBuilder_ == null) {
@@ -638,7 +638,7 @@ public final class FurnitureMakeHelpRspOuterClass {
}
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder setHelpDataList(
int index, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData value) {
@@ -655,7 +655,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder setHelpDataList(
int index, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder builderForValue) {
@@ -669,7 +669,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder addHelpDataList(emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData value) {
if (helpDataListBuilder_ == null) {
@@ -685,7 +685,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder addHelpDataList(
int index, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData value) {
@@ -702,7 +702,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder addHelpDataList(
emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder builderForValue) {
@@ -716,7 +716,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder addHelpDataList(
int index, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder builderForValue) {
@@ -730,7 +730,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder addAllHelpDataList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData> values) {
@@ -745,7 +745,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder clearHelpDataList() {
if (helpDataListBuilder_ == null) {
@@ -758,7 +758,7 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public Builder removeHelpDataList(int index) {
if (helpDataListBuilder_ == null) {
@@ -771,14 +771,14 @@ public final class FurnitureMakeHelpRspOuterClass {
return this;
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder getHelpDataListBuilder(
int index) {
return getHelpDataListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpDataOrBuilder getHelpDataListOrBuilder(
int index) {
@@ -788,7 +788,7 @@ public final class FurnitureMakeHelpRspOuterClass {
}
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpDataOrBuilder>
getHelpDataListOrBuilderList() {
@@ -799,14 +799,14 @@ public final class FurnitureMakeHelpRspOuterClass {
}
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder addHelpDataListBuilder() {
return getHelpDataListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.getDefaultInstance());
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder addHelpDataListBuilder(
int index) {
@@ -814,7 +814,7 @@ public final class FurnitureMakeHelpRspOuterClass {
index, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.getDefaultInstance());
}
/**
* <code>repeated .FurnitureMakeHelpData help_data_list = 14;</code>
* <code>repeated .FurnitureMakeHelpData help_data_list = 6;</code>
*/
public java.util.List<emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder>
getHelpDataListBuilderList() {
@@ -903,7 +903,7 @@ public final class FurnitureMakeHelpRspOuterClass {
java.lang.String[] descriptorData = {
"\n\032FurnitureMakeHelpRsp.proto\032\033FurnitureM" +
"akeHelpData.proto\"W\n\024FurnitureMakeHelpRs" +
"p\022\017\n\007retcode\030\r \001(\005\022.\n\016help_data_list\030\016 \003" +
"p\022\017\n\007retcode\030\010 \001(\005\022.\n\016help_data_list\030\006 \003" +
"(\0132\026.FurnitureMakeHelpDataB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};