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,17 +19,17 @@ public final class AvatarTeamOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @return A list containing the avatarGuidList.
*/
java.util.List<java.lang.Long> getAvatarGuidListList();
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @return The count of avatarGuidList.
*/
int getAvatarGuidListCount();
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -49,7 +49,7 @@ public final class AvatarTeamOuterClass {
}
/**
* <pre>
* Name: MFJBPEPMJOH
* Obf: MPFLGNHCAGM
* </pre>
*
* Protobuf type {@code AvatarTeam}
@@ -105,7 +105,7 @@ public final class AvatarTeamOuterClass {
teamName_ = s;
break;
}
case 120: {
case 88: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000001;
@@ -113,7 +113,7 @@ public final class AvatarTeamOuterClass {
avatarGuidList_.addLong(input.readUInt64());
break;
}
case 122: {
case 90: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -161,10 +161,10 @@ public final class AvatarTeamOuterClass {
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.class, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.Builder.class);
}
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 15;
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 11;
private com.google.protobuf.Internal.LongList avatarGuidList_;
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @return A list containing the avatarGuidList.
*/
@java.lang.Override
@@ -173,14 +173,14 @@ public final class AvatarTeamOuterClass {
return avatarGuidList_;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -246,7 +246,7 @@ public final class AvatarTeamOuterClass {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, teamName_);
}
if (getAvatarGuidListList().size() > 0) {
output.writeUInt32NoTag(122);
output.writeUInt32NoTag(90);
output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
}
for (int i = 0; i < avatarGuidList_.size(); i++) {
@@ -411,7 +411,7 @@ public final class AvatarTeamOuterClass {
}
/**
* <pre>
* Name: MFJBPEPMJOH
* Obf: MPFLGNHCAGM
* </pre>
*
* Protobuf type {@code AvatarTeam}
@@ -588,7 +588,7 @@ public final class AvatarTeamOuterClass {
}
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @return A list containing the avatarGuidList.
*/
public java.util.List<java.lang.Long>
@@ -597,14 +597,14 @@ public final class AvatarTeamOuterClass {
java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -612,7 +612,7 @@ public final class AvatarTeamOuterClass {
return avatarGuidList_.getLong(index);
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @param index The index to set the value at.
* @param value The avatarGuidList to set.
* @return This builder for chaining.
@@ -625,7 +625,7 @@ public final class AvatarTeamOuterClass {
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @param value The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -636,7 +636,7 @@ public final class AvatarTeamOuterClass {
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @param values The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -649,7 +649,7 @@ public final class AvatarTeamOuterClass {
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* <code>repeated uint64 avatar_guid_list = 11;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuidList() {
@@ -802,7 +802,7 @@ public final class AvatarTeamOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\020AvatarTeam.proto\"9\n\nAvatarTeam\022\030\n\020avat" +
"ar_guid_list\030\017 \003(\004\022\021\n\tteam_name\030\002 \001(\tB\033\n" +
"ar_guid_list\030\013 \003(\004\022\021\n\tteam_name\030\002 \001(\tB\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor