Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 10:55:02 +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/TeamEnterSceneInfoOuterClass.java
+219 -219
View File
@@ -19,37 +19,37 @@ public final class TeamEnterSceneInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
* @return Whether the abilityControlBlock field is set.
*/
boolean hasAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
* @return The abilityControlBlock.
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
* @return Whether the teamAbilityInfo field is set.
*/
boolean hasTeamAbilityInfo();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
* @return The teamAbilityInfo.
*/
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
/**
* <code>uint32 team_entity_id = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 5;</code>
* @return Whether the abilityControlBlock field is set.
*/
boolean hasAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
* @return The abilityControlBlock.
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
/**
* <code>uint32 team_entity_id = 11;</code>
* @return The teamEntityId.
*/
int getTeamEntityId();
@@ -99,7 +99,7 @@ public final class TeamEnterSceneInfoOuterClass {
case 0:
done = true;
break;
case 58: {
case 42: {
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
if (abilityControlBlock_ != null) {
subBuilder = abilityControlBlock_.toBuilder();
@@ -112,7 +112,7 @@ public final class TeamEnterSceneInfoOuterClass {
break;
}
case 82: {
case 50: {
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
if (teamAbilityInfo_ != null) {
subBuilder = teamAbilityInfo_.toBuilder();
@@ -125,7 +125,7 @@ public final class TeamEnterSceneInfoOuterClass {
break;
}
case 120: {
case 88: {
teamEntityId_ = input.readUInt32();
break;
@@ -162,36 +162,10 @@ public final class TeamEnterSceneInfoOuterClass {
emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.class, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder.class);
}
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 7;
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
* @return Whether the abilityControlBlock field is set.
*/
@java.lang.Override
public boolean hasAbilityControlBlock() {
return abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
* @return The abilityControlBlock.
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
return getAbilityControlBlock();
}
public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 10;
public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
* @return Whether the teamAbilityInfo field is set.
*/
@java.lang.Override
@@ -199,7 +173,7 @@ public final class TeamEnterSceneInfoOuterClass {
return teamAbilityInfo_ != null;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
* @return The teamAbilityInfo.
*/
@java.lang.Override
@@ -207,17 +181,43 @@ public final class TeamEnterSceneInfoOuterClass {
return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
return getTeamAbilityInfo();
}
public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 15;
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 5;
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
* @return Whether the abilityControlBlock field is set.
*/
@java.lang.Override
public boolean hasAbilityControlBlock() {
return abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
* @return The abilityControlBlock.
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
return getAbilityControlBlock();
}
public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 11;
private int teamEntityId_;
/**
* <code>uint32 team_entity_id = 15;</code>
* <code>uint32 team_entity_id = 11;</code>
* @return The teamEntityId.
*/
@java.lang.Override
@@ -240,13 +240,13 @@ public final class TeamEnterSceneInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (abilityControlBlock_ != null) {
output.writeMessage(7, getAbilityControlBlock());
output.writeMessage(5, getAbilityControlBlock());
}
if (teamAbilityInfo_ != null) {
output.writeMessage(10, getTeamAbilityInfo());
output.writeMessage(6, getTeamAbilityInfo());
}
if (teamEntityId_ != 0) {
output.writeUInt32(15, teamEntityId_);
output.writeUInt32(11, teamEntityId_);
}
unknownFields.writeTo(output);
}
@@ -259,15 +259,15 @@ public final class TeamEnterSceneInfoOuterClass {
size = 0;
if (abilityControlBlock_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(7, getAbilityControlBlock());
.computeMessageSize(5, getAbilityControlBlock());
}
if (teamAbilityInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, getTeamAbilityInfo());
.computeMessageSize(6, getTeamAbilityInfo());
}
if (teamEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, teamEntityId_);
.computeUInt32Size(11, teamEntityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -284,16 +284,16 @@ public final class TeamEnterSceneInfoOuterClass {
}
emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo other = (emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo) obj;
if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
if (hasAbilityControlBlock()) {
if (!getAbilityControlBlock()
.equals(other.getAbilityControlBlock())) return false;
}
if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
if (hasTeamAbilityInfo()) {
if (!getTeamAbilityInfo()
.equals(other.getTeamAbilityInfo())) return false;
}
if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
if (hasAbilityControlBlock()) {
if (!getAbilityControlBlock()
.equals(other.getAbilityControlBlock())) return false;
}
if (getTeamEntityId()
!= other.getTeamEntityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -307,14 +307,14 @@ public final class TeamEnterSceneInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasAbilityControlBlock()) {
hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
hash = (53 * hash) + getAbilityControlBlock().hashCode();
}
if (hasTeamAbilityInfo()) {
hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
hash = (53 * hash) + getTeamAbilityInfo().hashCode();
}
if (hasAbilityControlBlock()) {
hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
hash = (53 * hash) + getAbilityControlBlock().hashCode();
}
hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getTeamEntityId();
hash = (29 * hash) + unknownFields.hashCode();
@@ -450,18 +450,18 @@ public final class TeamEnterSceneInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
if (abilityControlBlockBuilder_ == null) {
abilityControlBlock_ = null;
} else {
abilityControlBlock_ = null;
abilityControlBlockBuilder_ = null;
}
if (teamAbilityInfoBuilder_ == null) {
teamAbilityInfo_ = null;
} else {
teamAbilityInfo_ = null;
teamAbilityInfoBuilder_ = null;
}
if (abilityControlBlockBuilder_ == null) {
abilityControlBlock_ = null;
} else {
abilityControlBlock_ = null;
abilityControlBlockBuilder_ = null;
}
teamEntityId_ = 0;
return this;
@@ -490,16 +490,16 @@ public final class TeamEnterSceneInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo buildPartial() {
emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo result = new emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo(this);
if (abilityControlBlockBuilder_ == null) {
result.abilityControlBlock_ = abilityControlBlock_;
} else {
result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
}
if (teamAbilityInfoBuilder_ == null) {
result.teamAbilityInfo_ = teamAbilityInfo_;
} else {
result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
}
if (abilityControlBlockBuilder_ == null) {
result.abilityControlBlock_ = abilityControlBlock_;
} else {
result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
}
result.teamEntityId_ = teamEntityId_;
onBuilt();
return result;
@@ -549,12 +549,12 @@ public final class TeamEnterSceneInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo other) {
if (other == emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance()) return this;
if (other.hasAbilityControlBlock()) {
mergeAbilityControlBlock(other.getAbilityControlBlock());
}
if (other.hasTeamAbilityInfo()) {
mergeTeamAbilityInfo(other.getTeamAbilityInfo());
}
if (other.hasAbilityControlBlock()) {
mergeAbilityControlBlock(other.getAbilityControlBlock());
}
if (other.getTeamEntityId() != 0) {
setTeamEntityId(other.getTeamEntityId());
}
@@ -587,137 +587,18 @@ public final class TeamEnterSceneInfoOuterClass {
return this;
}
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
* @return Whether the abilityControlBlock field is set.
*/
public boolean hasAbilityControlBlock() {
return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
* @return The abilityControlBlock.
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
if (abilityControlBlockBuilder_ == null) {
return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
} else {
return abilityControlBlockBuilder_.getMessage();
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
abilityControlBlock_ = value;
onChanged();
} else {
abilityControlBlockBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
public Builder setAbilityControlBlock(
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
if (abilityControlBlockBuilder_ == null) {
abilityControlBlock_ = builderForValue.build();
onChanged();
} else {
abilityControlBlockBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
if (abilityControlBlock_ != null) {
abilityControlBlock_ =
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.newBuilder(abilityControlBlock_).mergeFrom(value).buildPartial();
} else {
abilityControlBlock_ = value;
}
onChanged();
} else {
abilityControlBlockBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
public Builder clearAbilityControlBlock() {
if (abilityControlBlockBuilder_ == null) {
abilityControlBlock_ = null;
onChanged();
} else {
abilityControlBlock_ = null;
abilityControlBlockBuilder_ = null;
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
onChanged();
return getAbilityControlBlockFieldBuilder().getBuilder();
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
if (abilityControlBlockBuilder_ != null) {
return abilityControlBlockBuilder_.getMessageOrBuilder();
} else {
return abilityControlBlock_ == null ?
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 7;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>
getAbilityControlBlockFieldBuilder() {
if (abilityControlBlockBuilder_ == null) {
abilityControlBlockBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>(
getAbilityControlBlock(),
getParentForChildren(),
isClean());
abilityControlBlock_ = null;
}
return abilityControlBlockBuilder_;
}
private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
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 = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
* @return Whether the teamAbilityInfo field is set.
*/
public boolean hasTeamAbilityInfo() {
return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
* @return The teamAbilityInfo.
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
@@ -728,7 +609,7 @@ public final class TeamEnterSceneInfoOuterClass {
}
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
if (teamAbilityInfoBuilder_ == null) {
@@ -744,7 +625,7 @@ public final class TeamEnterSceneInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
public Builder setTeamAbilityInfo(
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -758,7 +639,7 @@ public final class TeamEnterSceneInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
if (teamAbilityInfoBuilder_ == null) {
@@ -776,7 +657,7 @@ public final class TeamEnterSceneInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
public Builder clearTeamAbilityInfo() {
if (teamAbilityInfoBuilder_ == null) {
@@ -790,7 +671,7 @@ public final class TeamEnterSceneInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
@@ -798,7 +679,7 @@ public final class TeamEnterSceneInfoOuterClass {
return getTeamAbilityInfoFieldBuilder().getBuilder();
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
if (teamAbilityInfoBuilder_ != null) {
@@ -809,7 +690,7 @@ public final class TeamEnterSceneInfoOuterClass {
}
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 6;</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>
@@ -825,9 +706,128 @@ public final class TeamEnterSceneInfoOuterClass {
return teamAbilityInfoBuilder_;
}
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
* @return Whether the abilityControlBlock field is set.
*/
public boolean hasAbilityControlBlock() {
return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
* @return The abilityControlBlock.
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
if (abilityControlBlockBuilder_ == null) {
return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
} else {
return abilityControlBlockBuilder_.getMessage();
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
abilityControlBlock_ = value;
onChanged();
} else {
abilityControlBlockBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
public Builder setAbilityControlBlock(
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
if (abilityControlBlockBuilder_ == null) {
abilityControlBlock_ = builderForValue.build();
onChanged();
} else {
abilityControlBlockBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
if (abilityControlBlock_ != null) {
abilityControlBlock_ =
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.newBuilder(abilityControlBlock_).mergeFrom(value).buildPartial();
} else {
abilityControlBlock_ = value;
}
onChanged();
} else {
abilityControlBlockBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
public Builder clearAbilityControlBlock() {
if (abilityControlBlockBuilder_ == null) {
abilityControlBlock_ = null;
onChanged();
} else {
abilityControlBlock_ = null;
abilityControlBlockBuilder_ = null;
}
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
onChanged();
return getAbilityControlBlockFieldBuilder().getBuilder();
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
if (abilityControlBlockBuilder_ != null) {
return abilityControlBlockBuilder_.getMessageOrBuilder();
} else {
return abilityControlBlock_ == null ?
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>
getAbilityControlBlockFieldBuilder() {
if (abilityControlBlockBuilder_ == null) {
abilityControlBlockBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>(
getAbilityControlBlock(),
getParentForChildren(),
isClean());
abilityControlBlock_ = null;
}
return abilityControlBlockBuilder_;
}
private int teamEntityId_ ;
/**
* <code>uint32 team_entity_id = 15;</code>
* <code>uint32 team_entity_id = 11;</code>
* @return The teamEntityId.
*/
@java.lang.Override
@@ -835,7 +835,7 @@ public final class TeamEnterSceneInfoOuterClass {
return teamEntityId_;
}
/**
* <code>uint32 team_entity_id = 15;</code>
* <code>uint32 team_entity_id = 11;</code>
* @param value The teamEntityId to set.
* @return This builder for chaining.
*/
@@ -846,7 +846,7 @@ public final class TeamEnterSceneInfoOuterClass {
return this;
}
/**
* <code>uint32 team_entity_id = 15;</code>
* <code>uint32 team_entity_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearTeamEntityId() {
@@ -924,10 +924,10 @@ public final class TeamEnterSceneInfoOuterClass {
java.lang.String[] descriptorData = {
"\n\030TeamEnterSceneInfo.proto\032\031AbilityContr" +
"olBlock.proto\032\032AbilitySyncStateInfo.prot" +
"o\"\223\001\n\022TeamEnterSceneInfo\0223\n\025ability_cont" +
"rol_block\030\007 \001(\0132\024.AbilityControlBlock\0220\n" +
"\021team_ability_info\030\n \001(\0132\025.AbilitySyncSt" +
"ateInfo\022\026\n\016team_entity_id\030\017 \001(\rB\033\n\031emu.g" +
"o\"\223\001\n\022TeamEnterSceneInfo\0220\n\021team_ability" +
"_info\030\006 \001(\0132\025.AbilitySyncStateInfo\0223\n\025ab" +
"ility_control_block\030\005 \001(\0132\024.AbilityContr" +
"olBlock\022\026\n\016team_entity_id\030\013 \001(\rB\033\n\031emu.g" +
"rasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -941,7 +941,7 @@ public final class TeamEnterSceneInfoOuterClass {
internal_static_TeamEnterSceneInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TeamEnterSceneInfo_descriptor,
new java.lang.String[] { "AbilityControlBlock", "TeamAbilityInfo", "TeamEntityId", });
new java.lang.String[] { "TeamAbilityInfo", "AbilityControlBlock", "TeamEntityId", });
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
}