Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 02:19:50 +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/PullPrivateChatReqOuterClass.java
+102 -94
View File
@@ -19,29 +19,33 @@ public final class PullPrivateChatReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 target_uid = 5;</code>
* <code>uint32 from_sequence = 5;</code>
* @return The fromSequence.
*/
int getFromSequence();
/**
* <code>uint32 target_uid = 12;</code>
* @return The targetUid.
*/
int getTargetUid();
/**
* <code>uint32 pull_num = 7;</code>
* <code>uint32 pull_num = 11;</code>
* @return The pullNum.
*/
int getPullNum();
/**
* <code>uint32 from_sequence = 12;</code>
* @return The fromSequence.
*/
int getFromSequence();
}
/**
* <pre>
* CmdId: 4971
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 4993;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code PullPrivateChatReq}
@@ -90,17 +94,17 @@ public final class PullPrivateChatReqOuterClass {
break;
case 40: {
targetUid_ = input.readUInt32();
fromSequence_ = input.readUInt32();
break;
}
case 56: {
case 88: {
pullNum_ = input.readUInt32();
break;
}
case 96: {
fromSequence_ = input.readUInt32();
targetUid_ = input.readUInt32();
break;
}
default: {
@@ -135,10 +139,21 @@ public final class PullPrivateChatReqOuterClass {
emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.class, emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.Builder.class);
}
public static final int TARGET_UID_FIELD_NUMBER = 5;
public static final int FROM_SEQUENCE_FIELD_NUMBER = 5;
private int fromSequence_;
/**
* <code>uint32 from_sequence = 5;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
public static final int TARGET_UID_FIELD_NUMBER = 12;
private int targetUid_;
/**
* <code>uint32 target_uid = 5;</code>
* <code>uint32 target_uid = 12;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -146,10 +161,10 @@ public final class PullPrivateChatReqOuterClass {
return targetUid_;
}
public static final int PULL_NUM_FIELD_NUMBER = 7;
public static final int PULL_NUM_FIELD_NUMBER = 11;
private int pullNum_;
/**
* <code>uint32 pull_num = 7;</code>
* <code>uint32 pull_num = 11;</code>
* @return The pullNum.
*/
@java.lang.Override
@@ -157,17 +172,6 @@ public final class PullPrivateChatReqOuterClass {
return pullNum_;
}
public static final int FROM_SEQUENCE_FIELD_NUMBER = 12;
private int fromSequence_;
/**
* <code>uint32 from_sequence = 12;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -182,14 +186,14 @@ public final class PullPrivateChatReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (targetUid_ != 0) {
output.writeUInt32(5, targetUid_);
if (fromSequence_ != 0) {
output.writeUInt32(5, fromSequence_);
}
if (pullNum_ != 0) {
output.writeUInt32(7, pullNum_);
output.writeUInt32(11, pullNum_);
}
if (fromSequence_ != 0) {
output.writeUInt32(12, fromSequence_);
if (targetUid_ != 0) {
output.writeUInt32(12, targetUid_);
}
unknownFields.writeTo(output);
}
@@ -200,17 +204,17 @@ public final class PullPrivateChatReqOuterClass {
if (size != -1) return size;
size = 0;
if (targetUid_ != 0) {
if (fromSequence_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, targetUid_);
.computeUInt32Size(5, fromSequence_);
}
if (pullNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, pullNum_);
.computeUInt32Size(11, pullNum_);
}
if (fromSequence_ != 0) {
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, fromSequence_);
.computeUInt32Size(12, targetUid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -227,12 +231,12 @@ public final class PullPrivateChatReqOuterClass {
}
emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq other = (emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq) obj;
if (getFromSequence()
!= other.getFromSequence()) return false;
if (getTargetUid()
!= other.getTargetUid()) return false;
if (getPullNum()
!= other.getPullNum()) return false;
if (getFromSequence()
!= other.getFromSequence()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -244,12 +248,12 @@ public final class PullPrivateChatReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + FROM_SEQUENCE_FIELD_NUMBER;
hash = (53 * hash) + getFromSequence();
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
hash = (37 * hash) + PULL_NUM_FIELD_NUMBER;
hash = (53 * hash) + getPullNum();
hash = (37 * hash) + FROM_SEQUENCE_FIELD_NUMBER;
hash = (53 * hash) + getFromSequence();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -347,10 +351,14 @@ public final class PullPrivateChatReqOuterClass {
}
/**
* <pre>
* CmdId: 4971
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 4993;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code PullPrivateChatReq}
@@ -390,12 +398,12 @@ public final class PullPrivateChatReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
fromSequence_ = 0;
targetUid_ = 0;
pullNum_ = 0;
fromSequence_ = 0;
return this;
}
@@ -422,9 +430,9 @@ public final class PullPrivateChatReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq buildPartial() {
emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq result = new emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq(this);
result.fromSequence_ = fromSequence_;
result.targetUid_ = targetUid_;
result.pullNum_ = pullNum_;
result.fromSequence_ = fromSequence_;
onBuilt();
return result;
}
@@ -473,15 +481,15 @@ public final class PullPrivateChatReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq other) {
if (other == emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.getDefaultInstance()) return this;
if (other.getFromSequence() != 0) {
setFromSequence(other.getFromSequence());
}
if (other.getTargetUid() != 0) {
setTargetUid(other.getTargetUid());
}
if (other.getPullNum() != 0) {
setPullNum(other.getPullNum());
}
if (other.getFromSequence() != 0) {
setFromSequence(other.getFromSequence());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -511,9 +519,40 @@ public final class PullPrivateChatReqOuterClass {
return this;
}
private int fromSequence_ ;
/**
* <code>uint32 from_sequence = 5;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
/**
* <code>uint32 from_sequence = 5;</code>
* @param value The fromSequence to set.
* @return This builder for chaining.
*/
public Builder setFromSequence(int value) {
fromSequence_ = value;
onChanged();
return this;
}
/**
* <code>uint32 from_sequence = 5;</code>
* @return This builder for chaining.
*/
public Builder clearFromSequence() {
fromSequence_ = 0;
onChanged();
return this;
}
private int targetUid_ ;
/**
* <code>uint32 target_uid = 5;</code>
* <code>uint32 target_uid = 12;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -521,7 +560,7 @@ public final class PullPrivateChatReqOuterClass {
return targetUid_;
}
/**
* <code>uint32 target_uid = 5;</code>
* <code>uint32 target_uid = 12;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
@@ -532,7 +571,7 @@ public final class PullPrivateChatReqOuterClass {
return this;
}
/**
* <code>uint32 target_uid = 5;</code>
* <code>uint32 target_uid = 12;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
@@ -544,7 +583,7 @@ public final class PullPrivateChatReqOuterClass {
private int pullNum_ ;
/**
* <code>uint32 pull_num = 7;</code>
* <code>uint32 pull_num = 11;</code>
* @return The pullNum.
*/
@java.lang.Override
@@ -552,7 +591,7 @@ public final class PullPrivateChatReqOuterClass {
return pullNum_;
}
/**
* <code>uint32 pull_num = 7;</code>
* <code>uint32 pull_num = 11;</code>
* @param value The pullNum to set.
* @return This builder for chaining.
*/
@@ -563,7 +602,7 @@ public final class PullPrivateChatReqOuterClass {
return this;
}
/**
* <code>uint32 pull_num = 7;</code>
* <code>uint32 pull_num = 11;</code>
* @return This builder for chaining.
*/
public Builder clearPullNum() {
@@ -572,37 +611,6 @@ public final class PullPrivateChatReqOuterClass {
onChanged();
return this;
}
private int fromSequence_ ;
/**
* <code>uint32 from_sequence = 12;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
/**
* <code>uint32 from_sequence = 12;</code>
* @param value The fromSequence to set.
* @return This builder for chaining.
*/
public Builder setFromSequence(int value) {
fromSequence_ = value;
onChanged();
return this;
}
/**
* <code>uint32 from_sequence = 12;</code>
* @return This builder for chaining.
*/
public Builder clearFromSequence() {
fromSequence_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -671,8 +679,8 @@ public final class PullPrivateChatReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\030PullPrivateChatReq.proto\"Q\n\022PullPrivat" +
"eChatReq\022\022\n\ntarget_uid\030\005 \001(\r\022\020\n\010pull_num" +
"\030\007 \001(\r\022\025\n\rfrom_sequence\030\014 \001(\rB\033\n\031emu.gra" +
"eChatReq\022\025\n\rfrom_sequence\030\005 \001(\r\022\022\n\ntarge" +
"t_uid\030\014 \001(\r\022\020\n\010pull_num\030\013 \001(\rB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -684,7 +692,7 @@ public final class PullPrivateChatReqOuterClass {
internal_static_PullPrivateChatReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PullPrivateChatReq_descriptor,
new java.lang.String[] { "TargetUid", "PullNum", "FromSequence", });
new java.lang.String[] { "FromSequence", "TargetUid", "PullNum", });
}
// @@protoc_insertion_point(outer_class_scope)