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

Update gc to 3.3 (#1981)

Browse Source 
* 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:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairReqOuterClass.java
+197 -189
View File
@@ -19,32 +19,36 @@ public final class EvtAvatarLockChairReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 chair_id = 5;</code>
* @return The chairId.
*/
long getChairId();
/**
* <code>.Vector position = 8;</code>
* <code>.Vector position = 2;</code>
* @return Whether the position field is set.
*/
boolean hasPosition();
/**
* <code>.Vector position = 8;</code>
* <code>.Vector position = 2;</code>
* @return The position.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
/**
* <code>.Vector position = 8;</code>
* <code>.Vector position = 2;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
/**
* <code>uint64 chair_id = 5;</code>
* @return The chairId.
*/
long getChairId();
}
/**
* <pre>
* CmdId: 318
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 308;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code EvtAvatarLockChairReq}
@@ -91,12 +95,7 @@ public final class EvtAvatarLockChairReqOuterClass {
case 0:
done = true;
break;
case 40: {
chairId_ = input.readUInt64();
break;
}
case 66: {
case 18: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (position_ != null) {
subBuilder = position_.toBuilder();
@@ -109,6 +108,11 @@ public final class EvtAvatarLockChairReqOuterClass {
break;
}
case 40: {
chairId_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -141,6 +145,32 @@ public final class EvtAvatarLockChairReqOuterClass {
emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.class, emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.Builder.class);
}
public static final int POSITION_FIELD_NUMBER = 2;
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
/**
* <code>.Vector position = 2;</code>
* @return Whether the position field is set.
*/
@java.lang.Override
public boolean hasPosition() {
return position_ != null;
}
/**
* <code>.Vector position = 2;</code>
* @return The position.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
/**
* <code>.Vector position = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
return getPosition();
}
public static final int CHAIR_ID_FIELD_NUMBER = 5;
private long chairId_;
/**
@@ -152,32 +182,6 @@ public final class EvtAvatarLockChairReqOuterClass {
return chairId_;
}
public static final int POSITION_FIELD_NUMBER = 8;
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
/**
* <code>.Vector position = 8;</code>
* @return Whether the position field is set.
*/
@java.lang.Override
public boolean hasPosition() {
return position_ != null;
}
/**
* <code>.Vector position = 8;</code>
* @return The position.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
/**
* <code>.Vector position = 8;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
return getPosition();
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -192,12 +196,12 @@ public final class EvtAvatarLockChairReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (position_ != null) {
output.writeMessage(2, getPosition());
}
if (chairId_ != 0L) {
output.writeUInt64(5, chairId_);
}
if (position_ != null) {
output.writeMessage(8, getPosition());
}
unknownFields.writeTo(output);
}
@@ -207,14 +211,14 @@ public final class EvtAvatarLockChairReqOuterClass {
if (size != -1) return size;
size = 0;
if (position_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, getPosition());
}
if (chairId_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(5, chairId_);
}
if (position_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, getPosition());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -230,13 +234,13 @@ public final class EvtAvatarLockChairReqOuterClass {
}
emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq other = (emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq) obj;
if (getChairId()
!= other.getChairId()) return false;
if (hasPosition() != other.hasPosition()) return false;
if (hasPosition()) {
if (!getPosition()
.equals(other.getPosition())) return false;
}
if (getChairId()
!= other.getChairId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -248,13 +252,13 @@ public final class EvtAvatarLockChairReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getChairId());
if (hasPosition()) {
hash = (37 * hash) + POSITION_FIELD_NUMBER;
hash = (53 * hash) + getPosition().hashCode();
}
hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getChairId());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -352,10 +356,14 @@ public final class EvtAvatarLockChairReqOuterClass {
}
/**
* <pre>
* CmdId: 318
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 308;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code EvtAvatarLockChairReq}
@@ -395,14 +403,14 @@ public final class EvtAvatarLockChairReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
chairId_ = 0L;
if (positionBuilder_ == null) {
position_ = null;
} else {
position_ = null;
positionBuilder_ = null;
}
chairId_ = 0L;
return this;
}
@@ -429,12 +437,12 @@ public final class EvtAvatarLockChairReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq buildPartial() {
emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq result = new emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq(this);
result.chairId_ = chairId_;
if (positionBuilder_ == null) {
result.position_ = position_;
} else {
result.position_ = positionBuilder_.build();
}
result.chairId_ = chairId_;
onBuilt();
return result;
}
@@ -483,12 +491,12 @@ public final class EvtAvatarLockChairReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq other) {
if (other == emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.getDefaultInstance()) return this;
if (other.getChairId() != 0L) {
setChairId(other.getChairId());
}
if (other.hasPosition()) {
mergePosition(other.getPosition());
}
if (other.getChairId() != 0L) {
setChairId(other.getChairId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -518,6 +526,125 @@ public final class EvtAvatarLockChairReqOuterClass {
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
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 = 2;</code>
* @return Whether the position field is set.
*/
public boolean hasPosition() {
return positionBuilder_ != null || position_ != null;
}
/**
* <code>.Vector position = 2;</code>
* @return The position.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
if (positionBuilder_ == null) {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
} else {
return positionBuilder_.getMessage();
}
}
/**
* <code>.Vector position = 2;</code>
*/
public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
position_ = value;
onChanged();
} else {
positionBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.Vector position = 2;</code>
*/
public Builder setPosition(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
if (positionBuilder_ == null) {
position_ = builderForValue.build();
onChanged();
} else {
positionBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.Vector position = 2;</code>
*/
public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
if (position_ != null) {
position_ =
emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(position_).mergeFrom(value).buildPartial();
} else {
position_ = value;
}
onChanged();
} else {
positionBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.Vector position = 2;</code>
*/
public Builder clearPosition() {
if (positionBuilder_ == null) {
position_ = null;
onChanged();
} else {
position_ = null;
positionBuilder_ = null;
}
return this;
}
/**
* <code>.Vector position = 2;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
onChanged();
return getPositionFieldBuilder().getBuilder();
}
/**
* <code>.Vector position = 2;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
if (positionBuilder_ != null) {
return positionBuilder_.getMessageOrBuilder();
} else {
return position_ == null ?
emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
}
/**
* <code>.Vector position = 2;</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>
getPositionFieldBuilder() {
if (positionBuilder_ == null) {
positionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
getPosition(),
getParentForChildren(),
isClean());
position_ = null;
}
return positionBuilder_;
}
private long chairId_ ;
/**
* <code>uint64 chair_id = 5;</code>
@@ -548,125 +675,6 @@ public final class EvtAvatarLockChairReqOuterClass {
onChanged();
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
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 = 8;</code>
* @return Whether the position field is set.
*/
public boolean hasPosition() {
return positionBuilder_ != null || position_ != null;
}
/**
* <code>.Vector position = 8;</code>
* @return The position.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
if (positionBuilder_ == null) {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
} else {
return positionBuilder_.getMessage();
}
}
/**
* <code>.Vector position = 8;</code>
*/
public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
position_ = value;
onChanged();
} else {
positionBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.Vector position = 8;</code>
*/
public Builder setPosition(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
if (positionBuilder_ == null) {
position_ = builderForValue.build();
onChanged();
} else {
positionBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.Vector position = 8;</code>
*/
public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
if (position_ != null) {
position_ =
emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(position_).mergeFrom(value).buildPartial();
} else {
position_ = value;
}
onChanged();
} else {
positionBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.Vector position = 8;</code>
*/
public Builder clearPosition() {
if (positionBuilder_ == null) {
position_ = null;
onChanged();
} else {
position_ = null;
positionBuilder_ = null;
}
return this;
}
/**
* <code>.Vector position = 8;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
onChanged();
return getPositionFieldBuilder().getBuilder();
}
/**
* <code>.Vector position = 8;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
if (positionBuilder_ != null) {
return positionBuilder_.getMessageOrBuilder();
} else {
return position_ == null ?
emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
}
/**
* <code>.Vector position = 8;</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>
getPositionFieldBuilder() {
if (positionBuilder_ == null) {
positionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
getPosition(),
getParentForChildren(),
isClean());
position_ = null;
}
return positionBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -735,8 +743,8 @@ public final class EvtAvatarLockChairReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033EvtAvatarLockChairReq.proto\032\014Vector.pr" +
"oto\"D\n\025EvtAvatarLockChairReq\022\020\n\010chair_id" +
"\030\005 \001(\004\022\031\n\010position\030\010 \001(\0132\007.VectorB\033\n\031emu" +
"oto\"D\n\025EvtAvatarLockChairReq\022\031\n\010position" +
"\030\002 \001(\0132\007.Vector\022\020\n\010chair_id\030\005 \001(\004B\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -749,7 +757,7 @@ public final class EvtAvatarLockChairReqOuterClass {
internal_static_EvtAvatarLockChairReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_EvtAvatarLockChairReq_descriptor,
new java.lang.String[] { "ChairId", "Position", });
new java.lang.String[] { "Position", "ChairId", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}