mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 13:53:37 +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
+27
-158
@@ -19,18 +19,23 @@ public final class SetPlayerNameReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @return The nickName.
|
||||
*/
|
||||
java.lang.String getNickName();
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @return The bytes for nickName.
|
||||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getNickNameBytes();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: CPIDFBGHCEJ
|
||||
* CmdId: 123
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SetPlayerNameReq}
|
||||
*/
|
||||
public static final class SetPlayerNameReq extends
|
||||
@@ -76,7 +81,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 26: {
|
||||
case 50: {
|
||||
java.lang.String s = input.readStringRequireUtf8();
|
||||
|
||||
nickName_ = s;
|
||||
@@ -114,149 +119,10 @@ public final class SetPlayerNameReqOuterClass {
|
||||
emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq.class, emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code SetPlayerNameReq.OGLEBIEPALE}
|
||||
*/
|
||||
public enum OGLEBIEPALE
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 200;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 200),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final OGLEBIEPALE DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final OGLEBIEPALE EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 200;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 200;
|
||||
/**
|
||||
* <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 OGLEBIEPALE 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 OGLEBIEPALE forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 200: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<OGLEBIEPALE>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
OGLEBIEPALE> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<OGLEBIEPALE>() {
|
||||
public OGLEBIEPALE findValueByNumber(int number) {
|
||||
return OGLEBIEPALE.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.SetPlayerNameReqOuterClass.SetPlayerNameReq.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final OGLEBIEPALE[] VALUES = getStaticValuesArray();
|
||||
private static OGLEBIEPALE[] getStaticValuesArray() {
|
||||
return new OGLEBIEPALE[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static OGLEBIEPALE 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 OGLEBIEPALE(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:SetPlayerNameReq.OGLEBIEPALE)
|
||||
}
|
||||
|
||||
public static final int NICKNAME_FIELD_NUMBER = 3;
|
||||
public static final int NICK_NAME_FIELD_NUMBER = 6;
|
||||
private volatile java.lang.Object nickName_;
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @return The nickName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -273,7 +139,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @return The bytes for nickName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -306,7 +172,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, nickName_);
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 6, nickName_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -318,7 +184,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
|
||||
size = 0;
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, nickName_);
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, nickName_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -348,7 +214,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
|
||||
hash = (37 * hash) + NICK_NAME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getNickName().hashCode();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
@@ -446,6 +312,11 @@ public final class SetPlayerNameReqOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: CPIDFBGHCEJ
|
||||
* CmdId: 123
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SetPlayerNameReq}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -595,7 +466,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
|
||||
private java.lang.Object nickName_ = "";
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @return The nickName.
|
||||
*/
|
||||
public java.lang.String getNickName() {
|
||||
@@ -611,7 +482,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @return The bytes for nickName.
|
||||
*/
|
||||
public com.google.protobuf.ByteString
|
||||
@@ -628,7 +499,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @param value The nickName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -643,7 +514,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearNickName() {
|
||||
@@ -653,7 +524,7 @@ public final class SetPlayerNameReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string nickName = 3;</code>
|
||||
* <code>string nick_name = 6;</code>
|
||||
* @param value The bytes for nickName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -735,11 +606,9 @@ public final class SetPlayerNameReqOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026SetPlayerNameReq.proto\"\206\001\n\020SetPlayerNa" +
|
||||
"meReq\022\020\n\010nickName\030\003 \001(\t\"`\n\013OGLEBIEPALE\022\010" +
|
||||
"\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\310\001\022\017\n\013DCDNILFDFL" +
|
||||
"B\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020" +
|
||||
"\001B\033\n\031emu.grasscutter.net.protob\006proto3"
|
||||
"\n\026SetPlayerNameReq.proto\"%\n\020SetPlayerNam" +
|
||||
"eReq\022\021\n\tnick_name\030\006 \001(\tB\033\n\031emu.grasscutt" +
|
||||
"er.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user