Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 18:13:35 +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/EvtAvatarStandUpNotifyOuterClass.java
+110 -241
View File
@@ -19,30 +19,35 @@ public final class EvtAvatarStandUpNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 chairId = 11;</code>
* <code>uint64 chair_id = 5;</code>
* @return The chairId.
*/
long getChairId();
/**
* <code>int32 performId = 14;</code>
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>int32 performId = 7;</code>
* @return The performId.
*/
int getPerformId();
/**
* <code>int32 direction = 5;</code>
* <code>int32 direction = 1;</code>
* @return The direction.
*/
int getDirection();
/**
* <code>uint32 entityId = 4;</code>
* @return The entityId.
*/
int getEntityId();
}
/**
* <pre>
* Name: DICIOCNEPCL
* CmdId: 388
* </pre>
*
* Protobuf type {@code EvtAvatarStandUpNotify}
*/
public static final class EvtAvatarStandUpNotify extends
@@ -87,6 +92,11 @@ public final class EvtAvatarStandUpNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
direction_ = input.readInt32();
break;
}
case 32: {
entityId_ = input.readUInt32();
@@ -94,15 +104,10 @@ public final class EvtAvatarStandUpNotifyOuterClass {
}
case 40: {
direction_ = input.readInt32();
break;
}
case 88: {
chairId_ = input.readUInt64();
break;
}
case 112: {
case 56: {
performId_ = input.readInt32();
break;
@@ -139,149 +144,10 @@ public final class EvtAvatarStandUpNotifyOuterClass {
emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.class, emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.Builder.class);
}
/**
* Protobuf enum {@code EvtAvatarStandUpNotify.FHBJMPCKONG}
*/
public enum FHBJMPCKONG
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 336;</code>
*/
PEPPOHPHJOJ(1, 336),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final FHBJMPCKONG DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final FHBJMPCKONG EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 336;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 336;
/**
* <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 FHBJMPCKONG 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 FHBJMPCKONG forNumber(int value) {
switch (value) {
case 0: return NONE;
case 336: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<FHBJMPCKONG>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
FHBJMPCKONG> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<FHBJMPCKONG>() {
public FHBJMPCKONG findValueByNumber(int number) {
return FHBJMPCKONG.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.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.getDescriptor().getEnumTypes().get(0);
}
private static final FHBJMPCKONG[] VALUES = getStaticValuesArray();
private static FHBJMPCKONG[] getStaticValuesArray() {
return new FHBJMPCKONG[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static FHBJMPCKONG 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 FHBJMPCKONG(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:EvtAvatarStandUpNotify.FHBJMPCKONG)
}
public static final int CHAIRID_FIELD_NUMBER = 11;
public static final int CHAIR_ID_FIELD_NUMBER = 5;
private long chairId_;
/**
* <code>uint64 chairId = 11;</code>
* <code>uint64 chair_id = 5;</code>
* @return The chairId.
*/
@java.lang.Override
@@ -289,10 +155,21 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return chairId_;
}
public static final int PERFORMID_FIELD_NUMBER = 14;
public static final int ENTITY_ID_FIELD_NUMBER = 4;
private int entityId_;
/**
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
public static final int PERFORMID_FIELD_NUMBER = 7;
private int performId_;
/**
* <code>int32 performId = 14;</code>
* <code>int32 performId = 7;</code>
* @return The performId.
*/
@java.lang.Override
@@ -300,10 +177,10 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return performId_;
}
public static final int DIRECTION_FIELD_NUMBER = 5;
public static final int DIRECTION_FIELD_NUMBER = 1;
private int direction_;
/**
* <code>int32 direction = 5;</code>
* <code>int32 direction = 1;</code>
* @return The direction.
*/
@java.lang.Override
@@ -311,17 +188,6 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return direction_;
}
public static final int ENTITYID_FIELD_NUMBER = 4;
private int entityId_;
/**
* <code>uint32 entityId = 4;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -336,17 +202,17 @@ public final class EvtAvatarStandUpNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (direction_ != 0) {
output.writeInt32(1, direction_);
}
if (entityId_ != 0) {
output.writeUInt32(4, entityId_);
}
if (direction_ != 0) {
output.writeInt32(5, direction_);
}
if (chairId_ != 0L) {
output.writeUInt64(11, chairId_);
output.writeUInt64(5, chairId_);
}
if (performId_ != 0) {
output.writeInt32(14, performId_);
output.writeInt32(7, performId_);
}
unknownFields.writeTo(output);
}
@@ -357,21 +223,21 @@ public final class EvtAvatarStandUpNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (direction_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, direction_);
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, entityId_);
}
if (direction_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(5, direction_);
}
if (chairId_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(11, chairId_);
.computeUInt64Size(5, chairId_);
}
if (performId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(14, performId_);
.computeInt32Size(7, performId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -390,12 +256,12 @@ public final class EvtAvatarStandUpNotifyOuterClass {
if (getChairId()
!= other.getChairId()) return false;
if (getEntityId()
!= other.getEntityId()) return false;
if (getPerformId()
!= other.getPerformId()) return false;
if (getDirection()
!= other.getDirection()) return false;
if (getEntityId()
!= other.getEntityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -407,15 +273,15 @@ public final class EvtAvatarStandUpNotifyOuterClass {
}
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());
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (37 * hash) + PERFORMID_FIELD_NUMBER;
hash = (53 * hash) + getPerformId();
hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
hash = (53 * hash) + getDirection();
hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -512,6 +378,11 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: DICIOCNEPCL
* CmdId: 388
* </pre>
*
* Protobuf type {@code EvtAvatarStandUpNotify}
*/
public static final class Builder extends
@@ -551,12 +422,12 @@ public final class EvtAvatarStandUpNotifyOuterClass {
super.clear();
chairId_ = 0L;
entityId_ = 0;
performId_ = 0;
direction_ = 0;
entityId_ = 0;
return this;
}
@@ -584,9 +455,9 @@ public final class EvtAvatarStandUpNotifyOuterClass {
public emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify buildPartial() {
emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify result = new emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify(this);
result.chairId_ = chairId_;
result.entityId_ = entityId_;
result.performId_ = performId_;
result.direction_ = direction_;
result.entityId_ = entityId_;
onBuilt();
return result;
}
@@ -638,15 +509,15 @@ public final class EvtAvatarStandUpNotifyOuterClass {
if (other.getChairId() != 0L) {
setChairId(other.getChairId());
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
if (other.getPerformId() != 0) {
setPerformId(other.getPerformId());
}
if (other.getDirection() != 0) {
setDirection(other.getDirection());
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -678,7 +549,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
private long chairId_ ;
/**
* <code>uint64 chairId = 11;</code>
* <code>uint64 chair_id = 5;</code>
* @return The chairId.
*/
@java.lang.Override
@@ -686,7 +557,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return chairId_;
}
/**
* <code>uint64 chairId = 11;</code>
* <code>uint64 chair_id = 5;</code>
* @param value The chairId to set.
* @return This builder for chaining.
*/
@@ -697,7 +568,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return this;
}
/**
* <code>uint64 chairId = 11;</code>
* <code>uint64 chair_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearChairId() {
@@ -707,9 +578,40 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return this;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 4;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
private int performId_ ;
/**
* <code>int32 performId = 14;</code>
* <code>int32 performId = 7;</code>
* @return The performId.
*/
@java.lang.Override
@@ -717,7 +619,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return performId_;
}
/**
* <code>int32 performId = 14;</code>
* <code>int32 performId = 7;</code>
* @param value The performId to set.
* @return This builder for chaining.
*/
@@ -728,7 +630,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return this;
}
/**
* <code>int32 performId = 14;</code>
* <code>int32 performId = 7;</code>
* @return This builder for chaining.
*/
public Builder clearPerformId() {
@@ -740,7 +642,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
private int direction_ ;
/**
* <code>int32 direction = 5;</code>
* <code>int32 direction = 1;</code>
* @return The direction.
*/
@java.lang.Override
@@ -748,7 +650,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return direction_;
}
/**
* <code>int32 direction = 5;</code>
* <code>int32 direction = 1;</code>
* @param value The direction to set.
* @return This builder for chaining.
*/
@@ -759,7 +661,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
return this;
}
/**
* <code>int32 direction = 5;</code>
* <code>int32 direction = 1;</code>
* @return This builder for chaining.
*/
public Builder clearDirection() {
@@ -768,37 +670,6 @@ public final class EvtAvatarStandUpNotifyOuterClass {
onChanged();
return this;
}
private int entityId_ ;
/**
* <code>uint32 entityId = 4;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entityId = 4;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entityId = 4;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -866,13 +737,11 @@ public final class EvtAvatarStandUpNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\034EvtAvatarStandUpNotify.proto\"\303\001\n\026EvtAv" +
"atarStandUpNotify\022\017\n\007chairId\030\013 \001(\004\022\021\n\tpe" +
"rformId\030\016 \001(\005\022\021\n\tdirection\030\005 \001(\005\022\020\n\010enti" +
"tyId\030\004 \001(\r\"`\n\013FHBJMPCKONG\022\010\n\004NONE\020\000\022\020\n\013P" +
"EPPOHPHJOJ\020\320\002\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOL" +
"MPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031emu.gras" +
"scutter.net.protob\006proto3"
"\n\034EvtAvatarStandUpNotify.proto\"c\n\026EvtAva" +
"tarStandUpNotify\022\020\n\010chair_id\030\005 \001(\004\022\021\n\ten" +
"tity_id\030\004 \001(\r\022\021\n\tperformId\030\007 \001(\005\022\021\n\tdire" +
"ction\030\001 \001(\005B\033\n\031emu.grasscutter.net.proto" +
"b\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -883,7 +752,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
internal_static_EvtAvatarStandUpNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_EvtAvatarStandUpNotify_descriptor,
new java.lang.String[] { "ChairId", "PerformId", "Direction", "EntityId", });
new java.lang.String[] { "ChairId", "EntityId", "PerformId", "Direction", });
}
// @@protoc_insertion_point(outer_class_scope)