Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-17 10:22:33 +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/AskAddFriendNotifyOuterClass.java
+107 -101
View File
@@ -19,32 +19,35 @@ public final class AskAddFriendNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>uint32 target_uid = 5;</code>
* @return The targetUid.
*/
int getTargetUid();
/**
* <code>.FriendBrief target_friend_brief = 1;</code>
* @return Whether the targetFriendBrief field is set.
*/
boolean hasTargetFriendBrief();
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
* @return The targetFriendBrief.
*/
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief();
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder();
/**
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
int getTargetUid();
}
/**
* <pre>
* CmdId: 4065
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 4089;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AskAddFriendNotify}
@@ -91,12 +94,7 @@ public final class AskAddFriendNotifyOuterClass {
case 0:
done = true;
break;
case 72: {
targetUid_ = input.readUInt32();
break;
}
case 122: {
case 10: {
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder subBuilder = null;
if (targetFriendBrief_ != null) {
subBuilder = targetFriendBrief_.toBuilder();
@@ -109,6 +107,11 @@ public final class AskAddFriendNotifyOuterClass {
break;
}
case 40: {
targetUid_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -141,10 +144,21 @@ public final class AskAddFriendNotifyOuterClass {
emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.class, emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.Builder.class);
}
public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 15;
public static final int TARGET_UID_FIELD_NUMBER = 5;
private int targetUid_;
/**
* <code>uint32 target_uid = 5;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 1;
private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
* @return Whether the targetFriendBrief field is set.
*/
@java.lang.Override
@@ -152,7 +166,7 @@ public final class AskAddFriendNotifyOuterClass {
return targetFriendBrief_ != null;
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
* @return The targetFriendBrief.
*/
@java.lang.Override
@@ -160,24 +174,13 @@ public final class AskAddFriendNotifyOuterClass {
return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
return getTargetFriendBrief();
}
public static final int TARGET_UID_FIELD_NUMBER = 9;
private int targetUid_;
/**
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -192,11 +195,11 @@ public final class AskAddFriendNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (targetUid_ != 0) {
output.writeUInt32(9, targetUid_);
}
if (targetFriendBrief_ != null) {
output.writeMessage(15, getTargetFriendBrief());
output.writeMessage(1, getTargetFriendBrief());
}
if (targetUid_ != 0) {
output.writeUInt32(5, targetUid_);
}
unknownFields.writeTo(output);
}
@@ -207,13 +210,13 @@ public final class AskAddFriendNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, targetUid_);
}
if (targetFriendBrief_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, getTargetFriendBrief());
.computeMessageSize(1, getTargetFriendBrief());
}
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, targetUid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -230,13 +233,13 @@ public final class AskAddFriendNotifyOuterClass {
}
emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other = (emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify) obj;
if (getTargetUid()
!= other.getTargetUid()) return false;
if (hasTargetFriendBrief() != other.hasTargetFriendBrief()) return false;
if (hasTargetFriendBrief()) {
if (!getTargetFriendBrief()
.equals(other.getTargetFriendBrief())) return false;
}
if (getTargetUid()
!= other.getTargetUid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -248,12 +251,12 @@ public final class AskAddFriendNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
if (hasTargetFriendBrief()) {
hash = (37 * hash) + TARGET_FRIEND_BRIEF_FIELD_NUMBER;
hash = (53 * hash) + getTargetFriendBrief().hashCode();
}
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -351,10 +354,13 @@ public final class AskAddFriendNotifyOuterClass {
}
/**
* <pre>
* CmdId: 4065
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 4089;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AskAddFriendNotify}
@@ -394,14 +400,14 @@ public final class AskAddFriendNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
targetUid_ = 0;
if (targetFriendBriefBuilder_ == null) {
targetFriendBrief_ = null;
} else {
targetFriendBrief_ = null;
targetFriendBriefBuilder_ = null;
}
targetUid_ = 0;
return this;
}
@@ -428,12 +434,12 @@ public final class AskAddFriendNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify buildPartial() {
emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify result = new emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify(this);
result.targetUid_ = targetUid_;
if (targetFriendBriefBuilder_ == null) {
result.targetFriendBrief_ = targetFriendBrief_;
} else {
result.targetFriendBrief_ = targetFriendBriefBuilder_.build();
}
result.targetUid_ = targetUid_;
onBuilt();
return result;
}
@@ -482,12 +488,12 @@ public final class AskAddFriendNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other) {
if (other == emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.getDefaultInstance()) return this;
if (other.hasTargetFriendBrief()) {
mergeTargetFriendBrief(other.getTargetFriendBrief());
}
if (other.getTargetUid() != 0) {
setTargetUid(other.getTargetUid());
}
if (other.hasTargetFriendBrief()) {
mergeTargetFriendBrief(other.getTargetFriendBrief());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -517,18 +523,49 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
private int targetUid_ ;
/**
* <code>uint32 target_uid = 5;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
/**
* <code>uint32 target_uid = 5;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
public Builder setTargetUid(int value) {
targetUid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 target_uid = 5;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
targetUid_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
* @return Whether the targetFriendBrief field is set.
*/
public boolean hasTargetFriendBrief() {
return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
* @return The targetFriendBrief.
*/
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
@@ -539,7 +576,7 @@ public final class AskAddFriendNotifyOuterClass {
}
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
if (targetFriendBriefBuilder_ == null) {
@@ -555,7 +592,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
public Builder setTargetFriendBrief(
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -569,7 +606,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
if (targetFriendBriefBuilder_ == null) {
@@ -587,7 +624,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
public Builder clearTargetFriendBrief() {
if (targetFriendBriefBuilder_ == null) {
@@ -601,7 +638,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
@@ -609,7 +646,7 @@ public final class AskAddFriendNotifyOuterClass {
return getTargetFriendBriefFieldBuilder().getBuilder();
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
if (targetFriendBriefBuilder_ != null) {
@@ -620,7 +657,7 @@ public final class AskAddFriendNotifyOuterClass {
}
}
/**
* <code>.FriendBrief target_friend_brief = 15;</code>
* <code>.FriendBrief target_friend_brief = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder>
@@ -635,37 +672,6 @@ public final class AskAddFriendNotifyOuterClass {
}
return targetFriendBriefBuilder_;
}
private int targetUid_ ;
/**
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
/**
* <code>uint32 target_uid = 9;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
public Builder setTargetUid(int value) {
targetUid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 target_uid = 9;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
targetUid_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -734,9 +740,9 @@ public final class AskAddFriendNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\030AskAddFriendNotify.proto\032\021FriendBrief." +
"proto\"S\n\022AskAddFriendNotify\022)\n\023target_fr" +
"iend_brief\030\017 \001(\0132\014.FriendBrief\022\022\n\ntarget" +
"_uid\030\t \001(\rB\033\n\031emu.grasscutter.net.protob" +
"proto\"S\n\022AskAddFriendNotify\022\022\n\ntarget_ui" +
"d\030\005 \001(\r\022)\n\023target_friend_brief\030\001 \001(\0132\014.F" +
"riendBriefB\033\n\031emu.grasscutter.net.protob" +
"\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -749,7 +755,7 @@ public final class AskAddFriendNotifyOuterClass {
internal_static_AskAddFriendNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AskAddFriendNotify_descriptor,
new java.lang.String[] { "TargetFriendBrief", "TargetUid", });
new java.lang.String[] { "TargetUid", "TargetFriendBrief", });
emu.grasscutter.net.proto.FriendBriefOuterClass.getDescriptor();
}