Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 11:59:54 +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/MusicGameStartReqOuterClass.java
+105 -237
View File
@@ -19,24 +19,29 @@ public final class MusicGameStartReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 ugcGuid = 5;</code>
* <code>uint64 ugc_guid = 13;</code>
* @return The ugcGuid.
*/
long getUgcGuid();
/**
* <code>uint32 musicBasicId = 7;</code>
* @return The musicBasicId.
*/
int getMusicBasicId();
/**
* <code>bool isSaveScore = 15;</code>
* <code>bool is_save_score = 7;</code>
* @return The isSaveScore.
*/
boolean getIsSaveScore();
/**
* <code>uint32 music_basic_id = 4;</code>
* @return The musicBasicId.
*/
int getMusicBasicId();
}
/**
* <pre>
* Name: KIECLHFBINF
* CmdId: 8103
* </pre>
*
* Protobuf type {@code MusicGameStartReq}
*/
public static final class MusicGameStartReq extends
@@ -81,21 +86,21 @@ public final class MusicGameStartReqOuterClass {
case 0:
done = true;
break;
case 40: {
ugcGuid_ = input.readUInt64();
break;
}
case 56: {
case 32: {
musicBasicId_ = input.readUInt32();
break;
}
case 120: {
case 56: {
isSaveScore_ = input.readBool();
break;
}
case 104: {
ugcGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,149 +133,10 @@ public final class MusicGameStartReqOuterClass {
emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq.class, emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq.Builder.class);
}
/**
* Protobuf enum {@code MusicGameStartReq.EMDPLMFEJCP}
*/
public enum EMDPLMFEJCP
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 8536;</code>
*/
PEPPOHPHJOJ(1, 8536),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final EMDPLMFEJCP DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final EMDPLMFEJCP EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 8536;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 8536;
/**
* <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 EMDPLMFEJCP 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 EMDPLMFEJCP forNumber(int value) {
switch (value) {
case 0: return NONE;
case 8536: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<EMDPLMFEJCP>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
EMDPLMFEJCP> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<EMDPLMFEJCP>() {
public EMDPLMFEJCP findValueByNumber(int number) {
return EMDPLMFEJCP.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.MusicGameStartReqOuterClass.MusicGameStartReq.getDescriptor().getEnumTypes().get(0);
}
private static final EMDPLMFEJCP[] VALUES = getStaticValuesArray();
private static EMDPLMFEJCP[] getStaticValuesArray() {
return new EMDPLMFEJCP[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static EMDPLMFEJCP 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 EMDPLMFEJCP(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:MusicGameStartReq.EMDPLMFEJCP)
}
public static final int UGCGUID_FIELD_NUMBER = 5;
public static final int UGC_GUID_FIELD_NUMBER = 13;
private long ugcGuid_;
/**
* <code>uint64 ugcGuid = 5;</code>
* <code>uint64 ugc_guid = 13;</code>
* @return The ugcGuid.
*/
@java.lang.Override
@@ -278,21 +144,10 @@ public final class MusicGameStartReqOuterClass {
return ugcGuid_;
}
public static final int MUSICBASICID_FIELD_NUMBER = 7;
private int musicBasicId_;
/**
* <code>uint32 musicBasicId = 7;</code>
* @return The musicBasicId.
*/
@java.lang.Override
public int getMusicBasicId() {
return musicBasicId_;
}
public static final int ISSAVESCORE_FIELD_NUMBER = 15;
public static final int IS_SAVE_SCORE_FIELD_NUMBER = 7;
private boolean isSaveScore_;
/**
* <code>bool isSaveScore = 15;</code>
* <code>bool is_save_score = 7;</code>
* @return The isSaveScore.
*/
@java.lang.Override
@@ -300,6 +155,17 @@ public final class MusicGameStartReqOuterClass {
return isSaveScore_;
}
public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 4;
private int musicBasicId_;
/**
* <code>uint32 music_basic_id = 4;</code>
* @return The musicBasicId.
*/
@java.lang.Override
public int getMusicBasicId() {
return musicBasicId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -314,14 +180,14 @@ public final class MusicGameStartReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (ugcGuid_ != 0L) {
output.writeUInt64(5, ugcGuid_);
}
if (musicBasicId_ != 0) {
output.writeUInt32(7, musicBasicId_);
output.writeUInt32(4, musicBasicId_);
}
if (isSaveScore_ != false) {
output.writeBool(15, isSaveScore_);
output.writeBool(7, isSaveScore_);
}
if (ugcGuid_ != 0L) {
output.writeUInt64(13, ugcGuid_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class MusicGameStartReqOuterClass {
if (size != -1) return size;
size = 0;
if (ugcGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(5, ugcGuid_);
}
if (musicBasicId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, musicBasicId_);
.computeUInt32Size(4, musicBasicId_);
}
if (isSaveScore_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(15, isSaveScore_);
.computeBoolSize(7, isSaveScore_);
}
if (ugcGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, ugcGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -361,10 +227,10 @@ public final class MusicGameStartReqOuterClass {
if (getUgcGuid()
!= other.getUgcGuid()) return false;
if (getMusicBasicId()
!= other.getMusicBasicId()) return false;
if (getIsSaveScore()
!= other.getIsSaveScore()) return false;
if (getMusicBasicId()
!= other.getMusicBasicId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -376,14 +242,14 @@ public final class MusicGameStartReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
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 = (53 * hash) + getMusicBasicId();
hash = (37 * hash) + ISSAVESCORE_FIELD_NUMBER;
hash = (37 * hash) + IS_SAVE_SCORE_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsSaveScore());
hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER;
hash = (53 * hash) + getMusicBasicId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -480,6 +346,11 @@ public final class MusicGameStartReqOuterClass {
return builder;
}
/**
* <pre>
* Name: KIECLHFBINF
* CmdId: 8103
* </pre>
*
* Protobuf type {@code MusicGameStartReq}
*/
public static final class Builder extends
@@ -519,10 +390,10 @@ public final class MusicGameStartReqOuterClass {
super.clear();
ugcGuid_ = 0L;
musicBasicId_ = 0;
isSaveScore_ = false;
musicBasicId_ = 0;
return this;
}
@@ -550,8 +421,8 @@ public final class MusicGameStartReqOuterClass {
public emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq buildPartial() {
emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq result = new emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq(this);
result.ugcGuid_ = ugcGuid_;
result.musicBasicId_ = musicBasicId_;
result.isSaveScore_ = isSaveScore_;
result.musicBasicId_ = musicBasicId_;
onBuilt();
return result;
}
@@ -603,12 +474,12 @@ public final class MusicGameStartReqOuterClass {
if (other.getUgcGuid() != 0L) {
setUgcGuid(other.getUgcGuid());
}
if (other.getMusicBasicId() != 0) {
setMusicBasicId(other.getMusicBasicId());
}
if (other.getIsSaveScore() != false) {
setIsSaveScore(other.getIsSaveScore());
}
if (other.getMusicBasicId() != 0) {
setMusicBasicId(other.getMusicBasicId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -640,7 +511,7 @@ public final class MusicGameStartReqOuterClass {
private long ugcGuid_ ;
/**
* <code>uint64 ugcGuid = 5;</code>
* <code>uint64 ugc_guid = 13;</code>
* @return The ugcGuid.
*/
@java.lang.Override
@@ -648,7 +519,7 @@ public final class MusicGameStartReqOuterClass {
return ugcGuid_;
}
/**
* <code>uint64 ugcGuid = 5;</code>
* <code>uint64 ugc_guid = 13;</code>
* @param value The ugcGuid to set.
* @return This builder for chaining.
*/
@@ -659,7 +530,7 @@ public final class MusicGameStartReqOuterClass {
return this;
}
/**
* <code>uint64 ugcGuid = 5;</code>
* <code>uint64 ugc_guid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearUgcGuid() {
@@ -669,40 +540,9 @@ public final class MusicGameStartReqOuterClass {
return this;
}
private int musicBasicId_ ;
/**
* <code>uint32 musicBasicId = 7;</code>
* @return The musicBasicId.
*/
@java.lang.Override
public int getMusicBasicId() {
return musicBasicId_;
}
/**
* <code>uint32 musicBasicId = 7;</code>
* @param value The musicBasicId to set.
* @return This builder for chaining.
*/
public Builder setMusicBasicId(int value) {
musicBasicId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 musicBasicId = 7;</code>
* @return This builder for chaining.
*/
public Builder clearMusicBasicId() {
musicBasicId_ = 0;
onChanged();
return this;
}
private boolean isSaveScore_ ;
/**
* <code>bool isSaveScore = 15;</code>
* <code>bool is_save_score = 7;</code>
* @return The isSaveScore.
*/
@java.lang.Override
@@ -710,7 +550,7 @@ public final class MusicGameStartReqOuterClass {
return isSaveScore_;
}
/**
* <code>bool isSaveScore = 15;</code>
* <code>bool is_save_score = 7;</code>
* @param value The isSaveScore to set.
* @return This builder for chaining.
*/
@@ -721,7 +561,7 @@ public final class MusicGameStartReqOuterClass {
return this;
}
/**
* <code>bool isSaveScore = 15;</code>
* <code>bool is_save_score = 7;</code>
* @return This builder for chaining.
*/
public Builder clearIsSaveScore() {
@@ -730,6 +570,37 @@ public final class MusicGameStartReqOuterClass {
onChanged();
return this;
}
private int musicBasicId_ ;
/**
* <code>uint32 music_basic_id = 4;</code>
* @return The musicBasicId.
*/
@java.lang.Override
public int getMusicBasicId() {
return musicBasicId_;
}
/**
* <code>uint32 music_basic_id = 4;</code>
* @param value The musicBasicId to set.
* @return This builder for chaining.
*/
public Builder setMusicBasicId(int value) {
musicBasicId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 music_basic_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearMusicBasicId() {
musicBasicId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -797,13 +668,10 @@ public final class MusicGameStartReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\027MusicGameStartReq.proto\"\261\001\n\021MusicGameS" +
"tartReq\022\017\n\007ugcGuid\030\005 \001(\004\022\024\n\014musicBasicId" +
"\030\007 \001(\r\022\023\n\013isSaveScore\030\017 \001(\010\"`\n\013EMDPLMFEJ" +
"CP\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\330B\022\017\n\013DCDNIL" +
"FDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020" +
"\001\032\002\020\001B\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
"\n\027MusicGameStartReq.proto\"T\n\021MusicGameSt" +
"artReq\022\020\n\010ugc_guid\030\r \001(\004\022\025\n\ris_save_scor" +
"e\030\007 \001(\010\022\026\n\016music_basic_id\030\004 \001(\rB\033\n\031emu.g" +
"rasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -814,7 +682,7 @@ public final class MusicGameStartReqOuterClass {
internal_static_MusicGameStartReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_MusicGameStartReq_descriptor,
new java.lang.String[] { "UgcGuid", "MusicBasicId", "IsSaveScore", });
new java.lang.String[] { "UgcGuid", "IsSaveScore", "MusicBasicId", });
}
// @@protoc_insertion_point(outer_class_scope)