Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 08:49:52 +08:00
Code Issues Projects Releases Wiki Activity

Add support for v3.5.0 (#2090)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarRspOuterClass.java
+134 -257
View File
@@ -25,24 +25,29 @@ public final class QuestUpdateQuestVarRspOuterClass {
int getRetcode();
/**
* <code>uint32 parentQuestVarSeq = 15;</code>
* @return The parentQuestVarSeq.
* <code>uint32 quest_id = 13;</code>
* @return The questId.
*/
int getParentQuestVarSeq();
int getQuestId();
/**
* <code>uint32 parentQuestId = 4;</code>
* <code>uint32 parent_quest_id = 14;</code>
* @return The parentQuestId.
*/
int getParentQuestId();
/**
* <code>uint32 questId = 9;</code>
* @return The questId.
* <code>uint32 parent_quest_var_seq = 10;</code>
* @return The parentQuestVarSeq.
*/
int getQuestId();
int getParentQuestVarSeq();
}
/**
* <pre>
* Name: NCFJPDCCNBF
* CmdId: 456
* </pre>
*
* Protobuf type {@code QuestUpdateQuestVarRsp}
*/
public static final class QuestUpdateQuestVarRsp extends
@@ -92,19 +97,19 @@ public final class QuestUpdateQuestVarRspOuterClass {
retcode_ = input.readInt32();
break;
}
case 32: {
case 80: {
parentQuestId_ = input.readUInt32();
parentQuestVarSeq_ = input.readUInt32();
break;
}
case 72: {
case 104: {
questId_ = input.readUInt32();
break;
}
case 120: {
case 112: {
parentQuestVarSeq_ = input.readUInt32();
parentQuestId_ = input.readUInt32();
break;
}
default: {
@@ -139,137 +144,6 @@ public final class QuestUpdateQuestVarRspOuterClass {
emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.class, emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.Builder.class);
}
/**
* Protobuf enum {@code QuestUpdateQuestVarRsp.HDLOCGAKGOM}
*/
public enum HDLOCGAKGOM
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 446;</code>
*/
PEPPOHPHJOJ(1, 446),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final HDLOCGAKGOM DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 446;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 446;
/**
* <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 HDLOCGAKGOM 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 HDLOCGAKGOM forNumber(int value) {
switch (value) {
case 0: return NONE;
case 446: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<HDLOCGAKGOM>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
HDLOCGAKGOM> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<HDLOCGAKGOM>() {
public HDLOCGAKGOM findValueByNumber(int number) {
return HDLOCGAKGOM.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.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.getDescriptor().getEnumTypes().get(0);
}
private static final HDLOCGAKGOM[] VALUES = getStaticValuesArray();
private static HDLOCGAKGOM[] getStaticValuesArray() {
return new HDLOCGAKGOM[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static HDLOCGAKGOM 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 HDLOCGAKGOM(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:QuestUpdateQuestVarRsp.HDLOCGAKGOM)
}
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
@@ -281,21 +155,21 @@ public final class QuestUpdateQuestVarRspOuterClass {
return retcode_;
}
public static final int PARENTQUESTVARSEQ_FIELD_NUMBER = 15;
private int parentQuestVarSeq_;
public static final int QUEST_ID_FIELD_NUMBER = 13;
private int questId_;
/**
* <code>uint32 parentQuestVarSeq = 15;</code>
* @return The parentQuestVarSeq.
* <code>uint32 quest_id = 13;</code>
* @return The questId.
*/
@java.lang.Override
public int getParentQuestVarSeq() {
return parentQuestVarSeq_;
public int getQuestId() {
return questId_;
}
public static final int PARENTQUESTID_FIELD_NUMBER = 4;
public static final int PARENT_QUEST_ID_FIELD_NUMBER = 14;
private int parentQuestId_;
/**
* <code>uint32 parentQuestId = 4;</code>
* <code>uint32 parent_quest_id = 14;</code>
* @return The parentQuestId.
*/
@java.lang.Override
@@ -303,15 +177,15 @@ public final class QuestUpdateQuestVarRspOuterClass {
return parentQuestId_;
}
public static final int QUESTID_FIELD_NUMBER = 9;
private int questId_;
public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 10;
private int parentQuestVarSeq_;
/**
* <code>uint32 questId = 9;</code>
* @return The questId.
* <code>uint32 parent_quest_var_seq = 10;</code>
* @return The parentQuestVarSeq.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
public int getParentQuestVarSeq() {
return parentQuestVarSeq_;
}
private byte memoizedIsInitialized = -1;
@@ -331,14 +205,14 @@ public final class QuestUpdateQuestVarRspOuterClass {
if (retcode_ != 0) {
output.writeInt32(2, retcode_);
}
if (parentQuestId_ != 0) {
output.writeUInt32(4, parentQuestId_);
if (parentQuestVarSeq_ != 0) {
output.writeUInt32(10, parentQuestVarSeq_);
}
if (questId_ != 0) {
output.writeUInt32(9, questId_);
output.writeUInt32(13, questId_);
}
if (parentQuestVarSeq_ != 0) {
output.writeUInt32(15, parentQuestVarSeq_);
if (parentQuestId_ != 0) {
output.writeUInt32(14, parentQuestId_);
}
unknownFields.writeTo(output);
}
@@ -353,17 +227,17 @@ public final class QuestUpdateQuestVarRspOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, retcode_);
}
if (parentQuestId_ != 0) {
if (parentQuestVarSeq_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, parentQuestId_);
.computeUInt32Size(10, parentQuestVarSeq_);
}
if (questId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, questId_);
.computeUInt32Size(13, questId_);
}
if (parentQuestVarSeq_ != 0) {
if (parentQuestId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, parentQuestVarSeq_);
.computeUInt32Size(14, parentQuestId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -382,12 +256,12 @@ public final class QuestUpdateQuestVarRspOuterClass {
if (getRetcode()
!= other.getRetcode()) return false;
if (getParentQuestVarSeq()
!= other.getParentQuestVarSeq()) return false;
if (getParentQuestId()
!= other.getParentQuestId()) return false;
if (getQuestId()
!= other.getQuestId()) return false;
if (getParentQuestId()
!= other.getParentQuestId()) return false;
if (getParentQuestVarSeq()
!= other.getParentQuestVarSeq()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -401,12 +275,12 @@ public final class QuestUpdateQuestVarRspOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + PARENTQUESTVARSEQ_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestVarSeq();
hash = (37 * hash) + PARENTQUESTID_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestId();
hash = (37 * hash) + QUESTID_FIELD_NUMBER;
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestId();
hash = (37 * hash) + PARENT_QUEST_VAR_SEQ_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestVarSeq();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -503,6 +377,11 @@ public final class QuestUpdateQuestVarRspOuterClass {
return builder;
}
/**
* <pre>
* Name: NCFJPDCCNBF
* CmdId: 456
* </pre>
*
* Protobuf type {@code QuestUpdateQuestVarRsp}
*/
public static final class Builder extends
@@ -542,11 +421,11 @@ public final class QuestUpdateQuestVarRspOuterClass {
super.clear();
retcode_ = 0;
parentQuestVarSeq_ = 0;
questId_ = 0;
parentQuestId_ = 0;
questId_ = 0;
parentQuestVarSeq_ = 0;
return this;
}
@@ -575,9 +454,9 @@ public final class QuestUpdateQuestVarRspOuterClass {
public emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp buildPartial() {
emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp result = new emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp(this);
result.retcode_ = retcode_;
result.parentQuestVarSeq_ = parentQuestVarSeq_;
result.parentQuestId_ = parentQuestId_;
result.questId_ = questId_;
result.parentQuestId_ = parentQuestId_;
result.parentQuestVarSeq_ = parentQuestVarSeq_;
onBuilt();
return result;
}
@@ -629,14 +508,14 @@ public final class QuestUpdateQuestVarRspOuterClass {
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getParentQuestVarSeq() != 0) {
setParentQuestVarSeq(other.getParentQuestVarSeq());
if (other.getQuestId() != 0) {
setQuestId(other.getQuestId());
}
if (other.getParentQuestId() != 0) {
setParentQuestId(other.getParentQuestId());
}
if (other.getQuestId() != 0) {
setQuestId(other.getQuestId());
if (other.getParentQuestVarSeq() != 0) {
setParentQuestVarSeq(other.getParentQuestVarSeq());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -698,71 +577,9 @@ public final class QuestUpdateQuestVarRspOuterClass {
return this;
}
private int parentQuestVarSeq_ ;
/**
* <code>uint32 parentQuestVarSeq = 15;</code>
* @return The parentQuestVarSeq.
*/
@java.lang.Override
public int getParentQuestVarSeq() {
return parentQuestVarSeq_;
}
/**
* <code>uint32 parentQuestVarSeq = 15;</code>
* @param value The parentQuestVarSeq to set.
* @return This builder for chaining.
*/
public Builder setParentQuestVarSeq(int value) {
parentQuestVarSeq_ = value;
onChanged();
return this;
}
/**
* <code>uint32 parentQuestVarSeq = 15;</code>
* @return This builder for chaining.
*/
public Builder clearParentQuestVarSeq() {
parentQuestVarSeq_ = 0;
onChanged();
return this;
}
private int parentQuestId_ ;
/**
* <code>uint32 parentQuestId = 4;</code>
* @return The parentQuestId.
*/
@java.lang.Override
public int getParentQuestId() {
return parentQuestId_;
}
/**
* <code>uint32 parentQuestId = 4;</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 = 4;</code>
* @return This builder for chaining.
*/
public Builder clearParentQuestId() {
parentQuestId_ = 0;
onChanged();
return this;
}
private int questId_ ;
/**
* <code>uint32 questId = 9;</code>
* <code>uint32 quest_id = 13;</code>
* @return The questId.
*/
@java.lang.Override
@@ -770,7 +587,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
return questId_;
}
/**
* <code>uint32 questId = 9;</code>
* <code>uint32 quest_id = 13;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
@@ -781,7 +598,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
return this;
}
/**
* <code>uint32 questId = 9;</code>
* <code>uint32 quest_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
@@ -790,6 +607,68 @@ public final class QuestUpdateQuestVarRspOuterClass {
onChanged();
return this;
}
private int parentQuestId_ ;
/**
* <code>uint32 parent_quest_id = 14;</code>
* @return The parentQuestId.
*/
@java.lang.Override
public int getParentQuestId() {
return parentQuestId_;
}
/**
* <code>uint32 parent_quest_id = 14;</code>
* @param value The parentQuestId to set.
* @return This builder for chaining.
*/
public Builder setParentQuestId(int value) {
parentQuestId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 parent_quest_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearParentQuestId() {
parentQuestId_ = 0;
onChanged();
return this;
}
private int parentQuestVarSeq_ ;
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* @return The parentQuestVarSeq.
*/
@java.lang.Override
public int getParentQuestVarSeq() {
return parentQuestVarSeq_;
}
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* @param value The parentQuestVarSeq to set.
* @return This builder for chaining.
*/
public Builder setParentQuestVarSeq(int value) {
parentQuestVarSeq_ = value;
onChanged();
return this;
}
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* @return This builder for chaining.
*/
public Builder clearParentQuestVarSeq() {
parentQuestVarSeq_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -857,13 +736,11 @@ public final class QuestUpdateQuestVarRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\034QuestUpdateQuestVarRsp.proto\"\275\001\n\026Quest" +
"UpdateQuestVarRsp\022\017\n\007retcode\030\002 \001(\005\022\031\n\021pa" +
"rentQuestVarSeq\030\017 \001(\r\022\025\n\rparentQuestId\030\004" +
" \001(\r\022\017\n\007questId\030\t \001(\r\"O\n\013HDLOCGAKGOM\022\010\n\004" +
"NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\276\003\022\017\n\013DCDNILFDFLB\020" +
"\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutte" +
"r.net.protob\006proto3"
"\n\034QuestUpdateQuestVarRsp.proto\"r\n\026QuestU" +
"pdateQuestVarRsp\022\017\n\007retcode\030\002 \001(\005\022\020\n\010que" +
"st_id\030\r \001(\r\022\027\n\017parent_quest_id\030\016 \001(\r\022\034\n\024" +
"parent_quest_var_seq\030\n \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -874,7 +751,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
internal_static_QuestUpdateQuestVarRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_QuestUpdateQuestVarRsp_descriptor,
new java.lang.String[] { "Retcode", "ParentQuestVarSeq", "ParentQuestId", "QuestId", });
new java.lang.String[] { "Retcode", "QuestId", "ParentQuestId", "ParentQuestVarSeq", });
}
// @@protoc_insertion_point(outer_class_scope)