mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-08 23:45:05 +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
+31
-162
@@ -19,23 +19,28 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @return A list containing the codexIdList.
|
||||
*/
|
||||
java.util.List<java.lang.Integer> getCodexIdListList();
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @return The count of codexIdList.
|
||||
*/
|
||||
int getCodexIdListCount();
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The codexIdList at the given index.
|
||||
*/
|
||||
int getCodexIdList(int index);
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: JNDHCGKOCNI
|
||||
* CmdId: 4208
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code QueryCodexMonsterBeKilledNumReq}
|
||||
*/
|
||||
public static final class QueryCodexMonsterBeKilledNumReq extends
|
||||
@@ -82,7 +87,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 8: {
|
||||
case 104: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
codexIdList_ = newIntList();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -90,7 +95,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
codexIdList_.addInt(input.readUInt32());
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
case 106: {
|
||||
int length = input.readRawVarint32();
|
||||
int limit = input.pushLimit(length);
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
|
||||
@@ -138,149 +143,10 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumReqOuterClass.QueryCodexMonsterBeKilledNumReq.class, emu.grasscutter.net.proto.QueryCodexMonsterBeKilledNumReqOuterClass.QueryCodexMonsterBeKilledNumReq.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code QueryCodexMonsterBeKilledNumReq.DGAJPOAKFEP}
|
||||
*/
|
||||
public enum DGAJPOAKFEP
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 4206;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 4206),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final DGAJPOAKFEP DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final DGAJPOAKFEP EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 4206;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 4206;
|
||||
/**
|
||||
* <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 DGAJPOAKFEP 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 DGAJPOAKFEP forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 4206: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<DGAJPOAKFEP>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
DGAJPOAKFEP> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<DGAJPOAKFEP>() {
|
||||
public DGAJPOAKFEP findValueByNumber(int number) {
|
||||
return DGAJPOAKFEP.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.QueryCodexMonsterBeKilledNumReqOuterClass.QueryCodexMonsterBeKilledNumReq.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final DGAJPOAKFEP[] VALUES = getStaticValuesArray();
|
||||
private static DGAJPOAKFEP[] getStaticValuesArray() {
|
||||
return new DGAJPOAKFEP[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static DGAJPOAKFEP 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 DGAJPOAKFEP(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:QueryCodexMonsterBeKilledNumReq.DGAJPOAKFEP)
|
||||
}
|
||||
|
||||
public static final int CODEXIDLIST_FIELD_NUMBER = 1;
|
||||
public static final int CODEX_ID_LIST_FIELD_NUMBER = 13;
|
||||
private com.google.protobuf.Internal.IntList codexIdList_;
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @return A list containing the codexIdList.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -289,14 +155,14 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
return codexIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @return The count of codexIdList.
|
||||
*/
|
||||
public int getCodexIdListCount() {
|
||||
return codexIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The codexIdList at the given index.
|
||||
*/
|
||||
@@ -321,7 +187,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (getCodexIdListList().size() > 0) {
|
||||
output.writeUInt32NoTag(10);
|
||||
output.writeUInt32NoTag(106);
|
||||
output.writeUInt32NoTag(codexIdListMemoizedSerializedSize);
|
||||
}
|
||||
for (int i = 0; i < codexIdList_.size(); i++) {
|
||||
@@ -379,7 +245,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
if (getCodexIdListCount() > 0) {
|
||||
hash = (37 * hash) + CODEXIDLIST_FIELD_NUMBER;
|
||||
hash = (37 * hash) + CODEX_ID_LIST_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getCodexIdListList().hashCode();
|
||||
}
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
@@ -478,6 +344,11 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: JNDHCGKOCNI
|
||||
* CmdId: 4208
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code QueryCodexMonsterBeKilledNumReq}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -645,7 +516,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @return A list containing the codexIdList.
|
||||
*/
|
||||
public java.util.List<java.lang.Integer>
|
||||
@@ -654,14 +525,14 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
java.util.Collections.unmodifiableList(codexIdList_) : codexIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @return The count of codexIdList.
|
||||
*/
|
||||
public int getCodexIdListCount() {
|
||||
return codexIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The codexIdList at the given index.
|
||||
*/
|
||||
@@ -669,7 +540,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
return codexIdList_.getInt(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @param index The index to set the value at.
|
||||
* @param value The codexIdList to set.
|
||||
* @return This builder for chaining.
|
||||
@@ -682,7 +553,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @param value The codexIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -693,7 +564,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @param values The codexIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -706,7 +577,7 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 codexIdList = 1;</code>
|
||||
* <code>repeated uint32 codex_id_list = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearCodexIdList() {
|
||||
@@ -783,11 +654,9 @@ public final class QueryCodexMonsterBeKilledNumReqOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n%QueryCodexMonsterBeKilledNumReq.proto\"" +
|
||||
"\230\001\n\037QueryCodexMonsterBeKilledNumReq\022\023\n\013c" +
|
||||
"odexIdList\030\001 \003(\r\"`\n\013DGAJPOAKFEP\022\010\n\004NONE\020" +
|
||||
"\000\022\020\n\013PEPPOHPHJOJ\020\356 \022\017\n\013DCDNILFDFLB\020\000\022\017\n\013" +
|
||||
"NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031em" +
|
||||
"u.grasscutter.net.protob\006proto3"
|
||||
"8\n\037QueryCodexMonsterBeKilledNumReq\022\025\n\rco" +
|
||||
"dex_id_list\030\r \003(\rB\033\n\031emu.grasscutter.net" +
|
||||
".protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user