Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 01:09:51 +08:00
Code Issues Projects Releases Wiki Activity

Add support for v3.5.0 (#2090)

Browse Source 
* 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
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairReqOuterClass.java
+42 -174
View File
@@ -19,27 +19,32 @@ public final class EvtAvatarLockChairReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 chairId = 3;</code>
* <code>uint64 chair_id = 7;</code>
* @return The chairId.
*/
long getChairId();
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
* @return Whether the position field is set.
*/
boolean hasPosition();
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
* @return The position.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
}
/**
* <pre>
* Name: PIBJPDAAJLK
* CmdId: 379
* </pre>
*
* Protobuf type {@code EvtAvatarLockChairReq}
*/
public static final class EvtAvatarLockChairReq extends
@@ -84,12 +89,12 @@ public final class EvtAvatarLockChairReqOuterClass {
case 0:
done = true;
break;
case 24: {
case 56: {
chairId_ = input.readUInt64();
break;
}
case 114: {
case 122: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (position_ != null) {
subBuilder = position_.toBuilder();
@@ -134,149 +139,10 @@ public final class EvtAvatarLockChairReqOuterClass {
emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.class, emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.Builder.class);
}
/**
* Protobuf enum {@code EvtAvatarLockChairReq.FINEJFAMDOG}
*/
public enum FINEJFAMDOG
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 337;</code>
*/
PEPPOHPHJOJ(1, 337),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final FINEJFAMDOG DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final FINEJFAMDOG EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 337;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 337;
/**
* <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 FINEJFAMDOG 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 FINEJFAMDOG forNumber(int value) {
switch (value) {
case 0: return NONE;
case 337: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<FINEJFAMDOG>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
FINEJFAMDOG> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<FINEJFAMDOG>() {
public FINEJFAMDOG findValueByNumber(int number) {
return FINEJFAMDOG.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.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.getDescriptor().getEnumTypes().get(0);
}
private static final FINEJFAMDOG[] VALUES = getStaticValuesArray();
private static FINEJFAMDOG[] getStaticValuesArray() {
return new FINEJFAMDOG[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static FINEJFAMDOG 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 FINEJFAMDOG(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:EvtAvatarLockChairReq.FINEJFAMDOG)
}
public static final int CHAIRID_FIELD_NUMBER = 3;
public static final int CHAIR_ID_FIELD_NUMBER = 7;
private long chairId_;
/**
* <code>uint64 chairId = 3;</code>
* <code>uint64 chair_id = 7;</code>
* @return The chairId.
*/
@java.lang.Override
@@ -284,10 +150,10 @@ public final class EvtAvatarLockChairReqOuterClass {
return chairId_;
}
public static final int POSITION_FIELD_NUMBER = 14;
public static final int POSITION_FIELD_NUMBER = 15;
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
* @return Whether the position field is set.
*/
@java.lang.Override
@@ -295,7 +161,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return position_ != null;
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
* @return The position.
*/
@java.lang.Override
@@ -303,7 +169,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
@@ -325,10 +191,10 @@ public final class EvtAvatarLockChairReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (chairId_ != 0L) {
output.writeUInt64(3, chairId_);
output.writeUInt64(7, chairId_);
}
if (position_ != null) {
output.writeMessage(14, getPosition());
output.writeMessage(15, getPosition());
}
unknownFields.writeTo(output);
}
@@ -341,11 +207,11 @@ public final class EvtAvatarLockChairReqOuterClass {
size = 0;
if (chairId_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(3, chairId_);
.computeUInt64Size(7, chairId_);
}
if (position_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, getPosition());
.computeMessageSize(15, getPosition());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -380,7 +246,7 @@ public final class EvtAvatarLockChairReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CHAIRID_FIELD_NUMBER;
hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getChairId());
if (hasPosition()) {
@@ -483,6 +349,11 @@ public final class EvtAvatarLockChairReqOuterClass {
return builder;
}
/**
* <pre>
* Name: PIBJPDAAJLK
* CmdId: 379
* </pre>
*
* Protobuf type {@code EvtAvatarLockChairReq}
*/
public static final class Builder extends
@@ -645,7 +516,7 @@ public final class EvtAvatarLockChairReqOuterClass {
private long chairId_ ;
/**
* <code>uint64 chairId = 3;</code>
* <code>uint64 chair_id = 7;</code>
* @return The chairId.
*/
@java.lang.Override
@@ -653,7 +524,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return chairId_;
}
/**
* <code>uint64 chairId = 3;</code>
* <code>uint64 chair_id = 7;</code>
* @param value The chairId to set.
* @return This builder for chaining.
*/
@@ -664,7 +535,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return this;
}
/**
* <code>uint64 chairId = 3;</code>
* <code>uint64 chair_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearChairId() {
@@ -678,14 +549,14 @@ public final class EvtAvatarLockChairReqOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_;
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
* @return Whether the position field is set.
*/
public boolean hasPosition() {
return positionBuilder_ != null || position_ != null;
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
* @return The position.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -696,7 +567,7 @@ public final class EvtAvatarLockChairReqOuterClass {
}
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
@@ -712,7 +583,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return this;
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
public Builder setPosition(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -726,7 +597,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return this;
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
@@ -744,7 +615,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return this;
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
public Builder clearPosition() {
if (positionBuilder_ == null) {
@@ -758,7 +629,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return this;
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
@@ -766,7 +637,7 @@ public final class EvtAvatarLockChairReqOuterClass {
return getPositionFieldBuilder().getBuilder();
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
if (positionBuilder_ != null) {
@@ -777,7 +648,7 @@ public final class EvtAvatarLockChairReqOuterClass {
}
}
/**
* <code>.Vector position = 14;</code>
* <code>.Vector position = 15;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
@@ -860,12 +731,9 @@ public final class EvtAvatarLockChairReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033EvtAvatarLockChairReq.proto\032\014Vector.pr" +
"oto\"\245\001\n\025EvtAvatarLockChairReq\022\017\n\007chairId" +
"\030\003 \001(\004\022\031\n\010position\030\016 \001(\0132\007.Vector\"`\n\013FIN" +
"EJFAMDOG\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\321\002\022\017\n\013" +
"DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIAB" +
"GAOCI\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.proto" +
"b\006proto3"
"oto\"D\n\025EvtAvatarLockChairReq\022\020\n\010chair_id" +
"\030\007 \001(\004\022\031\n\010position\030\017 \001(\0132\007.VectorB\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,