Add support for v3.5.0 (#2090)

* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
@@ -19,30 +19,47 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 talentIndex = 4;</code>
* @return The talentIndex.
* <pre>
* MCIMCJEMMAH
* </pre>
*
* <code>uint32 extra_level = 1;</code>
* @return The extraLevel.
*/
int getTalentIndex();
int getExtraLevel();
/**
* <code>uint64 avatarGuid = 2;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 talentType = 5;</code>
* <pre>
* IMHNBMDKMMN
* </pre>
*
* <code>uint32 talent_type = 7;</code>
* @return The talentType.
*/
int getTalentType();
/**
* <code>uint32 extraLevel = 13;</code>
* @return The extraLevel.
* <code>uint64 avatar_guid = 10;</code>
* @return The avatarGuid.
*/
int getExtraLevel();
long getAvatarGuid();
/**
* <pre>
* FAOAFMCOILH
* </pre>
*
* <code>uint32 talent_index = 11;</code>
* @return The talentIndex.
*/
int getTalentIndex();
}
/**
* <pre>
* Name: FFDMIACPHJJ
* CmdId: 1029
* </pre>
*
* Protobuf type {@code ProudSkillExtraLevelNotify}
*/
public static final class ProudSkillExtraLevelNotify extends
@@ -87,24 +104,24 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
case 0:
done = true;
break;
case 16: {
case 8: {
avatarGuid_ = input.readUInt64();
extraLevel_ = input.readUInt32();
break;
}
case 32: {
talentIndex_ = input.readUInt32();
break;
}
case 40: {
case 56: {
talentType_ = input.readUInt32();
break;
}
case 104: {
case 80: {
extraLevel_ = input.readUInt32();
avatarGuid_ = input.readUInt64();
break;
}
case 88: {
talentIndex_ = input.readUInt32();
break;
}
default: {
@@ -139,163 +156,29 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.class, emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.Builder.class);
}
public static final int EXTRA_LEVEL_FIELD_NUMBER = 1;
private int extraLevel_;
/**
* Protobuf enum {@code ProudSkillExtraLevelNotify.IKHGCHFMBBO}
*/
public enum IKHGCHFMBBO
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1013;</code>
*/
PEPPOHPHJOJ(1, 1013),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final IKHGCHFMBBO DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1013;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1013;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
public final int getNumber() {
if (index == -1) {
throw new java.lang.IllegalArgumentException(
"Can't get the number of an unknown enum value.");
}
return value;
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static IKHGCHFMBBO valueOf(int value) {
return forNumber(value);
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
*/
public static IKHGCHFMBBO forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1013: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<IKHGCHFMBBO>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
IKHGCHFMBBO> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<IKHGCHFMBBO>() {
public IKHGCHFMBBO findValueByNumber(int number) {
return IKHGCHFMBBO.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
if (index == -1) {
throw new java.lang.IllegalStateException(
"Can't get the descriptor of an unrecognized enum value.");
}
return getDescriptor().getValues().get(index);
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.getDescriptor().getEnumTypes().get(0);
}
private static final IKHGCHFMBBO[] VALUES = getStaticValuesArray();
private static IKHGCHFMBBO[] getStaticValuesArray() {
return new IKHGCHFMBBO[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static IKHGCHFMBBO valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
}
if (desc.getIndex() == -1) {
return UNRECOGNIZED;
}
return VALUES[desc.getIndex()];
}
private final int index;
private final int value;
private IKHGCHFMBBO(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ProudSkillExtraLevelNotify.IKHGCHFMBBO)
}
public static final int TALENTINDEX_FIELD_NUMBER = 4;
private int talentIndex_;
/**
* <code>uint32 talentIndex = 4;</code>
* @return The talentIndex.
* <pre>
* MCIMCJEMMAH
* </pre>
*
* <code>uint32 extra_level = 1;</code>
* @return The extraLevel.
*/
@java.lang.Override
public int getTalentIndex() {
return talentIndex_;
public int getExtraLevel() {
return extraLevel_;
}
public static final int AVATARGUID_FIELD_NUMBER = 2;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int TALENTTYPE_FIELD_NUMBER = 5;
public static final int TALENT_TYPE_FIELD_NUMBER = 7;
private int talentType_;
/**
* <code>uint32 talentType = 5;</code>
* <pre>
* IMHNBMDKMMN
* </pre>
*
* <code>uint32 talent_type = 7;</code>
* @return The talentType.
*/
@java.lang.Override
@@ -303,15 +186,30 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return talentType_;
}
public static final int EXTRALEVEL_FIELD_NUMBER = 13;
private int extraLevel_;
public static final int AVATAR_GUID_FIELD_NUMBER = 10;
private long avatarGuid_;
/**
* <code>uint32 extraLevel = 13;</code>
* @return The extraLevel.
* <code>uint64 avatar_guid = 10;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public int getExtraLevel() {
return extraLevel_;
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int TALENT_INDEX_FIELD_NUMBER = 11;
private int talentIndex_;
/**
* <pre>
* FAOAFMCOILH
* </pre>
*
* <code>uint32 talent_index = 11;</code>
* @return The talentIndex.
*/
@java.lang.Override
public int getTalentIndex() {
return talentIndex_;
}
private byte memoizedIsInitialized = -1;
@@ -328,17 +226,17 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(2, avatarGuid_);
}
if (talentIndex_ != 0) {
output.writeUInt32(4, talentIndex_);
if (extraLevel_ != 0) {
output.writeUInt32(1, extraLevel_);
}
if (talentType_ != 0) {
output.writeUInt32(5, talentType_);
output.writeUInt32(7, talentType_);
}
if (extraLevel_ != 0) {
output.writeUInt32(13, extraLevel_);
if (avatarGuid_ != 0L) {
output.writeUInt64(10, avatarGuid_);
}
if (talentIndex_ != 0) {
output.writeUInt32(11, talentIndex_);
}
unknownFields.writeTo(output);
}
@@ -349,21 +247,21 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
if (extraLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(2, avatarGuid_);
}
if (talentIndex_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, talentIndex_);
.computeUInt32Size(1, extraLevel_);
}
if (talentType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, talentType_);
.computeUInt32Size(7, talentType_);
}
if (extraLevel_ != 0) {
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, extraLevel_);
.computeUInt64Size(10, avatarGuid_);
}
if (talentIndex_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, talentIndex_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -380,14 +278,14 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
}
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other = (emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify) obj;
if (getTalentIndex()
!= other.getTalentIndex()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getTalentType()
!= other.getTalentType()) return false;
if (getExtraLevel()
!= other.getExtraLevel()) return false;
if (getTalentType()
!= other.getTalentType()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getTalentIndex()
!= other.getTalentIndex()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -399,15 +297,15 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TALENTINDEX_FIELD_NUMBER;
hash = (53 * hash) + getTalentIndex();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + EXTRA_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getExtraLevel();
hash = (37 * hash) + TALENT_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getTalentType();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + TALENTTYPE_FIELD_NUMBER;
hash = (53 * hash) + getTalentType();
hash = (37 * hash) + EXTRALEVEL_FIELD_NUMBER;
hash = (53 * hash) + getExtraLevel();
hash = (37 * hash) + TALENT_INDEX_FIELD_NUMBER;
hash = (53 * hash) + getTalentIndex();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -504,6 +402,11 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: FFDMIACPHJJ
* CmdId: 1029
* </pre>
*
* Protobuf type {@code ProudSkillExtraLevelNotify}
*/
public static final class Builder extends
@@ -541,13 +444,13 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
talentIndex_ = 0;
avatarGuid_ = 0L;
extraLevel_ = 0;
talentType_ = 0;
extraLevel_ = 0;
avatarGuid_ = 0L;
talentIndex_ = 0;
return this;
}
@@ -575,10 +478,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify buildPartial() {
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify result = new emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify(this);
result.talentIndex_ = talentIndex_;
result.avatarGuid_ = avatarGuid_;
result.talentType_ = talentType_;
result.extraLevel_ = extraLevel_;
result.talentType_ = talentType_;
result.avatarGuid_ = avatarGuid_;
result.talentIndex_ = talentIndex_;
onBuilt();
return result;
}
@@ -627,17 +530,17 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other) {
if (other == emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.getDefaultInstance()) return this;
if (other.getTalentIndex() != 0) {
setTalentIndex(other.getTalentIndex());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
if (other.getExtraLevel() != 0) {
setExtraLevel(other.getExtraLevel());
}
if (other.getTalentType() != 0) {
setTalentType(other.getTalentType());
}
if (other.getExtraLevel() != 0) {
setExtraLevel(other.getExtraLevel());
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getTalentIndex() != 0) {
setTalentIndex(other.getTalentIndex());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -668,102 +571,13 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return this;
}
private int talentIndex_ ;
/**
* <code>uint32 talentIndex = 4;</code>
* @return The talentIndex.
*/
@java.lang.Override
public int getTalentIndex() {
return talentIndex_;
}
/**
* <code>uint32 talentIndex = 4;</code>
* @param value The talentIndex to set.
* @return This builder for chaining.
*/
public Builder setTalentIndex(int value) {
talentIndex_ = value;
onChanged();
return this;
}
/**
* <code>uint32 talentIndex = 4;</code>
* @return This builder for chaining.
*/
public Builder clearTalentIndex() {
talentIndex_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 2;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatarGuid = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int talentType_ ;
/**
* <code>uint32 talentType = 5;</code>
* @return The talentType.
*/
@java.lang.Override
public int getTalentType() {
return talentType_;
}
/**
* <code>uint32 talentType = 5;</code>
* @param value The talentType to set.
* @return This builder for chaining.
*/
public Builder setTalentType(int value) {
talentType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 talentType = 5;</code>
* @return This builder for chaining.
*/
public Builder clearTalentType() {
talentType_ = 0;
onChanged();
return this;
}
private int extraLevel_ ;
/**
* <code>uint32 extraLevel = 13;</code>
* <pre>
* MCIMCJEMMAH
* </pre>
*
* <code>uint32 extra_level = 1;</code>
* @return The extraLevel.
*/
@java.lang.Override
@@ -771,7 +585,11 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return extraLevel_;
}
/**
* <code>uint32 extraLevel = 13;</code>
* <pre>
* MCIMCJEMMAH
* </pre>
*
* <code>uint32 extra_level = 1;</code>
* @param value The extraLevel to set.
* @return This builder for chaining.
*/
@@ -782,7 +600,11 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return this;
}
/**
* <code>uint32 extraLevel = 13;</code>
* <pre>
* MCIMCJEMMAH
* </pre>
*
* <code>uint32 extra_level = 1;</code>
* @return This builder for chaining.
*/
public Builder clearExtraLevel() {
@@ -791,6 +613,123 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
onChanged();
return this;
}
private int talentType_ ;
/**
* <pre>
* IMHNBMDKMMN
* </pre>
*
* <code>uint32 talent_type = 7;</code>
* @return The talentType.
*/
@java.lang.Override
public int getTalentType() {
return talentType_;
}
/**
* <pre>
* IMHNBMDKMMN
* </pre>
*
* <code>uint32 talent_type = 7;</code>
* @param value The talentType to set.
* @return This builder for chaining.
*/
public Builder setTalentType(int value) {
talentType_ = value;
onChanged();
return this;
}
/**
* <pre>
* IMHNBMDKMMN
* </pre>
*
* <code>uint32 talent_type = 7;</code>
* @return This builder for chaining.
*/
public Builder clearTalentType() {
talentType_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 10;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 10;</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 = 10;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int talentIndex_ ;
/**
* <pre>
* FAOAFMCOILH
* </pre>
*
* <code>uint32 talent_index = 11;</code>
* @return The talentIndex.
*/
@java.lang.Override
public int getTalentIndex() {
return talentIndex_;
}
/**
* <pre>
* FAOAFMCOILH
* </pre>
*
* <code>uint32 talent_index = 11;</code>
* @param value The talentIndex to set.
* @return This builder for chaining.
*/
public Builder setTalentIndex(int value) {
talentIndex_ = value;
onChanged();
return this;
}
/**
* <pre>
* FAOAFMCOILH
* </pre>
*
* <code>uint32 talent_index = 11;</code>
* @return This builder for chaining.
*/
public Builder clearTalentIndex() {
talentIndex_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -858,13 +797,11 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n ProudSkillExtraLevelNotify.proto\"\276\001\n\032P" +
"roudSkillExtraLevelNotify\022\023\n\013talentIndex" +
"\030\004 \001(\r\022\022\n\navatarGuid\030\002 \001(\004\022\022\n\ntalentType" +
"\030\005 \001(\r\022\022\n\nextraLevel\030\r \001(\r\"O\n\013IKHGCHFMBB" +
"O\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\365\007\022\017\n\013DCDNILF" +
"DFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grass" +
"cutter.net.protob\006proto3"
"\n ProudSkillExtraLevelNotify.proto\"q\n\032Pr" +
"oudSkillExtraLevelNotify\022\023\n\013extra_level\030" +
"\001 \001(\r\022\023\n\013talent_type\030\007 \001(\r\022\023\n\013avatar_gui" +
"d\030\n \001(\004\022\024\n\014talent_index\030\013 \001(\rB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -875,7 +812,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
internal_static_ProudSkillExtraLevelNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ProudSkillExtraLevelNotify_descriptor,
new java.lang.String[] { "TalentIndex", "AvatarGuid", "TalentType", "ExtraLevel", });
new java.lang.String[] { "ExtraLevel", "TalentType", "AvatarGuid", "TalentIndex", });
}
// @@protoc_insertion_point(outer_class_scope)