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 TakeCompoundOutputRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>
getItemListList();
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index);
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
int getItemListCount();
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList();
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index);
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 10;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 104
* Name: MOJLFNMFKMH
* CmdId: 146
* Obf: EIJPLGLEGGJ
* </pre>
*
* Protobuf type {@code TakeCompoundOutputRsp}
@@ -100,12 +100,7 @@ public final class TakeCompoundOutputRspOuterClass {
case 0:
done = true;
break;
case 32: {
retcode_ = input.readInt32();
break;
}
case 106: {
case 74: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
mutable_bitField0_ |= 0x00000001;
@@ -114,6 +109,11 @@ public final class TakeCompoundOutputRspOuterClass {
input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
break;
}
case 80: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,17 +149,17 @@ public final class TakeCompoundOutputRspOuterClass {
emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp.class, emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp.Builder.class);
}
public static final int ITEM_LIST_FIELD_NUMBER = 13;
public static final int ITEM_LIST_FIELD_NUMBER = 9;
private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_;
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
return itemList_;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
@@ -167,21 +167,21 @@ public final class TakeCompoundOutputRspOuterClass {
return itemList_;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public int getItemListCount() {
return itemList_.size();
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
return itemList_.get(index);
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
@@ -189,10 +189,10 @@ public final class TakeCompoundOutputRspOuterClass {
return itemList_.get(index);
}
public static final int RETCODE_FIELD_NUMBER = 4;
public static final int RETCODE_FIELD_NUMBER = 10;
private int retcode_;
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 10;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -214,11 +214,11 @@ public final class TakeCompoundOutputRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(4, retcode_);
}
for (int i = 0; i < itemList_.size(); i++) {
output.writeMessage(13, itemList_.get(i));
output.writeMessage(9, itemList_.get(i));
}
if (retcode_ != 0) {
output.writeInt32(10, retcode_);
}
unknownFields.writeTo(output);
}
@@ -229,13 +229,13 @@ public final class TakeCompoundOutputRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, retcode_);
}
for (int i = 0; i < itemList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, itemList_.get(i));
.computeMessageSize(9, itemList_.get(i));
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(10, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -370,8 +370,8 @@ public final class TakeCompoundOutputRspOuterClass {
}
/**
* <pre>
* CmdId: 104
* Name: MOJLFNMFKMH
* CmdId: 146
* Obf: EIJPLGLEGGJ
* </pre>
*
* Protobuf type {@code TakeCompoundOutputRsp}
@@ -577,7 +577,7 @@ public final class TakeCompoundOutputRspOuterClass {
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_;
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
if (itemListBuilder_ == null) {
@@ -587,7 +587,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public int getItemListCount() {
if (itemListBuilder_ == null) {
@@ -597,7 +597,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
if (itemListBuilder_ == null) {
@@ -607,7 +607,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -624,7 +624,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -638,7 +638,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
if (itemListBuilder_ == null) {
@@ -654,7 +654,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -671,7 +671,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -685,7 +685,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -699,7 +699,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addAllItemList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -714,7 +714,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder clearItemList() {
if (itemListBuilder_ == null) {
@@ -727,7 +727,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder removeItemList(int index) {
if (itemListBuilder_ == null) {
@@ -740,14 +740,14 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder(
int index) {
return getItemListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index) {
@@ -757,7 +757,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList() {
@@ -768,14 +768,14 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() {
return getItemListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder(
int index) {
@@ -783,7 +783,7 @@ public final class TakeCompoundOutputRspOuterClass {
index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam item_list = 13;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder>
getItemListBuilderList() {
@@ -806,7 +806,7 @@ public final class TakeCompoundOutputRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 10;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -814,7 +814,7 @@ public final class TakeCompoundOutputRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 10;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -825,7 +825,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 10;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -903,7 +903,7 @@ public final class TakeCompoundOutputRspOuterClass {
java.lang.String[] descriptorData = {
"\n\033TakeCompoundOutputRsp.proto\032\017ItemParam" +
".proto\"G\n\025TakeCompoundOutputRsp\022\035\n\titem_" +
"list\030\r \003(\0132\n.ItemParam\022\017\n\007retcode\030\004 \001(\005B" +
"list\030\t \003(\0132\n.ItemParam\022\017\n\007retcode\030\n \001(\005B" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor