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,20 +19,20 @@ public final class PotionAvatarInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatar_id = 14;</code>
* <code>uint64 avatar_id = 7;</code>
* @return The avatarId.
*/
long getAvatarId();
/**
* <code>bool is_trial = 8;</code>
* <code>bool is_trial = 10;</code>
* @return The isTrial.
*/
boolean getIsTrial();
}
/**
* <pre>
* Name: FHIBGDNPPMI
* Obf: EGFDGFANNGN
* </pre>
*
* Protobuf type {@code PotionAvatarInfo}
@@ -79,16 +79,16 @@ public final class PotionAvatarInfoOuterClass {
case 0:
done = true;
break;
case 64: {
isTrial_ = input.readBool();
break;
}
case 112: {
case 56: {
avatarId_ = input.readUInt64();
break;
}
case 80: {
isTrial_ = input.readBool();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -121,10 +121,10 @@ public final class PotionAvatarInfoOuterClass {
emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo.class, emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo.Builder.class);
}
public static final int AVATAR_ID_FIELD_NUMBER = 14;
public static final int AVATAR_ID_FIELD_NUMBER = 7;
private long avatarId_;
/**
* <code>uint64 avatar_id = 14;</code>
* <code>uint64 avatar_id = 7;</code>
* @return The avatarId.
*/
@java.lang.Override
@@ -132,10 +132,10 @@ public final class PotionAvatarInfoOuterClass {
return avatarId_;
}
public static final int IS_TRIAL_FIELD_NUMBER = 8;
public static final int IS_TRIAL_FIELD_NUMBER = 10;
private boolean isTrial_;
/**
* <code>bool is_trial = 8;</code>
* <code>bool is_trial = 10;</code>
* @return The isTrial.
*/
@java.lang.Override
@@ -157,11 +157,11 @@ public final class PotionAvatarInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (isTrial_ != false) {
output.writeBool(8, isTrial_);
}
if (avatarId_ != 0L) {
output.writeUInt64(14, avatarId_);
output.writeUInt64(7, avatarId_);
}
if (isTrial_ != false) {
output.writeBool(10, isTrial_);
}
unknownFields.writeTo(output);
}
@@ -172,13 +172,13 @@ public final class PotionAvatarInfoOuterClass {
if (size != -1) return size;
size = 0;
if (isTrial_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(8, isTrial_);
}
if (avatarId_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(14, avatarId_);
.computeUInt64Size(7, avatarId_);
}
if (isTrial_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(10, isTrial_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -313,7 +313,7 @@ public final class PotionAvatarInfoOuterClass {
}
/**
* <pre>
* Name: FHIBGDNPPMI
* Obf: EGFDGFANNGN
* </pre>
*
* Protobuf type {@code PotionAvatarInfo}
@@ -470,7 +470,7 @@ public final class PotionAvatarInfoOuterClass {
private long avatarId_ ;
/**
* <code>uint64 avatar_id = 14;</code>
* <code>uint64 avatar_id = 7;</code>
* @return The avatarId.
*/
@java.lang.Override
@@ -478,7 +478,7 @@ public final class PotionAvatarInfoOuterClass {
return avatarId_;
}
/**
* <code>uint64 avatar_id = 14;</code>
* <code>uint64 avatar_id = 7;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
@@ -489,7 +489,7 @@ public final class PotionAvatarInfoOuterClass {
return this;
}
/**
* <code>uint64 avatar_id = 14;</code>
* <code>uint64 avatar_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
@@ -501,7 +501,7 @@ public final class PotionAvatarInfoOuterClass {
private boolean isTrial_ ;
/**
* <code>bool is_trial = 8;</code>
* <code>bool is_trial = 10;</code>
* @return The isTrial.
*/
@java.lang.Override
@@ -509,7 +509,7 @@ public final class PotionAvatarInfoOuterClass {
return isTrial_;
}
/**
* <code>bool is_trial = 8;</code>
* <code>bool is_trial = 10;</code>
* @param value The isTrial to set.
* @return This builder for chaining.
*/
@@ -520,7 +520,7 @@ public final class PotionAvatarInfoOuterClass {
return this;
}
/**
* <code>bool is_trial = 8;</code>
* <code>bool is_trial = 10;</code>
* @return This builder for chaining.
*/
public Builder clearIsTrial() {
@@ -597,7 +597,7 @@ public final class PotionAvatarInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026PotionAvatarInfo.proto\"7\n\020PotionAvatar" +
"Info\022\021\n\tavatar_id\030\016 \001(\004\022\020\n\010is_trial\030\010 \001(" +
"Info\022\021\n\tavatar_id\030\007 \001(\004\022\020\n\010is_trial\030\n \001(" +
"\010B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor