Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 09:09:50 +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/AvatarFetterLevelRewardReqOuterClass.java
+34 -166
View File
@@ -19,18 +19,23 @@ public final class AvatarFetterLevelRewardReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 fetterLevel = 12;</code>
* <code>uint32 fetter_level = 13;</code>
* @return The fetterLevel.
*/
int getFetterLevel();
}
/**
* <pre>
* Name: OGJNGMANPOH
* CmdId: 1653
* </pre>
*
* Protobuf type {@code AvatarFetterLevelRewardReq}
*/
public static final class AvatarFetterLevelRewardReq extends
@@ -75,12 +80,12 @@ public final class AvatarFetterLevelRewardReqOuterClass {
case 0:
done = true;
break;
case 96: {
case 104: {
fetterLevel_ = input.readUInt32();
break;
}
case 104: {
case 120: {
avatarGuid_ = input.readUInt64();
break;
@@ -117,149 +122,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.class, emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.Builder.class);
}
/**
* Protobuf enum {@code AvatarFetterLevelRewardReq.BMENKDDIBDD}
*/
public enum BMENKDDIBDD
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1682;</code>
*/
PEPPOHPHJOJ(1, 1682),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final BMENKDDIBDD DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final BMENKDDIBDD EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1682;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1682;
/**
* <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 BMENKDDIBDD 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 BMENKDDIBDD forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1682: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<BMENKDDIBDD>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
BMENKDDIBDD> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<BMENKDDIBDD>() {
public BMENKDDIBDD findValueByNumber(int number) {
return BMENKDDIBDD.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.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.getDescriptor().getEnumTypes().get(0);
}
private static final BMENKDDIBDD[] VALUES = getStaticValuesArray();
private static BMENKDDIBDD[] getStaticValuesArray() {
return new BMENKDDIBDD[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static BMENKDDIBDD 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 BMENKDDIBDD(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarFetterLevelRewardReq.BMENKDDIBDD)
}
public static final int AVATARGUID_FIELD_NUMBER = 13;
public static final int AVATAR_GUID_FIELD_NUMBER = 15;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -267,10 +133,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
return avatarGuid_;
}
public static final int FETTERLEVEL_FIELD_NUMBER = 12;
public static final int FETTER_LEVEL_FIELD_NUMBER = 13;
private int fetterLevel_;
/**
* <code>uint32 fetterLevel = 12;</code>
* <code>uint32 fetter_level = 13;</code>
* @return The fetterLevel.
*/
@java.lang.Override
@@ -293,10 +159,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (fetterLevel_ != 0) {
output.writeUInt32(12, fetterLevel_);
output.writeUInt32(13, fetterLevel_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_);
output.writeUInt64(15, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -309,11 +175,11 @@ public final class AvatarFetterLevelRewardReqOuterClass {
size = 0;
if (fetterLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, fetterLevel_);
.computeUInt32Size(13, fetterLevel_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, avatarGuid_);
.computeUInt64Size(15, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -345,10 +211,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + FETTERLEVEL_FIELD_NUMBER;
hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getFetterLevel();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -446,6 +312,11 @@ public final class AvatarFetterLevelRewardReqOuterClass {
return builder;
}
/**
* <pre>
* Name: OGJNGMANPOH
* CmdId: 1653
* </pre>
*
* Protobuf type {@code AvatarFetterLevelRewardReq}
*/
public static final class Builder extends
@@ -600,7 +471,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -608,7 +479,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 15;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -619,7 +490,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -631,7 +502,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
private int fetterLevel_ ;
/**
* <code>uint32 fetterLevel = 12;</code>
* <code>uint32 fetter_level = 13;</code>
* @return The fetterLevel.
*/
@java.lang.Override
@@ -639,7 +510,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
return fetterLevel_;
}
/**
* <code>uint32 fetterLevel = 12;</code>
* <code>uint32 fetter_level = 13;</code>
* @param value The fetterLevel to set.
* @return This builder for chaining.
*/
@@ -650,7 +521,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
return this;
}
/**
* <code>uint32 fetterLevel = 12;</code>
* <code>uint32 fetter_level = 13;</code>
* @return This builder for chaining.
*/
public Builder clearFetterLevel() {
@@ -726,13 +597,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n AvatarFetterLevelRewardReq.proto\"\247\001\n\032A" +
"vatarFetterLevelRewardReq\022\022\n\navatarGuid\030" +
"\r \001(\004\022\023\n\013fetterLevel\030\014 \001(\r\"`\n\013BMENKDDIBD" +
"D\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\222\r\022\017\n\013DCDNILF" +
"DFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001" +
"\032\002\020\001B\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
"\n AvatarFetterLevelRewardReq.proto\"G\n\032Av" +
"atarFetterLevelRewardReq\022\023\n\013avatar_guid\030" +
"\017 \001(\004\022\024\n\014fetter_level\030\r \001(\rB\033\n\031emu.grass" +
"cutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,