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,29 +19,34 @@ public final class MarkNewNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated uint32 idList = 1;</code>
* <code>uint32 mark_new_type = 13;</code>
* @return The markNewType.
*/
int getMarkNewType();
/**
* <code>repeated uint32 id_list = 2;</code>
* @return A list containing the idList.
*/
java.util.List<java.lang.Integer> getIdListList();
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @return The count of idList.
*/
int getIdListCount();
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @param index The index of the element to return.
* @return The idList at the given index.
*/
int getIdList(int index);
/**
* <code>uint32 markNewType = 15;</code>
* @return The markNewType.
*/
int getMarkNewType();
}
/**
* <pre>
* Name: NGIAHNHBFNJ
* CmdId: 1207
* </pre>
*
* Protobuf type {@code MarkNewNotify}
*/
public static final class MarkNewNotify extends
@@ -88,7 +93,7 @@ public final class MarkNewNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
case 16: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
idList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -96,7 +101,7 @@ public final class MarkNewNotifyOuterClass {
idList_.addInt(input.readUInt32());
break;
}
case 10: {
case 18: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -109,7 +114,7 @@ public final class MarkNewNotifyOuterClass {
input.popLimit(limit);
break;
}
case 120: {
case 104: {
markNewType_ = input.readUInt32();
break;
@@ -149,141 +154,21 @@ public final class MarkNewNotifyOuterClass {
emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify.class, emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify.Builder.class);
}
public static final int MARK_NEW_TYPE_FIELD_NUMBER = 13;
private int markNewType_;
/**
* Protobuf enum {@code MarkNewNotify.PLJJEEODALH}
* <code>uint32 mark_new_type = 13;</code>
* @return The markNewType.
*/
public enum PLJJEEODALH
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1229;</code>
*/
PEPPOHPHJOJ(1, 1229),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final PLJJEEODALH DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1229;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1229;
/**
* <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 PLJJEEODALH 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 PLJJEEODALH forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1229: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<PLJJEEODALH>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
PLJJEEODALH> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<PLJJEEODALH>() {
public PLJJEEODALH findValueByNumber(int number) {
return PLJJEEODALH.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.MarkNewNotifyOuterClass.MarkNewNotify.getDescriptor().getEnumTypes().get(0);
}
private static final PLJJEEODALH[] VALUES = getStaticValuesArray();
private static PLJJEEODALH[] getStaticValuesArray() {
return new PLJJEEODALH[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static PLJJEEODALH 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 PLJJEEODALH(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:MarkNewNotify.PLJJEEODALH)
@java.lang.Override
public int getMarkNewType() {
return markNewType_;
}
public static final int IDLIST_FIELD_NUMBER = 1;
public static final int ID_LIST_FIELD_NUMBER = 2;
private com.google.protobuf.Internal.IntList idList_;
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @return A list containing the idList.
*/
@java.lang.Override
@@ -292,14 +177,14 @@ public final class MarkNewNotifyOuterClass {
return idList_;
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @return The count of idList.
*/
public int getIdListCount() {
return idList_.size();
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @param index The index of the element to return.
* @return The idList at the given index.
*/
@@ -308,17 +193,6 @@ public final class MarkNewNotifyOuterClass {
}
private int idListMemoizedSerializedSize = -1;
public static final int MARKNEWTYPE_FIELD_NUMBER = 15;
private int markNewType_;
/**
* <code>uint32 markNewType = 15;</code>
* @return The markNewType.
*/
@java.lang.Override
public int getMarkNewType() {
return markNewType_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -335,14 +209,14 @@ public final class MarkNewNotifyOuterClass {
throws java.io.IOException {
getSerializedSize();
if (getIdListList().size() > 0) {
output.writeUInt32NoTag(10);
output.writeUInt32NoTag(18);
output.writeUInt32NoTag(idListMemoizedSerializedSize);
}
for (int i = 0; i < idList_.size(); i++) {
output.writeUInt32NoTag(idList_.getInt(i));
}
if (markNewType_ != 0) {
output.writeUInt32(15, markNewType_);
output.writeUInt32(13, markNewType_);
}
unknownFields.writeTo(output);
}
@@ -369,7 +243,7 @@ public final class MarkNewNotifyOuterClass {
}
if (markNewType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, markNewType_);
.computeUInt32Size(13, markNewType_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -386,10 +260,10 @@ public final class MarkNewNotifyOuterClass {
}
emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify other = (emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify) obj;
if (!getIdListList()
.equals(other.getIdListList())) return false;
if (getMarkNewType()
!= other.getMarkNewType()) return false;
if (!getIdListList()
.equals(other.getIdListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -401,12 +275,12 @@ public final class MarkNewNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + MARK_NEW_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getMarkNewType();
if (getIdListCount() > 0) {
hash = (37 * hash) + IDLIST_FIELD_NUMBER;
hash = (37 * hash) + ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getIdListList().hashCode();
}
hash = (37 * hash) + MARKNEWTYPE_FIELD_NUMBER;
hash = (53 * hash) + getMarkNewType();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -503,6 +377,11 @@ public final class MarkNewNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: NGIAHNHBFNJ
* CmdId: 1207
* </pre>
*
* Protobuf type {@code MarkNewNotify}
*/
public static final class Builder extends
@@ -540,10 +419,10 @@ public final class MarkNewNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
idList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
markNewType_ = 0;
idList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -571,12 +450,12 @@ public final class MarkNewNotifyOuterClass {
public emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify buildPartial() {
emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify result = new emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify(this);
int from_bitField0_ = bitField0_;
result.markNewType_ = markNewType_;
if (((bitField0_ & 0x00000001) != 0)) {
idList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.idList_ = idList_;
result.markNewType_ = markNewType_;
onBuilt();
return result;
}
@@ -625,6 +504,9 @@ public final class MarkNewNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify other) {
if (other == emu.grasscutter.net.proto.MarkNewNotifyOuterClass.MarkNewNotify.getDefaultInstance()) return this;
if (other.getMarkNewType() != 0) {
setMarkNewType(other.getMarkNewType());
}
if (!other.idList_.isEmpty()) {
if (idList_.isEmpty()) {
idList_ = other.idList_;
@@ -635,9 +517,6 @@ public final class MarkNewNotifyOuterClass {
}
onChanged();
}
if (other.getMarkNewType() != 0) {
setMarkNewType(other.getMarkNewType());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -668,6 +547,37 @@ public final class MarkNewNotifyOuterClass {
}
private int bitField0_;
private int markNewType_ ;
/**
* <code>uint32 mark_new_type = 13;</code>
* @return The markNewType.
*/
@java.lang.Override
public int getMarkNewType() {
return markNewType_;
}
/**
* <code>uint32 mark_new_type = 13;</code>
* @param value The markNewType to set.
* @return This builder for chaining.
*/
public Builder setMarkNewType(int value) {
markNewType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 mark_new_type = 13;</code>
* @return This builder for chaining.
*/
public Builder clearMarkNewType() {
markNewType_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.IntList idList_ = emptyIntList();
private void ensureIdListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -676,7 +586,7 @@ public final class MarkNewNotifyOuterClass {
}
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @return A list containing the idList.
*/
public java.util.List<java.lang.Integer>
@@ -685,14 +595,14 @@ public final class MarkNewNotifyOuterClass {
java.util.Collections.unmodifiableList(idList_) : idList_;
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @return The count of idList.
*/
public int getIdListCount() {
return idList_.size();
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @param index The index of the element to return.
* @return The idList at the given index.
*/
@@ -700,7 +610,7 @@ public final class MarkNewNotifyOuterClass {
return idList_.getInt(index);
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @param index The index to set the value at.
* @param value The idList to set.
* @return This builder for chaining.
@@ -713,7 +623,7 @@ public final class MarkNewNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @param value The idList to add.
* @return This builder for chaining.
*/
@@ -724,7 +634,7 @@ public final class MarkNewNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @param values The idList to add.
* @return This builder for chaining.
*/
@@ -737,7 +647,7 @@ public final class MarkNewNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 idList = 1;</code>
* <code>repeated uint32 id_list = 2;</code>
* @return This builder for chaining.
*/
public Builder clearIdList() {
@@ -746,37 +656,6 @@ public final class MarkNewNotifyOuterClass {
onChanged();
return this;
}
private int markNewType_ ;
/**
* <code>uint32 markNewType = 15;</code>
* @return The markNewType.
*/
@java.lang.Override
public int getMarkNewType() {
return markNewType_;
}
/**
* <code>uint32 markNewType = 15;</code>
* @param value The markNewType to set.
* @return This builder for chaining.
*/
public Builder setMarkNewType(int value) {
markNewType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 markNewType = 15;</code>
* @return This builder for chaining.
*/
public Builder clearMarkNewType() {
markNewType_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -844,11 +723,9 @@ public final class MarkNewNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\023MarkNewNotify.proto\"\205\001\n\rMarkNewNotify\022" +
"\016\n\006idList\030\001 \003(\r\022\023\n\013markNewType\030\017 \001(\r\"O\n\013" +
"PLJJEEODALH\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\315\t\022" +
"\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
"\n\023MarkNewNotify.proto\"7\n\rMarkNewNotify\022\025" +
"\n\rmark_new_type\030\r \001(\r\022\017\n\007id_list\030\002 \003(\rB\033" +
"\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -859,7 +736,7 @@ public final class MarkNewNotifyOuterClass {
internal_static_MarkNewNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_MarkNewNotify_descriptor,
new java.lang.String[] { "IdList", "MarkNewType", });
new java.lang.String[] { "MarkNewType", "IdList", });
}
// @@protoc_insertion_point(outer_class_scope)