mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 12:53:34 +08:00
Add support for v3.5.0 (#2090)
* Fix Dvalin battle See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25. This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence. Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com> * Update protos * 3.4 protos * Fix Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended. * Change from false to true Per what smileoflove has been told on Discord * 3.5 * Remove the Dvalin crap from this PR Git is so confusing * Update version * Apply README changes from `origin/development` * Remove unnecessary debugging information --------- Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com> Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
+281
-273
@@ -19,42 +19,46 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 teamEntityId = 4;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
* @return Whether the teamAbilityInfo field is set.
|
||||
*/
|
||||
boolean hasTeamAbilityInfo();
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
* @return The teamAbilityInfo.
|
||||
*/
|
||||
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
|
||||
|
||||
/**
|
||||
* <code>uint32 team_entity_id = 8;</code>
|
||||
* @return The teamEntityId.
|
||||
*/
|
||||
int getTeamEntityId();
|
||||
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</code>
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</code>
|
||||
* @return Whether the abilityControlBlock field is set.
|
||||
*/
|
||||
boolean hasAbilityControlBlock();
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</code>
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</code>
|
||||
* @return The abilityControlBlock.
|
||||
*/
|
||||
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</code>
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
|
||||
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* @return Whether the teamAbilityInfo field is set.
|
||||
*/
|
||||
boolean hasTeamAbilityInfo();
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* @return The teamAbilityInfo.
|
||||
*/
|
||||
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KPLLCJKCHDJ
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code TeamEnterSceneInfo}
|
||||
*/
|
||||
public static final class TeamEnterSceneInfo extends
|
||||
@@ -99,12 +103,20 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 32: {
|
||||
case 10: {
|
||||
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
|
||||
if (abilityControlBlock_ != null) {
|
||||
subBuilder = abilityControlBlock_.toBuilder();
|
||||
}
|
||||
abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
|
||||
if (subBuilder != null) {
|
||||
subBuilder.mergeFrom(abilityControlBlock_);
|
||||
abilityControlBlock_ = subBuilder.buildPartial();
|
||||
}
|
||||
|
||||
teamEntityId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 82: {
|
||||
case 34: {
|
||||
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
|
||||
if (teamAbilityInfo_ != null) {
|
||||
subBuilder = teamAbilityInfo_.toBuilder();
|
||||
@@ -117,17 +129,9 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
|
||||
break;
|
||||
}
|
||||
case 98: {
|
||||
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
|
||||
if (abilityControlBlock_ != null) {
|
||||
subBuilder = abilityControlBlock_.toBuilder();
|
||||
}
|
||||
abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
|
||||
if (subBuilder != null) {
|
||||
subBuilder.mergeFrom(abilityControlBlock_);
|
||||
abilityControlBlock_ = subBuilder.buildPartial();
|
||||
}
|
||||
case 64: {
|
||||
|
||||
teamEntityId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -162,47 +166,10 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.class, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder.class);
|
||||
}
|
||||
|
||||
public static final int TEAMENTITYID_FIELD_NUMBER = 4;
|
||||
private int teamEntityId_;
|
||||
/**
|
||||
* <code>uint32 teamEntityId = 4;</code>
|
||||
* @return The teamEntityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTeamEntityId() {
|
||||
return teamEntityId_;
|
||||
}
|
||||
|
||||
public static final int ABILITYCONTROLBLOCK_FIELD_NUMBER = 12;
|
||||
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</code>
|
||||
* @return Whether the abilityControlBlock field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasAbilityControlBlock() {
|
||||
return abilityControlBlock_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</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 abilityControlBlock = 12;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
|
||||
return getAbilityControlBlock();
|
||||
}
|
||||
|
||||
public static final int TEAMABILITYINFO_FIELD_NUMBER = 10;
|
||||
public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 4;
|
||||
private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
* @return Whether the teamAbilityInfo field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -210,7 +177,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return teamAbilityInfo_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
* @return The teamAbilityInfo.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -218,13 +185,50 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</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_;
|
||||
}
|
||||
|
||||
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 1;
|
||||
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
|
||||
/**
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</code>
|
||||
* @return Whether the abilityControlBlock field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasAbilityControlBlock() {
|
||||
return abilityControlBlock_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</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 = 1;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
|
||||
return getAbilityControlBlock();
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -239,14 +243,14 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (teamEntityId_ != 0) {
|
||||
output.writeUInt32(4, teamEntityId_);
|
||||
if (abilityControlBlock_ != null) {
|
||||
output.writeMessage(1, getAbilityControlBlock());
|
||||
}
|
||||
if (teamAbilityInfo_ != null) {
|
||||
output.writeMessage(10, getTeamAbilityInfo());
|
||||
output.writeMessage(4, getTeamAbilityInfo());
|
||||
}
|
||||
if (abilityControlBlock_ != null) {
|
||||
output.writeMessage(12, getAbilityControlBlock());
|
||||
if (teamEntityId_ != 0) {
|
||||
output.writeUInt32(8, teamEntityId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -257,17 +261,17 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (teamEntityId_ != 0) {
|
||||
if (abilityControlBlock_ != null) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(4, teamEntityId_);
|
||||
.computeMessageSize(1, getAbilityControlBlock());
|
||||
}
|
||||
if (teamAbilityInfo_ != null) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(10, getTeamAbilityInfo());
|
||||
.computeMessageSize(4, getTeamAbilityInfo());
|
||||
}
|
||||
if (abilityControlBlock_ != null) {
|
||||
if (teamEntityId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(12, getAbilityControlBlock());
|
||||
.computeUInt32Size(8, teamEntityId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -284,6 +288,11 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo other = (emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo) obj;
|
||||
|
||||
if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
|
||||
if (hasTeamAbilityInfo()) {
|
||||
if (!getTeamAbilityInfo()
|
||||
.equals(other.getTeamAbilityInfo())) return false;
|
||||
}
|
||||
if (getTeamEntityId()
|
||||
!= other.getTeamEntityId()) return false;
|
||||
if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
|
||||
@@ -291,11 +300,6 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
if (!getAbilityControlBlock()
|
||||
.equals(other.getAbilityControlBlock())) return false;
|
||||
}
|
||||
if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
|
||||
if (hasTeamAbilityInfo()) {
|
||||
if (!getTeamAbilityInfo()
|
||||
.equals(other.getTeamAbilityInfo())) return false;
|
||||
}
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -307,16 +311,16 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + TEAMENTITYID_FIELD_NUMBER;
|
||||
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();
|
||||
if (hasAbilityControlBlock()) {
|
||||
hash = (37 * hash) + ABILITYCONTROLBLOCK_FIELD_NUMBER;
|
||||
hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getAbilityControlBlock().hashCode();
|
||||
}
|
||||
if (hasTeamAbilityInfo()) {
|
||||
hash = (37 * hash) + TEAMABILITYINFO_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTeamAbilityInfo().hashCode();
|
||||
}
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -413,6 +417,10 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KPLLCJKCHDJ
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code TeamEnterSceneInfo}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -450,6 +458,12 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
if (teamAbilityInfoBuilder_ == null) {
|
||||
teamAbilityInfo_ = null;
|
||||
} else {
|
||||
teamAbilityInfo_ = null;
|
||||
teamAbilityInfoBuilder_ = null;
|
||||
}
|
||||
teamEntityId_ = 0;
|
||||
|
||||
if (abilityControlBlockBuilder_ == null) {
|
||||
@@ -458,12 +472,6 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
abilityControlBlock_ = null;
|
||||
abilityControlBlockBuilder_ = null;
|
||||
}
|
||||
if (teamAbilityInfoBuilder_ == null) {
|
||||
teamAbilityInfo_ = null;
|
||||
} else {
|
||||
teamAbilityInfo_ = null;
|
||||
teamAbilityInfoBuilder_ = null;
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -490,17 +498,17 @@ 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 (teamAbilityInfoBuilder_ == null) {
|
||||
result.teamAbilityInfo_ = teamAbilityInfo_;
|
||||
} else {
|
||||
result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
|
||||
}
|
||||
result.teamEntityId_ = teamEntityId_;
|
||||
if (abilityControlBlockBuilder_ == null) {
|
||||
result.abilityControlBlock_ = abilityControlBlock_;
|
||||
} else {
|
||||
result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
|
||||
}
|
||||
if (teamAbilityInfoBuilder_ == null) {
|
||||
result.teamAbilityInfo_ = teamAbilityInfo_;
|
||||
} else {
|
||||
result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
|
||||
}
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -549,15 +557,15 @@ 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.hasTeamAbilityInfo()) {
|
||||
mergeTeamAbilityInfo(other.getTeamAbilityInfo());
|
||||
}
|
||||
if (other.getTeamEntityId() != 0) {
|
||||
setTeamEntityId(other.getTeamEntityId());
|
||||
}
|
||||
if (other.hasAbilityControlBlock()) {
|
||||
mergeAbilityControlBlock(other.getAbilityControlBlock());
|
||||
}
|
||||
if (other.hasTeamAbilityInfo()) {
|
||||
mergeTeamAbilityInfo(other.getTeamAbilityInfo());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -587,168 +595,18 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int teamEntityId_ ;
|
||||
/**
|
||||
* <code>uint32 teamEntityId = 4;</code>
|
||||
* @return The teamEntityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTeamEntityId() {
|
||||
return teamEntityId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 teamEntityId = 4;</code>
|
||||
* @param value The teamEntityId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setTeamEntityId(int value) {
|
||||
|
||||
teamEntityId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 teamEntityId = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTeamEntityId() {
|
||||
|
||||
teamEntityId_ = 0;
|
||||
onChanged();
|
||||
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 abilityControlBlock = 12;</code>
|
||||
* @return Whether the abilityControlBlock field is set.
|
||||
*/
|
||||
public boolean hasAbilityControlBlock() {
|
||||
return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</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 abilityControlBlock = 12;</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 abilityControlBlock = 12;</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 abilityControlBlock = 12;</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 abilityControlBlock = 12;</code>
|
||||
*/
|
||||
public Builder clearAbilityControlBlock() {
|
||||
if (abilityControlBlockBuilder_ == null) {
|
||||
abilityControlBlock_ = null;
|
||||
onChanged();
|
||||
} else {
|
||||
abilityControlBlock_ = null;
|
||||
abilityControlBlockBuilder_ = null;
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
|
||||
|
||||
onChanged();
|
||||
return getAbilityControlBlockFieldBuilder().getBuilder();
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock abilityControlBlock = 12;</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 abilityControlBlock = 12;</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 teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
* @return Whether the teamAbilityInfo field is set.
|
||||
*/
|
||||
public boolean hasTeamAbilityInfo() {
|
||||
return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
* @return The teamAbilityInfo.
|
||||
*/
|
||||
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
|
||||
@@ -759,7 +617,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
*/
|
||||
public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
|
||||
if (teamAbilityInfoBuilder_ == null) {
|
||||
@@ -775,7 +633,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
*/
|
||||
public Builder setTeamAbilityInfo(
|
||||
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
|
||||
@@ -789,7 +647,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
*/
|
||||
public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
|
||||
if (teamAbilityInfoBuilder_ == null) {
|
||||
@@ -807,7 +665,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
*/
|
||||
public Builder clearTeamAbilityInfo() {
|
||||
if (teamAbilityInfoBuilder_ == null) {
|
||||
@@ -821,7 +679,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
|
||||
|
||||
@@ -829,7 +687,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
return getTeamAbilityInfoFieldBuilder().getBuilder();
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
|
||||
if (teamAbilityInfoBuilder_ != null) {
|
||||
@@ -840,7 +698,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
|
||||
* <code>.AbilitySyncStateInfo team_ability_info = 4;</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>
|
||||
@@ -855,6 +713,156 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
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 = 1;</code>
|
||||
* @return Whether the abilityControlBlock field is set.
|
||||
*/
|
||||
public boolean hasAbilityControlBlock() {
|
||||
return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</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 = 1;</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 = 1;</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 = 1;</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 = 1;</code>
|
||||
*/
|
||||
public Builder clearAbilityControlBlock() {
|
||||
if (abilityControlBlockBuilder_ == null) {
|
||||
abilityControlBlock_ = null;
|
||||
onChanged();
|
||||
} else {
|
||||
abilityControlBlock_ = null;
|
||||
abilityControlBlockBuilder_ = null;
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
|
||||
|
||||
onChanged();
|
||||
return getAbilityControlBlockFieldBuilder().getBuilder();
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityControlBlock ability_control_block = 1;</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 = 1;</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_;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -924,11 +932,11 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\030TeamEnterSceneInfo.proto\032\031AbilityContr" +
|
||||
"olBlock.proto\032\032AbilitySyncStateInfo.prot" +
|
||||
"o\"\215\001\n\022TeamEnterSceneInfo\022\024\n\014teamEntityId" +
|
||||
"\030\004 \001(\r\0221\n\023abilityControlBlock\030\014 \001(\0132\024.Ab" +
|
||||
"ilityControlBlock\022.\n\017teamAbilityInfo\030\n \001" +
|
||||
"(\0132\025.AbilitySyncStateInfoB\033\n\031emu.grasscu" +
|
||||
"tter.net.protob\006proto3"
|
||||
"o\"\223\001\n\022TeamEnterSceneInfo\0220\n\021team_ability" +
|
||||
"_info\030\004 \001(\0132\025.AbilitySyncStateInfo\022\026\n\016te" +
|
||||
"am_entity_id\030\010 \001(\r\0223\n\025ability_control_bl" +
|
||||
"ock\030\001 \001(\0132\024.AbilityControlBlockB\033\n\031emu.g" +
|
||||
"rasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -941,7 +949,7 @@ public final class TeamEnterSceneInfoOuterClass {
|
||||
internal_static_TeamEnterSceneInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_TeamEnterSceneInfo_descriptor,
|
||||
new java.lang.String[] { "TeamEntityId", "AbilityControlBlock", "TeamAbilityInfo", });
|
||||
new java.lang.String[] { "TeamAbilityInfo", "TeamEntityId", "AbilityControlBlock", });
|
||||
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user