mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-08 15:33:39 +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,23 +19,28 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @return The enum numeric value on the wire for forwardType.
|
||||
*/
|
||||
int getForwardTypeValue();
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @return The forwardType.
|
||||
*/
|
||||
emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
|
||||
|
||||
/**
|
||||
* <code>uint32 entityId = 3;</code>
|
||||
* <code>uint32 entity_id = 4;</code>
|
||||
* @return The entityId.
|
||||
*/
|
||||
int getEntityId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: PPABGJHNOHL
|
||||
* CmdId: 334
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code EvtDestroyGadgetNotify}
|
||||
*/
|
||||
public static final class EvtDestroyGadgetNotify extends
|
||||
@@ -81,12 +86,12 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 24: {
|
||||
case 32: {
|
||||
|
||||
entityId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 88: {
|
||||
case 48: {
|
||||
int rawValue = input.readEnum();
|
||||
|
||||
forwardType_ = rawValue;
|
||||
@@ -124,156 +129,17 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.EvtDestroyGadgetNotifyOuterClass.EvtDestroyGadgetNotify.class, emu.grasscutter.net.proto.EvtDestroyGadgetNotifyOuterClass.EvtDestroyGadgetNotify.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code EvtDestroyGadgetNotify.CFFIONNKMNJ}
|
||||
*/
|
||||
public enum CFFIONNKMNJ
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 374;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 374),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final CFFIONNKMNJ DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final CFFIONNKMNJ EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 374;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 374;
|
||||
/**
|
||||
* <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 CFFIONNKMNJ 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 CFFIONNKMNJ forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 374: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<CFFIONNKMNJ>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
CFFIONNKMNJ> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<CFFIONNKMNJ>() {
|
||||
public CFFIONNKMNJ findValueByNumber(int number) {
|
||||
return CFFIONNKMNJ.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.EvtDestroyGadgetNotifyOuterClass.EvtDestroyGadgetNotify.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final CFFIONNKMNJ[] VALUES = getStaticValuesArray();
|
||||
private static CFFIONNKMNJ[] getStaticValuesArray() {
|
||||
return new CFFIONNKMNJ[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static CFFIONNKMNJ 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 CFFIONNKMNJ(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:EvtDestroyGadgetNotify.CFFIONNKMNJ)
|
||||
}
|
||||
|
||||
public static final int FORWARDTYPE_FIELD_NUMBER = 11;
|
||||
public static final int FORWARD_TYPE_FIELD_NUMBER = 6;
|
||||
private int forwardType_;
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @return The enum numeric value on the wire for forwardType.
|
||||
*/
|
||||
@java.lang.Override public int getForwardTypeValue() {
|
||||
return forwardType_;
|
||||
}
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @return The forwardType.
|
||||
*/
|
||||
@java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
|
||||
@@ -282,10 +148,10 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
|
||||
}
|
||||
|
||||
public static final int ENTITYID_FIELD_NUMBER = 3;
|
||||
public static final int ENTITY_ID_FIELD_NUMBER = 4;
|
||||
private int entityId_;
|
||||
/**
|
||||
* <code>uint32 entityId = 3;</code>
|
||||
* <code>uint32 entity_id = 4;</code>
|
||||
* @return The entityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -308,10 +174,10 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (entityId_ != 0) {
|
||||
output.writeUInt32(3, entityId_);
|
||||
output.writeUInt32(4, entityId_);
|
||||
}
|
||||
if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
|
||||
output.writeEnum(11, forwardType_);
|
||||
output.writeEnum(6, forwardType_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -324,11 +190,11 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
size = 0;
|
||||
if (entityId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(3, entityId_);
|
||||
.computeUInt32Size(4, entityId_);
|
||||
}
|
||||
if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(11, forwardType_);
|
||||
.computeEnumSize(6, forwardType_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -359,9 +225,9 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + FORWARDTYPE_FIELD_NUMBER;
|
||||
hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + forwardType_;
|
||||
hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getEntityId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
@@ -459,6 +325,11 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: PPABGJHNOHL
|
||||
* CmdId: 334
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code EvtDestroyGadgetNotify}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -613,14 +484,14 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
|
||||
private int forwardType_ = 0;
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @return The enum numeric value on the wire for forwardType.
|
||||
*/
|
||||
@java.lang.Override public int getForwardTypeValue() {
|
||||
return forwardType_;
|
||||
}
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @param value The enum numeric value on the wire for forwardType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -631,7 +502,7 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @return The forwardType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -641,7 +512,7 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
|
||||
}
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @param value The forwardType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -655,7 +526,7 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.ForwardType forwardType = 11;</code>
|
||||
* <code>.ForwardType forward_type = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearForwardType() {
|
||||
@@ -667,7 +538,7 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
|
||||
private int entityId_ ;
|
||||
/**
|
||||
* <code>uint32 entityId = 3;</code>
|
||||
* <code>uint32 entity_id = 4;</code>
|
||||
* @return The entityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -675,7 +546,7 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
return entityId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entityId = 3;</code>
|
||||
* <code>uint32 entity_id = 4;</code>
|
||||
* @param value The entityId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -686,7 +557,7 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entityId = 3;</code>
|
||||
* <code>uint32 entity_id = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearEntityId() {
|
||||
@@ -763,12 +634,10 @@ public final class EvtDestroyGadgetNotifyOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\034EvtDestroyGadgetNotify.proto\032\021ForwardT" +
|
||||
"ype.proto\"\257\001\n\026EvtDestroyGadgetNotify\022!\n\013" +
|
||||
"forwardType\030\013 \001(\0162\014.ForwardType\022\020\n\010entit" +
|
||||
"yId\030\003 \001(\r\"`\n\013CFFIONNKMNJ\022\010\n\004NONE\020\000\022\020\n\013PE" +
|
||||
"PPOHPHJOJ\020\366\002\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"
|
||||
"ype.proto\"O\n\026EvtDestroyGadgetNotify\022\"\n\014f" +
|
||||
"orward_type\030\006 \001(\0162\014.ForwardType\022\021\n\tentit" +
|
||||
"y_id\030\004 \001(\rB\033\n\031emu.grasscutter.net.protob" +
|
||||
"\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user