mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 03:13:35 +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:
Colleiflower
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
+23
-146
@@ -19,12 +19,17 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 flycloakId = 15;</code>
|
||||
* <code>uint32 flycloak_id = 9;</code>
|
||||
* @return The flycloakId.
|
||||
*/
|
||||
int getFlycloakId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: HCLMIGIPANC
|
||||
* CmdId: 1793
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarGainFlycloakNotify}
|
||||
*/
|
||||
public static final class AvatarGainFlycloakNotify extends
|
||||
@@ -69,7 +74,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 120: {
|
||||
case 72: {
|
||||
|
||||
flycloakId_ = input.readUInt32();
|
||||
break;
|
||||
@@ -106,141 +111,10 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.class, emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code AvatarGainFlycloakNotify.BNAPPNHGLHA}
|
||||
*/
|
||||
public enum BNAPPNHGLHA
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1702;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 1702),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final BNAPPNHGLHA DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1702;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 1702;
|
||||
/**
|
||||
* <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 BNAPPNHGLHA 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 BNAPPNHGLHA forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 1702: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<BNAPPNHGLHA>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
BNAPPNHGLHA> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<BNAPPNHGLHA>() {
|
||||
public BNAPPNHGLHA findValueByNumber(int number) {
|
||||
return BNAPPNHGLHA.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.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final BNAPPNHGLHA[] VALUES = getStaticValuesArray();
|
||||
private static BNAPPNHGLHA[] getStaticValuesArray() {
|
||||
return new BNAPPNHGLHA[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
|
||||
};
|
||||
}
|
||||
public static BNAPPNHGLHA 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 BNAPPNHGLHA(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:AvatarGainFlycloakNotify.BNAPPNHGLHA)
|
||||
}
|
||||
|
||||
public static final int FLYCLOAKID_FIELD_NUMBER = 15;
|
||||
public static final int FLYCLOAK_ID_FIELD_NUMBER = 9;
|
||||
private int flycloakId_;
|
||||
/**
|
||||
* <code>uint32 flycloakId = 15;</code>
|
||||
* <code>uint32 flycloak_id = 9;</code>
|
||||
* @return The flycloakId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -263,7 +137,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (flycloakId_ != 0) {
|
||||
output.writeUInt32(15, flycloakId_);
|
||||
output.writeUInt32(9, flycloakId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -276,7 +150,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
size = 0;
|
||||
if (flycloakId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, flycloakId_);
|
||||
.computeUInt32Size(9, flycloakId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -306,7 +180,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + FLYCLOAKID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getFlycloakId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
@@ -404,6 +278,11 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: HCLMIGIPANC
|
||||
* CmdId: 1793
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarGainFlycloakNotify}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -552,7 +431,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
|
||||
private int flycloakId_ ;
|
||||
/**
|
||||
* <code>uint32 flycloakId = 15;</code>
|
||||
* <code>uint32 flycloak_id = 9;</code>
|
||||
* @return The flycloakId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -560,7 +439,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
return flycloakId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 flycloakId = 15;</code>
|
||||
* <code>uint32 flycloak_id = 9;</code>
|
||||
* @param value The flycloakId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -571,7 +450,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 flycloakId = 15;</code>
|
||||
* <code>uint32 flycloak_id = 9;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearFlycloakId() {
|
||||
@@ -647,11 +526,9 @@ public final class AvatarGainFlycloakNotifyOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\036AvatarGainFlycloakNotify.proto\"\177\n\030Avat" +
|
||||
"arGainFlycloakNotify\022\022\n\nflycloakId\030\017 \001(\r" +
|
||||
"\"O\n\013BNAPPNHGLHA\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ" +
|
||||
"\020\246\r\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020" +
|
||||
"\001B\033\n\031emu.grasscutter.net.protob\006proto3"
|
||||
"\n\036AvatarGainFlycloakNotify.proto\"/\n\030Avat" +
|
||||
"arGainFlycloakNotify\022\023\n\013flycloak_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