Add support for game version 3.6 (#2110)

* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
@@ -19,30 +19,30 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* @return Whether the equipAffixInfo field is set.
*/
boolean hasEquipAffixInfo();
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* @return The equipAffixInfo.
*/
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo();
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder();
/**
* <code>uint64 avatar_guid = 7;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* Name: GDBEDIEBFFL
* CmdId: 1666
* CmdId: 1645
* Name: ICFBBMJLJLA
* </pre>
*
* Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -89,12 +89,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
case 0:
done = true;
break;
case 40: {
avatarGuid_ = input.readUInt64();
break;
}
case 82: {
case 50: {
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder subBuilder = null;
if (equipAffixInfo_ != null) {
subBuilder = equipAffixInfo_.toBuilder();
@@ -107,6 +102,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
break;
}
case 56: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -139,21 +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 AVATAR_GUID_FIELD_NUMBER = 5;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 10;
public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* @return Whether the equipAffixInfo field is set.
*/
@java.lang.Override
@@ -161,7 +150,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return equipAffixInfo_ != null;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* @return The equipAffixInfo.
*/
@java.lang.Override
@@ -169,13 +158,24 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return equipAffixInfo_ == null ? emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
return getEquipAffixInfo();
}
public static final int AVATAR_GUID_FIELD_NUMBER = 7;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 7;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -190,11 +190,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(5, avatarGuid_);
}
if (equipAffixInfo_ != null) {
output.writeMessage(10, getEquipAffixInfo());
output.writeMessage(6, getEquipAffixInfo());
}
if (avatarGuid_ != 0L) {
output.writeUInt64(7, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -205,13 +205,13 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(5, avatarGuid_);
}
if (equipAffixInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, getEquipAffixInfo());
.computeMessageSize(6, getEquipAffixInfo());
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(7, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -228,13 +228,13 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify other = (emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify) obj;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (hasEquipAffixInfo() != other.hasEquipAffixInfo()) return false;
if (hasEquipAffixInfo()) {
if (!getEquipAffixInfo()
.equals(other.getEquipAffixInfo())) return false;
}
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -246,13 +246,13 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
if (hasEquipAffixInfo()) {
hash = (37 * hash) + EQUIP_AFFIX_INFO_FIELD_NUMBER;
hash = (53 * hash) + getEquipAffixInfo().hashCode();
}
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -350,8 +350,8 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
/**
* <pre>
* Name: GDBEDIEBFFL
* CmdId: 1666
* CmdId: 1645
* Name: ICFBBMJLJLA
* </pre>
*
* Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -391,14 +391,14 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
avatarGuid_ = 0L;
if (equipAffixInfoBuilder_ == null) {
equipAffixInfo_ = null;
} else {
equipAffixInfo_ = null;
equipAffixInfoBuilder_ = null;
}
avatarGuid_ = 0L;
return this;
}
@@ -425,12 +425,12 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify buildPartial() {
emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify result = new emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify(this);
result.avatarGuid_ = avatarGuid_;
if (equipAffixInfoBuilder_ == null) {
result.equipAffixInfo_ = equipAffixInfo_;
} else {
result.equipAffixInfo_ = equipAffixInfoBuilder_.build();
}
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
}
@@ -479,12 +479,12 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify other) {
if (other == emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.getDefaultInstance()) return this;
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.hasEquipAffixInfo()) {
mergeEquipAffixInfo(other.getEquipAffixInfo());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -514,49 +514,18 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 5;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 5;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
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 = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* @return Whether the equipAffixInfo field is set.
*/
public boolean hasEquipAffixInfo() {
return equipAffixInfoBuilder_ != null || equipAffixInfo_ != null;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
* @return The equipAffixInfo.
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo() {
@@ -567,7 +536,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
public Builder setEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
if (equipAffixInfoBuilder_ == null) {
@@ -583,7 +552,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
public Builder setEquipAffixInfo(
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder builderForValue) {
@@ -597,7 +566,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
public Builder mergeEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
if (equipAffixInfoBuilder_ == null) {
@@ -615,7 +584,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
public Builder clearEquipAffixInfo() {
if (equipAffixInfoBuilder_ == null) {
@@ -629,7 +598,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder getEquipAffixInfoBuilder() {
@@ -637,7 +606,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return getEquipAffixInfoFieldBuilder().getBuilder();
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</code>
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
if (equipAffixInfoBuilder_ != null) {
@@ -648,7 +617,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
}
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 6;</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>
@@ -663,6 +632,37 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
return equipAffixInfoBuilder_;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 7;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 7;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 7;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -732,9 +732,9 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n!AvatarEquipAffixStartNotify.proto\032\032Ava" +
"tarEquipAffixInfo.proto\"c\n\033AvatarEquipAf" +
"fixStartNotify\022\023\n\013avatar_guid\030\005 \001(\004\022/\n\020e" +
"quip_affix_info\030\n \001(\0132\025.AvatarEquipAffix" +
"InfoB\033\n\031emu.grasscutter.net.protob\006proto" +
"fixStartNotify\022/\n\020equip_affix_info\030\006 \001(\013" +
"2\025.AvatarEquipAffixInfo\022\023\n\013avatar_guid\030\007" +
" \001(\004B\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -747,7 +747,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
internal_static_AvatarEquipAffixStartNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarEquipAffixStartNotify_descriptor,
new java.lang.String[] { "AvatarGuid", "EquipAffixInfo", });
new java.lang.String[] { "EquipAffixInfo", "AvatarGuid", });
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor();
}