Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-17 01:12:34 +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/AddQuestContentProgressReqOuterClass.java
+103 -235
View File
@@ -19,24 +19,29 @@ public final class AddQuestContentProgressReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 addProgress = 2;</code>
* @return The addProgress.
*/
int getAddProgress();
/**
* <code>uint32 param = 9;</code>
* <code>uint32 param = 10;</code>
* @return The param.
*/
int getParam();
/**
* <code>uint32 contentType = 14;</code>
* <code>uint32 content_type = 2;</code>
* @return The contentType.
*/
int getContentType();
/**
* <code>uint32 add_progress = 8;</code>
* @return The addProgress.
*/
int getAddProgress();
}
/**
* <pre>
* Name: GALKBFKDBEG
* CmdId: 434
* </pre>
*
* Protobuf type {@code AddQuestContentProgressReq}
*/
public static final class AddQuestContentProgressReq extends
@@ -83,19 +88,19 @@ public final class AddQuestContentProgressReqOuterClass {
break;
case 16: {
contentType_ = input.readUInt32();
break;
}
case 64: {
addProgress_ = input.readUInt32();
break;
}
case 72: {
case 80: {
param_ = input.readUInt32();
break;
}
case 112: {
contentType_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,160 +133,10 @@ public final class AddQuestContentProgressReqOuterClass {
emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.class, emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.Builder.class);
}
/**
* Protobuf enum {@code AddQuestContentProgressReq.FJCPEKKPFHI}
*/
public enum FJCPEKKPFHI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 474;</code>
*/
PEPPOHPHJOJ(1, 474),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final FJCPEKKPFHI DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final FJCPEKKPFHI EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 474;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 474;
/**
* <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 FJCPEKKPFHI 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 FJCPEKKPFHI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 474: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<FJCPEKKPFHI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
FJCPEKKPFHI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<FJCPEKKPFHI>() {
public FJCPEKKPFHI findValueByNumber(int number) {
return FJCPEKKPFHI.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.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.getDescriptor().getEnumTypes().get(0);
}
private static final FJCPEKKPFHI[] VALUES = getStaticValuesArray();
private static FJCPEKKPFHI[] getStaticValuesArray() {
return new FJCPEKKPFHI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static FJCPEKKPFHI 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 FJCPEKKPFHI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AddQuestContentProgressReq.FJCPEKKPFHI)
}
public static final int ADDPROGRESS_FIELD_NUMBER = 2;
private int addProgress_;
/**
* <code>uint32 addProgress = 2;</code>
* @return The addProgress.
*/
@java.lang.Override
public int getAddProgress() {
return addProgress_;
}
public static final int PARAM_FIELD_NUMBER = 9;
public static final int PARAM_FIELD_NUMBER = 10;
private int param_;
/**
* <code>uint32 param = 9;</code>
* <code>uint32 param = 10;</code>
* @return The param.
*/
@java.lang.Override
@@ -289,10 +144,10 @@ public final class AddQuestContentProgressReqOuterClass {
return param_;
}
public static final int CONTENTTYPE_FIELD_NUMBER = 14;
public static final int CONTENT_TYPE_FIELD_NUMBER = 2;
private int contentType_;
/**
* <code>uint32 contentType = 14;</code>
* <code>uint32 content_type = 2;</code>
* @return The contentType.
*/
@java.lang.Override
@@ -300,6 +155,17 @@ public final class AddQuestContentProgressReqOuterClass {
return contentType_;
}
public static final int ADD_PROGRESS_FIELD_NUMBER = 8;
private int addProgress_;
/**
* <code>uint32 add_progress = 8;</code>
* @return The addProgress.
*/
@java.lang.Override
public int getAddProgress() {
return addProgress_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -314,14 +180,14 @@ public final class AddQuestContentProgressReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (contentType_ != 0) {
output.writeUInt32(2, contentType_);
}
if (addProgress_ != 0) {
output.writeUInt32(2, addProgress_);
output.writeUInt32(8, addProgress_);
}
if (param_ != 0) {
output.writeUInt32(9, param_);
}
if (contentType_ != 0) {
output.writeUInt32(14, contentType_);
output.writeUInt32(10, param_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class AddQuestContentProgressReqOuterClass {
if (size != -1) return size;
size = 0;
if (contentType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, contentType_);
}
if (addProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, addProgress_);
.computeUInt32Size(8, addProgress_);
}
if (param_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, param_);
}
if (contentType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, contentType_);
.computeUInt32Size(10, param_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -359,12 +225,12 @@ public final class AddQuestContentProgressReqOuterClass {
}
emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other = (emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq) obj;
if (getAddProgress()
!= other.getAddProgress()) return false;
if (getParam()
!= other.getParam()) return false;
if (getContentType()
!= other.getContentType()) return false;
if (getAddProgress()
!= other.getAddProgress()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -376,12 +242,12 @@ public final class AddQuestContentProgressReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ADDPROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getAddProgress();
hash = (37 * hash) + PARAM_FIELD_NUMBER;
hash = (53 * hash) + getParam();
hash = (37 * hash) + CONTENTTYPE_FIELD_NUMBER;
hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getContentType();
hash = (37 * hash) + ADD_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getAddProgress();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -478,6 +344,11 @@ public final class AddQuestContentProgressReqOuterClass {
return builder;
}
/**
* <pre>
* Name: GALKBFKDBEG
* CmdId: 434
* </pre>
*
* Protobuf type {@code AddQuestContentProgressReq}
*/
public static final class Builder extends
@@ -515,12 +386,12 @@ public final class AddQuestContentProgressReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
addProgress_ = 0;
param_ = 0;
contentType_ = 0;
addProgress_ = 0;
return this;
}
@@ -547,9 +418,9 @@ public final class AddQuestContentProgressReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq buildPartial() {
emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq result = new emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq(this);
result.addProgress_ = addProgress_;
result.param_ = param_;
result.contentType_ = contentType_;
result.addProgress_ = addProgress_;
onBuilt();
return result;
}
@@ -598,15 +469,15 @@ public final class AddQuestContentProgressReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other) {
if (other == emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.getDefaultInstance()) return this;
if (other.getAddProgress() != 0) {
setAddProgress(other.getAddProgress());
}
if (other.getParam() != 0) {
setParam(other.getParam());
}
if (other.getContentType() != 0) {
setContentType(other.getContentType());
}
if (other.getAddProgress() != 0) {
setAddProgress(other.getAddProgress());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -636,40 +507,9 @@ public final class AddQuestContentProgressReqOuterClass {
return this;
}
private int addProgress_ ;
/**
* <code>uint32 addProgress = 2;</code>
* @return The addProgress.
*/
@java.lang.Override
public int getAddProgress() {
return addProgress_;
}
/**
* <code>uint32 addProgress = 2;</code>
* @param value The addProgress to set.
* @return This builder for chaining.
*/
public Builder setAddProgress(int value) {
addProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 addProgress = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAddProgress() {
addProgress_ = 0;
onChanged();
return this;
}
private int param_ ;
/**
* <code>uint32 param = 9;</code>
* <code>uint32 param = 10;</code>
* @return The param.
*/
@java.lang.Override
@@ -677,7 +517,7 @@ public final class AddQuestContentProgressReqOuterClass {
return param_;
}
/**
* <code>uint32 param = 9;</code>
* <code>uint32 param = 10;</code>
* @param value The param to set.
* @return This builder for chaining.
*/
@@ -688,7 +528,7 @@ public final class AddQuestContentProgressReqOuterClass {
return this;
}
/**
* <code>uint32 param = 9;</code>
* <code>uint32 param = 10;</code>
* @return This builder for chaining.
*/
public Builder clearParam() {
@@ -700,7 +540,7 @@ public final class AddQuestContentProgressReqOuterClass {
private int contentType_ ;
/**
* <code>uint32 contentType = 14;</code>
* <code>uint32 content_type = 2;</code>
* @return The contentType.
*/
@java.lang.Override
@@ -708,7 +548,7 @@ public final class AddQuestContentProgressReqOuterClass {
return contentType_;
}
/**
* <code>uint32 contentType = 14;</code>
* <code>uint32 content_type = 2;</code>
* @param value The contentType to set.
* @return This builder for chaining.
*/
@@ -719,7 +559,7 @@ public final class AddQuestContentProgressReqOuterClass {
return this;
}
/**
* <code>uint32 contentType = 14;</code>
* <code>uint32 content_type = 2;</code>
* @return This builder for chaining.
*/
public Builder clearContentType() {
@@ -728,6 +568,37 @@ public final class AddQuestContentProgressReqOuterClass {
onChanged();
return this;
}
private int addProgress_ ;
/**
* <code>uint32 add_progress = 8;</code>
* @return The addProgress.
*/
@java.lang.Override
public int getAddProgress() {
return addProgress_;
}
/**
* <code>uint32 add_progress = 8;</code>
* @param value The addProgress to set.
* @return This builder for chaining.
*/
public Builder setAddProgress(int value) {
addProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 add_progress = 8;</code>
* @return This builder for chaining.
*/
public Builder clearAddProgress() {
addProgress_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -795,13 +666,10 @@ public final class AddQuestContentProgressReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n AddQuestContentProgressReq.proto\"\267\001\n\032A" +
"ddQuestContentProgressReq\022\023\n\013addProgress" +
"\030\002 \001(\r\022\r\n\005param\030\t \001(\r\022\023\n\013contentType\030\016 \001" +
"(\r\"`\n\013FJCPEKKPFHI\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJ" +
"OJ\020\332\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"
"\n AddQuestContentProgressReq.proto\"W\n\032Ad" +
"dQuestContentProgressReq\022\r\n\005param\030\n \001(\r\022" +
"\024\n\014content_type\030\002 \001(\r\022\024\n\014add_progress\030\010 " +
"\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -812,7 +680,7 @@ public final class AddQuestContentProgressReqOuterClass {
internal_static_AddQuestContentProgressReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AddQuestContentProgressReq_descriptor,
new java.lang.String[] { "AddProgress", "Param", "ContentType", });
new java.lang.String[] { "Param", "ContentType", "AddProgress", });
}
// @@protoc_insertion_point(outer_class_scope)