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
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
@@ -19,35 +19,40 @@ public final class TryEnterHomeRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 targetUid = 15;</code>
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 target_uid = 4;</code>
* @return The targetUid.
*/
int getTargetUid();
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @return A list containing the paramList.
*/
java.util.List<java.lang.Integer> getParamListList();
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @return The count of paramList.
*/
int getParamListCount();
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @param index The index of the element to return.
* @return The paramList at the given index.
*/
int getParamList(int index);
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: AHNJCJHDDPO
* CmdId: 4597
* </pre>
*
* Protobuf type {@code TryEnterHomeRsp}
*/
public static final class TryEnterHomeRsp extends
@@ -94,7 +99,12 @@ public final class TryEnterHomeRspOuterClass {
case 0:
done = true;
break;
case 80: {
case 32: {
targetUid_ = input.readUInt32();
break;
}
case 40: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
paramList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -102,7 +112,7 @@ public final class TryEnterHomeRspOuterClass {
paramList_.addInt(input.readUInt32());
break;
}
case 82: {
case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -115,16 +125,11 @@ public final class TryEnterHomeRspOuterClass {
input.popLimit(limit);
break;
}
case 96: {
case 48: {
retcode_ = input.readInt32();
break;
}
case 120: {
targetUid_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -160,141 +165,21 @@ public final class TryEnterHomeRspOuterClass {
emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp.class, emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 6;
private int retcode_;
/**
* Protobuf enum {@code TryEnterHomeRsp.HFBHBGNLNMK}
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
public enum HFBHBGNLNMK
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4820;</code>
*/
PEPPOHPHJOJ(1, 4820),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final HFBHBGNLNMK DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4820;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4820;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
public final int getNumber() {
if (index == -1) {
throw new java.lang.IllegalArgumentException(
"Can't get the number of an unknown enum value.");
}
return value;
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static HFBHBGNLNMK valueOf(int value) {
return forNumber(value);
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
*/
public static HFBHBGNLNMK forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4820: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<HFBHBGNLNMK>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
HFBHBGNLNMK> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<HFBHBGNLNMK>() {
public HFBHBGNLNMK findValueByNumber(int number) {
return HFBHBGNLNMK.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
if (index == -1) {
throw new java.lang.IllegalStateException(
"Can't get the descriptor of an unrecognized enum value.");
}
return getDescriptor().getValues().get(index);
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp.getDescriptor().getEnumTypes().get(0);
}
private static final HFBHBGNLNMK[] VALUES = getStaticValuesArray();
private static HFBHBGNLNMK[] getStaticValuesArray() {
return new HFBHBGNLNMK[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static HFBHBGNLNMK valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
}
if (desc.getIndex() == -1) {
return UNRECOGNIZED;
}
return VALUES[desc.getIndex()];
}
private final int index;
private final int value;
private HFBHBGNLNMK(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:TryEnterHomeRsp.HFBHBGNLNMK)
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int TARGETUID_FIELD_NUMBER = 15;
public static final int TARGET_UID_FIELD_NUMBER = 4;
private int targetUid_;
/**
* <code>uint32 targetUid = 15;</code>
* <code>uint32 target_uid = 4;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -302,10 +187,10 @@ public final class TryEnterHomeRspOuterClass {
return targetUid_;
}
public static final int PARAMLIST_FIELD_NUMBER = 10;
public static final int PARAM_LIST_FIELD_NUMBER = 5;
private com.google.protobuf.Internal.IntList paramList_;
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @return A list containing the paramList.
*/
@java.lang.Override
@@ -314,14 +199,14 @@ public final class TryEnterHomeRspOuterClass {
return paramList_;
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @return The count of paramList.
*/
public int getParamListCount() {
return paramList_.size();
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @param index The index of the element to return.
* @return The paramList at the given index.
*/
@@ -330,17 +215,6 @@ public final class TryEnterHomeRspOuterClass {
}
private int paramListMemoizedSerializedSize = -1;
public static final int RETCODE_FIELD_NUMBER = 12;
private int retcode_;
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -356,18 +230,18 @@ public final class TryEnterHomeRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (targetUid_ != 0) {
output.writeUInt32(4, targetUid_);
}
if (getParamListList().size() > 0) {
output.writeUInt32NoTag(82);
output.writeUInt32NoTag(42);
output.writeUInt32NoTag(paramListMemoizedSerializedSize);
}
for (int i = 0; i < paramList_.size(); i++) {
output.writeUInt32NoTag(paramList_.getInt(i));
}
if (retcode_ != 0) {
output.writeInt32(12, retcode_);
}
if (targetUid_ != 0) {
output.writeUInt32(15, targetUid_);
output.writeInt32(6, retcode_);
}
unknownFields.writeTo(output);
}
@@ -378,6 +252,10 @@ public final class TryEnterHomeRspOuterClass {
if (size != -1) return size;
size = 0;
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, targetUid_);
}
{
int dataSize = 0;
for (int i = 0; i < paramList_.size(); i++) {
@@ -394,11 +272,7 @@ public final class TryEnterHomeRspOuterClass {
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, retcode_);
}
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, targetUid_);
.computeInt32Size(6, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -415,12 +289,12 @@ public final class TryEnterHomeRspOuterClass {
}
emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp other = (emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (getTargetUid()
!= other.getTargetUid()) return false;
if (!getParamListList()
.equals(other.getParamListList())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -432,14 +306,14 @@ public final class TryEnterHomeRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TARGETUID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
if (getParamListCount() > 0) {
hash = (37 * hash) + PARAMLIST_FIELD_NUMBER;
hash = (53 * hash) + getParamListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
if (getParamListCount() > 0) {
hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
hash = (53 * hash) + getParamListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -536,6 +410,11 @@ public final class TryEnterHomeRspOuterClass {
return builder;
}
/**
* <pre>
* Name: AHNJCJHDDPO
* CmdId: 4597
* </pre>
*
* Protobuf type {@code TryEnterHomeRsp}
*/
public static final class Builder extends
@@ -573,12 +452,12 @@ public final class TryEnterHomeRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
targetUid_ = 0;
paramList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
retcode_ = 0;
return this;
}
@@ -606,13 +485,13 @@ public final class TryEnterHomeRspOuterClass {
public emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp buildPartial() {
emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp result = new emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp(this);
int from_bitField0_ = bitField0_;
result.retcode_ = retcode_;
result.targetUid_ = targetUid_;
if (((bitField0_ & 0x00000001) != 0)) {
paramList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.paramList_ = paramList_;
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -661,6 +540,9 @@ public final class TryEnterHomeRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp other) {
if (other == emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getTargetUid() != 0) {
setTargetUid(other.getTargetUid());
}
@@ -674,9 +556,6 @@ public final class TryEnterHomeRspOuterClass {
}
onChanged();
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -707,9 +586,40 @@ public final class TryEnterHomeRspOuterClass {
}
private int bitField0_;
private int retcode_ ;
/**
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 6;</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 = 6;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int targetUid_ ;
/**
* <code>uint32 targetUid = 15;</code>
* <code>uint32 target_uid = 4;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -717,7 +627,7 @@ public final class TryEnterHomeRspOuterClass {
return targetUid_;
}
/**
* <code>uint32 targetUid = 15;</code>
* <code>uint32 target_uid = 4;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
@@ -728,7 +638,7 @@ public final class TryEnterHomeRspOuterClass {
return this;
}
/**
* <code>uint32 targetUid = 15;</code>
* <code>uint32 target_uid = 4;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
@@ -746,7 +656,7 @@ public final class TryEnterHomeRspOuterClass {
}
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @return A list containing the paramList.
*/
public java.util.List<java.lang.Integer>
@@ -755,14 +665,14 @@ public final class TryEnterHomeRspOuterClass {
java.util.Collections.unmodifiableList(paramList_) : paramList_;
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @return The count of paramList.
*/
public int getParamListCount() {
return paramList_.size();
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @param index The index of the element to return.
* @return The paramList at the given index.
*/
@@ -770,7 +680,7 @@ public final class TryEnterHomeRspOuterClass {
return paramList_.getInt(index);
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @param index The index to set the value at.
* @param value The paramList to set.
* @return This builder for chaining.
@@ -783,7 +693,7 @@ public final class TryEnterHomeRspOuterClass {
return this;
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @param value The paramList to add.
* @return This builder for chaining.
*/
@@ -794,7 +704,7 @@ public final class TryEnterHomeRspOuterClass {
return this;
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @param values The paramList to add.
* @return This builder for chaining.
*/
@@ -807,7 +717,7 @@ public final class TryEnterHomeRspOuterClass {
return this;
}
/**
* <code>repeated uint32 paramList = 10;</code>
* <code>repeated uint32 param_list = 5;</code>
* @return This builder for chaining.
*/
public Builder clearParamList() {
@@ -816,37 +726,6 @@ public final class TryEnterHomeRspOuterClass {
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 12;</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 = 12;</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) {
@@ -914,11 +793,9 @@ public final class TryEnterHomeRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\025TryEnterHomeRsp.proto\"\231\001\n\017TryEnterHome" +
"Rsp\022\021\n\ttargetUid\030\017 \001(\r\022\021\n\tparamList\030\n \003(" +
"\r\022\017\n\007retcode\030\014 \001(\005\"O\n\013HFBHBGNLNMK\022\010\n\004NON" +
"E\020\000\022\020\n\013PEPPOHPHJOJ\020\324%\022\017\n\013DCDNILFDFLB\020\000\022\017" +
"\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.n" +
"\n\025TryEnterHomeRsp.proto\"J\n\017TryEnterHomeR" +
"sp\022\017\n\007retcode\030\006 \001(\005\022\022\n\ntarget_uid\030\004 \001(\r\022" +
"\022\n\nparam_list\030\005 \003(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -930,7 +807,7 @@ public final class TryEnterHomeRspOuterClass {
internal_static_TryEnterHomeRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TryEnterHomeRsp_descriptor,
new java.lang.String[] { "TargetUid", "ParamList", "Retcode", });
new java.lang.String[] { "Retcode", "TargetUid", "ParamList", });
}
// @@protoc_insertion_point(outer_class_scope)