mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-08 21:43:51 +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:
Colleiflower
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
+160
-291
@@ -19,48 +19,53 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 parentQuestVarSeq = 9;</code>
|
||||
* <code>uint32 quest_id = 10;</code>
|
||||
* @return The questId.
|
||||
*/
|
||||
int getQuestId();
|
||||
|
||||
/**
|
||||
* <code>uint32 parent_quest_var_seq = 11;</code>
|
||||
* @return The parentQuestVarSeq.
|
||||
*/
|
||||
int getParentQuestVarSeq();
|
||||
|
||||
/**
|
||||
* <code>uint32 parentQuestId = 12;</code>
|
||||
* @return The parentQuestId.
|
||||
*/
|
||||
int getParentQuestId();
|
||||
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
java.util.List<emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp>
|
||||
getQuestVarOpListList();
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getQuestVarOpList(int index);
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
int getQuestVarOpListCount();
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
java.util.List<? extends emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder>
|
||||
getQuestVarOpListOrBuilderList();
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQuestVarOpListOrBuilder(
|
||||
int index);
|
||||
|
||||
/**
|
||||
* <code>uint32 questId = 3;</code>
|
||||
* @return The questId.
|
||||
* <code>uint32 parent_quest_id = 1;</code>
|
||||
* @return The parentQuestId.
|
||||
*/
|
||||
int getQuestId();
|
||||
int getParentQuestId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: NLKBKCONOPK
|
||||
* CmdId: 461
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code QuestUpdateQuestVarReq}
|
||||
*/
|
||||
public static final class QuestUpdateQuestVarReq extends
|
||||
@@ -107,12 +112,12 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 24: {
|
||||
case 8: {
|
||||
|
||||
questId_ = input.readUInt32();
|
||||
parentQuestId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 34: {
|
||||
case 58: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
questVarOpList_ = new java.util.ArrayList<emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp>();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -121,14 +126,14 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
input.readMessage(emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.parser(), extensionRegistry));
|
||||
break;
|
||||
}
|
||||
case 72: {
|
||||
case 80: {
|
||||
|
||||
parentQuestVarSeq_ = input.readUInt32();
|
||||
questId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
case 88: {
|
||||
|
||||
parentQuestId_ = input.readUInt32();
|
||||
parentQuestVarSeq_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -166,149 +171,21 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq.class, emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq.Builder.class);
|
||||
}
|
||||
|
||||
public static final int QUEST_ID_FIELD_NUMBER = 10;
|
||||
private int questId_;
|
||||
/**
|
||||
* Protobuf enum {@code QuestUpdateQuestVarReq.OAKICGPFBIK}
|
||||
* <code>uint32 quest_id = 10;</code>
|
||||
* @return The questId.
|
||||
*/
|
||||
public enum OAKICGPFBIK
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 439;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 439),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final OAKICGPFBIK DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final OAKICGPFBIK EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 439;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 439;
|
||||
/**
|
||||
* <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 OAKICGPFBIK 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 OAKICGPFBIK forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 439: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<OAKICGPFBIK>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
OAKICGPFBIK> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<OAKICGPFBIK>() {
|
||||
public OAKICGPFBIK findValueByNumber(int number) {
|
||||
return OAKICGPFBIK.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.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final OAKICGPFBIK[] VALUES = getStaticValuesArray();
|
||||
private static OAKICGPFBIK[] getStaticValuesArray() {
|
||||
return new OAKICGPFBIK[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static OAKICGPFBIK 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 OAKICGPFBIK(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:QuestUpdateQuestVarReq.OAKICGPFBIK)
|
||||
@java.lang.Override
|
||||
public int getQuestId() {
|
||||
return questId_;
|
||||
}
|
||||
|
||||
public static final int PARENTQUESTVARSEQ_FIELD_NUMBER = 9;
|
||||
public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 11;
|
||||
private int parentQuestVarSeq_;
|
||||
/**
|
||||
* <code>uint32 parentQuestVarSeq = 9;</code>
|
||||
* <code>uint32 parent_quest_var_seq = 11;</code>
|
||||
* @return The parentQuestVarSeq.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -316,28 +193,17 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return parentQuestVarSeq_;
|
||||
}
|
||||
|
||||
public static final int PARENTQUESTID_FIELD_NUMBER = 12;
|
||||
private int parentQuestId_;
|
||||
/**
|
||||
* <code>uint32 parentQuestId = 12;</code>
|
||||
* @return The parentQuestId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getParentQuestId() {
|
||||
return parentQuestId_;
|
||||
}
|
||||
|
||||
public static final int QUESTVAROPLIST_FIELD_NUMBER = 4;
|
||||
public static final int QUEST_VAR_OP_LIST_FIELD_NUMBER = 7;
|
||||
private java.util.List<emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp> questVarOpList_;
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public java.util.List<emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp> getQuestVarOpListList() {
|
||||
return questVarOpList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public java.util.List<? extends emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder>
|
||||
@@ -345,21 +211,21 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return questVarOpList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getQuestVarOpListCount() {
|
||||
return questVarOpList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getQuestVarOpList(int index) {
|
||||
return questVarOpList_.get(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQuestVarOpListOrBuilder(
|
||||
@@ -367,15 +233,15 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return questVarOpList_.get(index);
|
||||
}
|
||||
|
||||
public static final int QUESTID_FIELD_NUMBER = 3;
|
||||
private int questId_;
|
||||
public static final int PARENT_QUEST_ID_FIELD_NUMBER = 1;
|
||||
private int parentQuestId_;
|
||||
/**
|
||||
* <code>uint32 questId = 3;</code>
|
||||
* @return The questId.
|
||||
* <code>uint32 parent_quest_id = 1;</code>
|
||||
* @return The parentQuestId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getQuestId() {
|
||||
return questId_;
|
||||
public int getParentQuestId() {
|
||||
return parentQuestId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@@ -392,17 +258,17 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (questId_ != 0) {
|
||||
output.writeUInt32(3, questId_);
|
||||
if (parentQuestId_ != 0) {
|
||||
output.writeUInt32(1, parentQuestId_);
|
||||
}
|
||||
for (int i = 0; i < questVarOpList_.size(); i++) {
|
||||
output.writeMessage(4, questVarOpList_.get(i));
|
||||
output.writeMessage(7, questVarOpList_.get(i));
|
||||
}
|
||||
if (questId_ != 0) {
|
||||
output.writeUInt32(10, questId_);
|
||||
}
|
||||
if (parentQuestVarSeq_ != 0) {
|
||||
output.writeUInt32(9, parentQuestVarSeq_);
|
||||
}
|
||||
if (parentQuestId_ != 0) {
|
||||
output.writeUInt32(12, parentQuestId_);
|
||||
output.writeUInt32(11, parentQuestVarSeq_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -413,21 +279,21 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (questId_ != 0) {
|
||||
if (parentQuestId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(3, questId_);
|
||||
.computeUInt32Size(1, parentQuestId_);
|
||||
}
|
||||
for (int i = 0; i < questVarOpList_.size(); i++) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(4, questVarOpList_.get(i));
|
||||
.computeMessageSize(7, questVarOpList_.get(i));
|
||||
}
|
||||
if (questId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(10, questId_);
|
||||
}
|
||||
if (parentQuestVarSeq_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(9, parentQuestVarSeq_);
|
||||
}
|
||||
if (parentQuestId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(12, parentQuestId_);
|
||||
.computeUInt32Size(11, parentQuestVarSeq_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -444,14 +310,14 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq other = (emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq) obj;
|
||||
|
||||
if (getParentQuestVarSeq()
|
||||
!= other.getParentQuestVarSeq()) return false;
|
||||
if (getParentQuestId()
|
||||
!= other.getParentQuestId()) return false;
|
||||
if (!getQuestVarOpListList()
|
||||
.equals(other.getQuestVarOpListList())) return false;
|
||||
if (getQuestId()
|
||||
!= other.getQuestId()) return false;
|
||||
if (getParentQuestVarSeq()
|
||||
!= other.getParentQuestVarSeq()) return false;
|
||||
if (!getQuestVarOpListList()
|
||||
.equals(other.getQuestVarOpListList())) return false;
|
||||
if (getParentQuestId()
|
||||
!= other.getParentQuestId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -463,16 +329,16 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + PARENTQUESTVARSEQ_FIELD_NUMBER;
|
||||
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getQuestId();
|
||||
hash = (37 * hash) + PARENT_QUEST_VAR_SEQ_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getParentQuestVarSeq();
|
||||
hash = (37 * hash) + PARENTQUESTID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getParentQuestId();
|
||||
if (getQuestVarOpListCount() > 0) {
|
||||
hash = (37 * hash) + QUESTVAROPLIST_FIELD_NUMBER;
|
||||
hash = (37 * hash) + QUEST_VAR_OP_LIST_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getQuestVarOpListList().hashCode();
|
||||
}
|
||||
hash = (37 * hash) + QUESTID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getQuestId();
|
||||
hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getParentQuestId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -569,6 +435,11 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: NLKBKCONOPK
|
||||
* CmdId: 461
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code QuestUpdateQuestVarReq}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -607,9 +478,9 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
parentQuestVarSeq_ = 0;
|
||||
questId_ = 0;
|
||||
|
||||
parentQuestId_ = 0;
|
||||
parentQuestVarSeq_ = 0;
|
||||
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
questVarOpList_ = java.util.Collections.emptyList();
|
||||
@@ -617,7 +488,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
} else {
|
||||
questVarOpListBuilder_.clear();
|
||||
}
|
||||
questId_ = 0;
|
||||
parentQuestId_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -646,8 +517,8 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
public emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq buildPartial() {
|
||||
emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq result = new emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq(this);
|
||||
int from_bitField0_ = bitField0_;
|
||||
result.questId_ = questId_;
|
||||
result.parentQuestVarSeq_ = parentQuestVarSeq_;
|
||||
result.parentQuestId_ = parentQuestId_;
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
if (((bitField0_ & 0x00000001) != 0)) {
|
||||
questVarOpList_ = java.util.Collections.unmodifiableList(questVarOpList_);
|
||||
@@ -657,7 +528,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
} else {
|
||||
result.questVarOpList_ = questVarOpListBuilder_.build();
|
||||
}
|
||||
result.questId_ = questId_;
|
||||
result.parentQuestId_ = parentQuestId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -706,12 +577,12 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq other) {
|
||||
if (other == emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq.getDefaultInstance()) return this;
|
||||
if (other.getQuestId() != 0) {
|
||||
setQuestId(other.getQuestId());
|
||||
}
|
||||
if (other.getParentQuestVarSeq() != 0) {
|
||||
setParentQuestVarSeq(other.getParentQuestVarSeq());
|
||||
}
|
||||
if (other.getParentQuestId() != 0) {
|
||||
setParentQuestId(other.getParentQuestId());
|
||||
}
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
if (!other.questVarOpList_.isEmpty()) {
|
||||
if (questVarOpList_.isEmpty()) {
|
||||
@@ -738,8 +609,8 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (other.getQuestId() != 0) {
|
||||
setQuestId(other.getQuestId());
|
||||
if (other.getParentQuestId() != 0) {
|
||||
setParentQuestId(other.getParentQuestId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
@@ -771,9 +642,40 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
private int bitField0_;
|
||||
|
||||
private int questId_ ;
|
||||
/**
|
||||
* <code>uint32 quest_id = 10;</code>
|
||||
* @return The questId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getQuestId() {
|
||||
return questId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 quest_id = 10;</code>
|
||||
* @param value The questId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setQuestId(int value) {
|
||||
|
||||
questId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 quest_id = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearQuestId() {
|
||||
|
||||
questId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int parentQuestVarSeq_ ;
|
||||
/**
|
||||
* <code>uint32 parentQuestVarSeq = 9;</code>
|
||||
* <code>uint32 parent_quest_var_seq = 11;</code>
|
||||
* @return The parentQuestVarSeq.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -781,7 +683,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return parentQuestVarSeq_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 parentQuestVarSeq = 9;</code>
|
||||
* <code>uint32 parent_quest_var_seq = 11;</code>
|
||||
* @param value The parentQuestVarSeq to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -792,7 +694,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 parentQuestVarSeq = 9;</code>
|
||||
* <code>uint32 parent_quest_var_seq = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearParentQuestVarSeq() {
|
||||
@@ -802,37 +704,6 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int parentQuestId_ ;
|
||||
/**
|
||||
* <code>uint32 parentQuestId = 12;</code>
|
||||
* @return The parentQuestId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getParentQuestId() {
|
||||
return parentQuestId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 parentQuestId = 12;</code>
|
||||
* @param value The parentQuestId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setParentQuestId(int value) {
|
||||
|
||||
parentQuestId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 parentQuestId = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearParentQuestId() {
|
||||
|
||||
parentQuestId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private java.util.List<emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp> questVarOpList_ =
|
||||
java.util.Collections.emptyList();
|
||||
private void ensureQuestVarOpListIsMutable() {
|
||||
@@ -846,7 +717,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder> questVarOpListBuilder_;
|
||||
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public java.util.List<emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp> getQuestVarOpListList() {
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
@@ -856,7 +727,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public int getQuestVarOpListCount() {
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
@@ -866,7 +737,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getQuestVarOpList(int index) {
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
@@ -876,7 +747,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder setQuestVarOpList(
|
||||
int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp value) {
|
||||
@@ -893,7 +764,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder setQuestVarOpList(
|
||||
int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder builderForValue) {
|
||||
@@ -907,7 +778,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder addQuestVarOpList(emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp value) {
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
@@ -923,7 +794,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder addQuestVarOpList(
|
||||
int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp value) {
|
||||
@@ -940,7 +811,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder addQuestVarOpList(
|
||||
emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder builderForValue) {
|
||||
@@ -954,7 +825,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder addQuestVarOpList(
|
||||
int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder builderForValue) {
|
||||
@@ -968,7 +839,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder addAllQuestVarOpList(
|
||||
java.lang.Iterable<? extends emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp> values) {
|
||||
@@ -983,7 +854,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder clearQuestVarOpList() {
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
@@ -996,7 +867,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public Builder removeQuestVarOpList(int index) {
|
||||
if (questVarOpListBuilder_ == null) {
|
||||
@@ -1009,14 +880,14 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder getQuestVarOpListBuilder(
|
||||
int index) {
|
||||
return getQuestVarOpListFieldBuilder().getBuilder(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQuestVarOpListOrBuilder(
|
||||
int index) {
|
||||
@@ -1026,7 +897,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public java.util.List<? extends emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder>
|
||||
getQuestVarOpListOrBuilderList() {
|
||||
@@ -1037,14 +908,14 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder addQuestVarOpListBuilder() {
|
||||
return getQuestVarOpListFieldBuilder().addBuilder(
|
||||
emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.getDefaultInstance());
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder addQuestVarOpListBuilder(
|
||||
int index) {
|
||||
@@ -1052,7 +923,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.getDefaultInstance());
|
||||
}
|
||||
/**
|
||||
* <code>repeated .QuestVarOp questVarOpList = 4;</code>
|
||||
* <code>repeated .QuestVarOp quest_var_op_list = 7;</code>
|
||||
*/
|
||||
public java.util.List<emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder>
|
||||
getQuestVarOpListBuilderList() {
|
||||
@@ -1073,33 +944,33 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
return questVarOpListBuilder_;
|
||||
}
|
||||
|
||||
private int questId_ ;
|
||||
private int parentQuestId_ ;
|
||||
/**
|
||||
* <code>uint32 questId = 3;</code>
|
||||
* @return The questId.
|
||||
* <code>uint32 parent_quest_id = 1;</code>
|
||||
* @return The parentQuestId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getQuestId() {
|
||||
return questId_;
|
||||
public int getParentQuestId() {
|
||||
return parentQuestId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 questId = 3;</code>
|
||||
* @param value The questId to set.
|
||||
* <code>uint32 parent_quest_id = 1;</code>
|
||||
* @param value The parentQuestId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setQuestId(int value) {
|
||||
public Builder setParentQuestId(int value) {
|
||||
|
||||
questId_ = value;
|
||||
parentQuestId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 questId = 3;</code>
|
||||
* <code>uint32 parent_quest_id = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearQuestId() {
|
||||
public Builder clearParentQuestId() {
|
||||
|
||||
questId_ = 0;
|
||||
parentQuestId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@@ -1171,13 +1042,11 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\034QuestUpdateQuestVarReq.proto\032\020QuestVar" +
|
||||
"Op.proto\"\342\001\n\026QuestUpdateQuestVarReq\022\031\n\021p" +
|
||||
"arentQuestVarSeq\030\t \001(\r\022\025\n\rparentQuestId\030" +
|
||||
"\014 \001(\r\022#\n\016questVarOpList\030\004 \003(\0132\013.QuestVar" +
|
||||
"Op\022\017\n\007questId\030\003 \001(\r\"`\n\013OAKICGPFBIK\022\010\n\004NO" +
|
||||
"NE\020\000\022\020\n\013PEPPOHPHJOJ\020\267\003\022\017\n\013DCDNILFDFLB\020\000\022" +
|
||||
"\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n" +
|
||||
"\031emu.grasscutter.net.protob\006proto3"
|
||||
"Op.proto\"\211\001\n\026QuestUpdateQuestVarReq\022\020\n\010q" +
|
||||
"uest_id\030\n \001(\r\022\034\n\024parent_quest_var_seq\030\013 " +
|
||||
"\001(\r\022&\n\021quest_var_op_list\030\007 \003(\0132\013.QuestVa" +
|
||||
"rOp\022\027\n\017parent_quest_id\030\001 \001(\rB\033\n\031emu.gras" +
|
||||
"scutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -1189,7 +1058,7 @@ public final class QuestUpdateQuestVarReqOuterClass {
|
||||
internal_static_QuestUpdateQuestVarReq_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_QuestUpdateQuestVarReq_descriptor,
|
||||
new java.lang.String[] { "ParentQuestVarSeq", "ParentQuestId", "QuestVarOpList", "QuestId", });
|
||||
new java.lang.String[] { "QuestId", "ParentQuestVarSeq", "QuestVarOpList", "ParentQuestId", });
|
||||
emu.grasscutter.net.proto.QuestVarOpOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user