mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-24 02:39:51 +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
+34
-165
@@ -19,18 +19,23 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 pointId = 6;</code>
|
||||
* <code>uint32 point_id = 12;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
int getPointId();
|
||||
|
||||
/**
|
||||
* <code>bool isQuitImmediately = 5;</code>
|
||||
* <code>bool is_quit_immediately = 4;</code>
|
||||
* @return The isQuitImmediately.
|
||||
*/
|
||||
boolean getIsQuitImmediately();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: ABBDKBIGMHD
|
||||
* CmdId: 914
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code PlayerQuitDungeonReq}
|
||||
*/
|
||||
public static final class PlayerQuitDungeonReq extends
|
||||
@@ -75,12 +80,12 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 40: {
|
||||
case 32: {
|
||||
|
||||
isQuitImmediately_ = input.readBool();
|
||||
break;
|
||||
}
|
||||
case 48: {
|
||||
case 96: {
|
||||
|
||||
pointId_ = input.readUInt32();
|
||||
break;
|
||||
@@ -117,149 +122,10 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.class, emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code PlayerQuitDungeonReq.HACCGPMBNMB}
|
||||
*/
|
||||
public enum HACCGPMBNMB
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 920;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 920),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final HACCGPMBNMB DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final HACCGPMBNMB EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 920;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 920;
|
||||
/**
|
||||
* <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 HACCGPMBNMB 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 HACCGPMBNMB forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 920: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<HACCGPMBNMB>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
HACCGPMBNMB> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<HACCGPMBNMB>() {
|
||||
public HACCGPMBNMB findValueByNumber(int number) {
|
||||
return HACCGPMBNMB.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.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final HACCGPMBNMB[] VALUES = getStaticValuesArray();
|
||||
private static HACCGPMBNMB[] getStaticValuesArray() {
|
||||
return new HACCGPMBNMB[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static HACCGPMBNMB 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 HACCGPMBNMB(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:PlayerQuitDungeonReq.HACCGPMBNMB)
|
||||
}
|
||||
|
||||
public static final int POINTID_FIELD_NUMBER = 6;
|
||||
public static final int POINT_ID_FIELD_NUMBER = 12;
|
||||
private int pointId_;
|
||||
/**
|
||||
* <code>uint32 pointId = 6;</code>
|
||||
* <code>uint32 point_id = 12;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -267,10 +133,10 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
return pointId_;
|
||||
}
|
||||
|
||||
public static final int ISQUITIMMEDIATELY_FIELD_NUMBER = 5;
|
||||
public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 4;
|
||||
private boolean isQuitImmediately_;
|
||||
/**
|
||||
* <code>bool isQuitImmediately = 5;</code>
|
||||
* <code>bool is_quit_immediately = 4;</code>
|
||||
* @return The isQuitImmediately.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -293,10 +159,10 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (isQuitImmediately_ != false) {
|
||||
output.writeBool(5, isQuitImmediately_);
|
||||
output.writeBool(4, isQuitImmediately_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
output.writeUInt32(6, pointId_);
|
||||
output.writeUInt32(12, pointId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -309,11 +175,11 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
size = 0;
|
||||
if (isQuitImmediately_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(5, isQuitImmediately_);
|
||||
.computeBoolSize(4, isQuitImmediately_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(6, pointId_);
|
||||
.computeUInt32Size(12, pointId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -345,9 +211,9 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + POINTID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getPointId();
|
||||
hash = (37 * hash) + ISQUITIMMEDIATELY_FIELD_NUMBER;
|
||||
hash = (37 * hash) + IS_QUIT_IMMEDIATELY_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsQuitImmediately());
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
@@ -446,6 +312,11 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: ABBDKBIGMHD
|
||||
* CmdId: 914
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code PlayerQuitDungeonReq}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -600,7 +471,7 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
|
||||
private int pointId_ ;
|
||||
/**
|
||||
* <code>uint32 pointId = 6;</code>
|
||||
* <code>uint32 point_id = 12;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -608,7 +479,7 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
return pointId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 pointId = 6;</code>
|
||||
* <code>uint32 point_id = 12;</code>
|
||||
* @param value The pointId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -619,7 +490,7 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 pointId = 6;</code>
|
||||
* <code>uint32 point_id = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPointId() {
|
||||
@@ -631,7 +502,7 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
|
||||
private boolean isQuitImmediately_ ;
|
||||
/**
|
||||
* <code>bool isQuitImmediately = 5;</code>
|
||||
* <code>bool is_quit_immediately = 4;</code>
|
||||
* @return The isQuitImmediately.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -639,7 +510,7 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
return isQuitImmediately_;
|
||||
}
|
||||
/**
|
||||
* <code>bool isQuitImmediately = 5;</code>
|
||||
* <code>bool is_quit_immediately = 4;</code>
|
||||
* @param value The isQuitImmediately to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -650,7 +521,7 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool isQuitImmediately = 5;</code>
|
||||
* <code>bool is_quit_immediately = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsQuitImmediately() {
|
||||
@@ -726,12 +597,10 @@ public final class PlayerQuitDungeonReqOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\032PlayerQuitDungeonReq.proto\"\244\001\n\024PlayerQ" +
|
||||
"uitDungeonReq\022\017\n\007pointId\030\006 \001(\r\022\031\n\021isQuit" +
|
||||
"Immediately\030\005 \001(\010\"`\n\013HACCGPMBNMB\022\010\n\004NONE" +
|
||||
"\020\000\022\020\n\013PEPPOHPHJOJ\020\230\007\022\017\n\013DCDNILFDFLB\020\000\022\017\n" +
|
||||
"\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031e" +
|
||||
"mu.grasscutter.net.protob\006proto3"
|
||||
"\n\032PlayerQuitDungeonReq.proto\"E\n\024PlayerQu" +
|
||||
"itDungeonReq\022\020\n\010point_id\030\014 \001(\r\022\033\n\023is_qui" +
|
||||
"t_immediately\030\004 \001(\010B\033\n\031emu.grasscutter.n" +
|
||||
"et.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user