mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-04 23:13:42 +08:00
Add support for v3.5.0 (#2090)
* 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:
committed by
GitHub
Unverified
parent
922f7bca51
commit
516e5975e1
+38
-169
@@ -19,24 +19,29 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @return The avatarName.
|
||||
*/
|
||||
java.lang.String getAvatarName();
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @return The bytes for avatarName.
|
||||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getAvatarNameBytes();
|
||||
|
||||
/**
|
||||
* <code>uint32 renameId = 14;</code>
|
||||
* <code>uint32 rename_id = 9;</code>
|
||||
* @return The renameId.
|
||||
*/
|
||||
int getRenameId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: GFOEOBLJIJH
|
||||
* CmdId: 1780
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ItemRenameAvatarReq}
|
||||
*/
|
||||
public static final class ItemRenameAvatarReq extends
|
||||
@@ -82,13 +87,13 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 34: {
|
||||
case 10: {
|
||||
java.lang.String s = input.readStringRequireUtf8();
|
||||
|
||||
avatarName_ = s;
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
case 72: {
|
||||
|
||||
renameId_ = input.readUInt32();
|
||||
break;
|
||||
@@ -125,149 +130,10 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
emu.grasscutter.net.proto.ItemRenameAvatarReqOuterClass.ItemRenameAvatarReq.class, emu.grasscutter.net.proto.ItemRenameAvatarReqOuterClass.ItemRenameAvatarReq.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code ItemRenameAvatarReq.GGOKOJMMCDI}
|
||||
*/
|
||||
public enum GGOKOJMMCDI
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1747;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 1747),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final GGOKOJMMCDI DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final GGOKOJMMCDI EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1747;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 1747;
|
||||
/**
|
||||
* <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 GGOKOJMMCDI 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 GGOKOJMMCDI forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 1747: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<GGOKOJMMCDI>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
GGOKOJMMCDI> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<GGOKOJMMCDI>() {
|
||||
public GGOKOJMMCDI findValueByNumber(int number) {
|
||||
return GGOKOJMMCDI.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.ItemRenameAvatarReqOuterClass.ItemRenameAvatarReq.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final GGOKOJMMCDI[] VALUES = getStaticValuesArray();
|
||||
private static GGOKOJMMCDI[] getStaticValuesArray() {
|
||||
return new GGOKOJMMCDI[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static GGOKOJMMCDI 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 GGOKOJMMCDI(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:ItemRenameAvatarReq.GGOKOJMMCDI)
|
||||
}
|
||||
|
||||
public static final int AVATARNAME_FIELD_NUMBER = 4;
|
||||
public static final int AVATAR_NAME_FIELD_NUMBER = 1;
|
||||
private volatile java.lang.Object avatarName_;
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @return The avatarName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -284,7 +150,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @return The bytes for avatarName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -302,10 +168,10 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
}
|
||||
}
|
||||
|
||||
public static final int RENAMEID_FIELD_NUMBER = 14;
|
||||
public static final int RENAME_ID_FIELD_NUMBER = 9;
|
||||
private int renameId_;
|
||||
/**
|
||||
* <code>uint32 renameId = 14;</code>
|
||||
* <code>uint32 rename_id = 9;</code>
|
||||
* @return The renameId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -328,10 +194,10 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, avatarName_);
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, avatarName_);
|
||||
}
|
||||
if (renameId_ != 0) {
|
||||
output.writeUInt32(14, renameId_);
|
||||
output.writeUInt32(9, renameId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -343,11 +209,11 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
|
||||
size = 0;
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, avatarName_);
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, avatarName_);
|
||||
}
|
||||
if (renameId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(14, renameId_);
|
||||
.computeUInt32Size(9, renameId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -379,9 +245,9 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + AVATARNAME_FIELD_NUMBER;
|
||||
hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getAvatarName().hashCode();
|
||||
hash = (37 * hash) + RENAMEID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + RENAME_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRenameId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
@@ -479,6 +345,11 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: GFOEOBLJIJH
|
||||
* CmdId: 1780
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ItemRenameAvatarReq}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -634,7 +505,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
|
||||
private java.lang.Object avatarName_ = "";
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @return The avatarName.
|
||||
*/
|
||||
public java.lang.String getAvatarName() {
|
||||
@@ -650,7 +521,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @return The bytes for avatarName.
|
||||
*/
|
||||
public com.google.protobuf.ByteString
|
||||
@@ -667,7 +538,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @param value The avatarName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -682,7 +553,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarName() {
|
||||
@@ -692,7 +563,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string avatarName = 4;</code>
|
||||
* <code>string avatar_name = 1;</code>
|
||||
* @param value The bytes for avatarName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -710,7 +581,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
|
||||
private int renameId_ ;
|
||||
/**
|
||||
* <code>uint32 renameId = 14;</code>
|
||||
* <code>uint32 rename_id = 9;</code>
|
||||
* @return The renameId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -718,7 +589,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
return renameId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 renameId = 14;</code>
|
||||
* <code>uint32 rename_id = 9;</code>
|
||||
* @param value The renameId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -729,7 +600,7 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 renameId = 14;</code>
|
||||
* <code>uint32 rename_id = 9;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearRenameId() {
|
||||
@@ -805,12 +676,10 @@ public final class ItemRenameAvatarReqOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\031ItemRenameAvatarReq.proto\"\235\001\n\023ItemRena" +
|
||||
"meAvatarReq\022\022\n\navatarName\030\004 \001(\t\022\020\n\010renam" +
|
||||
"eId\030\016 \001(\r\"`\n\013GGOKOJMMCDI\022\010\n\004NONE\020\000\022\020\n\013PE" +
|
||||
"PPOHPHJOJ\020\323\r\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLM" +
|
||||
"POEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031emu.grass" +
|
||||
"cutter.net.protob\006proto3"
|
||||
"\n\031ItemRenameAvatarReq.proto\"=\n\023ItemRenam" +
|
||||
"eAvatarReq\022\023\n\013avatar_name\030\001 \001(\t\022\021\n\trenam" +
|
||||
"e_id\030\t \001(\rB\033\n\031emu.grasscutter.net.protob" +
|
||||
"\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user