Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 14:50:57 +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/AddQuestContentProgressRspOuterClass.java
+85 -208
View File
@@ -19,18 +19,23 @@ public final class AddQuestContentProgressRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 contentType = 13;</code>
* @return The contentType.
*/
int getContentType();
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 content_type = 12;</code>
* @return The contentType.
*/
int getContentType();
}
/**
* <pre>
* Name: LNEHHKPDPHL
* CmdId: 472
* </pre>
*
* Protobuf type {@code AddQuestContentProgressRsp}
*/
public static final class AddQuestContentProgressRsp extends
@@ -75,12 +80,12 @@ public final class AddQuestContentProgressRspOuterClass {
case 0:
done = true;
break;
case 64: {
case 40: {
retcode_ = input.readInt32();
break;
}
case 104: {
case 96: {
contentType_ = input.readUInt32();
break;
@@ -117,152 +122,10 @@ public final class AddQuestContentProgressRspOuterClass {
emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.class, emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.Builder.class);
}
/**
* Protobuf enum {@code AddQuestContentProgressRsp.OCHDKHKOIKI}
*/
public enum OCHDKHKOIKI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 480;</code>
*/
PEPPOHPHJOJ(1, 480),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final OCHDKHKOIKI DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 480;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 480;
/**
* <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 OCHDKHKOIKI 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 OCHDKHKOIKI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 480: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<OCHDKHKOIKI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
OCHDKHKOIKI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<OCHDKHKOIKI>() {
public OCHDKHKOIKI findValueByNumber(int number) {
return OCHDKHKOIKI.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.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.getDescriptor().getEnumTypes().get(0);
}
private static final OCHDKHKOIKI[] VALUES = getStaticValuesArray();
private static OCHDKHKOIKI[] getStaticValuesArray() {
return new OCHDKHKOIKI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static OCHDKHKOIKI 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 OCHDKHKOIKI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AddQuestContentProgressRsp.OCHDKHKOIKI)
}
public static final int CONTENTTYPE_FIELD_NUMBER = 13;
private int contentType_;
/**
* <code>uint32 contentType = 13;</code>
* @return The contentType.
*/
@java.lang.Override
public int getContentType() {
return contentType_;
}
public static final int RETCODE_FIELD_NUMBER = 8;
public static final int RETCODE_FIELD_NUMBER = 5;
private int retcode_;
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -270,6 +133,17 @@ public final class AddQuestContentProgressRspOuterClass {
return retcode_;
}
public static final int CONTENT_TYPE_FIELD_NUMBER = 12;
private int contentType_;
/**
* <code>uint32 content_type = 12;</code>
* @return The contentType.
*/
@java.lang.Override
public int getContentType() {
return contentType_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -285,10 +159,10 @@ public final class AddQuestContentProgressRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(8, retcode_);
output.writeInt32(5, retcode_);
}
if (contentType_ != 0) {
output.writeUInt32(13, contentType_);
output.writeUInt32(12, contentType_);
}
unknownFields.writeTo(output);
}
@@ -301,11 +175,11 @@ public final class AddQuestContentProgressRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, retcode_);
.computeInt32Size(5, retcode_);
}
if (contentType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, contentType_);
.computeUInt32Size(12, contentType_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -322,10 +196,10 @@ public final class AddQuestContentProgressRspOuterClass {
}
emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp other = (emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp) obj;
if (getContentType()
!= other.getContentType()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getContentType()
!= other.getContentType()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -337,10 +211,10 @@ public final class AddQuestContentProgressRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CONTENTTYPE_FIELD_NUMBER;
hash = (53 * hash) + getContentType();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getContentType();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -437,6 +311,11 @@ public final class AddQuestContentProgressRspOuterClass {
return builder;
}
/**
* <pre>
* Name: LNEHHKPDPHL
* CmdId: 472
* </pre>
*
* Protobuf type {@code AddQuestContentProgressRsp}
*/
public static final class Builder extends
@@ -474,10 +353,10 @@ public final class AddQuestContentProgressRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
contentType_ = 0;
retcode_ = 0;
contentType_ = 0;
return this;
}
@@ -504,8 +383,8 @@ public final class AddQuestContentProgressRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp buildPartial() {
emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp result = new emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp(this);
result.contentType_ = contentType_;
result.retcode_ = retcode_;
result.contentType_ = contentType_;
onBuilt();
return result;
}
@@ -554,12 +433,12 @@ public final class AddQuestContentProgressRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp other) {
if (other == emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.getDefaultInstance()) return this;
if (other.getContentType() != 0) {
setContentType(other.getContentType());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getContentType() != 0) {
setContentType(other.getContentType());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -589,40 +468,9 @@ public final class AddQuestContentProgressRspOuterClass {
return this;
}
private int contentType_ ;
/**
* <code>uint32 contentType = 13;</code>
* @return The contentType.
*/
@java.lang.Override
public int getContentType() {
return contentType_;
}
/**
* <code>uint32 contentType = 13;</code>
* @param value The contentType to set.
* @return This builder for chaining.
*/
public Builder setContentType(int value) {
contentType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 contentType = 13;</code>
* @return This builder for chaining.
*/
public Builder clearContentType() {
contentType_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -630,7 +478,7 @@ public final class AddQuestContentProgressRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 5;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -641,7 +489,7 @@ public final class AddQuestContentProgressRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 8;</code>
* <code>int32 retcode = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -650,6 +498,37 @@ public final class AddQuestContentProgressRspOuterClass {
onChanged();
return this;
}
private int contentType_ ;
/**
* <code>uint32 content_type = 12;</code>
* @return The contentType.
*/
@java.lang.Override
public int getContentType() {
return contentType_;
}
/**
* <code>uint32 content_type = 12;</code>
* @param value The contentType to set.
* @return This builder for chaining.
*/
public Builder setContentType(int value) {
contentType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 content_type = 12;</code>
* @return This builder for chaining.
*/
public Builder clearContentType() {
contentType_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -717,12 +596,10 @@ public final class AddQuestContentProgressRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n AddQuestContentProgressRsp.proto\"\223\001\n\032A" +
"ddQuestContentProgressRsp\022\023\n\013contentType" +
"\030\r \001(\r\022\017\n\007retcode\030\010 \001(\005\"O\n\013OCHDKHKOIKI\022\010" +
"\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\340\003\022\017\n\013DCDNILFDFL" +
"B\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscut" +
"ter.net.protob\006proto3"
"\n AddQuestContentProgressRsp.proto\"C\n\032Ad" +
"dQuestContentProgressRsp\022\017\n\007retcode\030\005 \001(" +
"\005\022\024\n\014content_type\030\014 \001(\rB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -733,7 +610,7 @@ public final class AddQuestContentProgressRspOuterClass {
internal_static_AddQuestContentProgressRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AddQuestContentProgressRsp_descriptor,
new java.lang.String[] { "ContentType", "Retcode", });
new java.lang.String[] { "Retcode", "ContentType", });
}
// @@protoc_insertion_point(outer_class_scope)