Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 19:10:32 +08:00
Code Issues Projects Releases Wiki Activity

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java
+86 -86
View File
@@ -19,30 +19,30 @@ public final class AbilityChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>uint32 entity_id = 11;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* @return Whether the abilityControlBlock field is set.
*/
boolean hasAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* @return The abilityControlBlock.
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
/**
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
int getEntityId();
}
/**
* <pre>
* Name: FGNFEPLECFC
* CmdId: 1159
* Name: BOGDLGCDJGN
* </pre>
*
* Protobuf type {@code AbilityChangeNotify}
@@ -89,12 +89,12 @@ public final class AbilityChangeNotifyOuterClass {
case 0:
done = true;
break;
case 16: {
case 88: {
entityId_ = input.readUInt32();
break;
}
case 98: {
case 122: {
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
if (abilityControlBlock_ != null) {
subBuilder = abilityControlBlock_.toBuilder();
@@ -139,10 +139,21 @@ public final class AbilityChangeNotifyOuterClass {
emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.class, emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.Builder.class);
}
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 12;
public static final int ENTITY_ID_FIELD_NUMBER = 11;
private int entityId_;
/**
* <code>uint32 entity_id = 11;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 15;
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* @return Whether the abilityControlBlock field is set.
*/
@java.lang.Override
@@ -150,7 +161,7 @@ public final class AbilityChangeNotifyOuterClass {
return abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* @return The abilityControlBlock.
*/
@java.lang.Override
@@ -158,24 +169,13 @@ public final class AbilityChangeNotifyOuterClass {
return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
return getAbilityControlBlock();
}
public static final int ENTITY_ID_FIELD_NUMBER = 2;
private int entityId_;
/**
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -191,10 +191,10 @@ public final class AbilityChangeNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (entityId_ != 0) {
output.writeUInt32(2, entityId_);
output.writeUInt32(11, entityId_);
}
if (abilityControlBlock_ != null) {
output.writeMessage(12, getAbilityControlBlock());
output.writeMessage(15, getAbilityControlBlock());
}
unknownFields.writeTo(output);
}
@@ -207,11 +207,11 @@ public final class AbilityChangeNotifyOuterClass {
size = 0;
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, entityId_);
.computeUInt32Size(11, entityId_);
}
if (abilityControlBlock_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, getAbilityControlBlock());
.computeMessageSize(15, getAbilityControlBlock());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -228,13 +228,13 @@ public final class AbilityChangeNotifyOuterClass {
}
emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other = (emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify) obj;
if (getEntityId()
!= other.getEntityId()) return false;
if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
if (hasAbilityControlBlock()) {
if (!getAbilityControlBlock()
.equals(other.getAbilityControlBlock())) return false;
}
if (getEntityId()
!= other.getEntityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -246,12 +246,12 @@ public final class AbilityChangeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
if (hasAbilityControlBlock()) {
hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
hash = (53 * hash) + getAbilityControlBlock().hashCode();
}
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -349,8 +349,8 @@ public final class AbilityChangeNotifyOuterClass {
}
/**
* <pre>
* Name: FGNFEPLECFC
* CmdId: 1159
* Name: BOGDLGCDJGN
* </pre>
*
* Protobuf type {@code AbilityChangeNotify}
@@ -390,14 +390,14 @@ public final class AbilityChangeNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
entityId_ = 0;
if (abilityControlBlockBuilder_ == null) {
abilityControlBlock_ = null;
} else {
abilityControlBlock_ = null;
abilityControlBlockBuilder_ = null;
}
entityId_ = 0;
return this;
}
@@ -424,12 +424,12 @@ public final class AbilityChangeNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify buildPartial() {
emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify result = new emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify(this);
result.entityId_ = entityId_;
if (abilityControlBlockBuilder_ == null) {
result.abilityControlBlock_ = abilityControlBlock_;
} else {
result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
}
result.entityId_ = entityId_;
onBuilt();
return result;
}
@@ -478,12 +478,12 @@ public final class AbilityChangeNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other) {
if (other == emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.getDefaultInstance()) return this;
if (other.hasAbilityControlBlock()) {
mergeAbilityControlBlock(other.getAbilityControlBlock());
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
if (other.hasAbilityControlBlock()) {
mergeAbilityControlBlock(other.getAbilityControlBlock());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -513,18 +513,49 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 11;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 11;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 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 = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* @return Whether the abilityControlBlock field is set.
*/
public boolean hasAbilityControlBlock() {
return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* @return The abilityControlBlock.
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
@@ -535,7 +566,7 @@ public final class AbilityChangeNotifyOuterClass {
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
@@ -551,7 +582,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
public Builder setAbilityControlBlock(
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
@@ -565,7 +596,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
@@ -583,7 +614,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
public Builder clearAbilityControlBlock() {
if (abilityControlBlockBuilder_ == null) {
@@ -597,7 +628,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
@@ -605,7 +636,7 @@ public final class AbilityChangeNotifyOuterClass {
return getAbilityControlBlockFieldBuilder().getBuilder();
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
if (abilityControlBlockBuilder_ != null) {
@@ -616,7 +647,7 @@ public final class AbilityChangeNotifyOuterClass {
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* <code>.AbilityControlBlock ability_control_block = 15;</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>
@@ -631,37 +662,6 @@ public final class AbilityChangeNotifyOuterClass {
}
return abilityControlBlockBuilder_;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 2;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +730,9 @@ public final class AbilityChangeNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031AbilityChangeNotify.proto\032\031AbilityCont" +
"rolBlock.proto\"]\n\023AbilityChangeNotify\0223\n" +
"\025ability_control_block\030\014 \001(\0132\024.AbilityCo" +
"ntrolBlock\022\021\n\tentity_id\030\002 \001(\rB\033\n\031emu.gra" +
"rolBlock.proto\"]\n\023AbilityChangeNotify\022\021\n" +
"\tentity_id\030\013 \001(\r\0223\n\025ability_control_bloc" +
"k\030\017 \001(\0132\024.AbilityControlBlockB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +745,7 @@ public final class AbilityChangeNotifyOuterClass {
internal_static_AbilityChangeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AbilityChangeNotify_descriptor,
new java.lang.String[] { "AbilityControlBlock", "EntityId", });
new java.lang.String[] { "EntityId", "AbilityControlBlock", });
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
}