mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-08 14:33:34 +08:00
Update gc to 3.3 (#1981)
* replace the deprecated api * update proto * delete music game * fixed codes * fix costume switch * fix mail bug * Bump version number. * Re-add max boss chest number Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+174
-166
@@ -19,35 +19,39 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
long getChairId();
|
||||
|
||||
/**
|
||||
* <code>int32 perform_id = 6;</code>
|
||||
* @return The performId.
|
||||
*/
|
||||
int getPerformId();
|
||||
|
||||
/**
|
||||
* <code>int32 direction = 1;</code>
|
||||
* <code>int32 direction = 13;</code>
|
||||
* @return The direction.
|
||||
*/
|
||||
int getDirection();
|
||||
|
||||
/**
|
||||
* <code>uint32 entity_id = 9;</code>
|
||||
* <code>uint64 chair_id = 3;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
long getChairId();
|
||||
|
||||
/**
|
||||
* <code>uint32 entity_id = 5;</code>
|
||||
* @return The entityId.
|
||||
*/
|
||||
int getEntityId();
|
||||
|
||||
/**
|
||||
* <code>int32 perform_id = 11;</code>
|
||||
* @return The performId.
|
||||
*/
|
||||
int getPerformId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 356
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 382;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* IS_ALLOW_CLIENT = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code EvtAvatarStandUpNotify}
|
||||
@@ -94,24 +98,24 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 8: {
|
||||
case 24: {
|
||||
|
||||
direction_ = input.readInt32();
|
||||
chairId_ = input.readUInt64();
|
||||
break;
|
||||
}
|
||||
case 48: {
|
||||
|
||||
performId_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 72: {
|
||||
case 40: {
|
||||
|
||||
entityId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 88: {
|
||||
|
||||
chairId_ = input.readUInt64();
|
||||
performId_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 104: {
|
||||
|
||||
direction_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -146,32 +150,10 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.class, emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.Builder.class);
|
||||
}
|
||||
|
||||
public static final int CHAIR_ID_FIELD_NUMBER = 11;
|
||||
private long chairId_;
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
|
||||
public static final int PERFORM_ID_FIELD_NUMBER = 6;
|
||||
private int performId_;
|
||||
/**
|
||||
* <code>int32 perform_id = 6;</code>
|
||||
* @return The performId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPerformId() {
|
||||
return performId_;
|
||||
}
|
||||
|
||||
public static final int DIRECTION_FIELD_NUMBER = 1;
|
||||
public static final int DIRECTION_FIELD_NUMBER = 13;
|
||||
private int direction_;
|
||||
/**
|
||||
* <code>int32 direction = 1;</code>
|
||||
* <code>int32 direction = 13;</code>
|
||||
* @return The direction.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -179,10 +161,21 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return direction_;
|
||||
}
|
||||
|
||||
public static final int ENTITY_ID_FIELD_NUMBER = 9;
|
||||
public static final int CHAIR_ID_FIELD_NUMBER = 3;
|
||||
private long chairId_;
|
||||
/**
|
||||
* <code>uint64 chair_id = 3;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
|
||||
public static final int ENTITY_ID_FIELD_NUMBER = 5;
|
||||
private int entityId_;
|
||||
/**
|
||||
* <code>uint32 entity_id = 9;</code>
|
||||
* <code>uint32 entity_id = 5;</code>
|
||||
* @return The entityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -190,6 +183,17 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return entityId_;
|
||||
}
|
||||
|
||||
public static final int PERFORM_ID_FIELD_NUMBER = 11;
|
||||
private int performId_;
|
||||
/**
|
||||
* <code>int32 perform_id = 11;</code>
|
||||
* @return The performId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPerformId() {
|
||||
return performId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -204,17 +208,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 (performId_ != 0) {
|
||||
output.writeInt32(6, performId_);
|
||||
if (chairId_ != 0L) {
|
||||
output.writeUInt64(3, chairId_);
|
||||
}
|
||||
if (entityId_ != 0) {
|
||||
output.writeUInt32(9, entityId_);
|
||||
output.writeUInt32(5, entityId_);
|
||||
}
|
||||
if (chairId_ != 0L) {
|
||||
output.writeUInt64(11, chairId_);
|
||||
if (performId_ != 0) {
|
||||
output.writeInt32(11, performId_);
|
||||
}
|
||||
if (direction_ != 0) {
|
||||
output.writeInt32(13, direction_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -225,21 +229,21 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (direction_ != 0) {
|
||||
if (chairId_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(1, direction_);
|
||||
}
|
||||
if (performId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(6, performId_);
|
||||
.computeUInt64Size(3, chairId_);
|
||||
}
|
||||
if (entityId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(9, entityId_);
|
||||
.computeUInt32Size(5, entityId_);
|
||||
}
|
||||
if (chairId_ != 0L) {
|
||||
if (performId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(11, chairId_);
|
||||
.computeInt32Size(11, performId_);
|
||||
}
|
||||
if (direction_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(13, direction_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -256,14 +260,14 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify other = (emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify) obj;
|
||||
|
||||
if (getChairId()
|
||||
!= other.getChairId()) return false;
|
||||
if (getPerformId()
|
||||
!= other.getPerformId()) return false;
|
||||
if (getDirection()
|
||||
!= other.getDirection()) return false;
|
||||
if (getChairId()
|
||||
!= other.getChairId()) return false;
|
||||
if (getEntityId()
|
||||
!= other.getEntityId()) return false;
|
||||
if (getPerformId()
|
||||
!= other.getPerformId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -275,15 +279,15 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getDirection();
|
||||
hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getChairId());
|
||||
hash = (37 * hash) + PERFORM_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getPerformId();
|
||||
hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getDirection();
|
||||
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getEntityId();
|
||||
hash = (37 * hash) + PERFORM_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getPerformId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -381,10 +385,14 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 356
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 382;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* IS_ALLOW_CLIENT = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code EvtAvatarStandUpNotify}
|
||||
@@ -424,14 +432,14 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
chairId_ = 0L;
|
||||
|
||||
performId_ = 0;
|
||||
|
||||
direction_ = 0;
|
||||
|
||||
chairId_ = 0L;
|
||||
|
||||
entityId_ = 0;
|
||||
|
||||
performId_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -458,10 +466,10 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
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.performId_ = performId_;
|
||||
result.direction_ = direction_;
|
||||
result.chairId_ = chairId_;
|
||||
result.entityId_ = entityId_;
|
||||
result.performId_ = performId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -510,18 +518,18 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify other) {
|
||||
if (other == emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.getDefaultInstance()) return this;
|
||||
if (other.getChairId() != 0L) {
|
||||
setChairId(other.getChairId());
|
||||
}
|
||||
if (other.getPerformId() != 0) {
|
||||
setPerformId(other.getPerformId());
|
||||
}
|
||||
if (other.getDirection() != 0) {
|
||||
setDirection(other.getDirection());
|
||||
}
|
||||
if (other.getChairId() != 0L) {
|
||||
setChairId(other.getChairId());
|
||||
}
|
||||
if (other.getEntityId() != 0) {
|
||||
setEntityId(other.getEntityId());
|
||||
}
|
||||
if (other.getPerformId() != 0) {
|
||||
setPerformId(other.getPerformId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -551,71 +559,9 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private long chairId_ ;
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @param value The chairId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setChairId(long value) {
|
||||
|
||||
chairId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearChairId() {
|
||||
|
||||
chairId_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int performId_ ;
|
||||
/**
|
||||
* <code>int32 perform_id = 6;</code>
|
||||
* @return The performId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPerformId() {
|
||||
return performId_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 perform_id = 6;</code>
|
||||
* @param value The performId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setPerformId(int value) {
|
||||
|
||||
performId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>int32 perform_id = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPerformId() {
|
||||
|
||||
performId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int direction_ ;
|
||||
/**
|
||||
* <code>int32 direction = 1;</code>
|
||||
* <code>int32 direction = 13;</code>
|
||||
* @return The direction.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -623,7 +569,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return direction_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 direction = 1;</code>
|
||||
* <code>int32 direction = 13;</code>
|
||||
* @param value The direction to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -634,7 +580,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>int32 direction = 1;</code>
|
||||
* <code>int32 direction = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearDirection() {
|
||||
@@ -644,9 +590,40 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private long chairId_ ;
|
||||
/**
|
||||
* <code>uint64 chair_id = 3;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 3;</code>
|
||||
* @param value The chairId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setChairId(long value) {
|
||||
|
||||
chairId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearChairId() {
|
||||
|
||||
chairId_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int entityId_ ;
|
||||
/**
|
||||
* <code>uint32 entity_id = 9;</code>
|
||||
* <code>uint32 entity_id = 5;</code>
|
||||
* @return The entityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -654,7 +631,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return entityId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entity_id = 9;</code>
|
||||
* <code>uint32 entity_id = 5;</code>
|
||||
* @param value The entityId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -665,7 +642,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entity_id = 9;</code>
|
||||
* <code>uint32 entity_id = 5;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearEntityId() {
|
||||
@@ -674,6 +651,37 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int performId_ ;
|
||||
/**
|
||||
* <code>int32 perform_id = 11;</code>
|
||||
* @return The performId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPerformId() {
|
||||
return performId_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 perform_id = 11;</code>
|
||||
* @param value The performId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setPerformId(int value) {
|
||||
|
||||
performId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>int32 perform_id = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPerformId() {
|
||||
|
||||
performId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -742,9 +750,9 @@ public final class EvtAvatarStandUpNotifyOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\034EvtAvatarStandUpNotify.proto\"d\n\026EvtAva" +
|
||||
"tarStandUpNotify\022\020\n\010chair_id\030\013 \001(\004\022\022\n\npe" +
|
||||
"rform_id\030\006 \001(\005\022\021\n\tdirection\030\001 \001(\005\022\021\n\tent" +
|
||||
"ity_id\030\t \001(\rB\033\n\031emu.grasscutter.net.prot" +
|
||||
"tarStandUpNotify\022\021\n\tdirection\030\r \001(\005\022\020\n\010c" +
|
||||
"hair_id\030\003 \001(\004\022\021\n\tentity_id\030\005 \001(\r\022\022\n\nperf" +
|
||||
"orm_id\030\013 \001(\005B\033\n\031emu.grasscutter.net.prot" +
|
||||
"ob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -756,7 +764,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[] { "Direction", "ChairId", "EntityId", "PerformId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user