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,35 +19,40 @@ public final class ChangeMpTeamAvatarRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 curAvatarGuid = 12;</code>
* @return The curAvatarGuid.
*/
long getCurAvatarGuid();
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @return A list containing the avatarGuidList.
*/
java.util.List<java.lang.Long> getAvatarGuidListList();
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @return The count of avatarGuidList.
*/
int getAvatarGuidListCount();
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
long getAvatarGuidList(int index);
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint64 cur_avatar_guid = 7;</code>
* @return The curAvatarGuid.
*/
long getCurAvatarGuid();
}
/**
* <pre>
* Name: AMFCHFIEMGP
* CmdId: 1747
* </pre>
*
* Protobuf type {@code ChangeMpTeamAvatarRsp}
*/
public static final class ChangeMpTeamAvatarRsp extends
@@ -94,12 +99,12 @@ public final class ChangeMpTeamAvatarRspOuterClass {
case 0:
done = true;
break;
case 8: {
case 40: {
retcode_ = input.readInt32();
break;
}
case 80: {
case 48: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000001;
@@ -107,7 +112,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
avatarGuidList_.addLong(input.readUInt64());
break;
}
case 82: {
case 50: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -120,7 +125,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
input.popLimit(limit);
break;
}
case 96: {
case 56: {
curAvatarGuid_ = input.readUInt64();
break;
@@ -160,152 +165,10 @@ public final class ChangeMpTeamAvatarRspOuterClass {
emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp.class, emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp.Builder.class);
}
/**
* Protobuf enum {@code ChangeMpTeamAvatarRsp.FHBBDOEOPMF}
*/
public enum FHBBDOEOPMF
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1796;</code>
*/
PEPPOHPHJOJ(1, 1796),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final FHBBDOEOPMF DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1796;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1796;
/**
* <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 FHBBDOEOPMF 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 FHBBDOEOPMF forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1796: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<FHBBDOEOPMF>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
FHBBDOEOPMF> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<FHBBDOEOPMF>() {
public FHBBDOEOPMF findValueByNumber(int number) {
return FHBBDOEOPMF.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.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp.getDescriptor().getEnumTypes().get(0);
}
private static final FHBBDOEOPMF[] VALUES = getStaticValuesArray();
private static FHBBDOEOPMF[] getStaticValuesArray() {
return new FHBBDOEOPMF[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static FHBBDOEOPMF 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 FHBBDOEOPMF(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ChangeMpTeamAvatarRsp.FHBBDOEOPMF)
}
public static final int CURAVATARGUID_FIELD_NUMBER = 12;
private long curAvatarGuid_;
/**
* <code>uint64 curAvatarGuid = 12;</code>
* @return The curAvatarGuid.
*/
@java.lang.Override
public long getCurAvatarGuid() {
return curAvatarGuid_;
}
public static final int AVATARGUIDLIST_FIELD_NUMBER = 10;
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 6;
private com.google.protobuf.Internal.LongList avatarGuidList_;
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @return A list containing the avatarGuidList.
*/
@java.lang.Override
@@ -314,14 +177,14 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return avatarGuidList_;
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -330,10 +193,10 @@ public final class ChangeMpTeamAvatarRspOuterClass {
}
private int avatarGuidListMemoizedSerializedSize = -1;
public static final int RETCODE_FIELD_NUMBER = 1;
public static final int RETCODE_FIELD_NUMBER = 5;
private int retcode_;
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -341,6 +204,17 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return retcode_;
}
public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 7;
private long curAvatarGuid_;
/**
* <code>uint64 cur_avatar_guid = 7;</code>
* @return The curAvatarGuid.
*/
@java.lang.Override
public long getCurAvatarGuid() {
return curAvatarGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -357,17 +231,17 @@ public final class ChangeMpTeamAvatarRspOuterClass {
throws java.io.IOException {
getSerializedSize();
if (retcode_ != 0) {
output.writeInt32(1, retcode_);
output.writeInt32(5, retcode_);
}
if (getAvatarGuidListList().size() > 0) {
output.writeUInt32NoTag(82);
output.writeUInt32NoTag(50);
output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
}
for (int i = 0; i < avatarGuidList_.size(); i++) {
output.writeUInt64NoTag(avatarGuidList_.getLong(i));
}
if (curAvatarGuid_ != 0L) {
output.writeUInt64(12, curAvatarGuid_);
output.writeUInt64(7, curAvatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -380,7 +254,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, retcode_);
.computeInt32Size(5, retcode_);
}
{
int dataSize = 0;
@@ -398,7 +272,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
}
if (curAvatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(12, curAvatarGuid_);
.computeUInt64Size(7, curAvatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -415,12 +289,12 @@ public final class ChangeMpTeamAvatarRspOuterClass {
}
emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp other = (emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp) obj;
if (getCurAvatarGuid()
!= other.getCurAvatarGuid()) return false;
if (!getAvatarGuidListList()
.equals(other.getAvatarGuidListList())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getCurAvatarGuid()
!= other.getCurAvatarGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -432,15 +306,15 @@ public final class ChangeMpTeamAvatarRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CURAVATARGUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCurAvatarGuid());
if (getAvatarGuidListCount() > 0) {
hash = (37 * hash) + AVATARGUIDLIST_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getAvatarGuidListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCurAvatarGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -537,6 +411,11 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return builder;
}
/**
* <pre>
* Name: AMFCHFIEMGP
* CmdId: 1747
* </pre>
*
* Protobuf type {@code ChangeMpTeamAvatarRsp}
*/
public static final class Builder extends
@@ -574,12 +453,12 @@ public final class ChangeMpTeamAvatarRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
curAvatarGuid_ = 0L;
avatarGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
retcode_ = 0;
curAvatarGuid_ = 0L;
return this;
}
@@ -607,13 +486,13 @@ public final class ChangeMpTeamAvatarRspOuterClass {
public emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp buildPartial() {
emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp result = new emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp(this);
int from_bitField0_ = bitField0_;
result.curAvatarGuid_ = curAvatarGuid_;
if (((bitField0_ & 0x00000001) != 0)) {
avatarGuidList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.avatarGuidList_ = avatarGuidList_;
result.retcode_ = retcode_;
result.curAvatarGuid_ = curAvatarGuid_;
onBuilt();
return result;
}
@@ -662,9 +541,6 @@ public final class ChangeMpTeamAvatarRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp other) {
if (other == emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp.getDefaultInstance()) return this;
if (other.getCurAvatarGuid() != 0L) {
setCurAvatarGuid(other.getCurAvatarGuid());
}
if (!other.avatarGuidList_.isEmpty()) {
if (avatarGuidList_.isEmpty()) {
avatarGuidList_ = other.avatarGuidList_;
@@ -678,6 +554,9 @@ public final class ChangeMpTeamAvatarRspOuterClass {
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getCurAvatarGuid() != 0L) {
setCurAvatarGuid(other.getCurAvatarGuid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -708,37 +587,6 @@ public final class ChangeMpTeamAvatarRspOuterClass {
}
private int bitField0_;
private long curAvatarGuid_ ;
/**
* <code>uint64 curAvatarGuid = 12;</code>
* @return The curAvatarGuid.
*/
@java.lang.Override
public long getCurAvatarGuid() {
return curAvatarGuid_;
}
/**
* <code>uint64 curAvatarGuid = 12;</code>
* @param value The curAvatarGuid to set.
* @return This builder for chaining.
*/
public Builder setCurAvatarGuid(long value) {
curAvatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 curAvatarGuid = 12;</code>
* @return This builder for chaining.
*/
public Builder clearCurAvatarGuid() {
curAvatarGuid_ = 0L;
onChanged();
return this;
}
private com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList();
private void ensureAvatarGuidListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -747,7 +595,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
}
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @return A list containing the avatarGuidList.
*/
public java.util.List<java.lang.Long>
@@ -756,14 +604,14 @@ public final class ChangeMpTeamAvatarRspOuterClass {
java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -771,7 +619,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return avatarGuidList_.getLong(index);
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @param index The index to set the value at.
* @param value The avatarGuidList to set.
* @return This builder for chaining.
@@ -784,7 +632,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @param value The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -795,7 +643,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @param values The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -808,7 +656,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 10;</code>
* <code>repeated uint64 avatar_guid_list = 6;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuidList() {
@@ -820,7 +668,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -828,7 +676,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 5;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -839,7 +687,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -848,6 +696,37 @@ public final class ChangeMpTeamAvatarRspOuterClass {
onChanged();
return this;
}
private long curAvatarGuid_ ;
/**
* <code>uint64 cur_avatar_guid = 7;</code>
* @return The curAvatarGuid.
*/
@java.lang.Override
public long getCurAvatarGuid() {
return curAvatarGuid_;
}
/**
* <code>uint64 cur_avatar_guid = 7;</code>
* @param value The curAvatarGuid to set.
* @return This builder for chaining.
*/
public Builder setCurAvatarGuid(long value) {
curAvatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 cur_avatar_guid = 7;</code>
* @return This builder for chaining.
*/
public Builder clearCurAvatarGuid() {
curAvatarGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -915,12 +794,10 @@ public final class ChangeMpTeamAvatarRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033ChangeMpTeamAvatarRsp.proto\"\250\001\n\025Change" +
"MpTeamAvatarRsp\022\025\n\rcurAvatarGuid\030\014 \001(\004\022\026" +
"\n\016avatarGuidList\030\n \003(\004\022\017\n\007retcode\030\001 \001(\005\"" +
"O\n\013FHBBDOEOPMF\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020" +
"\204\016\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001" +
"B\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\033ChangeMpTeamAvatarRsp.proto\"[\n\025ChangeM" +
"pTeamAvatarRsp\022\030\n\020avatar_guid_list\030\006 \003(\004" +
"\022\017\n\007retcode\030\005 \001(\005\022\027\n\017cur_avatar_guid\030\007 \001" +
"(\004B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -931,7 +808,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
internal_static_ChangeMpTeamAvatarRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ChangeMpTeamAvatarRsp_descriptor,
new java.lang.String[] { "CurAvatarGuid", "AvatarGuidList", "Retcode", });
new java.lang.String[] { "AvatarGuidList", "Retcode", "CurAvatarGuid", });
}
// @@protoc_insertion_point(outer_class_scope)