Add support for game version 3.6 (#2110)

* 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
@@ -19,43 +19,43 @@ public final class SceneEntityDisappearNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 param = 15;</code>
* <code>.VisionType disappear_type = 3;</code>
* @return The enum numeric value on the wire for disappearType.
*/
int getDisappearTypeValue();
/**
* <code>.VisionType disappear_type = 3;</code>
* @return The disappearType.
*/
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType();
/**
* <code>uint32 param = 5;</code>
* @return The param.
*/
int getParam();
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @return A list containing the entityList.
*/
java.util.List<java.lang.Integer> getEntityListList();
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @return The count of entityList.
*/
int getEntityListCount();
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @param index The index of the element to return.
* @return The entityList at the given index.
*/
int getEntityList(int index);
/**
* <code>.VisionType disappear_type = 8;</code>
* @return The enum numeric value on the wire for disappearType.
*/
int getDisappearTypeValue();
/**
* <code>.VisionType disappear_type = 8;</code>
* @return The disappearType.
*/
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType();
}
/**
* <pre>
* Name: DPLGLLKDHHD
* CmdId: 272
* CmdId: 241
* Name: EBBFDEDKBNO
* </pre>
*
* Protobuf type {@code SceneEntityDisappearNotify}
@@ -70,8 +70,8 @@ public final class SceneEntityDisappearNotifyOuterClass {
super(builder);
}
private SceneEntityDisappearNotify() {
entityList_ = emptyIntList();
disappearType_ = 0;
entityList_ = emptyIntList();
}
@java.lang.Override
@@ -105,13 +105,13 @@ public final class SceneEntityDisappearNotifyOuterClass {
case 0:
done = true;
break;
case 64: {
case 24: {
int rawValue = input.readEnum();
disappearType_ = rawValue;
break;
}
case 112: {
case 32: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
entityList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -119,7 +119,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
entityList_.addInt(input.readUInt32());
break;
}
case 114: {
case 34: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -132,7 +132,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
input.popLimit(limit);
break;
}
case 120: {
case 40: {
param_ = input.readUInt32();
break;
@@ -172,10 +172,29 @@ public final class SceneEntityDisappearNotifyOuterClass {
emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify.class, emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify.Builder.class);
}
public static final int PARAM_FIELD_NUMBER = 15;
public static final int DISAPPEAR_TYPE_FIELD_NUMBER = 3;
private int disappearType_;
/**
* <code>.VisionType disappear_type = 3;</code>
* @return The enum numeric value on the wire for disappearType.
*/
@java.lang.Override public int getDisappearTypeValue() {
return disappearType_;
}
/**
* <code>.VisionType disappear_type = 3;</code>
* @return The disappearType.
*/
@java.lang.Override public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType result = emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.valueOf(disappearType_);
return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
}
public static final int PARAM_FIELD_NUMBER = 5;
private int param_;
/**
* <code>uint32 param = 15;</code>
* <code>uint32 param = 5;</code>
* @return The param.
*/
@java.lang.Override
@@ -183,10 +202,10 @@ public final class SceneEntityDisappearNotifyOuterClass {
return param_;
}
public static final int ENTITY_LIST_FIELD_NUMBER = 14;
public static final int ENTITY_LIST_FIELD_NUMBER = 4;
private com.google.protobuf.Internal.IntList entityList_;
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @return A list containing the entityList.
*/
@java.lang.Override
@@ -195,14 +214,14 @@ public final class SceneEntityDisappearNotifyOuterClass {
return entityList_;
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @return The count of entityList.
*/
public int getEntityListCount() {
return entityList_.size();
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @param index The index of the element to return.
* @return The entityList at the given index.
*/
@@ -211,25 +230,6 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
private int entityListMemoizedSerializedSize = -1;
public static final int DISAPPEAR_TYPE_FIELD_NUMBER = 8;
private int disappearType_;
/**
* <code>.VisionType disappear_type = 8;</code>
* @return The enum numeric value on the wire for disappearType.
*/
@java.lang.Override public int getDisappearTypeValue() {
return disappearType_;
}
/**
* <code>.VisionType disappear_type = 8;</code>
* @return The disappearType.
*/
@java.lang.Override public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType result = emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.valueOf(disappearType_);
return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -246,17 +246,17 @@ public final class SceneEntityDisappearNotifyOuterClass {
throws java.io.IOException {
getSerializedSize();
if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
output.writeEnum(8, disappearType_);
output.writeEnum(3, disappearType_);
}
if (getEntityListList().size() > 0) {
output.writeUInt32NoTag(114);
output.writeUInt32NoTag(34);
output.writeUInt32NoTag(entityListMemoizedSerializedSize);
}
for (int i = 0; i < entityList_.size(); i++) {
output.writeUInt32NoTag(entityList_.getInt(i));
}
if (param_ != 0) {
output.writeUInt32(15, param_);
output.writeUInt32(5, param_);
}
unknownFields.writeTo(output);
}
@@ -269,7 +269,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
size = 0;
if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(8, disappearType_);
.computeEnumSize(3, disappearType_);
}
{
int dataSize = 0;
@@ -287,7 +287,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
if (param_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, param_);
.computeUInt32Size(5, param_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -304,11 +304,11 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify other = (emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify) obj;
if (disappearType_ != other.disappearType_) return false;
if (getParam()
!= other.getParam()) return false;
if (!getEntityListList()
.equals(other.getEntityListList())) return false;
if (disappearType_ != other.disappearType_) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -320,14 +320,14 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + DISAPPEAR_TYPE_FIELD_NUMBER;
hash = (53 * hash) + disappearType_;
hash = (37 * hash) + PARAM_FIELD_NUMBER;
hash = (53 * hash) + getParam();
if (getEntityListCount() > 0) {
hash = (37 * hash) + ENTITY_LIST_FIELD_NUMBER;
hash = (53 * hash) + getEntityListList().hashCode();
}
hash = (37 * hash) + DISAPPEAR_TYPE_FIELD_NUMBER;
hash = (53 * hash) + disappearType_;
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -425,8 +425,8 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
/**
* <pre>
* Name: DPLGLLKDHHD
* CmdId: 272
* CmdId: 241
* Name: EBBFDEDKBNO
* </pre>
*
* Protobuf type {@code SceneEntityDisappearNotify}
@@ -466,12 +466,12 @@ public final class SceneEntityDisappearNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
disappearType_ = 0;
param_ = 0;
entityList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
disappearType_ = 0;
return this;
}
@@ -499,13 +499,13 @@ public final class SceneEntityDisappearNotifyOuterClass {
public emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify buildPartial() {
emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify result = new emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify(this);
int from_bitField0_ = bitField0_;
result.disappearType_ = disappearType_;
result.param_ = param_;
if (((bitField0_ & 0x00000001) != 0)) {
entityList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.entityList_ = entityList_;
result.disappearType_ = disappearType_;
onBuilt();
return result;
}
@@ -554,6 +554,9 @@ public final class SceneEntityDisappearNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify other) {
if (other == emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify.getDefaultInstance()) return this;
if (other.disappearType_ != 0) {
setDisappearTypeValue(other.getDisappearTypeValue());
}
if (other.getParam() != 0) {
setParam(other.getParam());
}
@@ -567,9 +570,6 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
onChanged();
}
if (other.disappearType_ != 0) {
setDisappearTypeValue(other.getDisappearTypeValue());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -600,9 +600,63 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
private int bitField0_;
private int disappearType_ = 0;
/**
* <code>.VisionType disappear_type = 3;</code>
* @return The enum numeric value on the wire for disappearType.
*/
@java.lang.Override public int getDisappearTypeValue() {
return disappearType_;
}
/**
* <code>.VisionType disappear_type = 3;</code>
* @param value The enum numeric value on the wire for disappearType to set.
* @return This builder for chaining.
*/
public Builder setDisappearTypeValue(int value) {
disappearType_ = value;
onChanged();
return this;
}
/**
* <code>.VisionType disappear_type = 3;</code>
* @return The disappearType.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType result = emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.valueOf(disappearType_);
return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
}
/**
* <code>.VisionType disappear_type = 3;</code>
* @param value The disappearType to set.
* @return This builder for chaining.
*/
public Builder setDisappearType(emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType value) {
if (value == null) {
throw new NullPointerException();
}
disappearType_ = value.getNumber();
onChanged();
return this;
}
/**
* <code>.VisionType disappear_type = 3;</code>
* @return This builder for chaining.
*/
public Builder clearDisappearType() {
disappearType_ = 0;
onChanged();
return this;
}
private int param_ ;
/**
* <code>uint32 param = 15;</code>
* <code>uint32 param = 5;</code>
* @return The param.
*/
@java.lang.Override
@@ -610,7 +664,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
return param_;
}
/**
* <code>uint32 param = 15;</code>
* <code>uint32 param = 5;</code>
* @param value The param to set.
* @return This builder for chaining.
*/
@@ -621,7 +675,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
return this;
}
/**
* <code>uint32 param = 15;</code>
* <code>uint32 param = 5;</code>
* @return This builder for chaining.
*/
public Builder clearParam() {
@@ -639,7 +693,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
}
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @return A list containing the entityList.
*/
public java.util.List<java.lang.Integer>
@@ -648,14 +702,14 @@ public final class SceneEntityDisappearNotifyOuterClass {
java.util.Collections.unmodifiableList(entityList_) : entityList_;
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @return The count of entityList.
*/
public int getEntityListCount() {
return entityList_.size();
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @param index The index of the element to return.
* @return The entityList at the given index.
*/
@@ -663,7 +717,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
return entityList_.getInt(index);
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @param index The index to set the value at.
* @param value The entityList to set.
* @return This builder for chaining.
@@ -676,7 +730,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @param value The entityList to add.
* @return This builder for chaining.
*/
@@ -687,7 +741,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @param values The entityList to add.
* @return This builder for chaining.
*/
@@ -700,7 +754,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 entity_list = 14;</code>
* <code>repeated uint32 entity_list = 4;</code>
* @return This builder for chaining.
*/
public Builder clearEntityList() {
@@ -709,60 +763,6 @@ public final class SceneEntityDisappearNotifyOuterClass {
onChanged();
return this;
}
private int disappearType_ = 0;
/**
* <code>.VisionType disappear_type = 8;</code>
* @return The enum numeric value on the wire for disappearType.
*/
@java.lang.Override public int getDisappearTypeValue() {
return disappearType_;
}
/**
* <code>.VisionType disappear_type = 8;</code>
* @param value The enum numeric value on the wire for disappearType to set.
* @return This builder for chaining.
*/
public Builder setDisappearTypeValue(int value) {
disappearType_ = value;
onChanged();
return this;
}
/**
* <code>.VisionType disappear_type = 8;</code>
* @return The disappearType.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType result = emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.valueOf(disappearType_);
return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
}
/**
* <code>.VisionType disappear_type = 8;</code>
* @param value The disappearType to set.
* @return This builder for chaining.
*/
public Builder setDisappearType(emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType value) {
if (value == null) {
throw new NullPointerException();
}
disappearType_ = value.getNumber();
onChanged();
return this;
}
/**
* <code>.VisionType disappear_type = 8;</code>
* @return This builder for chaining.
*/
public Builder clearDisappearType() {
disappearType_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -832,8 +832,8 @@ public final class SceneEntityDisappearNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n SceneEntityDisappearNotify.proto\032\020Visi" +
"onType.proto\"e\n\032SceneEntityDisappearNoti" +
"fy\022\r\n\005param\030\017 \001(\r\022\023\n\013entity_list\030\016 \003(\r\022#" +
"\n\016disappear_type\030\010 \001(\0162\013.VisionTypeB\033\n\031e" +
"fy\022#\n\016disappear_type\030\003 \001(\0162\013.VisionType\022" +
"\r\n\005param\030\005 \001(\r\022\023\n\013entity_list\030\004 \003(\rB\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -846,7 +846,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
internal_static_SceneEntityDisappearNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SceneEntityDisappearNotify_descriptor,
new java.lang.String[] { "Param", "EntityList", "DisappearType", });
new java.lang.String[] { "DisappearType", "Param", "EntityList", });
emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor();
}