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 ClientAbilityInitFinishNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>
getInvokesList();
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
int getInvokesCount();
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
getInvokesOrBuilderList();
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
int index);
/**
* <code>uint32 entity_id = 4;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
int getEntityId();
}
/**
* <pre>
* CmdId: 1176
* Name: BKDFGPLGGGB
* CmdId: 1172
* Obf: AKLEFDPDDAD
* </pre>
*
* Protobuf type {@code ClientAbilityInitFinishNotify}
@@ -100,12 +100,12 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
case 0:
done = true;
break;
case 32: {
case 16: {
entityId_ = input.readUInt32();
break;
}
case 50: {
case 74: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
mutable_bitField0_ |= 0x00000001;
@@ -149,17 +149,17 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.class, emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.Builder.class);
}
public static final int INVOKES_FIELD_NUMBER = 6;
public static final int INVOKES_FIELD_NUMBER = 9;
private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
return invokes_;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
@@ -167,21 +167,21 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return invokes_;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
@java.lang.Override
public int getInvokesCount() {
return invokes_.size();
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
return invokes_.get(index);
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -189,10 +189,10 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return invokes_.get(index);
}
public static final int ENTITY_ID_FIELD_NUMBER = 4;
public static final int ENTITY_ID_FIELD_NUMBER = 2;
private int entityId_;
/**
* <code>uint32 entity_id = 4;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -215,10 +215,10 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (entityId_ != 0) {
output.writeUInt32(4, entityId_);
output.writeUInt32(2, entityId_);
}
for (int i = 0; i < invokes_.size(); i++) {
output.writeMessage(6, invokes_.get(i));
output.writeMessage(9, invokes_.get(i));
}
unknownFields.writeTo(output);
}
@@ -231,11 +231,11 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
size = 0;
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, entityId_);
.computeUInt32Size(2, entityId_);
}
for (int i = 0; i < invokes_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, invokes_.get(i));
.computeMessageSize(9, invokes_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -370,8 +370,8 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1176
* Name: BKDFGPLGGGB
* CmdId: 1172
* Obf: AKLEFDPDDAD
* </pre>
*
* Protobuf type {@code ClientAbilityInitFinishNotify}
@@ -577,7 +577,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
if (invokesBuilder_ == null) {
@@ -587,7 +587,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public int getInvokesCount() {
if (invokesBuilder_ == null) {
@@ -597,7 +597,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
if (invokesBuilder_ == null) {
@@ -607,7 +607,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder setInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -624,7 +624,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder setInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -638,7 +638,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
if (invokesBuilder_ == null) {
@@ -654,7 +654,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder addInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -671,7 +671,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder addInvokes(
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -685,7 +685,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder addInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -699,7 +699,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder addAllInvokes(
java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -714,7 +714,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder clearInvokes() {
if (invokesBuilder_ == null) {
@@ -727,7 +727,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public Builder removeInvokes(int index) {
if (invokesBuilder_ == null) {
@@ -740,14 +740,14 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
int index) {
return getInvokesFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
int index) {
@@ -757,7 +757,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
getInvokesOrBuilderList() {
@@ -768,14 +768,14 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
return getInvokesFieldBuilder().addBuilder(
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
int index) {
@@ -783,7 +783,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 6;</code>
* <code>repeated .AbilityInvokeEntry invokes = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder>
getInvokesBuilderList() {
@@ -806,7 +806,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
private int entityId_ ;
/**
* <code>uint32 entity_id = 4;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -814,7 +814,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return entityId_;
}
/**
* <code>uint32 entity_id = 4;</code>
* <code>uint32 entity_id = 2;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
@@ -825,7 +825,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>uint32 entity_id = 4;</code>
* <code>uint32 entity_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
@@ -903,8 +903,8 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n#ClientAbilityInitFinishNotify.proto\032\030A" +
"bilityInvokeEntry.proto\"X\n\035ClientAbility" +
"InitFinishNotify\022$\n\007invokes\030\006 \003(\0132\023.Abil" +
"ityInvokeEntry\022\021\n\tentity_id\030\004 \001(\rB\033\n\031emu" +
"InitFinishNotify\022$\n\007invokes\030\t \003(\0132\023.Abil" +
"ityInvokeEntry\022\021\n\tentity_id\030\002 \001(\rB\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor