Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 12:53: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/MusicGameStartRspOuterClass.java
+52 -175
View File
@@ -19,24 +19,29 @@ public final class MusicGameStartRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint64 ugcGuid = 8;</code>
* <code>uint64 ugc_guid = 15;</code>
* @return The ugcGuid.
*/
long getUgcGuid();
/**
* <code>uint32 musicBasicId = 15;</code>
* <code>uint32 music_basic_id = 11;</code>
* @return The musicBasicId.
*/
int getMusicBasicId();
}
/**
* <pre>
* Name: GGFNHKHDDKC
* CmdId: 8334
* </pre>
*
* Protobuf type {@code MusicGameStartRsp}
*/
public static final class MusicGameStartRsp extends
@@ -81,21 +86,21 @@ public final class MusicGameStartRspOuterClass {
case 0:
done = true;
break;
case 64: {
ugcGuid_ = input.readUInt64();
break;
}
case 80: {
case 72: {
retcode_ = input.readInt32();
break;
}
case 120: {
case 88: {
musicBasicId_ = input.readUInt32();
break;
}
case 120: {
ugcGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,141 +133,10 @@ public final class MusicGameStartRspOuterClass {
emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.class, emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.Builder.class);
}
/**
* Protobuf enum {@code MusicGameStartRsp.PFNNLOBODEB}
*/
public enum PFNNLOBODEB
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 8893;</code>
*/
PEPPOHPHJOJ(1, 8893),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final PFNNLOBODEB DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 8893;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 8893;
/**
* <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 PFNNLOBODEB 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 PFNNLOBODEB forNumber(int value) {
switch (value) {
case 0: return NONE;
case 8893: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<PFNNLOBODEB>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
PFNNLOBODEB> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<PFNNLOBODEB>() {
public PFNNLOBODEB findValueByNumber(int number) {
return PFNNLOBODEB.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.MusicGameStartRspOuterClass.MusicGameStartRsp.getDescriptor().getEnumTypes().get(0);
}
private static final PFNNLOBODEB[] VALUES = getStaticValuesArray();
private static PFNNLOBODEB[] getStaticValuesArray() {
return new PFNNLOBODEB[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static PFNNLOBODEB 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 PFNNLOBODEB(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:MusicGameStartRsp.PFNNLOBODEB)
}
public static final int RETCODE_FIELD_NUMBER = 10;
public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -270,10 +144,10 @@ public final class MusicGameStartRspOuterClass {
return retcode_;
}
public static final int UGCGUID_FIELD_NUMBER = 8;
public static final int UGC_GUID_FIELD_NUMBER = 15;
private long ugcGuid_;
/**
* <code>uint64 ugcGuid = 8;</code>
* <code>uint64 ugc_guid = 15;</code>
* @return The ugcGuid.
*/
@java.lang.Override
@@ -281,10 +155,10 @@ public final class MusicGameStartRspOuterClass {
return ugcGuid_;
}
public static final int MUSICBASICID_FIELD_NUMBER = 15;
public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 11;
private int musicBasicId_;
/**
* <code>uint32 musicBasicId = 15;</code>
* <code>uint32 music_basic_id = 11;</code>
* @return The musicBasicId.
*/
@java.lang.Override
@@ -306,14 +180,14 @@ public final class MusicGameStartRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (ugcGuid_ != 0L) {
output.writeUInt64(8, ugcGuid_);
}
if (retcode_ != 0) {
output.writeInt32(10, retcode_);
output.writeInt32(9, retcode_);
}
if (musicBasicId_ != 0) {
output.writeUInt32(15, musicBasicId_);
output.writeUInt32(11, musicBasicId_);
}
if (ugcGuid_ != 0L) {
output.writeUInt64(15, ugcGuid_);
}
unknownFields.writeTo(output);
}
@@ -324,17 +198,17 @@ public final class MusicGameStartRspOuterClass {
if (size != -1) return size;
size = 0;
if (ugcGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(8, ugcGuid_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(10, retcode_);
.computeInt32Size(9, retcode_);
}
if (musicBasicId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, musicBasicId_);
.computeUInt32Size(11, musicBasicId_);
}
if (ugcGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(15, ugcGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -370,10 +244,10 @@ public final class MusicGameStartRspOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + UGCGUID_FIELD_NUMBER;
hash = (37 * hash) + UGC_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getUgcGuid());
hash = (37 * hash) + MUSICBASICID_FIELD_NUMBER;
hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER;
hash = (53 * hash) + getMusicBasicId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -471,6 +345,11 @@ public final class MusicGameStartRspOuterClass {
return builder;
}
/**
* <pre>
* Name: GGFNHKHDDKC
* CmdId: 8334
* </pre>
*
* Protobuf type {@code MusicGameStartRsp}
*/
public static final class Builder extends
@@ -631,7 +510,7 @@ public final class MusicGameStartRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -639,7 +518,7 @@ public final class MusicGameStartRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 9;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -650,7 +529,7 @@ public final class MusicGameStartRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -662,7 +541,7 @@ public final class MusicGameStartRspOuterClass {
private long ugcGuid_ ;
/**
* <code>uint64 ugcGuid = 8;</code>
* <code>uint64 ugc_guid = 15;</code>
* @return The ugcGuid.
*/
@java.lang.Override
@@ -670,7 +549,7 @@ public final class MusicGameStartRspOuterClass {
return ugcGuid_;
}
/**
* <code>uint64 ugcGuid = 8;</code>
* <code>uint64 ugc_guid = 15;</code>
* @param value The ugcGuid to set.
* @return This builder for chaining.
*/
@@ -681,7 +560,7 @@ public final class MusicGameStartRspOuterClass {
return this;
}
/**
* <code>uint64 ugcGuid = 8;</code>
* <code>uint64 ugc_guid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearUgcGuid() {
@@ -693,7 +572,7 @@ public final class MusicGameStartRspOuterClass {
private int musicBasicId_ ;
/**
* <code>uint32 musicBasicId = 15;</code>
* <code>uint32 music_basic_id = 11;</code>
* @return The musicBasicId.
*/
@java.lang.Override
@@ -701,7 +580,7 @@ public final class MusicGameStartRspOuterClass {
return musicBasicId_;
}
/**
* <code>uint32 musicBasicId = 15;</code>
* <code>uint32 music_basic_id = 11;</code>
* @param value The musicBasicId to set.
* @return This builder for chaining.
*/
@@ -712,7 +591,7 @@ public final class MusicGameStartRspOuterClass {
return this;
}
/**
* <code>uint32 musicBasicId = 15;</code>
* <code>uint32 music_basic_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearMusicBasicId() {
@@ -788,12 +667,10 @@ public final class MusicGameStartRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\027MusicGameStartRsp.proto\"\234\001\n\021MusicGameS" +
"tartRsp\022\017\n\007retcode\030\n \001(\005\022\017\n\007ugcGuid\030\010 \001(" +
"\004\022\024\n\014musicBasicId\030\017 \001(\r\"O\n\013PFNNLOBODEB\022\010" +
"\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\275E\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\027MusicGameStartRsp.proto\"N\n\021MusicGameSt" +
"artRsp\022\017\n\007retcode\030\t \001(\005\022\020\n\010ugc_guid\030\017 \001(" +
"\004\022\026\n\016music_basic_id\030\013 \001(\rB\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,