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,45 +19,45 @@ public final class GetInvestigationMonsterRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool is_for_mark = 14;</code>
* <code>bool is_for_mark = 8;</code>
* @return The isForMark.
*/
boolean getIsForMark();
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster>
getMonsterListList();
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getMonsterList(int index);
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
int getMonsterListCount();
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder>
getMonsterListOrBuilderList();
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getMonsterListOrBuilder(
int index);
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: CNPABHAODOI
* CmdId: 1923
* CmdId: 1922
* Name: ACFFIBPINDH
* </pre>
*
* Protobuf type {@code GetInvestigationMonsterRsp}
@@ -106,12 +106,7 @@ public final class GetInvestigationMonsterRspOuterClass {
case 0:
done = true;
break;
case 32: {
retcode_ = input.readInt32();
break;
}
case 82: {
case 18: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
monsterList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster>();
mutable_bitField0_ |= 0x00000001;
@@ -120,11 +115,16 @@ public final class GetInvestigationMonsterRspOuterClass {
input.readMessage(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.parser(), extensionRegistry));
break;
}
case 112: {
case 64: {
isForMark_ = input.readBool();
break;
}
case 72: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -160,10 +160,10 @@ public final class GetInvestigationMonsterRspOuterClass {
emu.grasscutter.net.proto.GetInvestigationMonsterRspOuterClass.GetInvestigationMonsterRsp.class, emu.grasscutter.net.proto.GetInvestigationMonsterRspOuterClass.GetInvestigationMonsterRsp.Builder.class);
}
public static final int IS_FOR_MARK_FIELD_NUMBER = 14;
public static final int IS_FOR_MARK_FIELD_NUMBER = 8;
private boolean isForMark_;
/**
* <code>bool is_for_mark = 14;</code>
* <code>bool is_for_mark = 8;</code>
* @return The isForMark.
*/
@java.lang.Override
@@ -171,17 +171,28 @@ public final class GetInvestigationMonsterRspOuterClass {
return isForMark_;
}
public static final int MONSTER_LIST_FIELD_NUMBER = 10;
public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int MONSTER_LIST_FIELD_NUMBER = 2;
private java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> monsterList_;
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> getMonsterListList() {
return monsterList_;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder>
@@ -189,21 +200,21 @@ public final class GetInvestigationMonsterRspOuterClass {
return monsterList_;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
@java.lang.Override
public int getMonsterListCount() {
return monsterList_.size();
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getMonsterList(int index) {
return monsterList_.get(index);
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getMonsterListOrBuilder(
@@ -211,17 +222,6 @@ public final class GetInvestigationMonsterRspOuterClass {
return monsterList_.get(index);
}
public static final int RETCODE_FIELD_NUMBER = 4;
private int retcode_;
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -236,14 +236,14 @@ public final class GetInvestigationMonsterRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(4, retcode_);
}
for (int i = 0; i < monsterList_.size(); i++) {
output.writeMessage(10, monsterList_.get(i));
output.writeMessage(2, monsterList_.get(i));
}
if (isForMark_ != false) {
output.writeBool(14, isForMark_);
output.writeBool(8, isForMark_);
}
if (retcode_ != 0) {
output.writeInt32(9, retcode_);
}
unknownFields.writeTo(output);
}
@@ -254,17 +254,17 @@ public final class GetInvestigationMonsterRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, retcode_);
}
for (int i = 0; i < monsterList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, monsterList_.get(i));
.computeMessageSize(2, monsterList_.get(i));
}
if (isForMark_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(14, isForMark_);
.computeBoolSize(8, isForMark_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -283,10 +283,10 @@ public final class GetInvestigationMonsterRspOuterClass {
if (getIsForMark()
!= other.getIsForMark()) return false;
if (!getMonsterListList()
.equals(other.getMonsterListList())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!getMonsterListList()
.equals(other.getMonsterListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -301,12 +301,12 @@ public final class GetInvestigationMonsterRspOuterClass {
hash = (37 * hash) + IS_FOR_MARK_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsForMark());
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
if (getMonsterListCount() > 0) {
hash = (37 * hash) + MONSTER_LIST_FIELD_NUMBER;
hash = (53 * hash) + getMonsterListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -404,8 +404,8 @@ public final class GetInvestigationMonsterRspOuterClass {
}
/**
* <pre>
* Name: CNPABHAODOI
* CmdId: 1923
* CmdId: 1922
* Name: ACFFIBPINDH
* </pre>
*
* Protobuf type {@code GetInvestigationMonsterRsp}
@@ -448,14 +448,14 @@ public final class GetInvestigationMonsterRspOuterClass {
super.clear();
isForMark_ = false;
retcode_ = 0;
if (monsterListBuilder_ == null) {
monsterList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
monsterListBuilder_.clear();
}
retcode_ = 0;
return this;
}
@@ -484,6 +484,7 @@ public final class GetInvestigationMonsterRspOuterClass {
emu.grasscutter.net.proto.GetInvestigationMonsterRspOuterClass.GetInvestigationMonsterRsp result = new emu.grasscutter.net.proto.GetInvestigationMonsterRspOuterClass.GetInvestigationMonsterRsp(this);
int from_bitField0_ = bitField0_;
result.isForMark_ = isForMark_;
result.retcode_ = retcode_;
if (monsterListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
monsterList_ = java.util.Collections.unmodifiableList(monsterList_);
@@ -493,7 +494,6 @@ public final class GetInvestigationMonsterRspOuterClass {
} else {
result.monsterList_ = monsterListBuilder_.build();
}
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -545,6 +545,9 @@ public final class GetInvestigationMonsterRspOuterClass {
if (other.getIsForMark() != false) {
setIsForMark(other.getIsForMark());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (monsterListBuilder_ == null) {
if (!other.monsterList_.isEmpty()) {
if (monsterList_.isEmpty()) {
@@ -571,9 +574,6 @@ public final class GetInvestigationMonsterRspOuterClass {
}
}
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -606,7 +606,7 @@ public final class GetInvestigationMonsterRspOuterClass {
private boolean isForMark_ ;
/**
* <code>bool is_for_mark = 14;</code>
* <code>bool is_for_mark = 8;</code>
* @return The isForMark.
*/
@java.lang.Override
@@ -614,7 +614,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return isForMark_;
}
/**
* <code>bool is_for_mark = 14;</code>
* <code>bool is_for_mark = 8;</code>
* @param value The isForMark to set.
* @return This builder for chaining.
*/
@@ -625,7 +625,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>bool is_for_mark = 14;</code>
* <code>bool is_for_mark = 8;</code>
* @return This builder for chaining.
*/
public Builder clearIsForMark() {
@@ -635,6 +635,37 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 9;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> monsterList_ =
java.util.Collections.emptyList();
private void ensureMonsterListIsMutable() {
@@ -648,7 +679,7 @@ public final class GetInvestigationMonsterRspOuterClass {
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder> monsterListBuilder_;
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> getMonsterListList() {
if (monsterListBuilder_ == null) {
@@ -658,7 +689,7 @@ public final class GetInvestigationMonsterRspOuterClass {
}
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public int getMonsterListCount() {
if (monsterListBuilder_ == null) {
@@ -668,7 +699,7 @@ public final class GetInvestigationMonsterRspOuterClass {
}
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getMonsterList(int index) {
if (monsterListBuilder_ == null) {
@@ -678,7 +709,7 @@ public final class GetInvestigationMonsterRspOuterClass {
}
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder setMonsterList(
int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
@@ -695,7 +726,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder setMonsterList(
int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder builderForValue) {
@@ -709,7 +740,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder addMonsterList(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
if (monsterListBuilder_ == null) {
@@ -725,7 +756,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder addMonsterList(
int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
@@ -742,7 +773,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder addMonsterList(
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder builderForValue) {
@@ -756,7 +787,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder addMonsterList(
int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder builderForValue) {
@@ -770,7 +801,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder addAllMonsterList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> values) {
@@ -785,7 +816,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder clearMonsterList() {
if (monsterListBuilder_ == null) {
@@ -798,7 +829,7 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public Builder removeMonsterList(int index) {
if (monsterListBuilder_ == null) {
@@ -811,14 +842,14 @@ public final class GetInvestigationMonsterRspOuterClass {
return this;
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder getMonsterListBuilder(
int index) {
return getMonsterListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getMonsterListOrBuilder(
int index) {
@@ -828,7 +859,7 @@ public final class GetInvestigationMonsterRspOuterClass {
}
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder>
getMonsterListOrBuilderList() {
@@ -839,14 +870,14 @@ public final class GetInvestigationMonsterRspOuterClass {
}
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder addMonsterListBuilder() {
return getMonsterListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.getDefaultInstance());
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder addMonsterListBuilder(
int index) {
@@ -854,7 +885,7 @@ public final class GetInvestigationMonsterRspOuterClass {
index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.getDefaultInstance());
}
/**
* <code>repeated .InvestigationMonster monster_list = 10;</code>
* <code>repeated .InvestigationMonster monster_list = 2;</code>
*/
public java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder>
getMonsterListBuilderList() {
@@ -874,37 +905,6 @@ public final class GetInvestigationMonsterRspOuterClass {
}
return monsterListBuilder_;
}
private int retcode_ ;
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 4;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 4;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -974,9 +974,9 @@ public final class GetInvestigationMonsterRspOuterClass {
java.lang.String[] descriptorData = {
"\n GetInvestigationMonsterRsp.proto\032\032Inve" +
"stigationMonster.proto\"o\n\032GetInvestigati" +
"onMonsterRsp\022\023\n\013is_for_mark\030\016 \001(\010\022+\n\014mon" +
"ster_list\030\n \003(\0132\025.InvestigationMonster\022\017" +
"\n\007retcode\030\004 \001(\005B\033\n\031emu.grasscutter.net.p" +
"onMonsterRsp\022\023\n\013is_for_mark\030\010 \001(\010\022\017\n\007ret" +
"code\030\t \001(\005\022+\n\014monster_list\030\002 \003(\0132\025.Inves" +
"tigationMonsterB\033\n\031emu.grasscutter.net.p" +
"rotob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -989,7 +989,7 @@ public final class GetInvestigationMonsterRspOuterClass {
internal_static_GetInvestigationMonsterRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_GetInvestigationMonsterRsp_descriptor,
new java.lang.String[] { "IsForMark", "MonsterList", "Retcode", });
new java.lang.String[] { "IsForMark", "Retcode", "MonsterList", });
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.getDescriptor();
}