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,25 +19,25 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation>
getInvestigationListList();
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index);
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
int getInvestigationListCount();
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder>
getInvestigationListOrBuilderList();
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
int index);
@@ -68,8 +68,8 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1917
* Name: AAGKEHNFPPN
* CmdId: 1919
* Obf: CHGDBPOCDKC
* </pre>
*
* Protobuf type {@code PlayerInvestigationAllInfoNotify}
@@ -119,7 +119,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
case 0:
done = true;
break;
case 34: {
case 90: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
investigationList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation>();
mutable_bitField0_ |= 0x00000001;
@@ -175,17 +175,17 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify.class, emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify.Builder.class);
}
public static final int INVESTIGATION_LIST_FIELD_NUMBER = 4;
public static final int INVESTIGATION_LIST_FIELD_NUMBER = 11;
private java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> investigationList_;
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
return investigationList_;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder>
@@ -193,21 +193,21 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return investigationList_;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
@java.lang.Override
public int getInvestigationListCount() {
return investigationList_.size();
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
return investigationList_.get(index);
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
@@ -270,7 +270,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < investigationList_.size(); i++) {
output.writeMessage(4, investigationList_.get(i));
output.writeMessage(11, investigationList_.get(i));
}
for (int i = 0; i < investigationTargetList_.size(); i++) {
output.writeMessage(12, investigationTargetList_.get(i));
@@ -286,7 +286,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
size = 0;
for (int i = 0; i < investigationList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, investigationList_.get(i));
.computeMessageSize(11, investigationList_.get(i));
}
for (int i = 0; i < investigationTargetList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
@@ -427,8 +427,8 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1917
* Name: AAGKEHNFPPN
* CmdId: 1919
* Obf: CHGDBPOCDKC
* </pre>
*
* Protobuf type {@code PlayerInvestigationAllInfoNotify}
@@ -670,7 +670,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> investigationListBuilder_;
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
if (investigationListBuilder_ == null) {
@@ -680,7 +680,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
}
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public int getInvestigationListCount() {
if (investigationListBuilder_ == null) {
@@ -690,7 +690,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
}
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
if (investigationListBuilder_ == null) {
@@ -700,7 +700,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
}
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder setInvestigationList(
int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
@@ -717,7 +717,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder setInvestigationList(
int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
@@ -731,7 +731,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder addInvestigationList(emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
if (investigationListBuilder_ == null) {
@@ -747,7 +747,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder addInvestigationList(
int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
@@ -764,7 +764,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder addInvestigationList(
emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
@@ -778,7 +778,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder addInvestigationList(
int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
@@ -792,7 +792,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder addAllInvestigationList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> values) {
@@ -807,7 +807,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder clearInvestigationList() {
if (investigationListBuilder_ == null) {
@@ -820,7 +820,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public Builder removeInvestigationList(int index) {
if (investigationListBuilder_ == null) {
@@ -833,14 +833,14 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
return this;
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder getInvestigationListBuilder(
int index) {
return getInvestigationListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
int index) {
@@ -850,7 +850,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
}
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder>
getInvestigationListOrBuilderList() {
@@ -861,14 +861,14 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
}
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder() {
return getInvestigationListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder(
int index) {
@@ -876,7 +876,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
}
/**
* <code>repeated .Investigation investigation_list = 4;</code>
* <code>repeated .Investigation investigation_list = 11;</code>
*/
public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder>
getInvestigationListBuilderList() {
@@ -1206,7 +1206,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
"\n&PlayerInvestigationAllInfoNotify.proto" +
"\032\023Investigation.proto\032\031InvestigationTarg" +
"et.proto\"\207\001\n PlayerInvestigationAllInfoN" +
"otify\022*\n\022investigation_list\030\004 \003(\0132\016.Inve" +
"otify\022*\n\022investigation_list\030\013 \003(\0132\016.Inve" +
"stigation\0227\n\031investigation_target_list\030\014" +
" \003(\0132\024.InvestigationTargetB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"