Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 10:33:34 +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/SyncTeamEntityNotifyOuterClass.java
+111 -105
View File
@@ -19,41 +19,44 @@ public final class SyncTeamEntityNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo>
getTeamEntityInfoListList();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index);
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
int getTeamEntityInfoListCount();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder>
getTeamEntityInfoListOrBuilderList();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
int index);
/**
* <code>uint32 scene_id = 1;</code>
* @return The sceneId.
*/
int getSceneId();
}
/**
* <pre>
* CmdId: 317
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 391;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code SyncTeamEntityNotify}
@@ -102,12 +105,12 @@ public final class SyncTeamEntityNotifyOuterClass {
case 0:
done = true;
break;
case 104: {
case 8: {
sceneId_ = input.readUInt32();
break;
}
case 122: {
case 82: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
teamEntityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo>();
mutable_bitField0_ |= 0x00000001;
@@ -151,28 +154,17 @@ public final class SyncTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.class, emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.Builder.class);
}
public static final int SCENE_ID_FIELD_NUMBER = 13;
private int sceneId_;
/**
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
public static final int TEAM_ENTITY_INFO_LIST_FIELD_NUMBER = 15;
public static final int TEAM_ENTITY_INFO_LIST_FIELD_NUMBER = 10;
private java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> teamEntityInfoList_;
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> getTeamEntityInfoListList() {
return teamEntityInfoList_;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder>
@@ -180,21 +172,21 @@ public final class SyncTeamEntityNotifyOuterClass {
return teamEntityInfoList_;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
@java.lang.Override
public int getTeamEntityInfoListCount() {
return teamEntityInfoList_.size();
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index) {
return teamEntityInfoList_.get(index);
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
@@ -202,6 +194,17 @@ public final class SyncTeamEntityNotifyOuterClass {
return teamEntityInfoList_.get(index);
}
public static final int SCENE_ID_FIELD_NUMBER = 1;
private int sceneId_;
/**
* <code>uint32 scene_id = 1;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -217,10 +220,10 @@ public final class SyncTeamEntityNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (sceneId_ != 0) {
output.writeUInt32(13, sceneId_);
output.writeUInt32(1, sceneId_);
}
for (int i = 0; i < teamEntityInfoList_.size(); i++) {
output.writeMessage(15, teamEntityInfoList_.get(i));
output.writeMessage(10, teamEntityInfoList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -233,11 +236,11 @@ public final class SyncTeamEntityNotifyOuterClass {
size = 0;
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, sceneId_);
.computeUInt32Size(1, sceneId_);
}
for (int i = 0; i < teamEntityInfoList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, teamEntityInfoList_.get(i));
.computeMessageSize(10, teamEntityInfoList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -254,10 +257,10 @@ public final class SyncTeamEntityNotifyOuterClass {
}
emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify other = (emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify) obj;
if (getSceneId()
!= other.getSceneId()) return false;
if (!getTeamEntityInfoListList()
.equals(other.getTeamEntityInfoListList())) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -269,12 +272,12 @@ public final class SyncTeamEntityNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
if (getTeamEntityInfoListCount() > 0) {
hash = (37 * hash) + TEAM_ENTITY_INFO_LIST_FIELD_NUMBER;
hash = (53 * hash) + getTeamEntityInfoListList().hashCode();
}
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -372,10 +375,13 @@ public final class SyncTeamEntityNotifyOuterClass {
}
/**
* <pre>
* CmdId: 317
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 391;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code SyncTeamEntityNotify}
@@ -416,14 +422,14 @@ public final class SyncTeamEntityNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
sceneId_ = 0;
if (teamEntityInfoListBuilder_ == null) {
teamEntityInfoList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
teamEntityInfoListBuilder_.clear();
}
sceneId_ = 0;
return this;
}
@@ -451,7 +457,6 @@ public final class SyncTeamEntityNotifyOuterClass {
public emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify buildPartial() {
emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify result = new emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify(this);
int from_bitField0_ = bitField0_;
result.sceneId_ = sceneId_;
if (teamEntityInfoListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
teamEntityInfoList_ = java.util.Collections.unmodifiableList(teamEntityInfoList_);
@@ -461,6 +466,7 @@ public final class SyncTeamEntityNotifyOuterClass {
} else {
result.teamEntityInfoList_ = teamEntityInfoListBuilder_.build();
}
result.sceneId_ = sceneId_;
onBuilt();
return result;
}
@@ -509,9 +515,6 @@ public final class SyncTeamEntityNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify other) {
if (other == emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.getDefaultInstance()) return this;
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (teamEntityInfoListBuilder_ == null) {
if (!other.teamEntityInfoList_.isEmpty()) {
if (teamEntityInfoList_.isEmpty()) {
@@ -538,6 +541,9 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
}
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -568,37 +574,6 @@ public final class SyncTeamEntityNotifyOuterClass {
}
private int bitField0_;
private int sceneId_ ;
/**
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 13;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
public Builder setSceneId(int value) {
sceneId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 scene_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
sceneId_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> teamEntityInfoList_ =
java.util.Collections.emptyList();
private void ensureTeamEntityInfoListIsMutable() {
@@ -612,7 +587,7 @@ public final class SyncTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder> teamEntityInfoListBuilder_;
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> getTeamEntityInfoListList() {
if (teamEntityInfoListBuilder_ == null) {
@@ -622,7 +597,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public int getTeamEntityInfoListCount() {
if (teamEntityInfoListBuilder_ == null) {
@@ -632,7 +607,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index) {
if (teamEntityInfoListBuilder_ == null) {
@@ -642,7 +617,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder setTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
@@ -659,7 +634,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder setTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -673,7 +648,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder addTeamEntityInfoList(emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
if (teamEntityInfoListBuilder_ == null) {
@@ -689,7 +664,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder addTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
@@ -706,7 +681,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder addTeamEntityInfoList(
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -720,7 +695,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder addTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -734,7 +709,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder addAllTeamEntityInfoList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> values) {
@@ -749,7 +724,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder clearTeamEntityInfoList() {
if (teamEntityInfoListBuilder_ == null) {
@@ -762,7 +737,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public Builder removeTeamEntityInfoList(int index) {
if (teamEntityInfoListBuilder_ == null) {
@@ -775,14 +750,14 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder getTeamEntityInfoListBuilder(
int index) {
return getTeamEntityInfoListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
int index) {
@@ -792,7 +767,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder>
getTeamEntityInfoListOrBuilderList() {
@@ -803,14 +778,14 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder addTeamEntityInfoListBuilder() {
return getTeamEntityInfoListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.getDefaultInstance());
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder addTeamEntityInfoListBuilder(
int index) {
@@ -818,7 +793,7 @@ public final class SyncTeamEntityNotifyOuterClass {
index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.getDefaultInstance());
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 15;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 10;</code>
*/
public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder>
getTeamEntityInfoListBuilderList() {
@@ -838,6 +813,37 @@ public final class SyncTeamEntityNotifyOuterClass {
}
return teamEntityInfoListBuilder_;
}
private int sceneId_ ;
/**
* <code>uint32 scene_id = 1;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 1;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
public Builder setSceneId(int value) {
sceneId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 scene_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
sceneId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -906,9 +912,9 @@ public final class SyncTeamEntityNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032SyncTeamEntityNotify.proto\032\024TeamEntity" +
"Info.proto\"X\n\024SyncTeamEntityNotify\022\020\n\010sc" +
"ene_id\030\r \001(\r\022.\n\025team_entity_info_list\030\017 " +
"\003(\0132\017.TeamEntityInfoB\033\n\031emu.grasscutter." +
"Info.proto\"X\n\024SyncTeamEntityNotify\022.\n\025te" +
"am_entity_info_list\030\n \003(\0132\017.TeamEntityIn" +
"fo\022\020\n\010scene_id\030\001 \001(\rB\033\n\031emu.grasscutter." +
"net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -921,7 +927,7 @@ public final class SyncTeamEntityNotifyOuterClass {
internal_static_SyncTeamEntityNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SyncTeamEntityNotify_descriptor,
new java.lang.String[] { "SceneId", "TeamEntityInfoList", });
new java.lang.String[] { "TeamEntityInfoList", "SceneId", });
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.getDescriptor();
}