mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 10:33:34 +08:00
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:
committed by
GitHub
Unverified
parent
922f7bca51
commit
516e5975e1
+42
-173
@@ -19,29 +19,34 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @return A list containing the mailIdList.
|
||||
*/
|
||||
java.util.List<java.lang.Integer> getMailIdListList();
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @return The count of mailIdList.
|
||||
*/
|
||||
int getMailIdListCount();
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The mailIdList at the given index.
|
||||
*/
|
||||
int getMailIdList(int index);
|
||||
|
||||
/**
|
||||
* <code>bool isStar = 12;</code>
|
||||
* <code>bool is_star = 10;</code>
|
||||
* @return The isStar.
|
||||
*/
|
||||
boolean getIsStar();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: LDNEKLCGAIE
|
||||
* CmdId: 1491
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ChangeMailStarNotify}
|
||||
*/
|
||||
public static final class ChangeMailStarNotify extends
|
||||
@@ -88,7 +93,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 88: {
|
||||
case 48: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
mailIdList_ = newIntList();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -96,7 +101,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
mailIdList_.addInt(input.readUInt32());
|
||||
break;
|
||||
}
|
||||
case 90: {
|
||||
case 50: {
|
||||
int length = input.readRawVarint32();
|
||||
int limit = input.pushLimit(length);
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
|
||||
@@ -109,7 +114,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
input.popLimit(limit);
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
case 80: {
|
||||
|
||||
isStar_ = input.readBool();
|
||||
break;
|
||||
@@ -149,149 +154,10 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify.class, emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code ChangeMailStarNotify.PHAAKAMCIEC}
|
||||
*/
|
||||
public enum PHAAKAMCIEC
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1478;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 1478),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final PHAAKAMCIEC DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final PHAAKAMCIEC EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1478;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 1478;
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final int DCDNILFDFLB_VALUE = 0;
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
public static final int NNBKOLMPOEA_VALUE = 1;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final int EAJIABGAOCI_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 PHAAKAMCIEC 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 PHAAKAMCIEC forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 1478: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<PHAAKAMCIEC>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
PHAAKAMCIEC> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<PHAAKAMCIEC>() {
|
||||
public PHAAKAMCIEC findValueByNumber(int number) {
|
||||
return PHAAKAMCIEC.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.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final PHAAKAMCIEC[] VALUES = getStaticValuesArray();
|
||||
private static PHAAKAMCIEC[] getStaticValuesArray() {
|
||||
return new PHAAKAMCIEC[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static PHAAKAMCIEC 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 PHAAKAMCIEC(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:ChangeMailStarNotify.PHAAKAMCIEC)
|
||||
}
|
||||
|
||||
public static final int MAILIDLIST_FIELD_NUMBER = 11;
|
||||
public static final int MAIL_ID_LIST_FIELD_NUMBER = 6;
|
||||
private com.google.protobuf.Internal.IntList mailIdList_;
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @return A list containing the mailIdList.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -300,14 +166,14 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return mailIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @return The count of mailIdList.
|
||||
*/
|
||||
public int getMailIdListCount() {
|
||||
return mailIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The mailIdList at the given index.
|
||||
*/
|
||||
@@ -316,10 +182,10 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
}
|
||||
private int mailIdListMemoizedSerializedSize = -1;
|
||||
|
||||
public static final int ISSTAR_FIELD_NUMBER = 12;
|
||||
public static final int IS_STAR_FIELD_NUMBER = 10;
|
||||
private boolean isStar_;
|
||||
/**
|
||||
* <code>bool isStar = 12;</code>
|
||||
* <code>bool is_star = 10;</code>
|
||||
* @return The isStar.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -343,14 +209,14 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (getMailIdListList().size() > 0) {
|
||||
output.writeUInt32NoTag(90);
|
||||
output.writeUInt32NoTag(50);
|
||||
output.writeUInt32NoTag(mailIdListMemoizedSerializedSize);
|
||||
}
|
||||
for (int i = 0; i < mailIdList_.size(); i++) {
|
||||
output.writeUInt32NoTag(mailIdList_.getInt(i));
|
||||
}
|
||||
if (isStar_ != false) {
|
||||
output.writeBool(12, isStar_);
|
||||
output.writeBool(10, isStar_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -377,7 +243,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
}
|
||||
if (isStar_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(12, isStar_);
|
||||
.computeBoolSize(10, isStar_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -410,10 +276,10 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
if (getMailIdListCount() > 0) {
|
||||
hash = (37 * hash) + MAILIDLIST_FIELD_NUMBER;
|
||||
hash = (37 * hash) + MAIL_ID_LIST_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getMailIdListList().hashCode();
|
||||
}
|
||||
hash = (37 * hash) + ISSTAR_FIELD_NUMBER;
|
||||
hash = (37 * hash) + IS_STAR_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsStar());
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
@@ -512,6 +378,11 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: LDNEKLCGAIE
|
||||
* CmdId: 1491
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ChangeMailStarNotify}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -685,7 +556,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @return A list containing the mailIdList.
|
||||
*/
|
||||
public java.util.List<java.lang.Integer>
|
||||
@@ -694,14 +565,14 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @return The count of mailIdList.
|
||||
*/
|
||||
public int getMailIdListCount() {
|
||||
return mailIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The mailIdList at the given index.
|
||||
*/
|
||||
@@ -709,7 +580,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return mailIdList_.getInt(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @param index The index to set the value at.
|
||||
* @param value The mailIdList to set.
|
||||
* @return This builder for chaining.
|
||||
@@ -722,7 +593,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @param value The mailIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -733,7 +604,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @param values The mailIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -746,7 +617,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 mailIdList = 11;</code>
|
||||
* <code>repeated uint32 mail_id_list = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearMailIdList() {
|
||||
@@ -758,7 +629,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
|
||||
private boolean isStar_ ;
|
||||
/**
|
||||
* <code>bool isStar = 12;</code>
|
||||
* <code>bool is_star = 10;</code>
|
||||
* @return The isStar.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -766,7 +637,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return isStar_;
|
||||
}
|
||||
/**
|
||||
* <code>bool isStar = 12;</code>
|
||||
* <code>bool is_star = 10;</code>
|
||||
* @param value The isStar to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -777,7 +648,7 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool isStar = 12;</code>
|
||||
* <code>bool is_star = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsStar() {
|
||||
@@ -853,12 +724,10 @@ public final class ChangeMailStarNotifyOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\032ChangeMailStarNotify.proto\"\234\001\n\024ChangeM" +
|
||||
"ailStarNotify\022\022\n\nmailIdList\030\013 \003(\r\022\016\n\006isS" +
|
||||
"tar\030\014 \001(\010\"`\n\013PHAAKAMCIEC\022\010\n\004NONE\020\000\022\020\n\013PE" +
|
||||
"PPOHPHJOJ\020\306\013\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLM" +
|
||||
"POEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031emu.grass" +
|
||||
"cutter.net.protob\006proto3"
|
||||
"\n\032ChangeMailStarNotify.proto\"=\n\024ChangeMa" +
|
||||
"ilStarNotify\022\024\n\014mail_id_list\030\006 \003(\r\022\017\n\007is" +
|
||||
"_star\030\n \001(\010B\033\n\031emu.grasscutter.net.proto" +
|
||||
"b\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user