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,30 +19,30 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
* @return Whether the equipAffixInfo field is set.
*/
boolean hasEquipAffixInfo();
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
* @return The equipAffixInfo.
*/
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo();
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder();
/**
* <code>uint64 avatar_guid = 7;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* CmdId: 1645
* Name: ICFBBMJLJLA
* CmdId: 1612
* Obf: LCJLCHOKPMM
* </pre>
*
* Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -89,7 +89,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
case 0:
done = true;
break;
case 50: {
case 10: {
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder subBuilder = null;
if (equipAffixInfo_ != null) {
subBuilder = equipAffixInfo_.toBuilder();
@@ -102,7 +102,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
break;
}
case 56: {
case 120: {
avatarGuid_ = input.readUInt64();
break;
@@ -139,10 +139,10 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.class, emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.Builder.class);
}
public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 6;
public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 1;
private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
* @return Whether the equipAffixInfo field is set.
*/
@java.lang.Override
@@ -150,7 +150,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return equipAffixInfo_ != null;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
* @return The equipAffixInfo.
*/
@java.lang.Override
@@ -158,17 +158,17 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return equipAffixInfo_ == null ? emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
return getEquipAffixInfo();
}
public static final int AVATAR_GUID_FIELD_NUMBER = 7;
public static final int AVATAR_GUID_FIELD_NUMBER = 15;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 7;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -191,10 +191,10 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (equipAffixInfo_ != null) {
output.writeMessage(6, getEquipAffixInfo());
output.writeMessage(1, getEquipAffixInfo());
}
if (avatarGuid_ != 0L) {
output.writeUInt64(7, avatarGuid_);
output.writeUInt64(15, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -207,11 +207,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
size = 0;
if (equipAffixInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getEquipAffixInfo());
.computeMessageSize(1, getEquipAffixInfo());
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(7, avatarGuid_);
.computeUInt64Size(15, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -350,8 +350,8 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1645
* Name: ICFBBMJLJLA
* CmdId: 1612
* Obf: LCJLCHOKPMM
* </pre>
*
* Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -518,14 +518,14 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> equipAffixInfoBuilder_;
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
* @return Whether the equipAffixInfo field is set.
*/
public boolean hasEquipAffixInfo() {
return equipAffixInfoBuilder_ != null || equipAffixInfo_ != null;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
* @return The equipAffixInfo.
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo() {
@@ -536,7 +536,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
public Builder setEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
if (equipAffixInfoBuilder_ == null) {
@@ -552,7 +552,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
public Builder setEquipAffixInfo(
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder builderForValue) {
@@ -566,7 +566,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
public Builder mergeEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
if (equipAffixInfoBuilder_ == null) {
@@ -584,7 +584,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
public Builder clearEquipAffixInfo() {
if (equipAffixInfoBuilder_ == null) {
@@ -598,7 +598,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder getEquipAffixInfoBuilder() {
@@ -606,7 +606,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return getEquipAffixInfoFieldBuilder().getBuilder();
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
if (equipAffixInfoBuilder_ != null) {
@@ -617,7 +617,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder>
@@ -635,7 +635,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 7;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -643,7 +643,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 7;</code>
* <code>uint64 avatar_guid = 15;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -654,7 +654,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>uint64 avatar_guid = 7;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -732,8 +732,8 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n!AvatarEquipAffixStartNotify.proto\032\032Ava" +
"tarEquipAffixInfo.proto\"c\n\033AvatarEquipAf" +
"fixStartNotify\022/\n\020equip_affix_info\030\006 \001(\013" +
"2\025.AvatarEquipAffixInfo\022\023\n\013avatar_guid\030\007" +
"fixStartNotify\022/\n\020equip_affix_info\030\001 \001(\013" +
"2\025.AvatarEquipAffixInfo\022\023\n\013avatar_guid\030\017" +
" \001(\004B\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};