Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-06 00:13:37 +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/TeamEntityInfoOuterClass.java
+94 -94
View File
@@ -19,31 +19,31 @@ public final class TeamEntityInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 authority_peer_id = 10;</code>
* <code>uint32 team_entity_id = 3;</code>
* @return The teamEntityId.
*/
int getTeamEntityId();
/**
* <code>uint32 authority_peer_id = 12;</code>
* @return The authorityPeerId.
*/
int getAuthorityPeerId();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return Whether the teamAbilityInfo field is set.
*/
boolean hasTeamAbilityInfo();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return The teamAbilityInfo.
*/
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
/**
* <code>uint32 team_entity_id = 8;</code>
* @return The teamEntityId.
*/
int getTeamEntityId();
}
/**
* Protobuf type {@code TeamEntityInfo}
@@ -90,12 +90,12 @@ public final class TeamEntityInfoOuterClass {
case 0:
done = true;
break;
case 64: {
case 24: {
teamEntityId_ = input.readUInt32();
break;
}
case 74: {
case 42: {
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
if (teamAbilityInfo_ != null) {
subBuilder = teamAbilityInfo_.toBuilder();
@@ -108,7 +108,7 @@ public final class TeamEntityInfoOuterClass {
break;
}
case 80: {
case 96: {
authorityPeerId_ = input.readUInt32();
break;
@@ -145,10 +145,21 @@ public final class TeamEntityInfoOuterClass {
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.class, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder.class);
}
public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 10;
public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 3;
private int teamEntityId_;
/**
* <code>uint32 team_entity_id = 3;</code>
* @return The teamEntityId.
*/
@java.lang.Override
public int getTeamEntityId() {
return teamEntityId_;
}
public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 12;
private int authorityPeerId_;
/**
* <code>uint32 authority_peer_id = 10;</code>
* <code>uint32 authority_peer_id = 12;</code>
* @return The authorityPeerId.
*/
@java.lang.Override
@@ -156,10 +167,10 @@ public final class TeamEntityInfoOuterClass {
return authorityPeerId_;
}
public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 9;
public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 5;
private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return Whether the teamAbilityInfo field is set.
*/
@java.lang.Override
@@ -167,7 +178,7 @@ public final class TeamEntityInfoOuterClass {
return teamAbilityInfo_ != null;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return The teamAbilityInfo.
*/
@java.lang.Override
@@ -175,24 +186,13 @@ public final class TeamEntityInfoOuterClass {
return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
return getTeamAbilityInfo();
}
public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 8;
private int teamEntityId_;
/**
* <code>uint32 team_entity_id = 8;</code>
* @return The teamEntityId.
*/
@java.lang.Override
public int getTeamEntityId() {
return teamEntityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -208,13 +208,13 @@ public final class TeamEntityInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (teamEntityId_ != 0) {
output.writeUInt32(8, teamEntityId_);
output.writeUInt32(3, teamEntityId_);
}
if (teamAbilityInfo_ != null) {
output.writeMessage(9, getTeamAbilityInfo());
output.writeMessage(5, getTeamAbilityInfo());
}
if (authorityPeerId_ != 0) {
output.writeUInt32(10, authorityPeerId_);
output.writeUInt32(12, authorityPeerId_);
}
unknownFields.writeTo(output);
}
@@ -227,15 +227,15 @@ public final class TeamEntityInfoOuterClass {
size = 0;
if (teamEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, teamEntityId_);
.computeUInt32Size(3, teamEntityId_);
}
if (teamAbilityInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(9, getTeamAbilityInfo());
.computeMessageSize(5, getTeamAbilityInfo());
}
if (authorityPeerId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, authorityPeerId_);
.computeUInt32Size(12, authorityPeerId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -252,6 +252,8 @@ public final class TeamEntityInfoOuterClass {
}
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo other = (emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo) obj;
if (getTeamEntityId()
!= other.getTeamEntityId()) return false;
if (getAuthorityPeerId()
!= other.getAuthorityPeerId()) return false;
if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
@@ -259,8 +261,6 @@ public final class TeamEntityInfoOuterClass {
if (!getTeamAbilityInfo()
.equals(other.getTeamAbilityInfo())) return false;
}
if (getTeamEntityId()
!= other.getTeamEntityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -272,14 +272,14 @@ public final class TeamEntityInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getTeamEntityId();
hash = (37 * hash) + AUTHORITY_PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getAuthorityPeerId();
if (hasTeamAbilityInfo()) {
hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
hash = (53 * hash) + getTeamAbilityInfo().hashCode();
}
hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getTeamEntityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -413,6 +413,8 @@ public final class TeamEntityInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
teamEntityId_ = 0;
authorityPeerId_ = 0;
if (teamAbilityInfoBuilder_ == null) {
@@ -421,8 +423,6 @@ public final class TeamEntityInfoOuterClass {
teamAbilityInfo_ = null;
teamAbilityInfoBuilder_ = null;
}
teamEntityId_ = 0;
return this;
}
@@ -449,13 +449,13 @@ public final class TeamEntityInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo buildPartial() {
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo result = new emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo(this);
result.teamEntityId_ = teamEntityId_;
result.authorityPeerId_ = authorityPeerId_;
if (teamAbilityInfoBuilder_ == null) {
result.teamAbilityInfo_ = teamAbilityInfo_;
} else {
result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
}
result.teamEntityId_ = teamEntityId_;
onBuilt();
return result;
}
@@ -504,15 +504,15 @@ public final class TeamEntityInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo other) {
if (other == emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.getDefaultInstance()) return this;
if (other.getTeamEntityId() != 0) {
setTeamEntityId(other.getTeamEntityId());
}
if (other.getAuthorityPeerId() != 0) {
setAuthorityPeerId(other.getAuthorityPeerId());
}
if (other.hasTeamAbilityInfo()) {
mergeTeamAbilityInfo(other.getTeamAbilityInfo());
}
if (other.getTeamEntityId() != 0) {
setTeamEntityId(other.getTeamEntityId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -542,9 +542,40 @@ public final class TeamEntityInfoOuterClass {
return this;
}
private int teamEntityId_ ;
/**
* <code>uint32 team_entity_id = 3;</code>
* @return The teamEntityId.
*/
@java.lang.Override
public int getTeamEntityId() {
return teamEntityId_;
}
/**
* <code>uint32 team_entity_id = 3;</code>
* @param value The teamEntityId to set.
* @return This builder for chaining.
*/
public Builder setTeamEntityId(int value) {
teamEntityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 team_entity_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearTeamEntityId() {
teamEntityId_ = 0;
onChanged();
return this;
}
private int authorityPeerId_ ;
/**
* <code>uint32 authority_peer_id = 10;</code>
* <code>uint32 authority_peer_id = 12;</code>
* @return The authorityPeerId.
*/
@java.lang.Override
@@ -552,7 +583,7 @@ public final class TeamEntityInfoOuterClass {
return authorityPeerId_;
}
/**
* <code>uint32 authority_peer_id = 10;</code>
* <code>uint32 authority_peer_id = 12;</code>
* @param value The authorityPeerId to set.
* @return This builder for chaining.
*/
@@ -563,7 +594,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>uint32 authority_peer_id = 10;</code>
* <code>uint32 authority_peer_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearAuthorityPeerId() {
@@ -577,14 +608,14 @@ public final class TeamEntityInfoOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> teamAbilityInfoBuilder_;
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return Whether the teamAbilityInfo field is set.
*/
public boolean hasTeamAbilityInfo() {
return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return The teamAbilityInfo.
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
@@ -595,7 +626,7 @@ public final class TeamEntityInfoOuterClass {
}
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
if (teamAbilityInfoBuilder_ == null) {
@@ -611,7 +642,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder setTeamAbilityInfo(
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -625,7 +656,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
if (teamAbilityInfoBuilder_ == null) {
@@ -643,7 +674,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder clearTeamAbilityInfo() {
if (teamAbilityInfoBuilder_ == null) {
@@ -657,7 +688,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
@@ -665,7 +696,7 @@ public final class TeamEntityInfoOuterClass {
return getTeamAbilityInfoFieldBuilder().getBuilder();
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
if (teamAbilityInfoBuilder_ != null) {
@@ -676,7 +707,7 @@ public final class TeamEntityInfoOuterClass {
}
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 9;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>
@@ -691,37 +722,6 @@ public final class TeamEntityInfoOuterClass {
}
return teamAbilityInfoBuilder_;
}
private int teamEntityId_ ;
/**
* <code>uint32 team_entity_id = 8;</code>
* @return The teamEntityId.
*/
@java.lang.Override
public int getTeamEntityId() {
return teamEntityId_;
}
/**
* <code>uint32 team_entity_id = 8;</code>
* @param value The teamEntityId to set.
* @return This builder for chaining.
*/
public Builder setTeamEntityId(int value) {
teamEntityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 team_entity_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearTeamEntityId() {
teamEntityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -790,10 +790,10 @@ public final class TeamEntityInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\024TeamEntityInfo.proto\032\032AbilitySyncState" +
"Info.proto\"u\n\016TeamEntityInfo\022\031\n\021authorit" +
"y_peer_id\030\n \001(\r\0220\n\021team_ability_info\030\t \001" +
"(\0132\025.AbilitySyncStateInfo\022\026\n\016team_entity" +
"_id\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
"Info.proto\"u\n\016TeamEntityInfo\022\026\n\016team_ent" +
"ity_id\030\003 \001(\r\022\031\n\021authority_peer_id\030\014 \001(\r\022" +
"0\n\021team_ability_info\030\005 \001(\0132\025.AbilitySync" +
"StateInfoB\033\n\031emu.grasscutter.net.protob\006" +
"proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -806,7 +806,7 @@ public final class TeamEntityInfoOuterClass {
internal_static_TeamEntityInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TeamEntityInfo_descriptor,
new java.lang.String[] { "AuthorityPeerId", "TeamAbilityInfo", "TeamEntityId", });
new java.lang.String[] { "TeamEntityId", "AuthorityPeerId", "TeamAbilityInfo", });
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
}