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

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/PlayerApplyEnterMpNotifyOuterClass.java
+167 -161
View File
@@ -19,38 +19,41 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 src_thread_index = 5;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
* @return Whether the srcPlayerInfo field is set.
*/
boolean hasSrcPlayerInfo();
/**
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
* @return The srcPlayerInfo.
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
/**
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
/**
* <code>uint32 src_thread_index = 9;</code>
* @return The srcThreadIndex.
*/
int getSrcThreadIndex();
/**
* <code>uint32 src_app_id = 6;</code>
* <code>uint32 src_app_id = 13;</code>
* @return The srcAppId.
*/
int getSrcAppId();
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* @return Whether the srcPlayerInfo field is set.
*/
boolean hasSrcPlayerInfo();
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* @return The srcPlayerInfo.
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
*/
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
}
/**
* <pre>
* CmdId: 1826
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1842;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code PlayerApplyEnterMpNotify}
@@ -97,7 +100,12 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
case 0:
done = true;
break;
case 18: {
case 72: {
srcThreadIndex_ = input.readUInt32();
break;
}
case 98: {
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
if (srcPlayerInfo_ != null) {
subBuilder = srcPlayerInfo_.toBuilder();
@@ -110,12 +118,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
break;
}
case 40: {
srcThreadIndex_ = input.readUInt32();
break;
}
case 48: {
case 104: {
srcAppId_ = input.readUInt32();
break;
@@ -152,32 +155,10 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.class, emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.Builder.class);
}
public static final int SRC_THREAD_INDEX_FIELD_NUMBER = 5;
private int srcThreadIndex_;
/**
* <code>uint32 src_thread_index = 5;</code>
* @return The srcThreadIndex.
*/
@java.lang.Override
public int getSrcThreadIndex() {
return srcThreadIndex_;
}
public static final int SRC_APP_ID_FIELD_NUMBER = 6;
private int srcAppId_;
/**
* <code>uint32 src_app_id = 6;</code>
* @return The srcAppId.
*/
@java.lang.Override
public int getSrcAppId() {
return srcAppId_;
}
public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 2;
public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 12;
private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
* @return Whether the srcPlayerInfo field is set.
*/
@java.lang.Override
@@ -185,7 +166,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return srcPlayerInfo_ != null;
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
* @return The srcPlayerInfo.
*/
@java.lang.Override
@@ -193,13 +174,35 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return srcPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : srcPlayerInfo_;
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
return getSrcPlayerInfo();
}
public static final int SRC_THREAD_INDEX_FIELD_NUMBER = 9;
private int srcThreadIndex_;
/**
* <code>uint32 src_thread_index = 9;</code>
* @return The srcThreadIndex.
*/
@java.lang.Override
public int getSrcThreadIndex() {
return srcThreadIndex_;
}
public static final int SRC_APP_ID_FIELD_NUMBER = 13;
private int srcAppId_;
/**
* <code>uint32 src_app_id = 13;</code>
* @return The srcAppId.
*/
@java.lang.Override
public int getSrcAppId() {
return srcAppId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -214,14 +217,14 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (srcPlayerInfo_ != null) {
output.writeMessage(2, getSrcPlayerInfo());
}
if (srcThreadIndex_ != 0) {
output.writeUInt32(5, srcThreadIndex_);
output.writeUInt32(9, srcThreadIndex_);
}
if (srcPlayerInfo_ != null) {
output.writeMessage(12, getSrcPlayerInfo());
}
if (srcAppId_ != 0) {
output.writeUInt32(6, srcAppId_);
output.writeUInt32(13, srcAppId_);
}
unknownFields.writeTo(output);
}
@@ -232,17 +235,17 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (srcPlayerInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, getSrcPlayerInfo());
}
if (srcThreadIndex_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, srcThreadIndex_);
.computeUInt32Size(9, srcThreadIndex_);
}
if (srcPlayerInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, getSrcPlayerInfo());
}
if (srcAppId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, srcAppId_);
.computeUInt32Size(13, srcAppId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -259,15 +262,15 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
}
emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify other = (emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify) obj;
if (getSrcThreadIndex()
!= other.getSrcThreadIndex()) return false;
if (getSrcAppId()
!= other.getSrcAppId()) return false;
if (hasSrcPlayerInfo() != other.hasSrcPlayerInfo()) return false;
if (hasSrcPlayerInfo()) {
if (!getSrcPlayerInfo()
.equals(other.getSrcPlayerInfo())) return false;
}
if (getSrcThreadIndex()
!= other.getSrcThreadIndex()) return false;
if (getSrcAppId()
!= other.getSrcAppId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -279,14 +282,14 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SRC_THREAD_INDEX_FIELD_NUMBER;
hash = (53 * hash) + getSrcThreadIndex();
hash = (37 * hash) + SRC_APP_ID_FIELD_NUMBER;
hash = (53 * hash) + getSrcAppId();
if (hasSrcPlayerInfo()) {
hash = (37 * hash) + SRC_PLAYER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getSrcPlayerInfo().hashCode();
}
hash = (37 * hash) + SRC_THREAD_INDEX_FIELD_NUMBER;
hash = (53 * hash) + getSrcThreadIndex();
hash = (37 * hash) + SRC_APP_ID_FIELD_NUMBER;
hash = (53 * hash) + getSrcAppId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -384,10 +387,13 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1826
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1842;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code PlayerApplyEnterMpNotify}
@@ -427,16 +433,16 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
srcThreadIndex_ = 0;
srcAppId_ = 0;
if (srcPlayerInfoBuilder_ == null) {
srcPlayerInfo_ = null;
} else {
srcPlayerInfo_ = null;
srcPlayerInfoBuilder_ = null;
}
srcThreadIndex_ = 0;
srcAppId_ = 0;
return this;
}
@@ -463,13 +469,13 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify buildPartial() {
emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify result = new emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify(this);
result.srcThreadIndex_ = srcThreadIndex_;
result.srcAppId_ = srcAppId_;
if (srcPlayerInfoBuilder_ == null) {
result.srcPlayerInfo_ = srcPlayerInfo_;
} else {
result.srcPlayerInfo_ = srcPlayerInfoBuilder_.build();
}
result.srcThreadIndex_ = srcThreadIndex_;
result.srcAppId_ = srcAppId_;
onBuilt();
return result;
}
@@ -518,15 +524,15 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify other) {
if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.getDefaultInstance()) return this;
if (other.hasSrcPlayerInfo()) {
mergeSrcPlayerInfo(other.getSrcPlayerInfo());
}
if (other.getSrcThreadIndex() != 0) {
setSrcThreadIndex(other.getSrcThreadIndex());
}
if (other.getSrcAppId() != 0) {
setSrcAppId(other.getSrcAppId());
}
if (other.hasSrcPlayerInfo()) {
mergeSrcPlayerInfo(other.getSrcPlayerInfo());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -556,80 +562,18 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return this;
}
private int srcThreadIndex_ ;
/**
* <code>uint32 src_thread_index = 5;</code>
* @return The srcThreadIndex.
*/
@java.lang.Override
public int getSrcThreadIndex() {
return srcThreadIndex_;
}
/**
* <code>uint32 src_thread_index = 5;</code>
* @param value The srcThreadIndex to set.
* @return This builder for chaining.
*/
public Builder setSrcThreadIndex(int value) {
srcThreadIndex_ = value;
onChanged();
return this;
}
/**
* <code>uint32 src_thread_index = 5;</code>
* @return This builder for chaining.
*/
public Builder clearSrcThreadIndex() {
srcThreadIndex_ = 0;
onChanged();
return this;
}
private int srcAppId_ ;
/**
* <code>uint32 src_app_id = 6;</code>
* @return The srcAppId.
*/
@java.lang.Override
public int getSrcAppId() {
return srcAppId_;
}
/**
* <code>uint32 src_app_id = 6;</code>
* @param value The srcAppId to set.
* @return This builder for chaining.
*/
public Builder setSrcAppId(int value) {
srcAppId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 src_app_id = 6;</code>
* @return This builder for chaining.
*/
public Builder clearSrcAppId() {
srcAppId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> srcPlayerInfoBuilder_;
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
* @return Whether the srcPlayerInfo field is set.
*/
public boolean hasSrcPlayerInfo() {
return srcPlayerInfoBuilder_ != null || srcPlayerInfo_ != null;
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
* @return The srcPlayerInfo.
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo() {
@@ -640,7 +584,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
}
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
if (srcPlayerInfoBuilder_ == null) {
@@ -656,7 +600,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return this;
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
public Builder setSrcPlayerInfo(
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -670,7 +614,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return this;
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
if (srcPlayerInfoBuilder_ == null) {
@@ -688,7 +632,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return this;
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
public Builder clearSrcPlayerInfo() {
if (srcPlayerInfoBuilder_ == null) {
@@ -702,7 +646,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return this;
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getSrcPlayerInfoBuilder() {
@@ -710,7 +654,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
return getSrcPlayerInfoFieldBuilder().getBuilder();
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
if (srcPlayerInfoBuilder_ != null) {
@@ -721,7 +665,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
}
}
/**
* <code>.OnlinePlayerInfo src_player_info = 2;</code>
* <code>.OnlinePlayerInfo src_player_info = 12;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>
@@ -736,6 +680,68 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
}
return srcPlayerInfoBuilder_;
}
private int srcThreadIndex_ ;
/**
* <code>uint32 src_thread_index = 9;</code>
* @return The srcThreadIndex.
*/
@java.lang.Override
public int getSrcThreadIndex() {
return srcThreadIndex_;
}
/**
* <code>uint32 src_thread_index = 9;</code>
* @param value The srcThreadIndex to set.
* @return This builder for chaining.
*/
public Builder setSrcThreadIndex(int value) {
srcThreadIndex_ = value;
onChanged();
return this;
}
/**
* <code>uint32 src_thread_index = 9;</code>
* @return This builder for chaining.
*/
public Builder clearSrcThreadIndex() {
srcThreadIndex_ = 0;
onChanged();
return this;
}
private int srcAppId_ ;
/**
* <code>uint32 src_app_id = 13;</code>
* @return The srcAppId.
*/
@java.lang.Override
public int getSrcAppId() {
return srcAppId_;
}
/**
* <code>uint32 src_app_id = 13;</code>
* @param value The srcAppId to set.
* @return This builder for chaining.
*/
public Builder setSrcAppId(int value) {
srcAppId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 src_app_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearSrcAppId() {
srcAppId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -805,9 +811,9 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n\036PlayerApplyEnterMpNotify.proto\032\026Online" +
"PlayerInfo.proto\"t\n\030PlayerApplyEnterMpNo" +
"tify\022\030\n\020src_thread_index\030\005 \001(\r\022\022\n\nsrc_ap" +
"p_id\030\006 \001(\r\022*\n\017src_player_info\030\002 \001(\0132\021.On" +
"linePlayerInfoB\033\n\031emu.grasscutter.net.pr" +
"tify\022*\n\017src_player_info\030\014 \001(\0132\021.OnlinePl" +
"ayerInfo\022\030\n\020src_thread_index\030\t \001(\r\022\022\n\nsr" +
"c_app_id\030\r \001(\rB\033\n\031emu.grasscutter.net.pr" +
"otob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -820,7 +826,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
internal_static_PlayerApplyEnterMpNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerApplyEnterMpNotify_descriptor,
new java.lang.String[] { "SrcThreadIndex", "SrcAppId", "SrcPlayerInfo", });
new java.lang.String[] { "SrcPlayerInfo", "SrcThreadIndex", "SrcAppId", });
emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
}